Merge branch 'remotetest-874821' into landing

Author: joewalker

.travis.yml

@@ -1,7 +1,12 @@
 
 language: node_js
 node_js:
+  - "0.10"
   - "0.8"
+before_script:
+  - "node gcli.js server start --allowexec --websocket &"
 script:
-  - "node gcli.js test && phantomjs ./phantom-test.js"
+  - "node gcli.js test && phantomjs ./phantom-test.js && phantomjs ./phantom-test.js --http"
+after_script:
+  - "phantomjs ./phantom-test.js --shutdown"
 

lib/demo/commands/basic.js

@@ -100,11 +100,11 @@ var sleep = {
       description: 'How long to wait (s)'
     }
   ],
-  returnType: 'html',
+  returnType: 'string',
   exec: function(args, context) {
     var deferred = context.defer();
     window.setTimeout(function() {
-      deferred.resolve('done');
+      deferred.resolve('Done');
     }, args.length * 1000);
     return deferred.promise;
   }

lib/gcli/canon.js

@@ -453,6 +453,10 @@ Canon.prototype.addProxyCommands = function(prefix, commandSpecs, remoter, to) {
   names.forEach(function(name) {
     var commandSpec = commandSpecs[name];
 
+    if (commandSpec.noRemote) {
+      return;
+    }
+
     if (!commandSpec.isParent) {
       commandSpec.exec = function(args, context) {
         context.commandName = name;

lib/gcli/cli.js

@@ -887,7 +887,7 @@ Requisition.prototype.complete = function(cursor, predictionChoice) {
       outstanding.push(promise);
     }
 
-    return util.all(outstanding).then(function() {
+    return Promise.all(outstanding).then(function() {
       this.onTextChange();
       this.onTextChange.resumeFire();
     }.bind(this));
@@ -1704,19 +1704,19 @@ Requisition.prototype._assign = function(args) {
 
   if (!this.commandAssignment.value) {
     this._addUnassignedArgs(args);
-    return util.all(outstanding);
+    return Promise.all(outstanding);
   }
 
   if (args.length === 0) {
     this.setBlankArguments();
-    return util.all(outstanding);
+    return Promise.all(outstanding);
   }
 
   // Create an error if the command does not take parameters, but we have
   // been given them ...
   if (this.assignmentCount === 0) {
     this._addUnassignedArgs(args);
-    return util.all(outstanding);
+    return Promise.all(outstanding);
   }
 
   // Special case: if there is only 1 parameter, and that's of type
@@ -1726,7 +1726,7 @@ Requisition.prototype._assign = function(args) {
     if (assignment.param.type.name === 'string') {
       var arg = (args.length === 1) ? args[0] : new MergedArgument(args);
       outstanding.push(this.setAssignment(assignment, arg, noArgUp));
-      return util.all(outstanding);
+      return Promise.all(outstanding);
     }
   }
 
@@ -1833,7 +1833,7 @@ Requisition.prototype._assign = function(args) {
   // What's left is can't be assigned, but we need to extract
   this._addUnassignedArgs(args);
 
-  return util.all(outstanding);
+  return Promise.all(outstanding);
 };
 
 exports.Requisition = Requisition;

lib/gcli/commands/connect.js

@@ -85,10 +85,12 @@ var connect = {
   createRemoter: function(prefix, connection) {
     return function(cmdArgs, context) {
       var typed = context.typed;
-      if (typed.indexOf(prefix) !== 0) {
-        throw new Error("Missing prefix");
+
+      // If we've been called using a 'context' then there will be no prefix
+      // otherwise we need to remove it
+      if (typed.indexOf(prefix) === 0) {
+        typed = typed.substring(prefix.length).replace(/^ */, "");
       }
-      typed = typed.substring(prefix.length).replace(/^ */, "");
 
       return connection.execute(typed, cmdArgs).then(function(reply) {
         var typedData = context.typedData(reply.type, reply.data);
@@ -128,12 +130,19 @@ var disconnect = {
       name: 'prefix',
       type: 'connection',
       description: l10n.lookup('disconnectPrefixDesc'),
+    },
+    {
+      name: 'force',
+      type: 'boolean',
+      description: l10n.lookup('disconnectForceDesc'),
+      hidden: connector.disconnectSupportsForce,
+      option: true
     }
   ],
   returnType: 'string',
 
   exec: function(args, context) {
-    return args.prefix.disconnect().then(function() {
+    return args.prefix.disconnect(args.force).then(function() {
       var removed = canon.removeProxyCommands(args.prefix.prefix);
       delete connections[args.prefix.prefix];
       return l10n.lookupFormat('disconnectReply', [ removed.length ]);

lib/gcli/commands/context.js

@@ -37,6 +37,7 @@ var contextCmdSpec = {
    }
   ],
   returnType: 'string',
+  noRemote: true,
   exec: function echo(args, context) {
     // Do not copy this code
     var requisition = context.__dlhjshfw;

lib/gcli/converters.js

@@ -110,6 +110,17 @@ var terminalDomConverter = {
   }
 };
 
+/**
+ * Convert a terminal object to a string
+ */
+var terminalStringConverter = {
+  from: 'terminal',
+  to: 'string',
+  exec: function(data, context) {
+    return Array.isArray(data) ? data.join('') : '' + data;
+  }
+};
+
 /**
  * Several converters are just data.toString inside a 'p' element
  */
@@ -289,6 +300,7 @@ exports.convert = function(data, from, to, conversionContext) {
 exports.addConverter(viewDomConverter);
 exports.addConverter(viewStringConverter);
 exports.addConverter(terminalDomConverter);
+exports.addConverter(terminalStringConverter);
 exports.addConverter(stringDomConverter);
 exports.addConverter(numberDomConverter);
 exports.addConverter(booleanDomConverter);

lib/gcli/nls/strings.js

@@ -272,9 +272,19 @@ var i18n = {
     // which is why it should be as short as possible.
     disconnectPrefixDesc: 'Parent prefix for imported commands',
 
+    // A short description of the 'force' parameter to the 'disconnect' command.
+    // This string is designed to be shown in a dialog with restricted space,
+    // which is why it should be as short as possible.
+    disconnectForceDesc: 'Ignore outstanding requests',
+
     // The output of the 'disconnect' command, telling the user what it's done.
     disconnectReply: 'Removed %S commands.',
 
+    // An error message displayed when the user attempts to disconnect before
+    // all requests have completed.
+    // %1$S is a list of commands which are incomplete
+    disconnectOutstanding: 'Outstanding requests (%1$S)',
+
     // A very short description of the 'cd' command.
     // This string is designed to be shown in a menu alongside the command name,
     // which is why it should be as short as possible.

lib/gcli/types/basic.js

@@ -449,7 +449,7 @@ ArrayType.prototype.parse = function(arg, context) {
   }.bind(this);
 
   var conversionPromises = arg.getArguments().map(subArgParse);
-  return util.all(conversionPromises).then(function(conversions) {
+  return Promise.all(conversionPromises).then(function(conversions) {
     return new ArrayConversion(conversions, arg);
   });
 };

lib/gclitest/helpers.js

@@ -226,7 +226,7 @@ helpers._actual = {
                 .replace(/ $/, '');
     };
 
-    var promisedJoin = util.promised(join);
+    var promisedJoin = Promise.promised(join);
     return promisedJoin(templateData.directTabText,
                         templateData.emptyParameters,
                         templateData.arrowTabText);
@@ -314,12 +314,12 @@ helpers._createDebugCheck = function(options) {
   var hintsPromise = helpers._actual.hints(options);
   var predictionsPromise = helpers._actual.predictions(options);
 
-  return util.all(hintsPromise, predictionsPromise).then(function(values) {
+  return Promise.all(hintsPromise, predictionsPromise).then(function(values) {
     var hints = values[0];
     var predictions = values[1];
     var output = '';
 
-    output += 'helpers.audit(options, [\n';
+    output += 'return helpers.audit(options, [\n';
     output += '  {\n';
 
     if (cursor === input.length) {
@@ -627,13 +627,14 @@ helpers._check = function(options, name, checks) {
     Object.keys(checks.args).forEach(function(paramName) {
       var check = checks.args[paramName];
 
-      var assignment;
-      if (paramName === 'command') {
+      // We allow an 'argument' called 'command' to be the command itself, but
+      // what if the command has a parameter called 'command' (for example, an
+      // 'exec' command)? We default to using the parameter because checking
+      // the command value is less useful
+      var assignment = requisition.getAssignment(paramName);
+      if (assignment == null && paramName === 'command') {
         assignment = requisition.commandAssignment;
       }
-      else {
-        assignment = requisition.getAssignment(paramName);
-      }
 
       if (assignment == null) {
         assert.ok(false, 'Unknown arg: ' + paramName + suffix);
@@ -699,7 +700,7 @@ helpers._check = function(options, name, checks) {
     });
   }
 
-  return util.all(outstanding).then(function() {
+  return Promise.all(outstanding).then(function() {
     // Ensure the promise resolves to nothing
     return undefined;
   });
@@ -717,7 +718,16 @@ helpers._exec = function(options, name, expected) {
     return Promise.resolve({});
   }
 
-  var output = options.display.requisition.exec({ hidden: true });
+  var output;
+  try {
+    output = options.display.requisition.exec({ hidden: true });
+  }
+  catch (ex) {
+    assert.ok(false, 'Failure executing \'' + name + '\': ' + ex);
+    util.errorHandler(ex);
+
+    return Promise.resolve({});
+  }
 
   if ('completed' in expected) {
     assert.is(output.completed,
@@ -735,9 +745,6 @@ helpers._exec = function(options, name, expected) {
   }
 
   var checkOutput = function() {
-    var div = options.window.document.createElement('div');
-    var conversionContext = options.display.requisition.conversionContext;
-
     if ('type' in expected) {
       assert.is(output.type,
                 expected.type,
@@ -750,20 +757,20 @@ helpers._exec = function(options, name, expected) {
                 'output.error for: ' + name);
     }
 
+    var conversionContext = options.display.requisition.conversionContext;
     var convertPromise = converters.convert(output.data, output.type, 'dom',
                                             conversionContext);
     return convertPromise.then(function(node) {
-      div.appendChild(node);
-      var actualOutput = div.textContent.trim();
+      var actualOutput = node.textContent.trim();
 
       var doTest = function(match, against) {
         if (match.test(against)) {
-          assert.ok(true, 'html output for ' + name + ' should match ' +
-                          match.source);
+          assert.ok(true, 'html output for ' + name + ' should match /' +
+                          match.source + '/');
         } else {
-          assert.ok(false, 'html output for ' + name + ' should match ' +
+          assert.ok(false, 'html output for ' + name + ' should match /' +
                            match.source +
-                           '. Actual textContent: "' + against + '"');
+                           '/. Actual textContent: "' + against + '"');
         }
       };
 
@@ -820,11 +827,13 @@ var totalResponseTime = 0;
 var averageOver = 0;
 var maxResponseTime = 0;
 var maxResponseCulprit = undefined;
+var start = undefined;
 
 /**
  * Restart the stats collection process
  */
 helpers.resetResponseTimes = function() {
+  start = new Date().getTime();
   totalResponseTime = 0;
   averageOver = 0;
   maxResponseTime = 0;
@@ -859,6 +868,20 @@ Object.defineProperty(helpers, 'maxResponseCulprit', {
   enumerable: true
 });
 
+/**
+ * Quick summary of the times
+ */
+Object.defineProperty(helpers, 'timingSummary', {
+  get: function() {
+    var elapsed = (new Date().getTime() - start) / 1000;
+    return 'Total ' + elapsed + 's, ' +
+           'ave response ' + helpers.averageResponseTime + 'ms, ' +
+           'max response ' + helpers.maxResponseTime + 'ms ' +
+           'from \'' + helpers.maxResponseCulprit + '\'';
+  },
+  enumerable: true
+});
+
 /**
  * A way of turning a set of tests into something more declarative, this helps
  * to allow tests to be asynchronous.