bal-util - npm Package Compare versions

Comparing version 1.12.2 to 1.12.3

out/lib/modules.js

@@ -209,3 +209,3 @@ // Generated by CoffeeScript 1.3.3
     npmCommand: function(command, opts, next) {
-      var cwd, nodePath, npmPath, output, _ref;
+      var cwd, nodePath, npmPath, output, partTwo, _ref;
       _ref = balUtilFlow.extractOptsAndCallback(opts, next), opts = _ref[0], next = _ref[1];
@@ -219,13 +219,23 @@ nodePath = opts.nodePath, npmPath = opts.npmPath, cwd = opts.cwd, output = opts.output;
       }
+      partTwo = function() {
+        return balUtilModules.spawn(command, {
+          cwd: cwd,
+          output: output
+        }, next);
+      };
       command.unshift(npmPath);
       if (nodePath) {
-        command.unshift(nodePath);
+        balUtilPaths.exists(npmPath, function(exists) {
+          if (exists) {
+            command.unshift(nodePath);
+          }
+          return partTwo();
+        });
+      } else {
+        partTwo();
       }
-      return balUtilModules.spawn(command, {
-        cwd: cwd,
-        output: output
-      }, next);
+      return this;
     },
     initNodeModules: function(opts, next) {
-      var command, force, logger, nodeModulesPath, packageJsonPath, path, pathUtil, _ref;
+      var force, logger, nodeModulesPath, packageJsonPath, partTwo, path, pathUtil, _ref;
       pathUtil = require('path');
@@ -237,26 +247,38 @@ _ref = balUtilFlow.extractOptsAndCallback(opts, next), opts = _ref[0], next = _ref[1];
       nodeModulesPath = pathUtil.join(path, 'node_modules');
-      if (force === false && balUtilPaths.existsSync(nodeModulesPath)) {
-        return next();
+      partTwo = function() {
+        return balUtilPaths.exists(packageJsonPath, function(exists) {
+          var command;
+          if (!exists) {
+            return next();
+          }
+          command = ['install'];
+          if (force) {
+            command.push('--force');
+          }
+          if (logger) {
+            logger.log('debug', "Initializing node modules\non:   " + dirPath + "\nwith:", command);
+          }
+          return balUtilModules.npmCommand(command, opts, function() {
+            var args;
+            args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+            if (args[0] != null) {
+              return next.apply(null, args);
+            }
+            if (logger) {
+              logger.log('debug', "Initialized node modules\non:   " + dirPath + "\nwith:", command);
+            }
+            return next.apply(null, args);
+          });
+        });
+      };
+      if (force === false) {
+        balUtilPaths.exists(nodeModulesPath, function(exists) {
+          if (exists) {
+            return next();
+          }
+          return partTwo();
+        });
+      } else {
+        partTwo();
       }
-      if (!balUtilPaths.existsSync(packageJsonPath)) {
-        return next();
-      }
-      command = ['install'];
-      if (force) {
-        command.push('--force');
-      }
-      if (logger) {
-        logger.log('debug', "Initializing node modules\non:   " + dirPath + "\nwith:", command);
-      }
-      balUtilModules.npmCommand(command, opts, function() {
-        var args;
-        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        if (args[0] != null) {
-          return next.apply(null, args);
-        }
-        if (logger) {
-          logger.log('debug', "Initialized node modules\non:   " + dirPath + "\nwith:", command);
-        }
-        return next.apply(null, args);
-      });
       return this;
@@ -263,0 +285,0 @@ }

package.json

 {
 	"name": "bal-util",
-	"version": "1.12.2",
+	"version": "1.12.3",
 	"description": "Common utility functions for Node.js used and maintained by Benjamin Lupton",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/balupton/bal-util",

No alert changes

Improved metrics

Total package byte prevSize

67983

increased by0.86%

Lines of code

1986

increased by1.12%

No dependency changes