[fixes #231] prefer project local CLI version

bin/ember

@@ -1,9 +1,17 @@
 #!/usr/bin/env node
+'use strict';
 
 process.title = 'ember';
+var resolve = require('resolve');
 
-require('../lib/cli')({
-  cliArgs: process.argv.slice(2),
-  inputStream: process.stdin,
-  outputStream: process.stdout
+resolve('ember-cli', {
+  basedir: process.cwd()
+}, function(error, projectLocalCli) {
+  var cli = error ? require('../lib/cli') : require(projectLocalCli);
+
+  cli({
+    cliArgs: process.argv.slice(2),
+    inputStream: process.stdin,
+    outputStream: process.stdout
+  });
 });

package.json

@@ -1,6 +1,7 @@
 {
   "name": "ember-cli",
   "version": "0.0.23",
+  "main": "lib/cli/index.js",
   "description": "Command line tool for developing ambitious ember.js apps",
   "bin": {
     "ember": "./bin/ember"
@@ -34,15 +35,18 @@
     "bower": "^1.3.2",
     "bower-config": "^0.5.0",
     "broccoli": "0.7.2",
+    "broccoli-bower": "^0.2.0",
     "broccoli-env": "0.0.1",
     "broccoli-es6-concatenator": "0.1.4",
     "broccoli-static-compiler": "0.1.4",
     "broccoli-uglify-js": "0.1.1",
-    "broccoli-bower": "^0.2.0",
     "chalk": "~0.4.0",
+    "configstore": "^0.2.3",
     "connect-livereload": "^0.3.2",
     "express": "^3.4.8",
+    "findup": "^0.1.5",
     "fs-extra": "~0.8.1",
+    "glob": "^3.2.9",
     "inquirer": "~0.4.1",
     "insight": "git+https://github.com/joefiorini/insight.git#mobile-app",
     "lodash-node": "~2.4.1",
@@ -51,15 +55,13 @@
     "ncp": "~0.5.0",
     "nopt": "^2.1.2",
     "npm": "~1.4.6",
+    "proxy-middleware": "^0.5.0",
+    "resolve": "^0.6.2",
     "rimraf": "^2.2.6",
     "rsvp": "~3.0.6",
     "through": "^2.3.4",
     "tiny-lr": "0.0.5",
-    "walk-sync": "^0.1.1",
-    "proxy-middleware": "^0.5.0",
-    "glob": "^3.2.9",
-    "findup": "^0.1.5",
-    "configstore": "^0.2.3"
+    "walk-sync": "^0.1.1"
   },
   "devDependencies": {
     "chai": "^1.9.1",