prune, shrinkwrap, list, fixes

Fixes:
- `cli-prompt` replaces deprecated `prompt` method of `commander`
- Use absolute junctions for XP, pending nodejs/node-v0.x-archive#8813

New commands:
- `rnpm prune [--production]`
- `rnpm shrinkwrap`
- `rnpm list --depth=n`

New aliases and shorthands:
- `i`: install
- `ls`: list
- `--prod`: --production

Author: vweevers

bin/rnpm

@@ -9,16 +9,40 @@ app
   .version(JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf-8')).version);
 
 app
-  .option('--production', 'Ignore `devDependencies`.')
+  .option('--prod, --production', 'Ignore `devDependencies`.')
   .option('--strict', 'Fail on inconsistent dependencies.')
 
 app
   .command('install')
+  .alias('i')
   .description('Recursively install dependencies')
   .action(function() {
     rnpm.install({ production: app.production, strict: app.strict })
   });
 
+app
+  .command('prune')
+  .description('Recursive npm prune')
+  .action(function() {
+    rnpm.prune({ production: app.production })
+  });
+
+app
+  .command('shrinkwrap')
+  .description('Recursive npm shrinkwrap')
+  .action(function() {
+    rnpm.custom('shrinkwrap')
+  });
+
+app
+  .command('list')
+  .alias('ls')
+  .option('--depth [n]', 'Max display depth of the dependency tree', parseInt)
+  .description('Recursive npm list')
+  .action(function(opts) {
+    rnpm.custom('list', {depth: opts.depth || 0})
+  });
+
 app
   .command('analyze')
   .description('Analyze dependencies recursively and warn about any inconsistencies')

lib/analyze.js

@@ -9,8 +9,8 @@ module.exports = function analyze(options, callback) {
     , depsPerDir = {
       '.': {}
       }
-    , inconsistencies = {
-    }
+    , inconsistencies = {}
+    , consolidated = []
     , done = false
     , pending = 0
 
@@ -24,7 +24,16 @@ module.exports = function analyze(options, callback) {
       return
     }
 
-    // Check for existance of package.json and read it
+    var relative = path.relative(cwd, dir)
+
+    // Check for existence of previous .rnpm
+    pending++;
+    fs.exists(path.join(dir, '.rnpm', 'package.json'), function(exists) {
+      if (exists) consolidated.push(relative || '.')
+      --pending; checkReady()
+    })
+
+    // Check for existence of package.json and read it
     var pkgjson = path.join(dir, 'package.json')
     pending++;
     fs.exists(pkgjson, function(exists) {
@@ -34,10 +43,10 @@ module.exports = function analyze(options, callback) {
           var data = JSON.parse(json);
 
           // Extract dependencies
-          addDependencies(data.dependencies, path.relative(cwd, dir), 'production')
+          addDependencies(data.dependencies, relative, 'production')
 
           // Extract development dependencies
-          addDependencies(data.devDependencies, path.relative(cwd, dir), 'development')
+          addDependencies(data.devDependencies, relative, 'development')
 
           --pending
           checkReady();
@@ -97,7 +106,7 @@ module.exports = function analyze(options, callback) {
   // Check if all package.json files were read
   function checkReady() {
     if (done && !pending) {
-      callback && callback(depsPerDir, inconsistencies)
+      callback && callback(depsPerDir, inconsistencies, consolidated)
     }
   }
 }

lib/custom.js

@@ -0,0 +1,32 @@
+var path = require('path')
+  , npm = require('npm')
+  , analyze = require('./analyze')
+  , util = require('./util')
+  , after = require('after')
+
+module.exports = function custom(command, options, callback) {
+  var cwd = process.cwd()
+
+  if (!options) options = {}
+
+  // Initialize NPM as a lib
+  npm.load({}, function() {
+    // analyze dependencies
+    analyze(options, function (depsPerDir, _, consolidated) {
+      var next = after(consolidated.length, function(err){
+        if (err) throw err
+        // util.log(command, 'Done.');
+        return callback && callback()
+      })
+
+      consolidated.forEach(function(dir){
+        util.log(command, dir)
+        
+        // run command inside the `.rpnm` directory
+        npm.prefix = path.join(cwd, dir, '.rnpm');
+        for(var k in options) npm.config.set(k, options[k])
+        npm.commands[command]([], next)
+      })
+    })
+  })
+}

lib/index.js

@@ -2,3 +2,5 @@ exports.install = require('./install')
 exports.analyze = require('./analyze')
 exports.updateDep = require('./update-dep')
 exports.normalize = require('./normalize')
+exports.prune = require('./prune')
+exports.custom = require('./custom')

lib/install.js

@@ -2,7 +2,16 @@ var fs = require('fs')
   , path = require('path')
   , npm = require('npm')
   , analyze = require('./analyze')
-  , util = require('./util');
+  , util = require('./util')
+  , os = require('os')
+
+// Use junctions on Windows < Vista (6.0),
+// Vista and later support regular symlinks.
+if (os.platform()=='win32' && parseInt(os.release())<6) {
+  var symlinkType = 'junction'
+} else {
+  symlinkType = 'dir'
+}
 
 module.exports = function install(options, callback) {
 
@@ -48,9 +57,7 @@ module.exports = function install(options, callback) {
           }
           fs.mkdirSync(dotrnpm);
           fs.mkdirSync(path.join(dotrnpm, 'node_modules'));
-          fs.symlinkSync('.rnpm/node_modules',
-                         path.join(cwd, dir, 'node_modules'),
-                         'junction');
+          symlink('.rnpm/node_modules', path.join(cwd, dir, 'node_modules'));
           // avoid npm warning, and provide some info
           // on the nature of the `.rnpm` dir
           fs.writeFileSync(path.join(dotrnpm, 'Readme.md'),
@@ -59,9 +66,7 @@ module.exports = function install(options, callback) {
                            'utf-8');
         } else {
           if (!fs.existsSync(path.join(cwd, dir, 'node_modules'))) {
-            fs.symlinkSync('.rnpm/node_modules',
-                           path.join(cwd, dir, 'node_modules'),
-                           'junction');
+            symlink('.rnpm/node_modules', path.join(cwd, dir, 'node_modules'));
           }
         }
 
@@ -100,3 +105,11 @@ module.exports = function install(options, callback) {
   })
 }
 
+function symlink(target, link) {
+  // Junction points must be absolute
+  if (symlinkType=='junction') {
+    target = path.resolve(link, '..', target)
+  }
+
+  fs.symlinkSync(target, link, symlinkType)
+}

lib/normalize.js

@@ -2,6 +2,7 @@ var commander = require('commander')
   , analyze = require('./analyze')
   , updateDep = require('./update-dep')
   , util = require('./util')
+  , prompt = require('cli-prompt')
 
 module.exports = function(options, callback) {
   // analyze dependencies
@@ -21,7 +22,7 @@ module.exports = function(options, callback) {
       }
 
       // ask the user for the right version
-      commander.prompt('(' + (i+1) + '/' + deps.length + ') New version for `' + deps[i] + '` [' + inconsistencies[deps[i]].sort().join(', ') + ']: ', function(version) {
+      prompt('(' + (i+1) + '/' + deps.length + ') New version for `' + deps[i] + '` [' + inconsistencies[deps[i]].sort().join(', ') + ']: ', function(version) {
         if (!version) {
           util.log('normalize', 'Skipping dependency `' + deps[i] + '`.');
           return normalizeOne(i+1);

lib/prune.js

@@ -0,0 +1,56 @@
+var path = require('path')
+  , npm = require('npm')
+  , analyze = require('./analyze')
+  , util = require('./util')
+  , after = require('after')
+  , rimraf = require('rimraf')
+
+module.exports = function prune(options, callback) {
+
+  var cwd = process.cwd()
+
+  // Initialize NPM as a lib
+  npm.load({}, function() {
+
+    // analyze dependencies
+    analyze(options, function (depsPerDir, _, consolidated) {
+
+      var next = after(consolidated.length, function(err){
+        if (err) throw err
+        // util.log('prune', 'Done.');
+        return callback && callback()
+      })
+
+      consolidated.forEach(function(dir){
+        // If dir has no overriding dependencies, 
+        // remove .rnpm (root is skipped)
+        if (dir!='.' && !depsPerDir[dir]) {
+          var _next = after(2, next)
+
+          remove('.rnpm')
+          remove('node_modules')
+          
+          function remove(sub) {
+            var full = path.join(cwd, dir, sub)
+            rimraf(full, function(err){
+              if (err) {
+                util.error('prune', dir + ': could not remove `'+full+'`')
+              } else {
+                util.log('prune', dir + ': removed '+sub)
+              }
+              _next()
+            })
+          }
+        } else {
+          util.log('prune', dir)
+          
+          // prune deps inside the `.rpnm` directory
+          npm.prefix = path.join(cwd, dir, '.rnpm');
+          npm.config.set('production', !!options.production);
+          npm.commands.prune([], next)
+        }
+      })
+    })
+  })
+}
+

package.json

@@ -11,8 +11,11 @@
   "dependencies": {
     "commander": "~2.5.0",
     "dive": "~0.3.0",
-    "npm": "~2.1.11",
-    "ansi": "~0.3.0"
+    "npm": "~2.1.0",
+    "ansi": "~0.3.0",
+    "rimraf": "~2.2.8",
+    "after": "~0.8.1",
+    "cli-prompt": "~0.4.1"
   },
   "bin": {
     "rnpm": "./bin/rnpm"