all-contributors-cli - npm Package Compare versions

Comparing version 2.0.0-beta8 to 2.0.0-beta9

cli.js

@@ -8,2 +8,3 @@ #!/usr/bin/env node
 var yargs = require('yargs');
+var inquirer = require('inquirer');
 
@@ -87,10 +88,35 @@ var init = require('./lib/init');
 
-var command = argv._[0];
+function promptForCommand(argv, cb) {
+  try {
+    fs.statSync(argv.config);
+  } catch (error) { // No config file --> first time using the command
+    return cb('init');
+  }
 
-if (command === 'init') {
-  init(onError);
-} else if (command === 'generate') {
-  startGeneration(argv, onError);
-} else if (command === 'add') {
-  addContribution(argv, onError);
+  var questions = [{
+    type: 'list',
+    name: 'command',
+    message: "What do you want to do?",
+    choices: [{
+      name: 'Add a new contributor or add a new contribution type',
+      value: 'add'
+    }, {
+      name: 'Re-generate the contributors list',
+      value: 'generate'
+    }],
+    default: 0
+  }];
+  inquirer.prompt(questions, function treatAnswers(answers) {
+    return cb(answers.command);
+  });
 }
+
+promptForCommand(argv, function (command) {
+  if (command === 'init') {
+    init(onError);
+  } else if (command === 'generate') {
+    startGeneration(argv, onError);
+  } else if (command === 'add') {
+    addContribution(argv, onError);
+  }
+});

lib/init/prompt.js

@@ -40,2 +40,7 @@ 'use strict';
   default: 100
+}, {
+  type: 'confirm',
+  name: 'commit',
+  message: "Do you want this badge to auto-commit when contributors are added?",
+  default: true
 }];
@@ -61,2 +66,3 @@
         imageSize: answers.imageSize,
+        commit: answers.commit,
         contributors: []
@@ -63,0 +69,0 @@ };

lib/util/configFile.js

@@ -6,12 +6,2 @@ 'use strict';
 
-function formatCommaFirst(o) {
-  return JSON.stringify(o, null, 2)
-    .split(/(,\n\s+)/)
-    .map(function (e, i) {
-      return i % 2 ? '\n' + e.substring(4) + ', ' : e;
-    })
-    .join('') +
-    '\n';
-}
-
 function readConfig(configPath) {
@@ -22,3 +12,3 @@ return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
 function writeConfig(configPath, content, cb) {
-  return fs.writeFile(configPath, formatCommaFirst(content), cb);
+  return fs.writeFile(configPath, JSON.stringify(content, null, 2), cb);
 }
@@ -29,3 +19,3 @@
   var content = _.assign(config, {contributors: contributors});
-  return fs.writeFile(configPath, formatCommaFirst(content), cb);
+  return fs.writeFile(configPath, JSON.stringify(content, null, 2), cb);
 }
@@ -32,0 +22,0 @@

lib/util/git.js

 'use strict';
 
+var path = require('path');
 var _ = require('lodash/fp');
@@ -39,3 +40,3 @@
 
-function spawnCommand(args, cb) {
+function spawnGitCommand(args, cb) {
   var git = spawn('git', args);
@@ -47,3 +48,7 @@ git.stderr.on('data', cb);
 function commit(options, data, cb) {
-  spawnCommand(['add', '.'], function (error) {
+  var files = options.files.concat(options.config);
+  var absolutePathFiles = files.map(function (file) {
+    return path.resolve(process.cwd(), file);
+  });
+  spawnGitCommand(['add'].concat(absolutePathFiles), function (error) {
     if (error) {
@@ -53,3 +58,3 @@ return cb(error);
     var commitMessage = _.template(options.commitTemplate || commitTemplate)(data);
-    spawnCommand(['commit', '-m', commitMessage], cb);
+    spawnGitCommand(['commit', '-m', commitMessage], cb);
   });
@@ -56,0 +61,0 @@ }

package.json

 {
   "name": "all-contributors-cli",
-  "version": "2.0.0-beta8",
+  "version": "2.0.0-beta9",
   "description": "Tool to easily add recognition for new contributors",
@@ -5,0 +5,0 @@ "bin": {

No alert changes

Improved metrics

Total package byte prevSize

45542

increased by1.95%

Lines of code

1193

increased by2.32%

No dependency changes