Merge pull request yeoman#170 from mklabs/dep-tree

reduce dependency tree

bin/yeoman

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 var fs = require('fs'),
   join = require('path').join,
-  _ = require('underscore'),
+  grunt = require('grunt'),
   colors = require('colors'),
   insight = require('../lib/plugins/insight.js'),
   yeoman = require('../'),
-  async = require('async'),
   pkg = require('../package.json'),
+  _ = grunt.util._,
+  async = grunt.util.async,
   compiled = _.template( fs.readFileSync( join(__dirname, 'help.txt'), 'utf8' ));
 
 // Returns the user's home directory in a platform agnostic way.
@@ -15,7 +16,7 @@ function getUserHome() {
 }
 
 // grunt with the plugin registered
-var grunt = require('grunt').npmTasks(join(__dirname, '../'));
+grunt.npmTasks(join(__dirname, '../'));
 
 // Get back a reference to the internal grunt cli object so that we can read
 // command line parsed options from grunt, to run our internal additional

lib/generators/ember/controller/index.js

@@ -2,7 +2,8 @@
 var path = require('path'),
   util = require('util'),
   yeoman = require('../../../../'),
-  _ = require('underscore');
+  grunt = require('grunt'),
+  _ = grunt.util._;
 
 module.exports = Generator;
 

lib/utils/index.js

@@ -7,7 +7,7 @@ var utils = module.exports;
 // flatiron/utile inspired.
 //
 // Set of common utilities, mainly defining wrapper to various utility modules
-// (like ncp, mkdir, rimraf) as lazy-loaded getters.
+// (like mkdir, rimraf) as lazy-loaded getters.
 //
 
 //
@@ -24,13 +24,6 @@ utils.__defineGetter__('rimraf', function () {
   return require('rimraf');
 });
 
-//
-// Wrapper to `require('ncp').ncp`
-//
-utils.__defineGetter__('ncp', function () {
-  return require('ncp').ncp;
-});
-
 //
 // Wrapper to `require('./fetch')`, internal tarball helper using
 // mikeal/request, zlib and isaacs/tar.

package.json

@@ -16,11 +16,9 @@
     "open": "0.0.2",
     "rimraf": "~2.0.1",
     "mkdirp": "~0.3.1",
-    "async": "~0.1.18",
-    "ncp": "~0.2.6",
     "requirejs": "~2.0.2",
     "clean-css": "~0.3.2",
-    "connect": "~1.8.6",
+    "connect": "~2.2.1",
     "request": "~2.9.200",
     "html-minifier": "~0.4.5",
     "which": "~1.0.5",
@@ -32,8 +30,7 @@
     "coffee-script": "~1.3.3",
     "grunt-jasmine-task": "~0.2.0",
     "faye-websocket": "~0.4.2",
-    "prompt": "~0.2.1",
-    "underscore": "1.3.3",
+    "prompt": "~0.1.12",
     "colors": "~0.6.0",
     "grunt-mocha": "~0.1.1"
   },

tasks/server.js

@@ -2,6 +2,7 @@
 var fs = require('fs'),
   path = require('path'),
   util = require('util'),
+  http = require('http'),
   events = require('events'),
   colors = require('colors'),
   connect = require('connect'),
@@ -27,7 +28,7 @@ module.exports = function(grunt) {
 
     this.server = options.server;
 
-    if ( !( this.server instanceof connect.HTTPServer ) ) {
+    if ( !( this.server instanceof http.Server ) ) {
       throw new Error('Is not a valid HTTP server');
     }
 

test/helpers/index.js

@@ -4,7 +4,6 @@ var fs = require('fs'),
   assert = require('assert'),
   rimraf = require('rimraf'),
   mkdirp = require('mkdirp'),
-  ncp = require('ncp').ncp,
   EventEmitter = require('events').EventEmitter;
 
 // helpers exports