nodeify the authorization script and update readme

Author: jlipps

README.md

@@ -21,9 +21,9 @@ Change into your local repo clone and install packages using following commands:
 
 First two commands will make test and build tools available (sudo may not be necessary if you installed node.js through homebrew). The third command will install all app dependencies.
 
-To avoid a security dialog that can appear when launching your iOS app, you need to modify your /etc/authorization file. You can do this by settings the element following <allow-root> under <key>system.privilege.taskport</key> to <true/> or by running the supplied python script (at your own risk)
+To avoid a security dialog that can appear when launching your iOS app, you need to modify your /etc/authorization file. You can do this by settings the element following <allow-root> under <key>system.privilege.taskport</key> to <true/> or by running the supplied grunt task (at your own risk)
 
-    > sudo python authorize.py
+    > sudo grunt authorize
 
 Quick Start
 -----------
@@ -36,20 +36,19 @@ Build an app:
     > grunt buildApp:UICatalog
     > grunt buildApp:TestApp
 
-Start it:
-
-    > grunt appium:TestApp &
-
-Run functional tests (make sure Appium server is not running as this command
-runs it for the duration of the test):
+Run functional tests against TestApp:
 
     > grunt functional
 
-Run unit tests:
+Run unit tests against TestApp:
 
     > grunt unit
 
-Run all tests:
+Run tests against UICatalog:
+
+    > grunt uicatalog
+
+Run all tests against TestApp and UICatalog:
 
     > grunt test
 
@@ -61,6 +60,18 @@ Before commiting code please run grunt to run test and check your changes agains
 
     Done, without errors.
 
+More things
+-----------
+If you want to run the appium server and have it listen indefinitely, you can
+do one of the following:
+
+    > grunt appium:TestApp
+    > grunt appium:UICatalog
+
+Then you can, e.g., run individual testfiles using Mocha directly:
+
+    > mocha -t 60000 -R spec test/functional/simple.js
+
 Using with a [Bitbeambot](http://bitbeam.org)
 -----------
 

authorize.py

@@ -4,6 +4,10 @@ var _ = require("underscore")
   , server = require('./server.js')
   , fs = require('fs')
   , path = require('path')
+  , temp = require('temp')
+  , difflib = require('difflib')
+  , prompt = require('prompt')
+  , exec = require('child_process').exec
   , spawn = require('child_process').spawn;
 
 module.exports.startAppium = function(appName, verbose, readyCb, doneCb) {
@@ -77,3 +81,64 @@ module.exports.runMochaTests = function(grunt, appName, testType, cb) {
   });
 
 };
+
+module.exports.authorize = function(grunt, cb) {
+  // somewhat messily ported from lukeis's authorize.py
+  var authFile = '/etc/authorization';
+  exec('DevToolsSecurity --enable', function(err, stdout, stderr) {
+    if (err) throw err;
+    fs.readFile(authFile, 'utf8', function(err, data) {
+      if (err) throw err;
+      var origData = data;
+      var re = /<key>system.privilege.taskport<\/key>\s*\n\s*<dict>\n\s*<key>allow-root<\/key>\n\s*(<[^>]+>)/;
+      var match = re.exec(data);
+      if (!match) {
+        grunt.fatal("Could not find the system.privilege.taskport key in /etc/authorization");
+      } else {
+        if (!(/<false\/>/.exec(match[0]))) {
+          grunt.fatal("/etc/authorization has already been modified to support appium");
+        } else {
+          var newText = match[0].replace(match[1], '<true/>');
+          var newContent = data.replace(match[0], newText);
+          temp.open('authorization.backup.', function (err, info) {
+            fs.write(info.fd, origData);
+            fs.close(info.fd, function(err) {
+              if (err) throw err;
+              grunt.log.writeln("Backed up to " + info.path);
+              var diff = difflib.contextDiff(origData.split("\n"), newContent.split("\n"), {fromfile: "before", tofile: "after"});
+              grunt.log.writeln("Check this diff to make sure the change looks cool:");
+              grunt.log.writeln(diff.join("\n"));
+              prompt.start();
+              var promptProps = {
+                properties: {
+                  proceed: {
+                    pattern: /^(y|n)/
+                    , description: "Make changes? [y/n] "
+                  }
+                }
+              };
+              prompt.get(promptProps, function(err, result) {
+                if (result.proceed == "y") {
+                  fs.writeFile(authFile, newContent, function(err) {
+                    if (err) {
+                      if (err.code === "EACCES") {
+                        grunt.fatal("You need to run this as sudo!");
+                      } else {
+                        throw err;
+                      }
+                    }
+                    grunt.log.writeln("Wrote new /etc/authorization");
+                    cb();
+                  });
+                } else {
+                  grunt.log.writeln("No changes were made");
+                  cb();
+                }
+              });
+            });
+          });
+        }
+      }
+    });
+  });
+};

grunt-helpers.js

@@ -6,6 +6,7 @@ var build = require('./build.js')
   , exec = require('child_process').exec
   , gruntHelpers = require('./grunt-helpers.js')
   , startAppium = gruntHelpers.startAppium
+  , authorize = gruntHelpers.authorize
   , runTestsWithServer = gruntHelpers.runTestsWithServer
   , fs = require('fs');
 
@@ -107,4 +108,7 @@ module.exports = function(grunt) {
       }
     });
   });
+  grunt.registerTask('authorize', "Authorize developer", function() {
+    authorize(grunt, this.async());
+  });
 };

grunt.js

@@ -44,6 +44,9 @@
     "assert": "~0.4.9",
     "grunt-mocha-test": "0.0.1",
     "request": "~2.12.0",
-    "winston": "~0.6.2"
+    "winston": "~0.6.2",
+    "temp": "~0.5.0",
+    "difflib": "~0.2.4",
+    "prompt": "~0.2.9"
   }
 }