Merge pull request himynameisdave#17 from himynameisdave/v0.6.0

v0.6.0

Author: himynameisdave

README.md

@@ -35,10 +35,14 @@ It must be a valid `.json` file, and must match the expected format. Check out [
 
 You can also remove labels. Just select the ones you want to ditch and :boom: they're gone.
 
-> **Related:**
-- [`git-label`](https://github.com/jasonbellamy/git-label) by [**jasonbellamy**](https://github.com/jasonbellamy), which `git-labelmaker` uses to add and remove labels
-- [`git-label-packages`](https://github.com/jasonbellamy/git-label-packages) is a really good set of default packages if you really want to level up your projects
-- [`git-label-faces`](https://github.com/himynameisdave/git-label-faces) is a joke package set that you should totally never use for real
+### Contributing
+
+Feel free to contribute to the project by opening a [Pull Request](https://github.com/himynameisdave/git-labelmaker/compare), filing a [new issue](https://github.com/himynameisdave/git-labelmaker/issues/new), or by barking at me on [the twitters](https://twitter.com/dave_lunny).
+
+**Related Stuff:**
+> - [`git-label`](https://github.com/jasonbellamy/git-label) by [**jasonbellamy**](https://github.com/jasonbellamy), which `git-labelmaker` uses to add and remove labels
+> - [`git-label-packages`](https://github.com/jasonbellamy/git-label-packages) is a really good set of default packages if you really want to level up your projects
+> - [`git-label-faces`](https://github.com/himynameisdave/git-label-faces) is a joke package set that you should totally never use for real
 
 ---
 

components/read-repo.js

@@ -1,201 +1,145 @@
 #!/usr/bin/env node
 "use strict";
 
-const fs = require("fs"),
-      iq = require("inquirer"),
-      octonode          = require("octonode"),
-      gitLabel          = require("git-label"),
-      readRepo          = require("./components/read-repo"),
-      cleanup           = require("./components/remove-tmp-pkg"),
-      mainPrompts       = require("./components/main-prompts"),
-      customAddPrompts  = require("./components/add-prompts");
+//    EXTERNAL DEPENDENCIES
+const fs                   = require("fs"),
+      iq                   = require("inquirer"),
+      gitLabel             = require("git-label");
+//    UTILS ARE STANDALONE METHODS WITH NO DEPENDENCIES
+const alertDeletes         = require("./utils/alertDeletes"),
+      banner               = require("./utils/banners"),
+      configGitLabel       = require("./utils/configGitLabel"),
+      filterRemovalLabels  = require("./utils/filterRemovalLabels"),
+      removeAll            = require("./utils/removeAll"),
+      validateRemovals     = require("./utils/validateRemovals");
+//    PROMPTS ARE THE PROMPTS ARRAYS FOR VARIOUS QUESTIONS
+const prompts              = {
+        addCustom:           require("./prompts/addCustom"),
+        deleteConfirm:       require("./prompts/deleteConfirm"),
+        mainMenu:            require("./prompts/mainMenu")
+      };
+//    MODULES ARE UTILS WITH DEPENDENCIES
+const doCustomLabelPrompts = require("./modules/doCustomLabelPrompts")(prompts.addCustom),
+      readRepo             = require("./modules/readRepo"),
+      setToken             = require("./modules/setToken"),
+      fetchToken           = require("./modules/fetchToken"),
+      isGitRepo            = require("./modules/isGitRepo"),
+      readGitConfig        = require("./modules/readGitConfig"),
+      requestLabels        = require("./modules/requestLabels"),
+      prompt               = require("./modules/prompt"),
+      validateAddPackages  = require("./modules/validateAddPackages");
 
-//    TODO: this should be a util
-const replaceAll = (str, find, replace) => str.split(find).join(replace);
 
-//  Responsible for fetching and returning our config/token
-const fetchToken = () => {
-        return new Promise((res, rej)=>{
-          fs.readFile(__dirname+"/.token.json", 'utf8', (e, data) => {
-            if (e) rej("No token.json file found!");
-            if (JSON.parse(data).token === "") rej("No token found!");
-            res(JSON.parse(data).token);
-          });
-        });
-      };
-//  Responsible for asking the user what their token is, and then storing it
-//  executed only if it can't be found!
-const setToken = (done) => {
-        iq.prompt([{
-            type: "input",
-            name: "token",
-            message: "What is your GitHub Access Token?",
-            default: "eg: 12345678..."
-        }], (answer) => {
-          fs.writeFile( __dirname+'/.token.json', JSON.stringify( { "token": answer.token }, null, 2 ), 'utf8', (e)=>{
-            if (e) throw e;
-            console.log("Stored new token!");
-            done(answer.token);
-          });
-        });
-      };
-//  Recursivly asks if you want to add another new label, then calls a callback when youre all done
-const doCustomLabelPrompts = ( newLabels, done ) => {
-        iq.prompt( customAddPrompts, ( answers ) => {
-          newLabels.push({ name: answers.labelName, color: answers.labelColor });
-          if ( answers.addAnother ){
-            doCustomLabelPrompts( newLabels, done );
-          }else{
-            done( newLabels );
-          }
-        });
-      };
+//    resetToken function
+const resetToken = () => {
+  banner.resetToken();
+  return setToken(gitLabelmaker);
+};
 
-const doPackageLabelPrompts = ( done ) => {
-        iq.prompt([
-          {
-            name: "type",
-            type: "list",
-            message: "Do you want to use a local package or choose from a list of common label packages?",
-            choices: [ "Local", "Packages" ]
-          },{
-            name: "pkgs",
-            type: "checkbox",
-            message: "Which packages would you like to use?",
-            choices: [
-              "git-label-packages:cla",
-              "git-label-packages:priority",
-              "git-label-packages:status",
-              "git-label-packages:type"
-            ],
-            when: (answers) => {
-              return answers.type.toLowerCase() === "packages";
-            }
-          }
-        ], (ans) => {
-          console.log(ans);
-          // if (ans.)
-          // done();
-        });
-      };
+//    addCustom labels function
+const addCustom = (repo, token) => {
+  banner.addCustom();
+  return doCustomLabelPrompts( [], (newLabels) => {
+    gitLabel.add( configGitLabel(repo, token), newLabels )
+      .then(console.log)
+      .catch(console.warn);
+  });
+};
 
-const doRemovePrompts = ( token, repo ) => {
-        octonode.client(token).get('/repos/'+repo+'/labels', (e, status, body) => {
-          iq.prompt([{
-            name:     "removals",
-            type:     "checkbox",
-            message:  "Which labels would you like to remove?",
-            choices:  body.map((label) => label.name),
-            filter:   (removals) => {
-              return body.filter((label) => {
-                return removals.indexOf(label.name) > -1 ? { name: label.name, color: label.color } : false;
-              });
-            }
-          }], (answers) => {
-            gitLabel.remove( configGitLabel(repo, token), answers.removals )
-              .then(console.log)
-              .catch(console.warn);
-          });
-        });
-      };
+//    addFromPackage function
+const addFromPackage = (repo, token, path) => {
+  gitLabel.find( removeAll( path, [ "`", '"', "'" ] ) )
+    .then((newLabels)=>{
+      return gitLabel.add( configGitLabel(repo, token), newLabels )
+    })
+    .then(console.log)
+    .catch(console.warn);
+};
 
-//  Promise-based check to see if we're even in a Git repo
-const isGitRepo = () => {
-        return new Promise((res, rej) => {
-          fs.readdir(process.cwd()+'/.git/', (e, files) => {
-            if (e) rej(false);
-            res(true);
-          })
-        });
-      };
-//  Promise-based reading the git config to find the repo
-const readGitConfig  = () => {
-        return new Promise((res, rej)=>{
-          fs.readFile( process.cwd()+'/.git/config', 'utf8', (e, data) => {
-            if (e) rej(e);
-            res( data );// split it at newlines
-          })
-        });
-      };
-//  Returns a config for gitLabel
-const configGitLabel = (repo, token) => {
-        return {
-          api:    'https://api.github.com',
-          repo:   repo,
-          token:  token
-        }
-      };
+//    removeLabels function
+const removeLabels = (repo, token, answers) => {
+  //  Tell the user what they're about to lose
+  console.log("About to delete the following labels:")
+  alertDeletes(answers.removals);// alerts the list of labels to be removed
+  //  Ya sure ya wanna do this bud?
+  prompt(prompts.deleteConfirm)
+    .then((confirmRemove)=>{
+      if ( confirmRemove.youSure ) {
+        return gitLabel.remove( configGitLabel(repo, token), answers.removals )
+      }
+      gitLabelmaker();
+    })
+    .then(console.log)
+    .catch(console.warn);
+};
 
-//    TODO: could be refactored to return the git.add as a promise..?
-const handleAddPrompts = (repo, token, newLabels) => {
-        gitLabel.add( configGitLabel(repo, token), newLabels )
-          .then(console.log)
-          .catch(console.warn);
-      };
+//    Callback for the main prompts, handles program flow
+const handleMainPrompts = (repo, token, ans) => {
+        switch ( ans.main.toLowerCase() ) {
+          case "reset token":
+            resetToken();
+            break;
 
-const handleMainPrompts = (repo, ans) => {
-        if ( ans.main.toLowerCase() === "reset token" ){
-          //  process will end after new token is set
-          return setToken((token) => {
-            iq.prompt( mainPrompts, handleMainPrompts.bind(null, repo));
-          });
-        }
-        //  if it's not to reset the token then we
-        fetchToken()
-          .then((token)=>{
-            if ( ans.main.toLowerCase() === "add custom labels" ){
-              return doCustomLabelPrompts( [], handleAddPrompts.bind(null, repo, token));
-            }
-            if ( ans.main.toLowerCase() === "add labels from package" ){
-              // return doPackageLabelPrompts( handleAddPrompts.bind(null, repo, token) );
-              let packagePath;
-              iq.prompt([{
-                name: "path",
-                type: "input",
-                message: "What is the path & name of the package you want to use? (eg: `packages/my-label-pkg.json`)",
-                validate: (path) => {
-                  try {
-                    if (path.indexOf(".json") < 0) throw "Not a JSON file";
-                    packagePath = path.indexOf("/") === 0 ? path.replace("/","") : path;
-                    //  TODO: make that fn loop over an array of replaces, or make it REMOVEALL and ditch that 3rd param
-                    packagePath = replaceAll( replaceAll( replaceAll(packagePath, '`', ""), '"', "" ), "'", "" )
-                    if ( fs.statSync( process.cwd()+"/"+packagePath ) ){
-                      return true;
-                    }
-                  } catch (e){
-                    return e;
-                  }
-                }
-              }], (ans) => {
-                gitLabel.find( replaceAll( replaceAll( replaceAll(ans.path, '`', ""), '"', "" ), "'", "" ) )
-                  .then((newLabels)=>{
-                    return gitLabel.add( configGitLabel(repo, token), newLabels )
-                  })
-                  .then(console.log)
-                  .catch(console.warn);
-              });
-            }
-            if ( ans.main.toLowerCase() === "remove labels" ){
-              doRemovePrompts(token, repo);
-            }
-          })
-          .catch((msg)=>{
-            console.log(msg);
-            setToken((token) => {
-              iq.prompt( mainPrompts, handleMainPrompts.bind(null, repo));
-            });
-          });
-      };
+          case "add custom labels":
+            addCustom(repo, token);
+            break;
 
+          case "add labels from package":
+            banner.addFromPackage();
+            prompt([{
+              name:    "path",
+              type:    "input",
+              message: "What is the path & name of the package you want to use? (eg: `packages/my-label-pkg.json`)",
+              validate: validateAddPackages
+            }])
+              .then((ans)=>{
+                return addFromPackage( repo, token, ans.path );
+              })
+              .catch(console.warn);
+            break;
 
-//    LET'S DO IT
-    Promise.all([ isGitRepo(), readGitConfig() ])
-      .then(( values )=>{
-        let repo = readRepo(values[1].split("\n"));
-        iq.prompt( mainPrompts, handleMainPrompts.bind(null, repo));
-      })
-      .catch((e)=>{
-        console.warn(e);
-        console.warn("Please run git-labelmaker from inside a git repo!")
+          case "remove labels":
+            banner.removeLabels();
+            requestLabels(repo, token)
+              .then((labels)=>{
+                return prompt([{
+                  name:     "removals",
+                  type:     "checkbox",
+                  message:  "Which labels would you like to remove?",
+                  choices:  labels.map((label) => label.name),
+                  validate: validateRemovals,
+                  filter:   filterRemovalLabels.bind(null, labels)
+                }]);
+              })
+              .then((answers)=>{
+                removeLabels(repo, token, answers);
+              })
+              .catch(console.warn);
+            break;
+
+          default:
+            gitLabelmaker();
+        };
+      };
+
+//    Kicks things off, named so that it can be called at any time
+const gitLabelmaker = () => {
+  //  Checks for three things at once, each will return a nice error obj if they fail
+  Promise.all([ isGitRepo(), readGitConfig(), fetchToken() ])
+    .then(( values )=>{
+      let repo = readRepo(values[1]);
+      let token = values[2];
+      banner.welcome();
+      iq.prompt( prompts.mainMenu, handleMainPrompts.bind(null, repo, token));
+    })
+    .catch((e)=>{
+      console.warn(e.err);
+      if (e.id === "TOKEN") {
+        setToken(gitLabelmaker);
+      } else {
         process.exit(1);
-      });
+      }
+    });
+};
+
+gitLabelmaker();