Merge pull request #82 from loopmediagroup/dev

[Gally]: master <- dev
loopmediagroup · Jul 27, 2018 · 43ef2a5 · 43ef2a5
2 parents cc2921d + 3651fbe
commit 43ef2a5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/src/configs/default.json b/src/configs/default.json
@@ -25,7 +25,7 @@
     "feat/*": {
       "upstream": "dev"
     },
-    "greenkeeper/*": {
+    "dependabot/*": {
       "upstream": "dev"
     }
   },
@@ -42,8 +42,7 @@
         "contexts": [
           "continuous-integration/circle-ci",
           "continuous-integration/travis-ci",
-          "coverage/coveralls",
-          "greenkeeper/verify"
+          "coverage/coveralls"
         ]
       },
       "enforce_admins": true,

diff --git a/src/gally.js b/src/gally.js
@@ -5,6 +5,7 @@ const set = require("lodash.set");
 const mergeWith = require("lodash.mergewith");
 const inquirer = require('inquirer');
 const json = require("./util/json");
+const ci = require("./util/ci");
 
 module.exports.load = async (configDir, cwd) => {
   if (!fs.existsSync(configDir)) {
@@ -17,7 +18,7 @@ module.exports.load = async (configDir, cwd) => {
   const globalConfig = json.loadOrDefault(globalConfigFile);
   const credentials = json.loadOrDefault(credentialsFile);
 
-  if (get(credentials, "github.token", process.env.GH_TOKEN) === undefined) {
+  if (get(credentials, "github.token", process.env.GH_TOKEN) === undefined && !ci.isCI()) {
     const token = (await inquirer.prompt([{
       type: 'password',
       message: 'Enter github personal access token',

diff --git a/src/util/ci.js b/src/util/ci.js
@@ -0,0 +1,6 @@
+module.exports.isCI = () => [
+  "CI",
+  "CONTINUOUS_INTEGRATION",
+  "BUILD_NUMBER",
+  "TRAVIS"
+].some(v => process.env[v] !== undefined);
diff --git a/test/gally.spec.js b/test/gally.spec.js
@@ -3,8 +3,11 @@ const path = require('path');
 const expect = require('chai').expect;
 const inquirer = require('inquirer');
 const tmp = require('tmp');
+const ci = require('./../src/util/ci');
 const gally = require('./../src/gally');
 
+const isCiOriginal = ci.isCI;
+
 tmp.setGracefulCleanup();
 
 describe("Testing Gally", () => {
@@ -13,6 +16,7 @@ describe("Testing Gally", () => {
   let promptCount = 0;
 
   before(() => {
+    ci.isCI = () => false;
     inquirerPrompt = inquirer.prompt;
     inquirer.prompt = () => {
       promptCount += 1;
@@ -25,6 +29,7 @@ describe("Testing Gally", () => {
   });
 
   after(() => {
+    ci.isCI = isCiOriginal;
     inquirer.prompt = inquirerPrompt;
     process.env.GH_TOKEN = ghToken;
   });

diff --git a/test/util/ci.spec.js b/test/util/ci.spec.js
@@ -0,0 +1,8 @@
+const expect = require('chai').expect;
+const ci = require('./../../src/util/ci');
+
+describe("Testing ci.js", () => {
+  it("Testing isCi", () => {
+    expect(typeof ci.isCI()).to.equal("boolean");
+  });
+});