fix(config): run environment check when not part of ghost setup

closes #265
- add ignoreEnvCheck flag to config command
- fix tests
- fix prompts to skip mysql prompts if sqlite is defined in config already

Author: acburdine

lib/commands/config/index.js

@@ -87,7 +87,9 @@ class ConfigCommand extends Command {
             });
         }
 
-        if (!argv.db || argv.db !== 'sqlite3') {
+        const db = argv.db || this.instance.config.get('database.client');
+
+        if (!db || db !== 'sqlite3') {
             if (!argv.dbhost) {
                 prompts.push({
                     type: 'input',
@@ -135,8 +137,11 @@ class ConfigCommand extends Command {
         const key = argv.key;
         let value = argv.value;
 
-        if (key && !value) {
+        if (key || !argv.ignoreEnvCheck) {
             this.instance.checkEnvironment();
+        }
+
+        if (key && !value) {
             // getter
             value = this.instance.config.get(key, null);
 
@@ -146,7 +151,6 @@ class ConfigCommand extends Command {
 
             return Promise.resolve();
         } else if (key) {
-            this.instance.checkEnvironment();
             // setter
             this.instance.config.set(key, value).save();
             return Promise.resolve();

lib/commands/setup.js

@@ -119,7 +119,10 @@ class SetupCommand extends Command {
             });
         }
 
-        return this.ui.run(() => this.runCommand(ConfigCommand, argv), 'Configuring Ghost').then(
+        return this.ui.run(
+            () => this.runCommand(ConfigCommand, Object.assign({ignoreEnvCheck: true}, argv)),
+            'Configuring Ghost'
+        ).then(
             () => this.system.hook('setup', this, argv)
         ).then(() => {
             const taskMap = {};

test/unit/commands/config-spec.js

@@ -291,30 +291,52 @@ describe('Unit: Command > Config', function () {
         });
 
         it('calls handleAdvancedOptions without prompts if no-prompt is set', function () {
-            const getInstanceStub = sinon.stub().returns({});
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
 
             const config = new ConfigCommand({}, {getInstance: getInstanceStub});
             const getConfigPromptsStub = sinon.stub(config, 'getConfigPrompts').returns([]);
             const handleAdvancedOptionsStub = sinon.stub(config, 'handleAdvancedOptions').resolves({result: true});
 
             return config.run({prompt: false}).then((result) => {
                 expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: false});
                 expect(handleAdvancedOptionsStub.calledOnce).to.be.true;
                 expect(handleAdvancedOptionsStub.args[0][0]).to.deep.equal({prompt: false});
             });
         });
 
+        it('does not call checkEnvironment if ignoreEnvCheck is passed', function () {
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
+
+            const config = new ConfigCommand({}, {getInstance: getInstanceStub});
+            const getConfigPromptsStub = sinon.stub(config, 'getConfigPrompts').returns([]);
+            const handleAdvancedOptionsStub = sinon.stub(config, 'handleAdvancedOptions').resolves({result: true});
+
+            return config.run({prompt: false, ignoreEnvCheck: true}).then((result) => {
+                expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.called).to.be.false;
+                expect(getConfigPromptsStub.calledOnce).to.be.true;
+                expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: false, ignoreEnvCheck: true});
+                expect(handleAdvancedOptionsStub.calledOnce).to.be.true;
+                expect(handleAdvancedOptionsStub.args[0][0]).to.deep.equal({prompt: false, ignoreEnvCheck: true});
+            });
+        });
+
         it('calls handleAdvancedOptions without prompts if no prompts are needed', function () {
-            const getInstanceStub = sinon.stub().returns({});
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
 
             const config = new ConfigCommand({}, {getInstance: getInstanceStub});
             const getConfigPromptsStub = sinon.stub(config, 'getConfigPrompts').returns([]);
             const handleAdvancedOptionsStub = sinon.stub(config, 'handleAdvancedOptions').resolves({result: true});
 
             return config.run({prompt: true}).then((result) => {
                 expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: true});
                 expect(handleAdvancedOptionsStub.calledOnce).to.be.true;
@@ -323,7 +345,8 @@ describe('Unit: Command > Config', function () {
         });
 
         it('prompts with defined prompts, passes result to handleAdvancedOptions', function () {
-            const getInstanceStub = sinon.stub().returns({});
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
             const promptStub = sinon.stub().resolves({});
 
             const config = new ConfigCommand({prompt: promptStub}, {getInstance: getInstanceStub});
@@ -332,6 +355,7 @@ describe('Unit: Command > Config', function () {
 
             return config.run({prompt: true}).then((result) => {
                 expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: true});
                 expect(promptStub.calledOnce).to.be.true;
@@ -342,7 +366,8 @@ describe('Unit: Command > Config', function () {
         });
 
         it('sets db to mysql if dbhost is provided via prompts', function () {
-            const getInstanceStub = sinon.stub().returns({});
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
             const promptStub = sinon.stub().resolves({dbhost: 'localhost'});
 
             const config = new ConfigCommand({prompt: promptStub}, {getInstance: getInstanceStub});
@@ -351,6 +376,7 @@ describe('Unit: Command > Config', function () {
 
             return config.run({prompt: true}).then((result) => {
                 expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: true, db: 'mysql', dbhost: 'localhost'});
                 expect(promptStub.calledOnce).to.be.true;
@@ -361,7 +387,8 @@ describe('Unit: Command > Config', function () {
         });
 
         it('doesn\'t add null prompt values to argv object', function () {
-            const getInstanceStub = sinon.stub().returns({});
+            const checkEnvironmentStub = sinon.stub();
+            const getInstanceStub = sinon.stub().returns({checkEnvironment: checkEnvironmentStub});
             const promptStub = sinon.stub().resolves({dbhost: 'localhost', dbpass: ''});
 
             const config = new ConfigCommand({prompt: promptStub}, {getInstance: getInstanceStub});
@@ -370,6 +397,7 @@ describe('Unit: Command > Config', function () {
 
             return config.run({prompt: true}).then((result) => {
                 expect(result).to.deep.equal({result: true});
+                expect(checkEnvironmentStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.calledOnce).to.be.true;
                 expect(getConfigPromptsStub.args[0][0]).to.deep.equal({prompt: true, db: 'mysql', dbhost: 'localhost'});
                 expect(promptStub.calledOnce).to.be.true;