fixed merge conflicts

lib/cmd.js

@@ -1,12 +1,15 @@
 var program = require('commander');
 var colors = require('colors');
 var shelljs = require('shelljs');
+var promptly = require('promptly');
+var path = require('path');
 var Embark = require('../lib/index');
 
 var Cmd = function() {
   program.version(Embark.version);
 };
 
+
 Cmd.prototype.process = function(args) {
   this.newApp();
   this.demo();
@@ -26,20 +29,41 @@ Cmd.prototype.process = function(args) {
   program.parse(args);
 };
 
-Cmd.prototype.newApp = function() {
+Cmd.prototype.newApp = function(name) {
-  program
-  .command('new [name]')
-  .description('new application')
-  .action(function(name, options) {
-    if (name === undefined) {
 
-      console.log("please specify your app Name".red);
+  var validateName = function (value) {
-      console.log("e.g embark new MyApp".green);
+    try  {
-      console.log("e.g embark new --help for more information".green);
+      if(value.match(/^[a-zA-Z\s\-]+$/)) return value;
-      process.exit(9);
+    } catch (e) {
+      throw new Error('Name must be only letters, spaces, or dashes');
     }
-    Embark.generateTemplate('boilerplate', './', name);
+  };
-  });
+
+  program
+    .command('new [name]')
+    .description('new application')
+    .action(function (name) {
+      if (name === undefined) {
+        var parentDirectory = path.dirname(__dirname).split("/").pop();
+        return promptly.prompt("Name your app (default is " + parentDirectory + "):", {
+          default: parentDirectory,
+          validator: validateName
+        }, function (err, inputvalue) {
+          if (err) {
+            console.error('Invalid name:', err.message);
+            // Manually call retry
+            // The passed error has a retry method to easily prompt again.
+            err.retry();
+          } else {
+            //slightly different assignment of name since it comes from child prompt
+            Embark.generateTemplate('boilerplate', './', inputvalue);
+          }
+        });
+      } else {
+        Embark.generateTemplate('boilerplate', './', name);
+      }
+
+    });
 };
 
 Cmd.prototype.demo = function() {

test/cmd.js

@@ -1,41 +1,51 @@
 var Embark = require('../lib/index');
 var Cmd = require('../lib/cmd');
 
+// Function to send a line to stdin
+function sendLine(line) {
+  setImmediate(function () {
+    process.stdin.emit('data', line + '\n');
+  });
+}
+
+var passingLines = function () {
+  var lines = [];
+  lines.push('Initializing Embark Template....');
+  lines.push('Installing packages.. this can take a few seconds');
+  lines.push('Init complete');
+  return lines;
+};
+
 describe('embark.Cmd', function () {
   this.timeout(0);
-  var cmd = new Cmd(Embark);
-  describe('#new', function () {
-    it('it should not create an app without a name', function (done) {
-      cmd.newApp(undefined, function (output) {
-        var lines = output.split('\n');
-        assert.equal(lines[0], 'please specify your app Name');
-        assert.equal(lines[1], 'e.g embark new MyApp');
-        assert.equal(lines[2], 'e.g embark new --help for more information');
-      });
-      done();
-    });
 
+  describe('#new', function () {
     it('it should create an app with a name', function (done) {
+      var cmd = new Cmd(Embark);
+      var pl = passingLines();
       var appname = 'deleteapp';
       cmd.newApp(appname, function (output) {
         var lines = output.split('\n');
-        assert.equal(lines[0], 'Initializing Embark Template....');
+        console.log(lines);
-        assert.equal(lines[1], 'Installing packages.. this can take a few seconds');
+        assert.equal(lines[0], pl[0]);
-        assert.equal(lines[2], 'Init complete');
+        assert.equal(lines[1], pl[1]);
+        assert.equal(lines[2], pl[2]);
         assert.equal(lines[3], 'App ready at ./' + appname);
-      });
+       });
-      done();
     });
-  });
 
-  // describe("#help", function () {
+    it('it should prompt when given an empty app name', function (done) {
-  //   it('it should spit out helpful text if no arguments are supplied', function (done) {
+      var cmd = new Cmd(Embark);
-  //     cmd.process([], function (output) {
+      var pl = passingLines();
-  //       var lines = output.split('\n');
+      var appname = 'deleteapp';
-  //       assert.equal(lines[0], '\n');
+
-  //       assert.equal(lines[1], 'Usage:');
+      cmd.newApp(undefined, function (output) {
-  //       done();
+        var lines = output.split('\n');
-  //     });
+        console.log(lines);
-  //   })
+        sendLine(appname + '\n');
-  // })
+        assert.equal(lines[0], pl[0]);
+        done();
+      });
+    });
+  })
 });