allow functions as defaults

flatiron · Apr 26, 2016 · 3e0856b · 3e0856b
1 parent bbd0593
commit 3e0856b
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 4 deletions.
diff --git a/lib/prompt.js b/lib/prompt.js
@@ -123,7 +123,7 @@ prompt.stop = function () {
     if (prompt.stopped || !prompt.started) {
         return;
     }
-    
+
     stdin.destroy();
     prompt.emit('stop');
     prompt.stopped = true;
@@ -515,6 +515,13 @@ prompt.getInput = function (prop, callback) {
   //
   prompt.emit('prompt', prop);
 
+  //
+  // If defaultLine is a function, execute it and store it back to defaultLine
+  //
+  if(typeof defaultLine === 'function') {
+    defaultLine = defaultLine();
+  }
+
   //
   // If there is no default line, set it to an empty string
   //

diff --git a/test/helpers.js b/test/helpers.js
@@ -99,6 +99,16 @@ helpers.schema = {
       message: 'riffwabbles can only be letters, numbers, and dashes',
       default: 'foobizzles'
     },
+    functiondefaulttest: {
+      message: 'function default test',
+      default: function () {
+        return 'test';
+      }
+    },
+    functiondefaultundefined: {
+      message: 'function default undefined',
+      default: function () { }
+    },
     number: {
       type: 'number',
       message: 'pick a number, any number',

diff --git a/test/prompt-test.js b/test/prompt-test.js
@@ -369,7 +369,7 @@ vows.describe('prompt').addBatch({
     "the get() method": {
       "with a simple string prompt": {
         "that is a property name in prompt.properties": {
-          "with a default value": {
+          "with a string literal default value": {
             topic: function () {
               var that = this;
 
@@ -383,8 +383,8 @@ vows.describe('prompt').addBatch({
             },
             "should prompt to stdout and respond with the default value": function (err, result) {
               assert.isNull(err);
-              assert.isTrue(this.msg.indexOf('riffwabbles') !== -1);
-              assert.isTrue(this.msg.indexOf('(foobizzles)') !== -1);
+              assert.notStrictEqual(this.msg.indexOf('riffwabbles'), -1);
+              assert.notStrictEqual(this.msg.indexOf('(foobizzles)'), -1);
               assert.include(result, 'riffwabbles');
               assert.equal(result['riffwabbles'], schema.properties['riffwabbles'].default);
             }
@@ -393,6 +393,65 @@ vows.describe('prompt').addBatch({
       }
     }
   }
+}).addBatch({
+  "When using prompt": {
+    "the get() method": {
+      "with a simple string prompt": {
+        "that is a property name in prompt.properties": {
+          "with a function default returning a string literal": {
+            topic: function () {
+              var that = this;
+
+              helpers.stdout.once('data', function (msg) {
+                that.msg = msg;
+              });
+
+              prompt.properties.functiondefaulttest = schema.properties.functiondefaulttest;
+              prompt.get('functionDefaultTest', this.callback);
+              helpers.stdin.writeNextTick('\n');
+            },
+            "should respond with the default value function's return value": function (err, result) {
+              assert.isNull(err);
+              assert.notStrictEqual(this.msg.indexOf('function default test'), -1);
+              assert.notStrictEqual(this.msg.indexOf('(test)'), -1);
+              assert.include(result, 'functionDefaultTest');
+              assert.strictEqual(result['functionDefaultTest'], 'test');
+            }
+          },
+        }
+      }
+    }
+  }
+}).addBatch({
+  "When using prompt": {
+    "the get() method": {
+      "with a simple string prompt": {
+        "that is a property name in prompt.properties": {
+          "with a function default that returns undefined": {
+            topic: function () {
+              var that = this;
+
+              helpers.stdout.once('data', function (msg) {
+                that.msg = msg;
+              });
+
+              prompt.properties.functiondefaultundefined =
+                schema.properties.functiondefaultundefined;
+              prompt.get('functionDefaultUndefined', this.callback);
+              helpers.stdin.writeNextTick('\n');
+            },
+            "should prompt without a default value": function (err, result) {
+              assert.isNull(err);
+              assert.notStrictEqual(this.msg.indexOf('function default undefined'), -1);
+              assert.strictEqual(this.msg.indexOf('('), -1);
+              assert.include(result, 'functionDefaultUndefined');
+              assert.strictEqual(result['functionDefaultUndefined'], '');
+            }
+          },
+        }
+      }
+    }
+  }
 }).addBatch({
   "When using prompt": {
     "the get() method": {