fixups and simplifying

Author: GantMan

__tests__/__mocks__/examplePlugin.ts

@@ -43,9 +43,9 @@ module.exports = context => {
           },
           {
             prop: 'nachos',
-            value: true
-          }
-        ]
+            value: true,
+          },
+        ],
       },
       checkThirdThing: {
         check: async (rule, context) => {
@@ -54,7 +54,7 @@ module.exports = context => {
             message: 'PAZZZZZ',
           }
         },
-        snapshot: async (rule, context) => []
+        snapshot: async (rule, context) => [],
       },
     },
   })

__tests__/command_helpers/findPluginInfo.ts

@@ -7,31 +7,33 @@ describe('findPluginInfo Function', () => {
     const rule = {
       rule: 'custom',
       plugin: 'FAKE',
-      name: 'checkThing'
+      name: 'checkThing',
     }
     const customPluginRule = findPluginInfo(rule, mockContext)
     expect(customPluginRule).toEqual({ message: "Plugin not found 'FAKE'", success: false })
-  }
+  })
 
   test('can fail to find plugins', () => {
     const rule = {
       rule: 'custom',
       plugin: 'Example Plugin',
-      name: 'FAKE'
+      name: 'FAKE',
     }
     const customPluginRule = findPluginInfo(rule, mockContext)
-    expect(customPluginRule.message).toEqual("NOT FOUND: Custom rule from 'Example Plugin' plugin with check function 'FAKE'")
+    expect(customPluginRule.message).toEqual(
+      "NOT FOUND: Custom rule from 'Example Plugin' plugin with check function 'FAKE'"
+    )
     expect(customPluginRule.success).toBeFalsy()
-  }
+  })
 
   test('can find plugins', () => {
     const rule = {
       rule: 'custom',
       plugin: 'Example Plugin',
-      name: 'checkThing'
+      name: 'checkThing',
     }
     const customPluginRule = findPluginInfo(rule, mockContext)
     expect(customPluginRule.success).toBeTruthy()
     expect(customPluginRule).toMatchSnapshot()
-  }
+  })
 })

__tests__/command_helpers/updateRequirement.ts

@@ -25,9 +25,8 @@ describe('updateRequirement', () => {
       spin: jest.fn(() => spinner),
       error: jest.fn(),
       colors: {
-        green: jest.fn()
-      }
-
+        green: jest.fn(),
+      },
     }
   })
 
@@ -162,7 +161,7 @@ describe('updateRequirement', () => {
           TestRequirement: [
             { rule: 'custom', plugin: 'Example Plugin', name: 'checkThing' },
             { rule: 'custom', plugin: 'Example Plugin', name: 'checkSecondThing' },
-            { rule: 'custom', plugin: 'Example Plugin', name: 'checkThirdThing' }
+            { rule: 'custom', plugin: 'Example Plugin', name: 'checkThirdThing' },
           ],
         })[0]
 

src/commands/report.ts

@@ -1,7 +1,7 @@
 import { GluegunCommand } from 'gluegun'
-import { helpers } from 'envinfo'
 import { SolidarityRunContext, SolidarityReportResults } from '../types'
 import { map, toPairs } from 'ramda'
+import { createReport } from '../extensions/functions/solidarityReport'
 
 module.exports = {
   alias: 'r',
@@ -22,13 +22,7 @@ module.exports = {
       process.exit(3)
     }
 
-    let results: SolidarityReportResults = {
-      basicInfo: [['System Basics', 'Value'], ['OS', helpers.getOperatingSystemInfo()], ['CPU', helpers.getCPUInfo()]],
-      cliRules: [['Binary', 'Location', 'Version', 'Desired']],
-      envRules: [['Environment Var', 'Value']],
-      filesystemRules: [['Location', 'Type', 'Exists']],
-      shellRules: [['Command', 'Pattern', 'Matches']],
-    }
+    let results: SolidarityReportResults = createReport()
 
     // break all rules into requirements
     const reportCalls = map(

src/extensions/functions/solidarityReport.ts

@@ -0,0 +1,12 @@
+import { SolidarityReportResults } from '../../types'
+import { helpers } from 'envinfo'
+
+export const createReport = (): SolidarityReportResults => {
+  return {
+    basicInfo: [['System Basics', 'Value'], ['OS', helpers.getOperatingSystemInfo()], ['CPU', helpers.getCPUInfo()]],
+    cliRules: [['Binary', 'Location', 'Version', 'Desired']],
+    envRules: [['Environment Var', 'Value']],
+    filesystemRules: [['Location', 'Type', 'Exists']],
+    shellRules: [['Command', 'Pattern', 'Matches']],
+  }
+}