Merge pull request #335 from isleofcode/feat/change-proxy-behaviour

[WIP] Change proxy to ember cdv:proxy $command

Author: alexblom

lib/commands/cordova.js

@@ -1,78 +1,26 @@
 'use strict';
+/* eslint-disable max-len */
 
 var Command         = require('./-command');
+var ProxyCommand    = require('./proxy');
 
-var BashTask        = require('../tasks/bash');
-var cordovaPath     = require('../utils/cordova-path');
 var logger          = require('../utils/logger');
 
-var ValidateCordova = require('../tasks/validate/cordova-installed');
-
 module.exports = Command.extend({
   name: 'cordova',
   aliases: ['cdv'],
-  description: 'Passes commands to Cordova CLI',
+  description: 'Deprecated',
   works: 'insideProject',
 
-  supportedCommands: [
-    'build',
-    'platform',
-    'platforms',
-    'plugin',
-    'plugins',
-    'prepare'
-  ],
-
-  knownCordovaCommands: [
-    'run',
-    'emulate'
-  ],
-
-  validateAndRun: function(rawArgs) {
-    var warning;
-
-    if (this.supportedCommands.indexOf(rawArgs[0]) >= 0) {
-      warning = rawArgs +
-        ' run in cordova, but bypassed ember-cordova command.' +
-        ' Consider running ember cdv:' + rawArgs + ' instead';
-
-    } else if (this.knownCordovaCommands.indexOf(rawArgs[0]) === -1) {
-      warning = rawArgs +
-        ' passed to Cordova, but is an unknown Cordova command';
-
-    }
-
-    if (warning !== undefined) {
-      logger.warn(warning);
-    }
-
-    return this.run({}, rawArgs);
-  },
-
   run: function(options, rawArgs) {
-    this._super.apply(this, arguments);
-
-    var project = this.project;
-
-    var isInstalled = new ValidateCordova({
-      project: project
-    });
-
-    return isInstalled.run().then(function() {
-      var joinedArgs = rawArgs.join(' ');
-      var cdvCommand = 'cordova ' + joinedArgs;
-
-      var msg = 'Running \'cordova ' + joinedArgs + '\'';
-      logger.success(msg);
-
-      return new BashTask({
-        command: cdvCommand,
-        options: {
-          cwd: cordovaPath(project)
-        }
-      }).run();
-    }).catch(function(e) {
-      logger.error(e);
-    });
+    logger.warn(
+      'DEPRECATION WARNING (ember-cordova): ember cdv proxy syntax has changed\n' +
+      'The prior proxy command was "ember cdv $COMMAND" \n' +
+      'To ease confusion this is now "ember cdv:proxy $COMMAND". No other changes are required. \n' +
+      'So ember cdv run would now be ember cdv:proxy run \n \n' +
+      'This is just a warning, your command has been proxied for now. The old proxy syntax will be fully deprecated on July 1 in favour of ember cdv:proxy.'
+    );
+
+    return new ProxyCommand({project: this.project}).validateAndRun(rawArgs);
   }
 });

lib/commands/index.js

@@ -6,6 +6,7 @@ module.exports = {
   'cordova:platform'                : require('./platform'),
   'cordova:plugin'                  : require('./plugin'),
   'cordova:prepare'                 : require('./prepare'),
+  'cordova:proxy'                   : require('./proxy'),
   'cordova:serve'                   : require('./serve'),
   'cordova:make-icons'              : require('./make-icons'),
   'cordova:make-splashes'           : require('./make-splashes'),

lib/commands/proxy.js

@@ -0,0 +1,79 @@
+'use strict';
+
+var Command         = require('./-command');
+
+var BashTask        = require('../tasks/bash');
+var cordovaPath     = require('../utils/cordova-path');
+var logger          = require('../utils/logger');
+
+var ValidateCordova = require('../tasks/validate/cordova-installed');
+
+module.exports = Command.extend({
+  name: 'cordova:proxy',
+  aliases: ['cdv:proxy'],
+  description: 'Passes commands to Cordova CLI',
+  works: 'insideProject',
+
+  supportedCommands: [
+    'build',
+    'platform',
+    'platforms',
+    'plugin',
+    'plugins',
+    'prepare'
+  ],
+
+  knownCordovaCommands: [
+    'run',
+    'emulate'
+  ],
+
+  validateAndRun: function(rawArgs) {
+    console.log('got', rawArgs);
+    var warning;
+
+    if (this.supportedCommands.indexOf(rawArgs[0]) >= 0) {
+      warning = rawArgs +
+        ' run in cordova, but bypassed ember-cordova command.' +
+        ' Consider running ember cdv:' + rawArgs + ' instead';
+
+    } else if (this.knownCordovaCommands.indexOf(rawArgs[0]) === -1) {
+      warning = rawArgs +
+        ' passed to Cordova, but is an unknown Cordova command';
+
+    }
+
+    if (warning !== undefined) {
+      logger.warn(warning);
+    }
+
+    return this.run({}, rawArgs);
+  },
+
+  run: function(options, rawArgs) {
+    this._super.apply(this, arguments);
+
+    var project = this.project;
+
+    var isInstalled = new ValidateCordova({
+      project: project
+    });
+
+    return isInstalled.run().then(function() {
+      var joinedArgs = rawArgs.join(' ');
+      var cdvCommand = 'cordova ' + joinedArgs;
+
+      var msg = 'Running \'cordova ' + joinedArgs + '\'';
+      logger.success(msg);
+
+      return new BashTask({
+        command: cdvCommand,
+        options: {
+          cwd: cordovaPath(project)
+        }
+      }).run();
+    }).catch(function(e) {
+      logger.error(e);
+    });
+  }
+});

node-tests/unit/commands/cordova-test.js renamed to node-tests/unit/commands/proxy-test.js

@@ -2,7 +2,7 @@
 
 var BashTask        = require('../../../lib/tasks/bash');
 var VerifyInstall   = require('../../../lib/tasks/validate/cordova-installed');
-var CordovaCmd      = require('../../../lib/commands/cordova');
+var CordovaCmd      = require('../../../lib/commands/proxy');
 var logger          = require('../../../lib/utils/logger');