✨ Fixups for new version

__tests__/command_helpers/getVersion.ts

@@ -43,6 +43,6 @@ describe('getVersion', () => {
     } catch (e) {
       result = e
     }
-    expect(result).toEqual(" No version was detected from the output of the binary 'ls'")
+    expect(result).toEqual("No version was detected from the output of the binary 'ls'")
   })
 })

__tests__/command_helpers/removeNonVersionCharacters.ts

@@ -13,7 +13,7 @@ test('parse the result', () => {
 test('throws an error when there is no version output', () => {
   const line = 'Homebrew without versions'
   const rule = { binary: 'ls' }
-  const errorMessage = ` No version was detected from the output of the binary '${rule.binary}'`
+  const errorMessage = `No version was detected from the output of the binary '${rule.binary}'`
   expect(() => {
     removeNonVersionCharacters(rule, line)
   }).toThrowError(errorMessage)

__tests__/integration/solidarity-check/__snapshots__/check-valid.ts.snap

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`also looks for .solidarity.json file 1`] = `
+"
+✔︎ Solidarity checks valid"
+`;
+
+exports[`default looks for .solidarity file 1`] = `
+"
+✔︎ Solidarity checks valid"
+`;
+
+exports[`silent flag works 1`] = `""`;
+
+exports[`verbose flag works 1`] = `
+"
+✔︎ Solidarity checks valid"
+`;

__tests__/integration/solidarity-check/check-invalid.ts

@@ -1,7 +1,8 @@
 import execa from 'execa'
 import tempy from 'tempy'
 
-const SOLIDARITY = `${process.cwd()}/bin/solidarity`
+const path = require('path')
+const SOLIDARITY = `node ${process.cwd()}${path.sep}bin${path.sep}solidarity`
 const origCwd = process.cwd()
 let originalTimeout
 
@@ -21,7 +22,7 @@ afterAll(function() {
 
 test('default looks for .solidarity file', async done => {
   try {
-    await execa(SOLIDARITY)
+    await execa.shellSync(SOLIDARITY)
     done.fail()
   } catch (err) {
     expect(err.code).not.toBe(0)

__tests__/integration/solidarity-check/check-valid.ts

@@ -0,0 +1,79 @@
+import execa from 'execa'
+import tempy from 'tempy'
+
+const path = require('path')
+const filesystem = require('fs-jetpack')
+const SOLIDARITY = `node ${process.cwd()}${path.sep}bin${path.sep}solidarity`
+const origCwd = process.cwd()
+let originalTimeout
+
+beforeAll(() => {
+  // These can be slow on CI
+  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000
+})
+
+afterAll(function() {
+  // Fix timeout change
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout
+})
+
+test('default looks for .solidarity file', async done => {
+  const tempDir = tempy.directory()
+  filesystem.copy(`__tests__${path.sep}sandbox${path.sep}solidarity_json${path.sep}.solidarity.json`, `${tempDir}${path.sep}.solidarity`)
+  process.chdir(tempDir)
+  try {
+    await execa.shell(SOLIDARITY).then(result => {
+      expect(result.stdout).toMatchSnapshot()
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+test('also looks for .solidarity.json file', async done => {
+  const tempDir = tempy.directory()
+  filesystem.copy(`__tests__${path.sep}sandbox${path.sep}solidarity_json${path.sep}.solidarity.json`, `${tempDir}${path.sep}.solidarity.json`)
+  process.chdir(tempDir)
+  try {
+    await execa.shell(SOLIDARITY).then(result => {
+      expect(result.stdout).toMatchSnapshot()
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+test('verbose flag works', async done => {
+  const tempDir = tempy.directory()
+  filesystem.copy(`__tests__${path.sep}sandbox${path.sep}solidarity_json${path.sep}.solidarity.json`, `${tempDir}${path.sep}.solidarity`)
+  process.chdir(tempDir)
+  try {
+    await execa.shell(`${SOLIDARITY} --verbose`).then(result => {
+      expect(result.stdout).toMatchSnapshot()
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+test('silent flag works', async done => {
+  const tempDir = tempy.directory()
+  filesystem.copy(`__tests__${path.sep}sandbox${path.sep}solidarity_json${path.sep}.solidarity.json`, `${tempDir}${path.sep}.solidarity`)
+  process.chdir(tempDir)
+  try {
+    await execa.shell(`${SOLIDARITY} --silent`).then(result => {
+      expect(result.stdout).toMatchSnapshot()
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+afterEach(() => {
+  process.chdir(origCwd)
+})

__tests__/integration/solidarity-report/report-basic.ts

@@ -0,0 +1,42 @@
+import execa from 'execa'
+import tempy from 'tempy'
+
+const path = require('path')
+const filesystem = require('fs-jetpack')
+const SOLIDARITY = `node ${process.cwd()}${path.sep}bin${path.sep}solidarity`
+const origCwd = process.cwd()
+let originalTimeout
+
+beforeAll(() => {
+  // These can be slow on CI
+  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000
+  const tempDir = tempy.directory()
+  filesystem.copy(`__tests__${path.sep}sandbox${path.sep}solidarity_json${path.sep}.solidarity.json`, `${tempDir}${path.sep}.solidarity`)
+  process.chdir(tempDir)
+})
+
+afterAll(function() {
+  // Fix timeout change
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout
+})
+
+test('solidarity report works', async done => {
+  try {
+    execa.shell(`${SOLIDARITY} report`).then(result => {
+      // check a few from the report
+      expect(result.stdout.includes('OS')).toBeTruthy()
+      expect(result.stdout.includes('CPU')).toBeTruthy()
+      expect(result.stdout.includes('Report Info')).toBeTruthy()
+      expect(result.stdout.includes('node')).toBeTruthy()
+      expect(result.code).toBe(0)
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+afterEach(() => {
+  process.chdir(origCwd)
+})

__tests__/integration/solidarity-snapshot/snapshot-nada.ts

@@ -0,0 +1,37 @@
+import execa from 'execa'
+import tempy from 'tempy'
+
+const path = require('path')
+const SOLIDARITY = `node ${process.cwd()}${path.sep}bin${path.sep}solidarity`
+const origCwd = process.cwd()
+let originalTimeout
+
+beforeAll(() => {
+  // These can be slow on CI
+  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000
+  const tempDir = tempy.directory()
+  process.chdir(tempDir)
+})
+
+afterAll(function() {
+  // Fix timeout change
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout
+})
+
+test('solidarity report works', async done => {
+  try {
+    execa.shell(`echo n | ${SOLIDARITY} snapshot`).then(result => {
+      // do not snapshot stdout bc windows bitches
+      expect(result.stdout.includes('Nothing to do')).toBeTruthy()
+      expect(result.code).toBe(0)
+      done()
+    })
+  } catch (err) {
+    done.fail()
+  }
+})
+
+afterEach(() => {
+  process.chdir(origCwd)
+})

__tests__/sandbox/solidarity_json/.solidarity.json

@@ -1,11 +1,6 @@
 {
   "requirements": {
     "NPM": [{ "rule": "cli", "binary": "npm" }],
-    "Yarn": [{ "rule": "cli", "binary": "yarn", "semver": "^1.0.0", "version": "--version" }],
-    "Node": [{ "rule": "cli", "binary": "node", "semver": ">=7.6.0", "error": "Upgrade to latest node >= 7.6 please."}],
-    "TypeScript Active": [
-      { "rule": "dir", "location": "./src", "error": "Did you get this code from npm? Try github!" },
-      { "rule": "dir", "location": "./dist", "error": "You haven't compiled. Run the build script!" }
-    ]
+    "Node": [{ "rule": "cli", "binary": "node", "semver": ">=4.6.0", "error": "Upgrade to latest node >= 4.6 please."}]
   }
 }

src/extensions/functions/checkCLI.ts

@@ -15,7 +15,13 @@ module.exports = async (rule: CLIRule, context: SolidarityRunContext): Promise<s
     // ensure we have valid rule input
     if (!semver.validRange(rule.semver)) return `Invalid semver rule ${rule.semver}`
 
-    const binaryVersion = await solidarity.getVersion(rule, context)
+    let binaryVersion
+    try {
+      binaryVersion = await solidarity.getVersion(rule, context)
+    } catch (e) {
+      return e
+    }
+
     // pad zeros for any non-semver version systems (rules still work)
     let binarySemantic = binaryVersion
     while (binarySemantic.split('.').length < 3) {

src/extensions/functions/getVersion.ts

@@ -19,7 +19,7 @@ module.exports = async (rule: CLIRule, context: SolidarityRunContext): Promise<s
         try {
           versionOutput = await system.run(`${rule.binary} -version`)
         } catch (_e) {
-          throw ' No version identifier flag for this binary was found'
+          throw 'No version identifier flag for this binary was found'
         }
       }
     }

src/extensions/functions/removeNonVersionCharacters.ts

@@ -6,6 +6,6 @@ module.exports = (rule: CLIRule, line: string): string => {
     const matchIndex = rule.matchIndex || 0
     return foundVersions[matchIndex]
   } else {
-    throw ` No version was detected from the output of the binary '${rule.binary}'`
+    throw `No version was detected from the output of the binary '${rule.binary}'`
   }
 }

src/extensions/functions/updateRequirement.ts

@@ -25,7 +25,13 @@ module.exports = async (
       // Handle CLI rule update
       case 'cli':
         if (!rule.semver) return []
-        const updateResult = await checkCLIForUpdates(rule, context)
+        let updateResult
+        try {
+          updateResult = await checkCLIForUpdates(rule, context)
+        } catch (e) {
+          spinner.fail(e)
+          return []
+        }
         const lineMessage = rule.line ? ` line ${rule.line} at` : ''
         ruleString = `Keep ${rule.binary}${lineMessage} ${rule.semver}`
         if (updateResult) {