Merge pull request #248 from SeaLife/master

#218 implementing non-interactive config

Author: yamalight

src/commands/config.js

@@ -123,10 +123,31 @@ exports.builder = {
  alias: 'f',
  description: 'generate a new config for function deployment',
  },
+ domain: {
+ alias: ['d', 'domain'],
+ description: 'sets the domain (enables non-interactive mode)',
+ },
+ project: {
+ alias: ['p', 'project'],
+ description: 'sets the project name (enables non-interactive mode)',
+ },
+ name: {
+ alias: ['n', 'name'],
+ description: 'sets the name (enables non-interactive mode)',
+ },
+ restart: {
+ alias: ['r', 'restart'],
+ description: 'sets the restart option (enables non-interactive mode)',
+ },
+ hostname: {
+ alias: ['hostname'],
+ description: 'sets the hostname (enables non-interactive mode)',
+ },
 };
-exports.handler = async ({func} = {}) => {
+exports.handler = async ({func, ...args} = {}) => {
  const workdir = process.cwd();
  const folderName = path.basename(workdir);
+ const nonInteractive = Object.keys(args).some(key => args[key].length > 0);
  const configPath = path.join(workdir, 'exoframe.json');
  let defaultConfig = {
  name: folderName,
@@ -365,12 +386,32 @@ exports.handler = async ({func} = {}) => {
  }
  };
 
- // get values from user
- const newConfig = await inquirer.prompt(prompts);
+ let newConfig = defaultConfig;
+
+ if (nonInteractive) {
+ console.log(chalk.yellow('Mode changed to'), 'non-interactive');
+ }
+
+ const overrideFromArgument = (key, value) => {
+ if (!value) return;
+ console.log('Setting', chalk.red(key), 'to', chalk.yellow(value));
+ newConfig[key] = value;
+ };
+
+ overrideFromArgument('domain', args.domain);
+ overrideFromArgument('name', args.name);
+ overrideFromArgument('project', args.project);
+ overrideFromArgument('restart', args.restart);
+ overrideFromArgument('hostname', args.hostname);
+
+ if (!nonInteractive) {
+ // get values from user
+ newConfig = await inquirer.prompt(prompts);
 
- // update users for auth if needed
- if (newConfig.basicAuth) {
- newConfig.users = await askForUsers();
+ // update users for auth if needed
+ if (newConfig.basicAuth) {
+ newConfig.users = await askForUsers();
+ }
  }
 
  writeConfig(configPath, {...defaultConfig, ...newConfig});

test/__snapshots__/config.test.js.snap

@@ -10,3 +10,48 @@ Array [
  ],
 ]
 `;
+
+exports[`Should generate the config with parameters 1`] = `
+Array [
+ Array [
+ "Creating new config..",
+ ],
+ Array [
+ "Mode changed to",
+ "non-interactive",
+ ],
+ Array [
+ "Setting",
+ "domain",
+ "to",
+ "test123.dev",
+ ],
+ Array [
+ "Setting",
+ "name",
+ "to",
+ "test name 123",
+ ],
+ Array [
+ "Setting",
+ "project",
+ "to",
+ "give-project-name",
+ ],
+ Array [
+ "Setting",
+ "restart",
+ "to",
+ "unless-stopped",
+ ],
+ Array [
+ "Setting",
+ "hostname",
+ "to",
+ "test123.dev",
+ ],
+ Array [
+ "Config created!",
+ ],
+]
+`;

test/config.test.js

@@ -60,11 +60,7 @@ beforeAll(() => {
  } catch (e) {
  // no config, just exit
  }
-});
 
-// test config generation
-test('Should generate config file', done => {
- // stup inquirer answers
  sinon
  .stub(inquirer, 'prompt')
  .onFirstCall()
@@ -73,6 +69,37 @@ test('Should generate config file', done => {
  .callsFake(() => Promise.resolve(users[0]))
  .onThirdCall()
  .callsFake(() => Promise.resolve(users[1]));
+});
+
+test('Should generate the config with parameters', done => {
+ // spy on console
+ const consoleSpy = sinon.spy(console, 'log');
+
+ config({
+ domain: 'test123.dev',
+ restart: 'unless-stopped',
+ project: 'give-project-name',
+ name: 'test name 123',
+ hostname: 'test123.dev',
+ }).then(() => {
+ expect(consoleSpy.args).toMatchSnapshot();
+ // then check config changes
+ const cfg = yaml.safeLoad(fs.readFileSync(configPath, 'utf8'));
+ expect(cfg.name).toEqual('test name 123');
+ expect(cfg.restart).toEqual('unless-stopped');
+ expect(cfg.domain).toEqual('test123.dev');
+ expect(cfg.project).toEqual('give-project-name');
+ expect(cfg.hostname).toEqual('test123.dev');
+ // restore console
+ console.log.restore();
+ // remove corrupted config
+ fs.unlinkSync(configPath);
+ done();
+ });
+});
+
+// test config generation
+test('Should generate config file', done => {
  // spy on console
  const consoleSpy = sinon.spy(console, 'log');
  // execute login