@sprucelabs/spruce-cli 27.0.4 → 27.1.1

package/src/__tests__/behavioral/upgrading/UpgradingASkillSkippingBuild.test.ts

@@ -0,0 +1,17 @@
+import { assert, test } from '@sprucelabs/test-utils'
+import AbstractSkillTest from '../../../tests/AbstractSkillTest'
+
+export default class UpgradingASkillSkippingBuildTest extends AbstractSkillTest {
+    protected static skillCacheKey = 'skills'
+    @test()
+    protected static async canSkipCleaningAndBuildingOnUpgrade() {
+        this.commandFaker.fakeInstall()
+        this.commandFaker.fakeCleanBuild(1)
+
+        const { errors } = await this.Action('node', 'upgrade').execute({
+            shouldBuild: false,
+        })
+
+        assert.isFalsy(errors, 'Should not have tried to build.')
+    }
+}

package/src/features/ActionExecuter.ts

@@ -139,6 +139,7 @@ export default class ActionExecuter {
                 results: response,
                 featureCode,
                 actionCode,
+                options: actionOptions,
             }
         )
 

package/src/features/node/NodeFeature.ts

@@ -38,9 +38,11 @@ export default class NodeFeature<
         super(options)
 
         void this.emitter.on('feature.did-execute', async (payload) => {
+            const { featureCode, actionCode, options } = payload
             const shouldUpgrade =
-                payload.featureCode === 'node' &&
-                payload.actionCode === 'upgrade' &&
+                featureCode === 'node' &&
+                actionCode === 'upgrade' &&
+                options?.shouldBuild !== false &&
                 this.features.isInSpruceModule()
 
             if (shouldUpgrade) {
@@ -55,8 +57,8 @@ export default class NodeFeature<
         try {
             this.ui.clear()
             this.ui.renderHero('Upgrade')
-
             this.ui.startLoading('Cleaning build...')
+
             await this.Service('command').execute('yarn clean.build')
 
             const pkg = this.Service('pkg')
@@ -68,7 +70,7 @@ export default class NodeFeature<
 
             return {
                 summaryLines: [
-                    'Build cleared.',
+                    'Old built files cleared.',
                     'Lint rules applied to source.',
                     'Code rebuilt successfully.',
                 ],

package/src/schemas/v2020_07_22/upgradeSkillOptions.builder.ts

@@ -6,6 +6,12 @@ export default buildSchema({
     description:
         'Upgrade. Everything. Heads up, this can take a few minutes. ⏱',
     fields: {
+        shouldBuild: {
+            type: 'boolean',
+            label: 'Build after upgrade',
+            defaultValue: true,
+            hint: 'Should I build your source after the upgrade?',
+        },
         upgradeMode: {
             type: 'select',
             label: 'Upgrade mode',

package/src/services/BuildService.ts

@@ -1,20 +1,20 @@
-import CommandServiceImpl from './CommandService'
+import { CommandService } from './CommandService'
 import LintService from './LintService'
 
 export default class BuildService {
     public set cwd(cwd: string) {
-        this.commandService.cwd = cwd
+        this.commandService.setCwd(cwd)
     }
 
     public get cwd() {
-        return this.commandService.cwd
+        return this.commandService.getCwd()
     }
 
-    private commandService: CommandServiceImpl
+    private commandService: CommandService
     private lintService: LintService
 
     public constructor(
-        commandService: CommandServiceImpl,
+        commandService: CommandService,
         lintService: LintService
     ) {
         this.commandService = commandService

package/src/services/CommandService.ts

@@ -10,7 +10,7 @@ import SpruceError from '../errors/SpruceError'
 process.setMaxListeners(100)
 
 export default class CommandServiceImpl implements CommandService {
-    public cwd: string
+    private cwd: string
     private activeChildProcess: ChildProcess | undefined
     private ignoreCloseErrors = false
     private static fakeResponses: {
@@ -23,6 +23,14 @@ export default class CommandServiceImpl implements CommandService {
         this.cwd = cwd
     }
 
+    public getCwd() {
+        return this.cwd
+    }
+
+    public setCwd(cwd: string) {
+        this.cwd = cwd
+    }
+
     public async execute(
         cmd: string,
         options?: ExecuteCommandOptions
@@ -206,6 +214,8 @@ export interface CommandService {
     ): Promise<{
         stdout: string
     }>
+    getCwd(): string
+    setCwd(cwd: string): void
     kill(): void
     pid(): number | undefined
 }

package/src/services/GameService.ts

@@ -1,17 +1,17 @@
 import { diskUtil } from '@sprucelabs/spruce-skill-utils'
 import TerminalInterface from '../interfaces/TerminalInterface'
-import CommandServiceImpl from './CommandService'
+import { CommandService } from './CommandService'
 
 export default class GameService {
-    private command: CommandServiceImpl
+    private command: CommandService
     private ui: TerminalInterface
     private statusMessage?: string
     private killed = false
 
-    public constructor(command: CommandServiceImpl, ui: TerminalInterface) {
+    public constructor(command: CommandService, ui: TerminalInterface) {
         this.command = command
         this.ui = ui
-        this.command.cwd = diskUtil.resolvePath(__dirname, '../../')
+        this.command.setCwd(diskUtil.resolvePath(__dirname, '../../'))
     }
 
     public setStatusMessage(message: string) {

package/src/tests/CommandFaker.ts

@@ -39,6 +39,6 @@ export default class CommandFaker {
     }
 
     public fakeInstall(code = 0) {
-        this.fakeCommand(/.*?install/gis, code)
+        this.fakeCommand(/.*?(add|install)/gis, code)
     }
 }