Merge branch 'master' into GPII-1108

Conflicts:
	gpii/node_modules/WindowsUtilities/WindowsUtilities.js

Author: amb26

.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"
+    ]
+  }
+}

.gitignore

@@ -0,0 +1,3 @@
+/node_modules/
+.vagrant
+**/test/*.exe

.jshintrc

@@ -1,45 +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");
-        
-    var gpiiGrunt = 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("start", "Start the GPII", function () {
-        gpiiGrunt.shellImmediate({
-            name: "start",
-            command: "node gpii.js"
-        });
-    });
+    grunt.registerTask("lint", "Apply jshint and jsonlint", ["eslint", "jsonlint"]);
 };

Gruntfile.js

@@ -9,32 +9,28 @@ 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 --ignore-scripts=true
-    grunt build
-
-Note that whenever you run the `npm install` task for this project, you must use the option appearing above.
+    npm install
 
-# Old Builds
+# Test VM
 
-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:
+It is possible to provision a Windows VM for testing purposes. Please ensure you have met [these VM requirements](https://github.com/GPII/qi-development-environments/#requirements) before proceeding. After that you can use the ``vagrant up`` command to create an instance of a [Windows 10 Evaluation VM](https://github.com/idi-ops/packer-windows) which will boot an instance of the Windows 10 VM, pull in the GPII Framework's npm dependencies, and then build it. 
 
+If this is your first time creating this VM an 8 GB download will take place. The downloaded image will be valid for 90 days after which the Windows installation will no longer be useable. To remove an expired image you can use the ``vagrant box remove "inclusivedesign/windows10-eval"`` command.
 
-* `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
+Once the VM has finished booting up you will need to type the ``vagrant reload`` command to cause it to restart. This is required so changes made to the Windows VM's ``PATH`` environment variable as part of the provisioning process are available in terminal sessions. This step is a temporary workaround and will be removed in the near future. 
 
+Now you can open a command prompt window and use the following commands to test the framework:
 
+```
+cd c:\vagrant
+node tests\UnitTests.js
+node tests\AcceptanceTests.js builtIn
+```

README.md

@@ -0,0 +1,41 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.require_version ">= 1.8.0"
+
+# By default this VM will use 2 processor cores and 2GB of RAM. The 'VM_CPUS' and
+# "VM_RAM" environment variables can be used to change that behaviour.
+cpus = ENV["VM_CPUS"] || 2
+ram = ENV["VM_RAM"] || 2048
+
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "inclusivedesign/windows10-eval"
+  config.vm.guest = :windows
+
+  config.vm.communicator = "winrm"
+  config.winrm.username = "vagrant"
+  config.winrm.password = "vagrant"
+  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct:true
+  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "rdp", auto_correct:true
+
+  config.vm.provider :virtualbox do |vm|
+    vm.gui = true
+    vm.customize ["modifyvm", :id, "--memory", ram]
+    vm.customize ["modifyvm", :id, "--cpus", cpus]
+    vm.customize ["modifyvm", :id, "--vram", "256"]
+    vm.customize ["modifyvm", :id, "--accelerate3d", "off"]
+    vm.customize ["modifyvm", :id, "--audio", "null", "--audiocontroller", "hda"]
+    vm.customize ["modifyvm", :id, "--ioapic", "on"]
+    vm.customize ["setextradata", "global", "GUI/SuppressMessages", "all"]
+  end
+
+  config.vm.provision "shell", inline: <<-SHELL
+    choco upgrade firefox googlechrome -y
+  SHELL
+  
+  config.vm.provision "shell", path: "provisioning/chocolatey-packages.bat"
+  config.vm.provision "shell", path: "provisioning/npm-packages.bat"
+  config.vm.provision "shell", path: "provisioning/build.bat"
+
+end

Vagrantfile

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