Updated build commands, set the revision based on the date of the latest commit and set the dependencies based on the variables of the provisioning files

Author: amatas

Gruntfile.js

@@ -24,6 +24,16 @@ module.exports = function (grunt) {
     var gypCompileCmd = "node-gyp configure build";
     var gypCleanCmd = "node-gyp clean";
     var pkgdata = require('./package.json');
+    var yaml = require('js-yaml');
+    var fs   = require('fs');
+    var varfile = [];
+
+    try {
+        varfile = yaml.safeLoad(fs.readFileSync('provisioning/vars.yml', 'utf8'));
+    } catch (e) {
+        grunt.log.error(e);
+    }
+
     var currentArch = (function() {
         if (process.arch == 'ia32')
             return 'i386';
@@ -33,6 +43,44 @@ module.exports = function (grunt) {
             return "noarch";
     })();
 
+    function getDate () {
+       var execSync = require("child_process").execSync;
+       var rawtimestamp;
+       try {
+           rawtimestamp = execSync("git show -s --format=%ct HEAD");
+       } catch (e) {
+           grunt.log.write(e.message);
+           rawtimestamp = 0;
+       }
+       var date = new Date(Number(rawtimestamp) * 1000);
+       var dateFields = {
+           year: date.getUTCFullYear(),
+           month: date.getUTCMonth() + 1, // months are zero based by default
+           day: date.getUTCDate(),
+           hours: date.getUTCHours(),
+           minutes: date.getUTCMinutes(),
+           seconds: date.getUTCSeconds()
+       }
+       return String(dateFields.year) +
+              padStr(dateFields.month) +
+              padStr(dateFields.day) +
+              padStr(dateFields.hours) +
+              padStr(dateFields.minutes) +
+              padStr(dateFields.seconds);
+    }
+    function padStr (num) {
+        return ('00' + num).slice(-2)
+    }
+    function getDepends (list) {
+        var auxlist = [];
+        auxlist.push("nodejs >= 4.4.0");
+        auxlist.push("python-httplib2");
+        for (var i = 0; i < list.length; i++) {
+            if (!list[i].match(/.*-devel/g))
+                auxlist.push(list[i]);
+        }
+        return auxlist;
+    }
     function nodeGypShell(cmd, cwd) {
         return {
             options: {
@@ -94,11 +142,16 @@ module.exports = function (grunt) {
                     "sudo rm -f -r /var/lib/gpii"
                 ].join("&&")
             },
-            prepareRpmEnv: {
-                command: "dnf install -y nodejs-grunt-cli npm alsa-lib-devel json-glib-devel PackageKit-glib-devel libXrandr-devel libgnome-keyring-devel sudo @development-tools rpmdevtools"
-            },
             buildRpmDocker: {
-                command: "docker run --rm -i -v $(pwd):/sync fedora /bin/bash -c 'dnf install -y nodejs-grunt-cli; cp -r /sync /packages; cd /packages; grunt build-rpm; cp -r /packages/bin /sync'"
+                command: "docker run --rm -i -v $(pwd):/sync fedora:23 /bin/bash -c '" +
+                    "dnf install -y ansible python2-dnf git sudo fedora-packager @development-tools;" +
+                    "cp -r /sync /packages; cd /packages;" +
+                    "ansible-galaxy install -fr /packages/provisioning/requirements.yml;" +
+                    "ansible-playbook /packages/provisioning/playbook.yml --tags=\"install\";" +
+                    "npm install; grunt build-rpm; cp -r /packages/bin /sync'"
+            },
+            npmInstall: {
+                command: "npm install"
             },
             runAcceptanceTests: {
                 command: "vagrant ssh -c 'DISPLAY=:0 node /home/vagrant/sync/tests/AcceptanceTests.js'"
@@ -109,18 +162,15 @@ module.exports = function (grunt) {
         },
         easy_rpm: {
             options: {
-                release: 1,
+                release: getDate(),
                 summary: pkgdata.description,
                 rpmDestination: "bin",
                 tempDir: "bin/tmp",
                 keepTemp: true,
-                license: pkgdata.licenses[0].type,
+                license: pkgdata.licenses,
                 url: pkgdata.homepage,
                 buildArch: currentArch,
-                requires: [
-                    "nodejs >= 0.10.42",
-                    "python-httplib2"
-                ]
+                requires: getDepends(varfile["nodejs_app_rpm_packages"]),
             },
             release: {
                 files: [
@@ -191,7 +241,7 @@ module.exports = function (grunt) {
         grunt.task.run("shell:buildRpmDocker");
     });
     grunt.registerTask("build-rpm", "Build GPII Linux and RPM package", function () {
-        grunt.task.run("shell:prepareRpmEnv");
+        grunt.task.run("shell:npmInstall");
         grunt.task.run("build");
         grunt.task.run("easy_rpm");
     });

README.md

@@ -61,6 +61,13 @@ To build a RPM package run the following command at the root of the git reposito
 you will get the rpm package and the source files of the package in the ``bin``
 directory.
 
+This command has been tested in a linux environment, to ensure that this process
+runs fine, exec it inside a linux box with Docker support.
+
+_Note: It should work in the new Docker for Windows/OSX, because it use a third 
+directory to build the application and the rpm, and finally copy the package to
+the directory of the repository, but it hasn't been tested jet._
+
 # Setting Up a Virtual Machine
 
 This repository contains content that will allow you to automatically provision a development VM. A [Vagrantfile](http://docs.vagrantup.com/v2/vagrantfile/) is provided that downloads a [Fedora Vagrant box](https://github.com/idi-ops/packer-fedora), starts a VM, and deploys the GPII Framework on it.

Vagrantfile

@@ -59,8 +59,8 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.provision "shell", inline: <<-SHELL
-    sudo ansible-galaxy install -fr /home/vagrant/sync/provisioning/requirements.yml
-    sudo PYTHONUNBUFFERED=1 ansible-playbook /home/vagrant/sync/provisioning/playbook.yml --tags="install,configure"
+   sudo ansible-galaxy install -fr /home/vagrant/sync/provisioning/requirements.yml
+   sudo PYTHONUNBUFFERED=1 ansible-playbook /home/vagrant/sync/provisioning/playbook.yml --tags="install,configure"
   SHELL
 
   # Using config.vm.hostname to set the hostname on Fedora VMs seems to remove the string

package.json

@@ -12,6 +12,7 @@
         "grunt-contrib-jshint": "~0.9.0",
         "grunt-jsonlint": "1.0.4",
         "grunt-gpii": "git://github.com/GPII/grunt-gpii.git#ec8412064e107febb120f0b7437d403453b40d2d",
+        "js-yaml": "~3.6.1",
         "nan": "^2.1.0"
     },
     "license" : "BSD-3-Clause",