Merge remote-tracking branch 'amb26/GPII-1848'

* amb26/GPII-1848:
  GPII-1848: Updated to current GPII-1848 version of universal to acquire node-jqunit as nested dependency, tidied up unused grunt-shell dependency, removed unneeded material from vagrant provisioning script
  GPII-1852: Fix for (quietly reported) test failure in registryResolver
  GPII-1848: Removal of grunt-gpii and stale build files, update to grunt 1.x and ESLint linting, position universal as a standard npm dependency

Author: colinbdclark

.eslintrc.json

@@ -0,0 +1,75 @@
+{
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "block-scoped-var": "error",
+    "comma-style": [
+      "error",
+      "last"
+    ],
+    "curly": [
+      "error",
+      "all"
+    ],
+    "dot-notation": [
+      "error",
+      {
+        "allowKeywords": false
+      }
+    ],
+    "eol-last": "error",
+    "eqeqeq": [
+      "error",
+      "allow-null"
+    ],
+    "indent": ["error", 4],
+    "new-cap": ["error", { "properties": false }],
+    "no-caller": "error",
+    "no-cond-assign": [
+      "error",
+      "except-parens"
+    ],
+    "no-debugger": "error",
+    "no-empty": ["error", {"allowEmptyCatch": true}],
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-irregular-whitespace": "error",
+    "no-iterator": "error",
+    "no-loop-func": "error",
+    "no-multi-str": "error",
+    "no-new": "error",
+    "no-proto": "error",
+    "no-script-url": "error",
+    "no-sequences": "error",
+    "no-trailing-spaces": "error",
+    "no-undef": "error",
+    "no-unused-vars": "error",
+    "no-with": "error",
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "space-before-blocks": ["error", "always"],
+    "space-before-function-paren": ["error", {"anonymous": "always", "named": "never"}],
+    "space-infix-ops": "error",
+    "space-unary-ops": [
+      "error", {
+        "words": true,
+        "nonwords": false,
+        "overrides": {
+            "typeof": false
+        }
+    }],
+    "strict": ["error", "safe"],
+    "valid-typeof": "error",
+    "wrap-iife": [
+      "error",
+      "inside"
+    ]
+  }
+}

.jshintrc

@@ -1,38 +1,30 @@
-/*!
+/*
 GPII Windows Personalization Framework Gruntfile
+Copyright 2013-2014 OCAD University
 
-Copyright 2014 RTF-US
+Licensed under the Educational Community License (ECL), Version 2.0 or the New
+BSD license. You may not use this file except in compliance with one these
+Licenses.
 
-Licensed under the New BSD license. You may not use this file except in
-compliance with this License.
-
-You may obtain a copy of the License at
-https://github.com/gpii/universal/LICENSE.txt
+You may obtain a copy of the ECL 2.0 License and BSD License at
+https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 */
 
 "use strict";
 
 module.exports = function (grunt) {
-    grunt.loadNpmTasks("grunt-contrib-jshint");
-    grunt.loadNpmTasks("grunt-jsonlint");
-    grunt.loadNpmTasks("grunt-shell");
-    grunt.loadNpmTasks("grunt-gpii");
-        
-    grunt.config.getRaw("gpiiGruntGlobal");
+
     grunt.initConfig({
-        jshint: {
-            src: ["gpii/**/*.js", "tests/**/*.js", "index.js", "gpii.js"],
-            buildScripts: ["Gruntfile.js"],
-            options: {
-                jshintrc: true
-            }
+        eslint: {
+            src: ["./gpii/**/*.js", "./tests/**/*.js", "./*.js"]
         },
         jsonlint: {
-            src: ["gpii/**/*.json", "tests/**/*.json"]
+            src: ["gpii/**/*.json", "tests/**/*.json", "examples/**/*.json"]
         }
     });
 
-    grunt.registerTask("build", "Build the entire GPII", function () {
-        grunt.task.run("gpii-universal");
-    });
+    grunt.loadNpmTasks("grunt-jsonlint");
+    grunt.loadNpmTasks("fluid-grunt-eslint");
+
+    grunt.registerTask("lint", "Apply jshint and jsonlint", ["eslint", "jsonlint"]);
 };

Gruntfile.js

@@ -9,33 +9,15 @@ Windows 7 SP1 and Windows 8 SP2) unless the following hotfix from Microsoft is a
 
 See http://issues.gpii.net/browse/GPII-49 for more details of this issue. 
 
-# Grunt Builds
+# Building
 
-We are in the process of adding support for building and running utility tasks 
-with grunt.js. At some point these will replace the current build scripts.
+This package depends on the node 4.x LTS infrastructure - at the time of writing, node 4.4.1 and npm 2.1.14.
 
-To use these, you must be running a recent version of npm, necessarily greater 
-than 1.4.  If you need to upgrade npm you can issue the following command:
-
-    npm install -g npm
-
-To build the GPII for Windows using grunt, perform the following:
+To build the GPII for Windows, perform the following:
 
     git clone https://github.com/GPII/windows.git
     cd windows
     npm install
-    grunt build
-
-Note that whenever you run the `npm install` task for this project, you must use the option appearing above.
-
-# Old Builds
-
-This project is still bundled with command-line build scripts (with the same effect as the above grunt builds) - support for these
-will be withdrawn soon. You can operate these as follows:
-
-
-* `build.cmd` will check out GPII's universal project https://github.com/GPII/universal in a subdirectory. 
-* `start.cmd` will run the GPII personalisation system
 
 # Test VM
 

README.md

@@ -14,6 +14,7 @@
  * https://github.com/GPII/universal/blob/master/LICENSE.txt
  */
 
+"use strict";
 
 var fluid = require("universal"),
     gpii = fluid.registerNamespace("gpii");