🚿 Get rid of promptly #63

lib/advanced/ci.js

@@ -63,7 +63,7 @@ module.exports = (() => {
       } else if (jobsSize === 1) {
         const jobKey = _.keys(allJobs)[ 0 ];
         const job = _.values(allJobs)[ 0 ];
-        prompt.yesNoPromisifiedPrompt(`Do you want to run job ${jobKey.cyan}?`)
+        prompt.yesNoPrompt({ message: `Do you want to run job ${jobKey.cyan}?`, defaultValue: true })
           .then((choice) => {
             if (choice) {
               executeJob(job, toolConfigurations, accounts);

lib/advanced/pr.js

@@ -42,7 +42,7 @@ module.exports = (() => {
       execution.print(`${index}: ${option}`);
     });
     execution.print('Choose a title for the PR.');
-    prompt.simpleInputPrompt('You can choose from the list above by number, type a title or q to abort.')
+    prompt.singleQuestion({ message: 'You can choose from the list above by number, type a title or q to abort.' })
       .then((choice) => {
         if (choice === 'q') {
           execution.exit(0, 'Operation aborted.');

lib/git/configure.js

@@ -13,37 +13,35 @@ module.exports = (() => {
   };
 
   const promptForgePath = (gutOptions) => {
-    const promptOptions = {
-      validator: dirPath => {
-        const evaluatedDirPath = _.includes(dirPath, '$')
-          ? execution.execute(`printf '%s' "${dirPath}"`)
-          : dirPath;
+    const validator = (dirPath) => {
+      const evaluatedDirPath = _.includes(dirPath, '$')
+        ? execution.execute(`printf '%s' "${dirPath}"`)
+        : dirPath;
 
-        if (fs.existsSync(evaluatedDirPath)) {
-          return evaluatedDirPath;
-        }
-
-        throw Error(`No directory found at ${evaluatedDirPath}`.red);
+      if (fs.existsSync(evaluatedDirPath)) {
+        return evaluatedDirPath;
       }
+
+      throw Error(`No directory found at ${evaluatedDirPath}`.red);
     };
 
-    return prompt.promisifiedPrompt('Type your git repositories folder', promptOptions)
+    return prompt.singleQuestion({ message: 'Type your git repositories folder', validator })
       .then(forgePath => {
         _.set(gutOptions, 'repositoriesPath', forgePath);
         return gutOptions;
       });
   };
 
   const promptGithubUsername = (gutOptions) => {
-    return prompt.promisifiedPrompt('Type your GitHub account username', {})
+    return prompt.singleQuestion({ message: 'Type your GitHub account username' })
       .then(githubUsername => {
         _.set(gutOptions, 'accounts.github.username', githubUsername);
         return gutOptions;
       });
   };
 
   const promptGithubPullRequestToken = (gutOptions) => {
-    return prompt.promisifiedPrompt('Type your GitHub account PR token', {})
+    return prompt.singleQuestion({ message: 'Type your GitHub account PR token' })
       .then(githubToken => {
         _.set(gutOptions, 'accounts.github.pullRequestToken', githubToken);
         return gutOptions;

lib/git/undo.js

@@ -73,7 +73,9 @@ module.exports = (() => {
 
       } else if (args[ ARG_HARD.name ]) {
         const commits = execution.execute(`git --no-pager log -n ${commitsNumber} --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr) %C(bold blue)<%an>%Creset %C(yellow)%d%Creset'`);
-        prompt.yesNoPromisifiedPrompt(`Are you sure you want to undo these commits ?\n\n${commits}\n\nThey will be lost forever`)
+
+        const message = `Are you sure you want to undo these commits ?\n\n${commits}\n\nThey will be lost forever`;
+        prompt.yesNoPrompt({ message, defaultValue: false })
           .then((choice) => {
             if (choice) {
               const eraseCommand = 'git reset --hard';

lib/utils/prompt.js

@@ -1,43 +1,14 @@
-// TODO: get rid of promptly, no need to have to prompt dependencies
-const promptly = require('promptly');
 const inquirer = require('inquirer');
 const prompt = inquirer.createPromptModule();
 
 module.exports = (() => {
-  const promisifiedPrompt = (message, options) => {
-    return new Promise((resolve, reject) => {
-      promptly.prompt(message, options || {}, (error, value) => {
-        return error
-          ? reject(error)
-          : resolve(value);
-      });
-    });
-  };
-
-  const yesNoPromisifiedPrompt = (message) => {
-    const options = {
-      default: 'n',
-      validator: choice => choice === 'y'
-    };
-
-    return new Promise((resolve, reject) => {
-      promptly.prompt(`${message} (y/n)`, options, (error, value) => {
-        return error
-          ? reject(error)
-          : resolve(value);
-      });
-    });
-  };
-
-  const simpleInputPrompt = (message) => {
-    const question = {
-      type: 'input',
+  const singleQuestion = ({ message, validator = () => true, type = 'input' }) => {
+    return prompt({
       message,
+      validate: validator,
+      type,
       name: 'result'
-    };
-
-    return prompt(question)
-      .then((answers) => answers.result);
+    }).then((answers) => answers.result);
   };
 
   const yesNoPrompt = ({ message, defaultValue = true }) => {
@@ -64,11 +35,7 @@ module.exports = (() => {
 
   return {
     yesNoPrompt,
-    simpleInputPrompt,
-
-    yesNoPromisifiedPrompt,
-    promisifiedPrompt,
-
+    singleQuestion,
     chooseFromList
   };
 })();

package.json

@@ -34,7 +34,6 @@
     "copy-paste": "1.3.0",
     "inquirer": "5.1.0",
     "lodash": "4.17.5",
-    "promptly": "3.0.3",
     "utf8": "3.0.0",
     "yargs": "11.0.0"
   },