overcast - npm Package Compare versions

Comparing version 0.4.9 to 0.4.10

modules/commands/pull.js

@@ -20,3 +20,3 @@ var _ = require('lodash');
 
-  if (args.rsync && args.rsync !== 'false') {
+  if (utils.argIsTruthy(args.rsync)) {
     rsync.run(args);
@@ -23,0 +23,0 @@ } else {

modules/commands/push.js

@@ -20,3 +20,3 @@ var _ = require('lodash');
 
-  if (args.rsync && args.rsync !== 'false') {
+  if (utils.argIsTruthy(args.rsync)) {
     rsync.run(args);
@@ -23,0 +23,0 @@ } else {

modules/commands/run.js

@@ -41,2 +41,3 @@ var path = require('path');
     '    --continueOnError               | false'.grey,
+    '    --ssh-args ARGS                 |'.grey,
     '',
@@ -60,2 +61,3 @@ '  Examples:'.grey,
     '    --continueOnError               | false'.grey,
+    '    --ssh-args ARGS                 |'.grey,
     '',
@@ -67,4 +69,6 @@ '  Relative paths are relative to the cwd, or to these directories:'.grey,
     '  Example:'.grey,
-    '  $ overcast run db install/core install/redis'.grey
+    '  $ overcast run db install/core install/redis'.grey,
+    '  # Pass along arbitrary SSH arguments, such as to force a pseudo-tty:'.grey,
+    '  $ overcast run all /my/install/script --ssh-args "-tt"'.grey
   ]);
 };

modules/providers/digitalocean.js

@@ -147,5 +147,5 @@ var fs = require('fs');
     var query = {
-      backups_enabled: !!(options['backups-enabled'] && options['backups-enabled'] !== 'false'),
+      backups_enabled: utils.argIsTruthy(options['backups-enabled']),
       name: options.name,
-      private_networking: !!(options['private-networking'] && options['private-networking'] !== 'false'),
+      private_networking: utils.argIsTruthy(options['private-networking']),
       ssh_key_ids: keyID
@@ -152,0 +152,0 @@ };

modules/ssh.js

@@ -8,2 +8,11 @@ var fs = require('fs');
 exports.run = function (args, callback) {
+  // Handle cases where minimist mistakenly parses ssh-args (e.g. "-tt" becomes { t: true }).
+  if (args['ssh-args'] === true) {
+    var rawArgs = process.argv.slice(2);
+    var rawArgsIndex = _.indexOf(rawArgs, '--ssh-args') + 1;
+    if (rawArgs[rawArgsIndex]) {
+      args['ssh-args'] = rawArgs[rawArgsIndex];
+    }
+  }
+
   var instances = utils.findMatchingInstances(args.name);
@@ -45,2 +54,3 @@ utils.handleInstanceOrClusterNotFound(instances, args);
     ssh_port: instance.ssh_port,
+    ssh_args: _.isString(args['ssh-args']) ? args['ssh-args'] : '',
     continueOnError: args.continueOnError,
@@ -79,3 +89,4 @@ env: args.env,
     OVERCAST_USER: options.user,
-    OVERCAST_IP: options.ip
+    OVERCAST_IP: options.ip,
+    OVERCAST_SSH_ARGS: options.ssh_args
   });
@@ -82,0 +93,0 @@

modules/utils.js

@@ -10,3 +10,3 @@ var fs = require('fs');
 
-exports.VERSION = '0.4.9';
+exports.VERSION = '0.4.10';
 
@@ -144,3 +144,10 @@ exports.clustersCache = null;
 exports.convertToAbsoluteFilePath = function (p) {
-  p = exports.isAbsolute(p) ? p : path.resolve(exports.CONFIG_DIR, 'files', p);
+  if (!exports.isAbsolute(p)) {
+    var cwdFile = path.normalize(process.cwd(), p);
+    if (fs.existsSync(cwdFile)) {
+      p = cwdFile;
+    } else {
+      p = path.resolve(exports.CONFIG_DIR, 'files', p);
+    }
+  }
   return exports.normalizeWindowsPath(p);
@@ -203,2 +210,6 @@ };
 
+exports.argIsTruthy = function (arg) {
+  return !!(arg && arg !== 'false');
+};
+
 // http://stackoverflow.com/questions/5364928/node-js-require-all-files-in-a-folder
@@ -205,0 +216,0 @@ exports.requireDirectory = function (dir) {

package.json

 {
   "name": "overcast",
   "description": "A simple, SSH-based cloud management CLI.",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "repository": "https://github.com/andrewchilds/overcast.git",
@@ -6,0 +6,0 @@ "author": {

README.md

@@ -433,3 +433,3 @@ # ![Overcast Logo](http://i.imgur.com/eCBl2NI.png)
 ```
-  Overcast v0.4.9
+  Overcast v0.4.10
 
@@ -796,2 +796,3 @@ Source code, issues, pull requests:
       --continueOnError               | false
+      --ssh-args ARGS                 |
 
@@ -815,2 +816,3 @@ Examples:
       --continueOnError               | false
+      --ssh-args ARGS                 |
 
@@ -823,2 +825,4 @@ Relative paths are relative to the cwd, or to these directories:
     $ overcast run db install/core install/redis
+    # Pass along arbitrary SSH arguments, such as to force a pseudo-tty:
+    $ overcast run all /my/install/script --ssh-args "-tt"
 ```
@@ -825,0 +829,0 @@

No alert changes

Improved metrics

Total package byte prevSize

250228

increased by0.43%

Lines of code

4398

increased by0.55%

Number of lines in readme file

912

increased by0.44%

No dependency changes