Merge pull request #24 from JPeer264/feature/detectnonadded

Fail non added

Author: JPeer264

lib/cli.js

@@ -4,6 +4,7 @@ import execa from 'execa';
 import yargs from 'yargs';
 import inquirer from 'inquirer';
 import isGit from 'is-git-repository';
+import isAdded from 'is-git-added';
 import updateNotifier from 'update-notifier';
 
 import pkg from '../package.json';
@@ -27,6 +28,8 @@ if (argv.v) {
   console.log(`v${pkg.version}`);
 } else if (!isGit()) {
   console.error('fatal: Not a git repository (or any of the parent directories): .git');
+} else if (!isAdded()) {
+  console.error(chalk.red('Please', chalk.bold('git add'), 'some files first before you commit.'));
 } else {
   inquirer.prompt(questionsList).then((answers) => {
     const message = answers.moreInfo ? `${answers.editor}` : `${answers.type} ${answers.description}`;

lib/promptConfig.js

@@ -33,9 +33,7 @@ const questions = (choicesList) => {
       validate: (input) => {
         const warnings = ruleWarningMessages(input);
 
-        if (warnings) return warnings;
-
-        return true;
+        return warnings || true;
       },
     },
     {

package.json

@@ -65,6 +65,7 @@
     "chalk": "^1.1.3",
     "execa": "^0.6.1",
     "inquirer": "^3.0.6",
+    "is-git-added": "^1.0.1",
     "is-git-repository": "^1.0.1",
     "json-extra": "^0.5.0",
     "object.entries": "^1.0.4",

test/cli.js

@@ -13,7 +13,8 @@ test('should print the right version', async (t) => {
   t.is(stdout, `v${pkg.version}`);
 });
 
-test('should fail on non git repository', async (t) => {
+// make serial due to dynamic process.chdir switching
+test.serial('should fail on non git repository', async (t) => {
   // assume that the homedir is not a git repo
   process.chdir(homedir());
 
@@ -24,3 +25,9 @@ test('should fail on non git repository', async (t) => {
   t.is(stderr, 'fatal: Not a git repository (or any of the parent directories): .git');
 });
 
+test('should fail on git repos where nothing is added', async (t) => {
+  // assume that the homedir is not a git repo
+  const { stderr } = await execa(cli);
+
+  t.is(stderr, 'Please git add some files first before you commit.');
+});

yarn.lock

@@ -2217,7 +2217,14 @@ is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
 
-is-git-repository@^1.0.1:
+is-git-added@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-git-added/-/is-git-added-1.0.1.tgz#d4a911f057488dd9c4e1b659c495295f448aec4e"
+  dependencies:
+    execa "^0.6.1"
+    is-git-repository "^1.0.0"
+
+is-git-repository@^1.0.0, is-git-repository@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-git-repository/-/is-git-repository-1.0.1.tgz#db80512b6ce8db3fa90c84292a7b525e427f5746"
   dependencies: