Merge remote-tracking branch 'remotes/upstream/master' into global-pa…

…ckages

.gitignore

@@ -2,3 +2,4 @@
 *.bcup
 *.DS_Store
 /coverage/
+*.git-label-maker-config

bin/constants.js

@@ -17,6 +17,7 @@ const constants = {
         'Welcome to git-labelmaker',
         'Adding Custom Labels',
         'Adding Labels From Package',
+        'Add Global Package',
         'Creating Package From Labels',
         'Removing Labels',
         'Resetting Token',

bin/index.js

@@ -5,6 +5,7 @@
 //    EXTERNAL DEPENDENCIES
 const fs = require('fs');
 const prompt = require('inquirer').prompt;
+const pathTool = require('path');
 const gitLabel = require('git-label');
 //    UTILS ARE STANDALONE METHODS WITH NO DEPENDENCIES
 const alertDeletes = require('./utils/alert-deletes.js');
@@ -111,6 +112,18 @@ const addFromPackage = (repo, token, path) => {
 };
 exports.addFromPackage = addFromPackage;
 
+const setGlobalPackage = (path, token) => {
+    fs.writeFile('.git-labelmaker-config', pathTool.resolve(__dirname, '..', path), (err) => {
+        if (err) throw err;
+        console.log(`Saved ${path} as a global. When you specify no file when adding from a package, the global will be used instead.`);
+        gitLabelmaker(token);
+    });
+};
+//  Not in use... yet :)
+// const getGlobalPackage = () => {
+//   return fs.readFileSync('.git-labelmaker-config', 'utf-8');
+// };
+
 //    removeLabels function
 const removeLabels = (repo, token, answers) => {
     //  Tell the user what they're about to lose
@@ -143,6 +156,16 @@ const handleMainPrompts = (repo, token, ans) => {
         case 'add custom labels':
             return addCustom(repo, token);
 
+        case 'add global package':
+            return prompt([{
+                name:    'path',
+                type:    'input',
+                message: 'What is the pathname you want to use for your package? (Must be valid json)',
+                validate: validateAddPackages,
+            }])
+                .then((globalAns) => setGlobalPackage(globalAns.path, token))
+                .catch(console.warn);
+
         case 'add labels from package':
             banner.addFromPackage();
             return prompt([{

bin/modules/validateAddPackages.js

@@ -0,0 +1,36 @@
+/**
+ *    Ensures that the label package file actually exists
+ *    @param  {String} path - path to the json file label package
+ *    @return {Bool || Error} this is a try-catch where the error
+ */
+
+
+const fs = require('fs');
+const path = require('path');
+const isJsonString = require('../utils/is-json-string.js');
+
+//  Not using arrows bc it will mess up "this" context
+module.exports = function (jsonPath) { // eslint-disable-line func-names
+    // Declare function as asynchronous, and save the done callback
+    const done = this.async();
+    // this is clunky, but this way `we can just use a default
+    if (jsonPath === '') done(true);
+    try {
+        if (jsonPath.indexOf('.json') < 0) {
+            done('Not a JSON file');
+            return;
+        }
+        // Calculate the full path of the JSON file based upon the current working directory. Using
+        // path.resolve allows for absolute paths to be used also.
+        const fullPath = path.resolve(process.cwd(), jsonPath);
+        fs.readFile(fullPath, (err, data) => {
+            if (err) { done(err); return; }
+            if (isJsonString(data)) {
+                done(true);
+            }
+            done('Not a valid JSON file');
+        });
+    } catch (e) {
+        done(e);
+    }
+};

bin/prompts/mainMenu.js

@@ -0,0 +1,13 @@
+/**
+ *    The "Initial"/"Main" prompts
+ */
+const menuChoices = require('../constants.js').menuChoices;
+
+module.exports = [
+    {
+        type:     'list',
+        name:     'main',
+        message:  'Welcome to git-labelmaker!\nWhat would you like to do?',
+        choices:  menuChoices,
+    }
+];

bin/utils/__tests__/banners.spec.js

@@ -42,43 +42,50 @@ test('it prints the addFromPackage banner to the console', () => {
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
-test('it prints the createPkgFromLabels banner to the console', () => {
+test('it prints the addGlobalPackage banner to the console', () => {
     const expected = makeExpected(pad33(constants.banners[3]));
+    banners.addGlobalPackage();
+    expect(console.log.mock.calls.length).toBe(1);
+    expect(console.log.mock.calls[0][0]).toBe(expected);
+});
+
+test('it prints the createPkgFromLabels banner to the console', () => {
+    const expected = makeExpected(pad33(constants.banners[4]));
     banners.createPkgFromLabels();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
 test('it prints the removeLabels banner to the console', () => {
-    const expected = makeExpected(pad33(constants.banners[4]));
+    const expected = makeExpected(pad33(constants.banners[5]));
     banners.removeLabels();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
 test('it prints the resetToken banner to the console', () => {
-    const expected = makeExpected(pad33(constants.banners[5]));
+    const expected = makeExpected(pad33(constants.banners[6]));
     banners.resetToken();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
 test('it prints the seeYa banner to the console', () => {
-    const expected = makeExpected(pad33(constants.banners[6]));
+    const expected = makeExpected(pad33(constants.banners[7]));
     banners.seeYa();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
 test('it prints the wrongPassword banner to the console', () => {
-    const expected = makeExpected(pad33(constants.banners[7]));
+    const expected = makeExpected(pad33(constants.banners[8]));
     banners.wrongPassword();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);
 });
 
 test('it prints the removeAllLabels banner to the console', () => {
-    const expected = makeExpected(pad33(constants.banners[8]));
+    const expected = makeExpected(pad33(constants.banners[9]));
     banners.removeAllLabels();
     expect(console.log.mock.calls.length).toBe(1);
     expect(console.log.mock.calls[0][0]).toBe(expected);

bin/utils/banners.js

@@ -4,7 +4,6 @@
 
 const pad33 = require('./pad-33.js');
 const banners = require('../constants.js').banners;
-
 const bar = '=======================================\n';
 const block = ']|[';
 const emptyRow = `${block}                                 ${block}\n`;
@@ -15,6 +14,7 @@ const props = [
     'welcome',
     'addCustom',
     'addFromPackage',
+    'addGlobalPackage',
     'createPkgFromLabels',
     'removeLabels',
     'resetToken',