Merge pull request #15 from JPeer264/feature/fail-non-git

Fail on non git directories

Author: JPeer264

appveyor.yml

@@ -0,0 +1,26 @@
+# Test against this version of Node.js
+environment:
+  matrix:
+    # node.js
+    - nodejs_version: "4"
+    - nodejs_version: "6"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install modules
+  - npm config set loglevel warn
+  - npm i -g npm
+  - npm i
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off

lib/cli.js

@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import execa from 'execa';
 import yargs from 'yargs';
 import inquirer from 'inquirer';
+import isGit from 'is-git-repository';
 import updateNotifier from 'update-notifier';
 
 import pkg from '../package.json';
@@ -24,6 +25,8 @@ updateNotifier({ pkg }).notify();
 
 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 {
   inquirer.prompt(questionsList).then((answers) => {
     const message = answers.moreInfo ? `${answers.editor}` : `${answers.type} ${answers.description}`;

package.json

@@ -8,7 +8,7 @@
     "sgc": "dest/cli.js"
   },
   "scripts": {
-    "pretest": "npm run lint",
+    "pretest": "npm run lint & npm run babel",
     "test": "nyc ava",
     "lint": "eslint lib test",
     "babel": "babel lib -d dest",
@@ -25,7 +25,8 @@
   },
   "nyc": {
     "exclude": [
-      "test"
+      "test",
+      "dest"
     ]
   },
   "repository": {
@@ -64,6 +65,7 @@
     "chalk": "^1.1.3",
     "execa": "^0.6.1",
     "inquirer": "^3.0.6",
+    "is-git-repository": "^1.0.1",
     "json-extra": "^0.5.0",
     "object.entries": "^1.0.4",
     "update-notifier": "^2.1.0",

test/cli.js

@@ -0,0 +1,26 @@
+import { homedir } from 'os';
+import test from 'ava';
+import path from 'path';
+import execa from 'execa';
+
+import pkg from '../package.json';
+
+const cli = 'dest/cli.js';
+
+test('should print the right version', async (t) => {
+  const { stdout } = await execa(cli, ['--version']);
+
+  t.is(stdout, `v${pkg.version}`);
+});
+
+test('should fail on non git repository', async (t) => {
+  // assume that the homedir is not a git repo
+  process.chdir(homedir());
+
+  const { stderr } = await execa(path.join(__dirname, '..', cli));
+
+  process.chdir(path.join(__dirname, '..'));
+
+  t.is(stderr, 'fatal: Not a git repository (or any of the parent directories): .git');
+});
+

test/getConfig.js

@@ -1,14 +1,17 @@
-import fs from 'fs-extra';
 import os from 'os';
 import test from 'ava';
 import path from 'path';
+import fs from 'fs-extra';
 import json from 'json-extra';
+
 import getConfig from '../lib/getConfig';
 
 const cwd = process.cwd();
 const homedir = os.homedir();
 const fixtures = path.join(cwd, 'test', 'fixtures');
-const randomString = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10);
+const date = new Date();
+const datetime = date.toISOString().slice(0, 10);
+const randomString = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 4);
 
 let globalExist = false;
 
@@ -17,13 +20,13 @@ let globalExist = false;
 test.before(() => {
   if (fs.existsSync(path.join(homedir, '.sgcrc'))) {
     globalExist = true;
-    fs.renameSync(path.join(homedir, '.sgcrc'), path.join(homedir, `.sgcrc.${randomString}.back`));
+    fs.renameSync(path.join(homedir, '.sgcrc'), path.join(homedir, `.sgcrc.${randomString}-${datetime}.back`));
   }
 });
 
 test.after(() => {
   if (globalExist) {
-    fs.renameSync(path.join(homedir, `.sgcrc.${randomString}.back`), path.join(homedir, '.sgcrc'));
+    fs.renameSync(path.join(homedir, `.sgcrc.${randomString}-${datetime}.back`), path.join(homedir, '.sgcrc'));
   }
 });
 
@@ -42,14 +45,14 @@ test('read config from package.json', (t) => {
   packageJson.sgc = sgcrc;
 
   // manipulate local package
-  fs.renameSync(path.join(cwd, 'package.json'), path.join(cwd, `package.json.${randomString}.back`));
+  fs.renameSync(path.join(cwd, 'package.json'), path.join(cwd, `package.json.${randomString}-${datetime}.back`));
   fs.writeFileSync(path.join(cwd, 'package.json'), JSON.stringify(packageJson));
 
   t.deepEqual(getConfig(), sgcrc);
 
   // revert local package
   fs.removeSync(path.join(cwd, 'package.json'));
-  fs.renameSync(path.join(cwd, `package.json.${randomString}.back`), path.join(cwd, 'package.json'));
+  fs.renameSync(path.join(cwd, `package.json.${randomString}-${datetime}.back`), path.join(cwd, 'package.json'));
 });
 
 test('read global config', (t) => {

test/prompConfig.js

@@ -1,11 +1,35 @@
+import os from 'os';
 import test from 'ava';
 import path from 'path';
 import chalk from 'chalk';
+import fs from 'fs-extra';
 import json from 'json-extra';
+
 import getConfig from '../lib/getConfig';
 import { choices, questions } from '../lib/promptConfig';
 
 const cwd = process.cwd();
+const homedir = os.homedir();
+const date = new Date();
+const datetime = date.toISOString().slice(0, 10);
+const randomString = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 4);
+
+let globalExist = false;
+
+
+// rename global .sgcrc
+test.before(() => {
+  if (fs.existsSync(path.join(homedir, '.sgcrc'))) {
+    globalExist = true;
+    fs.renameSync(path.join(homedir, '.sgcrc'), path.join(homedir, `.sgcrc.${randomString}-${datetime}.back`));
+  }
+});
+
+test.after(() => {
+  if (globalExist) {
+    fs.renameSync(path.join(homedir, `.sgcrc.${randomString}-${datetime}.back`), path.join(homedir, '.sgcrc'));
+  }
+});
 
 test('get configuration file equals .sgcrc_default', (t) => {
   t.deepEqual(getConfig(), json.readToObjSync(path.join(cwd, '.sgcrc_default')));

yarn.lock

@@ -2217,6 +2217,12 @@ 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:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-git-repository/-/is-git-repository-1.0.1.tgz#db80512b6ce8db3fa90c84292a7b525e427f5746"
+  dependencies:
+    execa "^0.6.1"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"