check git repository

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.0
+
+- check git repository
+- optimize help message
+
 # 0.0.0
 
 first version

commands/help.js

@@ -5,10 +5,10 @@
 
 export default () => {
     console.log(`
-    Usage: gacp
+usage: gacp
 
-        gacp
-        gacp message
-        gacp help
+    gacp
+    gacp <message>
+    gacp help
 `)
 };

commands/index.js

@@ -4,31 +4,25 @@
  */
 
 import inquirer from 'inquirer';
-import chark from 'chalk';
 import sh from 'shelljs';
 
-const shellSilentConfig = {
-    silent: true,
-};
-
-const getStdoutFromShell = (command) => {
-    let result = null;
-    const shellExec = sh.exec(command, shellSilentConfig);
-    if (shellExec.code === 0) {
-        result = shellExec.stdout.split(`\n`)[0];
-    }
-    return result;
-};
+import getInfoFromShell from '../lib/getInfoFromShell';
+import isAGitRepository from '../lib/isAGitRepository';
+import * as console from '../lib/console';
 
 const getRemote = () => {
-    return getStdoutFromShell(`git remote`);
+    return getInfoFromShell(`git remote`);
 };
 
 const getBranch = () => {
-    return getStdoutFromShell(`git symbolic-ref --short HEAD`);
+    return getInfoFromShell(`git symbolic-ref --short HEAD`);
 };
 
 export default async(...restArgs) => {
+    if (!isAGitRepository()) {
+        console.error(`not a git repository`);
+        process.exit(1);
+    }
     let commitMessage = null;
     if (restArgs.length === 0) {
         const answers = await inquirer.prompt([{
@@ -37,7 +31,7 @@ export default async(...restArgs) => {
             message: `please enter commit message:`,
             validate: (msg) => {
                 if (!msg.length) {
-                    return `commit message is required`
+                    return `commit message is required`;
                 }
                 return true;
             },
@@ -47,12 +41,13 @@ export default async(...restArgs) => {
         commitMessage = restArgs.join(` `);
     }
     const addCommand = `git add .`;
-    console.log(chark.green(addCommand));
+    console.info(addCommand);
     sh.exec(addCommand);
     const commitCommand = `git commit -m "${commitMessage}"`;
-    console.log(chark.green(commitCommand));
+    console.info(commitCommand);
     sh.exec(commitCommand);
     const pushCommand = `git push ${getRemote()} ${getBranch()}`;
-    console.log(chark.green(pushCommand));
+    console.info(pushCommand);
     sh.exec(pushCommand);
+    return true;
 };

lib/console.js

@@ -0,0 +1,14 @@
+/**
+ * @since 2016-11-22 16:16
+ * @author vivaxy
+ */
+
+import chalk from 'chalk';
+
+export const info = (...args) => {
+    console.log(chalk.blue(...args));
+};
+
+export const error = (...args) => {
+    console.log(chalk.red(...args));
+};

lib/getInfoFromShell.js

@@ -0,0 +1,19 @@
+/**
+ * @since 2016-11-22 16:04
+ * @author vivaxy
+ */
+
+import sh from 'shelljs';
+
+const shellSilentConfig = {
+    silent: true,
+};
+
+export default (command) => {
+    let result = null;
+    const shellExec = sh.exec(command, shellSilentConfig);
+    if (shellExec.code === 0) {
+        result = shellExec.stdout.split(`\n`)[0];
+    }
+    return result;
+};

lib/isAGitRepository.js

@@ -0,0 +1,20 @@
+/**
+ * @since 2016-11-22 16:05
+ * @author vivaxy
+ */
+
+import path from 'path';
+import sh from 'shelljs';
+
+import getInfoFromShell from './getInfoFromShell';
+
+const cwd = process.cwd();
+
+export default () => {
+    if (sh.test(`-d`, path.join(cwd, `.git`))) {
+        if (getInfoFromShell(`git rev-parse --is-inside-work-tree`) === `true`) {
+            return true;
+        }
+    }
+    return false;
+};