V3 fixes (#253)

* fix snapshot and onboard commands

* update additional old-style gluegun questions

* more tweaks for updated gluegun

* use the correct spinner method

* fix snapshot snapshot

* finish implementing basic onboarding functionality

* fix lint

* remove commented lines

Author: kevinvangelder

__tests__/commands/__snapshots__/snapshot.ts.snap

@@ -31,7 +31,7 @@ Array [
       ],
       "message": "Which of the above technology snapshots will you use for this project?",
       "name": "selectedRequirement",
-      "type": "list",
+      "type": "select",
     },
   ],
   Array [

src/commands/onboard.ts

@@ -1,6 +1,6 @@
 import { GluegunCommand } from 'gluegun'
 
-import { SolidarityRunContext } from '../types'
+import { SolidarityRunContext, SolidarityRule } from '../types'
 
 namespace Onboard {
   export const run = async (context: SolidarityRunContext) => {
@@ -38,16 +38,18 @@ namespace Onboard {
 
       printWizard(context)
       let repeat = true
+      let rules: Array<SolidarityRule> = []
       while (repeat) {
         // Find out what they wanted
         let answer = await onboardAdd(context)
         // execute their will
-        await executeAddRule(context, answer)
+        const rule = await executeAddRule(context, answer)
+        rules.push(rule)
         // more?
         repeat = await addMore(context)
       }
 
-      reviewAndSave(context)
+      reviewAndSave(context, rules)
     }
   }
 }

src/commands/snapshot.ts

@@ -35,19 +35,24 @@ namespace Snapshot {
       const answer = await context.prompt.ask({
         name: 'selectedPlugin',
         message: 'Which of the above technology snapshots will you use for this project?',
-        type: 'list',
+        type: 'select',
         choices: pluginOptions,
       })
 
       if (answer.selectedPlugin === FriendlyMessages.NONE) {
         print.info(FriendlyMessages.NOTHING)
+        print.info("If you don't wish to use a plugin, try creating your own rules with `solidarity onboard`")
       } else {
         const pluginSpinner = print.spin(`Running ${answer.selectedPlugin} Snapshot`)
         // Config for selected plugin only
         const runPlugin = head(filter(propEq('name', answer.selectedPlugin), pluginsWithTemplates))
-        // run plugin
-        await runPluginSnapshot(runPlugin, context)
-        pluginSpinner.succeed('Snapshot complete')
+        if (runPlugin) {
+          // run plugin
+          await runPluginSnapshot(runPlugin, context)
+          pluginSpinner.succeed('Snapshot complete')
+        } else {
+          pluginSpinner.fail("Couldn't find plugin")
+        }
       }
     } else {
       print.error(`No solidarity plugins found!

src/extensions/functions/buildSpecificRequirement.ts

@@ -54,7 +54,7 @@ namespace buildSpecificRequirement {
       const answer = await prompt.ask({
         name: 'selectedRequirement',
         message: 'Which of the above technology snapshots will you use for this project?',
-        type: 'list',
+        type: 'select',
         choices: requirementOptions,
       })
       requirementName = answer.selectedRequirement

src/extensions/functions/createPlugin.ts

@@ -27,7 +27,7 @@ module.exports = async context => {
     'Template + optional rules',
   ]
   const answer = await prompt.ask({
-    type: 'list',
+    type: 'select',
     name: 'ruleChoice',
     message: 'Your initial rule file template?',
     choices: ruleChoices,

src/extensions/functions/onboard/executeAddRule.ts

@@ -8,7 +8,6 @@ export default async (context: SolidarityRunContext, answer: string): Promise<vo
   let rule
   switch (answer) {
     case 'cli':
-      print.info('Kickoff CLI')
       rule = await Kickoffs.kickoffCLI(context)
       break
     case 'env':
@@ -21,7 +20,6 @@ export default async (context: SolidarityRunContext, answer: string): Promise<vo
       rule = await Kickoffs.kickoffDir(context)
       break
     case 'shell':
-      print.info('Kickoff SHELL')
       rule = await Kickoffs.kickoffShell(context)
       break
     default:
@@ -32,4 +30,5 @@ export default async (context: SolidarityRunContext, answer: string): Promise<vo
   // Now ask questions for ALL rules
   rule = await Kickoffs.kickoffAllRules(context, rule)
   // Now add rule to requirement
+  return rule
 }

src/extensions/functions/onboard/kickoffs/kickoffAllRules.ts

@@ -30,7 +30,7 @@ export default async (context: SolidarityRunContext, rule: SolidarityRule): Prom
   if (platformSpecific.value) {
     const platforms = await prompt.ask({
       name: 'value',
-      type: 'checkbox',
+      type: 'multiselect',
       message: 'Which operating systems does this rule run for?',
       choices: ['macos', 'freebsd', 'linux', 'sunos', 'windows'],
     })

src/extensions/functions/onboard/kickoffs/kickoffCLI.ts

@@ -1,7 +1,5 @@
-import { SolidarityRunContext } from '../../../../types'
+import { SolidarityRunContext, SolidarityRule } from '../../../../types'
 
-export default async (context: SolidarityRunContext): Promise<void> => {
-  const { print } = context
-  print.info(`kickoff CLI function`)
-  // return { rule: 'cli' }
+export default async (context: SolidarityRunContext): Promise<SolidarityRule> => {
+  return { rule: 'cli', binary: '' }
 }

src/extensions/functions/onboard/kickoffs/kickoffEnv.ts

@@ -7,7 +7,7 @@ export default async (context: SolidarityRunContext): Promise<SolidarityRule> =>
 
   const envStyle = await prompt.ask({
     name: 'value',
-    type: 'list',
+    type: 'select',
     message: 'How would you like to pick your environment variable',
     choices: [pickSentence, typeSentence],
   })
@@ -16,7 +16,7 @@ export default async (context: SolidarityRunContext): Promise<SolidarityRule> =>
   if (envStyle.value === pickSentence) {
     pickEnv = await prompt.ask({
       name: 'value',
-      type: 'list',
+      type: 'select',
       message: 'Which environment variable would you like to enforce?',
       choices: Object.keys(process.env),
     })

src/extensions/functions/onboard/kickoffs/kickoffShell.ts

@@ -1,6 +1,5 @@
-import { SolidarityRunContext } from '../../../../types'
+import { SolidarityRunContext, SolidarityRule } from '../../../../types'
 
-export default async (context: SolidarityRunContext): Promise<void> => {
-  const { print } = context
-  print.info(`kickoff Shell function`)
+export default async (context: SolidarityRunContext): Promise<SolidarityRule> => {
+  return { rule: 'shell', command: '', match: '' }
 }