⚒ Upgrades to the latest Gluegun beta (#177)

jamonholmgren · GantMan · commit e0c765277e8e · 2018-02-26T16:47:41.000-06:00
* ⚒ Upgrades to the latest Gluegun beta

* Upgrades to Gluegun 2.0.0-beta.7
diff --git a/__tests__/__mocks__/mockContext.ts b/__tests__/__mocks__/mockContext.ts
@@ -1,4 +1,4 @@
-const realThing = require('gluegun')
+const realThing = require('gluegun/toolbox')
 const realSolidarityContext = require('../../src/extensions/solidarity-extension')
 realSolidarityContext(realThing)
 
@@ -51,7 +51,7 @@ const mockContext = {
   },
   prompt: {
     ask: jest.fn(({ name }) => Promise.resolve({ [name]: 'taco', createFile: true })),
-    confirm: jest.fn(() => true)
+    confirm: jest.fn(() => true),
   },
   solidarity: noConfigSolidarity,
 }
diff --git a/__tests__/command_helpers/binaryExists.ts b/__tests__/command_helpers/binaryExists.ts
@@ -1,5 +1,5 @@
 import binaryExists from '../../src/extensions/functions/binaryExists'
-import context from 'gluegun'
+import * as context from 'gluegun/toolbox'
 
 const doesNotExistCLI = 'no_way_this_should_be_real'
 const alwaysExistCLI = 'node'
diff --git a/__tests__/command_helpers/checkCLI.ts b/__tests__/command_helpers/checkCLI.ts
@@ -14,7 +14,7 @@ const outOfDateCLI = {
   semver: '10.99',
 }
 
-const context = require('gluegun')
+const context = require('gluegun/toolbox')
 
 test('error on missing binary', async () => {
   expect(await checkCLI(doesNotExistCLI, context)).toBe(`Binary '${doesNotExistCLI.binary}' not found`)
diff --git a/__tests__/command_helpers/checkCLIForUpdates.ts b/__tests__/command_helpers/checkCLIForUpdates.ts
@@ -1,6 +1,6 @@
 import checkCLIForUpdates from '../../src/extensions/functions/checkCLIForUpdates'
 
-import context from 'gluegun'
+import * as context from 'gluegun/toolbox'
 const rule = {
   rule: 'cli',
   binary: 'bananas',
diff --git a/__tests__/command_helpers/checkDir.ts b/__tests__/command_helpers/checkDir.ts
@@ -1,5 +1,5 @@
 import checkDir from '../../src/extensions/functions/checkDir'
-import context from 'gluegun'
+import * as context from 'gluegun/toolbox'
 
 test('checkDir detects an existing dir', () => {
   // Check for a known directory
diff --git a/__tests__/command_helpers/checkFile.ts b/__tests__/command_helpers/checkFile.ts
@@ -1,5 +1,5 @@
 import checkFile from '../../src/extensions/functions/checkFile'
-import context from 'gluegun'
+import * as context from 'gluegun/toolbox'
 
 test('checkFile detects an existing file', () => {
   // known file
diff --git a/__tests__/command_helpers/checkRequirement.ts b/__tests__/command_helpers/checkRequirement.ts
@@ -1,6 +1,6 @@
 import { SolidarityRequirement } from '../../dist/types'
 import { toPairs } from 'ramda'
-import { strings } from 'gluegun'
+import { strings } from 'gluegun/toolbox'
 
 import checkRequirement from '../../src/extensions/functions/checkRequirement'
 import solidarityExtension from '../../src/extensions/solidarity-extension'
@@ -21,7 +21,7 @@ const checkENV = require('../../src/extensions/functions/checkENV')
 jest.mock('../../src/extensions/functions/checkFile')
 const checkFile = require('../../src/extensions/functions/checkFile')
 
-const context = require('gluegun')
+const context = require('gluegun/toolbox')
 
 const badRule = toPairs({
   YARN: [{ rule: 'knope', binary: 'yarn' }],
diff --git a/__tests__/command_helpers/checkShell.ts b/__tests__/command_helpers/checkShell.ts
@@ -1,5 +1,5 @@
 import { ShellRule, SolidarityRunContext } from '../../src/types'
-import { strings } from 'gluegun'
+import { strings } from 'gluegun/toolbox'
 const checkShell: any = require('../../src/extensions/functions/checkShell')
 
 /**
diff --git a/__tests__/command_helpers/createPlugin.ts b/__tests__/command_helpers/createPlugin.ts
@@ -6,7 +6,6 @@ test('check result shape', () => {
 })
 
 test('investigate createPlugin', async () => {
-
   const result = await createPlugin(context)
   expect(result).toMatchSnapshot()
   expect(context.template.generate).toBeCalled()
diff --git a/__tests__/command_helpers/getSolidaritySettings.ts b/__tests__/command_helpers/getSolidaritySettings.ts
@@ -1,7 +1,7 @@
 import { solidarity } from '../../src'
 import getSolidaritySettings from '../../src/extensions/functions/getSolidaritySettings'
 
-const context = require('gluegun')
+const context = require('gluegun/toolbox')
 
 describe('getSolidaritySettings', () => {
   describe('w/ success', () => {
diff --git a/__tests__/command_helpers/getVersion.ts b/__tests__/command_helpers/getVersion.ts
@@ -2,7 +2,7 @@ import getVersion from '../../src/extensions/functions/getVersion'
 
 import solidarityExtension from '../../src/extensions/solidarity-extension'
 
-const context = require('gluegun')
+const context = require('gluegun/toolbox')
 let originalTimeout
 solidarityExtension(context)
 
@@ -13,7 +13,7 @@ describe('getVersion', () => {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000
   })
 
-  afterAll(function() {
+  afterAll(function () {
     // Fix timeout change
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout
   })
diff --git a/__tests__/commands/create.ts b/__tests__/commands/create.ts
@@ -13,22 +13,24 @@ it('enforces required properties', () => {
 
 test('check solidarity create with no parameter', async () => {
   const result = await createCommand.run(mockContext)
-  expect(mockContext.print.error.mock.calls).toEqual([["Missing what to create"], ["solidarity create <wut?>"]])
+  expect(mockContext.print.error.mock.calls).toEqual([['Missing what to create'], ['solidarity create <wut?>']])
   expect(mockContext.print.info.mock.calls.length).toBe(1)
 })
 
 test('check solidarity create with plugin', async () => {
   const goodContext = {
     ...mockContext,
     parameters: { first: 'plugin' },
-    solidarity: { createPlugin: jest.fn() }
+    solidarity: { createPlugin: jest.fn() },
   }
   await createCommand.run(goodContext)
   expect(goodContext.solidarity.createPlugin).toBeCalled()
 
   // now make it fail
   const errorString = 'ER MA GERD ARRAWRS'
-  goodContext.solidarity.createPlugin = jest.fn(() => throw Error(errorString))
+  goodContext.solidarity.createPlugin = jest.fn(() => {
+    throw Error(errorString)
+  })
   await createCommand.run(goodContext)
   expect(goodContext.print.error.mock.calls.slice(-1).toString()).toEqual(`Error: ${errorString}`)
 })
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "callsite": "^1.0.0",
     "envinfo": "^4.0.0-beta.5",
-    "gluegun": "^2.0.0-beta.4",
+    "gluegun": "2.0.0-beta.7",
     "json5": "^0.5.1",
     "minimist": "^1.2.0",
     "ramda": "0.25.0"
diff --git a/src/commands/snapshot.ts b/src/commands/snapshot.ts
@@ -8,8 +8,10 @@ namespace Snapshot {
     if (typeof runPlugin.snapshot === 'string') {
       // Just a file copy
       const { filesystem, system } = context
+      // @ts-ignore -- strictNullChecks strikes
       filesystem.copy(`${runPlugin.templateDirectory}${runPlugin.snapshot}`, '.solidarity')
       // force local version update
+      // @ts-ignore -- strictNullChecks strikes
       await system.run('solidarity snapshot')
     } else {
       // run plugin's snapshot function
diff --git a/src/extensions/functions/createPlugin.ts b/src/extensions/functions/createPlugin.ts
@@ -14,7 +14,7 @@ module.exports = async context => {
   const description = await prompt.ask({
     type: 'input',
     name: 'pluginDesc',
-    message: 'Short plugin description (used in various places)'
+    message: 'Short plugin description (used in various places)',
   })
 
   const ruleChoices = [
diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,16 @@
-import { GluegunRunContext } from 'gluegun'
+import {
+  GluegunRunContext,
+  GluegunFilesystem,
+  GluegunStrings,
+  GluegunPrint,
+  GluegunSystem,
+  GluegunSemver,
+  GluegunHttp,
+  GluegunPatching,
+  GluegunPrompt,
+  GluegunTemplate,
+  GluegunMeta,
+} from 'gluegun'
 export const solidarity = {
   binaryExists: require('./extensions/functions/binaryExists'),
   getSolidaritySettings: require('./extensions/functions/getSolidaritySettings'),
@@ -35,6 +47,16 @@ export interface SolidarityRunContext extends GluegunRunContext {
   printSeparator: () => void
   outputMode: SolidarityOutputMode
   envHelpers: any
+  filesystem: GluegunFilesystem
+  strings: GluegunStrings
+  print: GluegunPrint
+  system: GluegunSystem
+  semver: GluegunSemver
+  http: GluegunHttp
+  patching: GluegunPatching
+  prompt: GluegunPrompt
+  template: GluegunTemplate
+  meta: GluegunMeta
 }
 
 export type SnapshotType = (context: SolidarityRunContext) => Promise<void>
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,24 +2,25 @@
   "compilerOptions": {
     // Brings in Promise and all es2015 extensions to TS
     // TODO: Bringing in dom to quell URL issue, please remove if possible
-    "lib": ["es2015", "dom", "es7"],
+    "lib": [
+      "es2015",
+      "dom",
+      "es7"
+    ],
     "outDir": "dist",
-
     // Emits types for others to consume
     "declaration": true,
     "declarationDir": "dist/types",
-
     // Using commonjs here to play nice with node (imports not welcome here)
     "module": "commonjs",
     "target": "es6",
     "moduleResolution": "node",
-
     // Help TS understand node globals
-    "types": ["node"],
-
+    "types": [
+      "node"
+    ],
     // Let's allow `import`
     "allowSyntheticDefaultImports": true,
-
     // Don't let sneaky null/undefined through
     "strictNullChecks": true,
     // Yes plz
@@ -30,4 +31,4 @@
   "include": [
     "src"
   ]
-}
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const outOfDateCLI = {`
`14`	`14`	`semver: '10.99',`
`15`	`15`	`}`
`16`	`16`
`17`		`-const context = require('gluegun')`
	`17`	`+const context = require('gluegun/toolbox')`
`18`	`18`
`19`	`19`	`test('error on missing binary', async () => {`
`20`	`20`	expect(await checkCLI(doesNotExistCLI, context)).toBe(`Binary '${doesNotExistCLI.binary}' not found`)