revamp path checks into own module

Author: joelwass

src/index.js

@@ -11,6 +11,7 @@ const Profile = require('./profile')
 const TempWriter = require('./util/temp')
 const UpdateController = require('./update')
 const Runlog = require('./util/runlog')
+const PathChecks = require('./util/pathChecks')
 
 const app = require('./app')
 
@@ -33,7 +34,8 @@ function main () {
 
   const alias = new Alias({ config, pm })
   const env = new Env({ config, alias })
-  const profile = new Profile({ env, runlog })
+  const pathChecks = new PathChecks()
+  const profile = new Profile({ env, runlog, pathChecks })
 
   const ui = new Ui({ config, runlog, client, stdout: process.stdout })
   const args = new Args({ client, update, ui, config, alias, env, profile, runlog })

src/profile/index.js

@@ -20,37 +20,38 @@ const makeDir = require('make-dir')
  *  respective profiles updated with the source command.
  */
 class Profile {
-  constructor ({ env, runlog }) {
+  constructor ({ env, runlog, pathChecks }) {
     this.env = env
+    this.pathChecks = pathChecks
     this.runlog = runlog
     // shells and an appropriate config file to add our source line to
     // ref: https://en.wikipedia.org/wiki/Unix_shell#Configuration_files
     this.SUPPORTED_SHELLS = {
       shellFormat: {
         // only support shells that support functions
         // ref: https://web.archive.org/web/20160403120601/http://www.unixnote.com/2010/05/different-unix-shell.html
-        sh: [this.inHome('.profile')],
-        ksh: [this.inHome('.kshrc')],
-        zsh: [this.inHome('.zshrc'), this.inHome('.profile'), this.inHome('.zprofile')],
-        bash: [this.inHome('.bashrc'), this.inHome('.profile'), this.inHome('.bash_profile')]
+        sh: [this.pathChecks.inHome('.profile')],
+        ksh: [this.pathChecks.inHome('.kshrc')],
+        zsh: [
+          this.pathChecks.inHome('.zshrc'),
+          this.pathChecks.inHome('.profile'),
+          this.pathChecks.inHome('.zprofile')
+        ],
+        bash: [
+          this.pathChecks.inHome('.bashrc'),
+          this.pathChecks.inHome('.profile'),
+          this.pathChecks.inHome('.bash_profile')
+        ]
       },
       powerFormat: {
         pwsh: os.platform() !== 'win32' // pwsh stores its profile in different places depending on the OS
-          ? [this.inConfig('powershell', 'Microsoft.PowerShell_profile.ps1')]
-          : [this.inHome('Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1')],
-        'powershell.exe': [this.inHome('Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1')]
+          ? [this.pathChecks.inConfig('powershell', 'Microsoft.PowerShell_profile.ps1')]
+          : [this.pathChecks.inHome('Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1')],
+        'powershell.exe': [this.pathChecks.inHome('Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1')]
       }
     }
   }
 
-  inHome (...filepaths) {
-    return path.join(os.homedir(), ...filepaths)
-  }
-
-  inConfig (...filepaths) {
-    return this.inHome('.config', ...filepaths)
-  }
-
   async installToProfiles () {
     return this._updateProfiles({ install: true })
   }

src/util/pathChecks.js

@@ -0,0 +1,14 @@
+const os = require('os')
+const path = require('path')
+
+class PathChecks {
+  inHome (...filepaths) {
+    return path.join(os.homedir(), ...filepaths)
+  }
+
+  inConfig (...filepaths) {
+    return this.inHome('.config', ...filepaths)
+  }
+}
+
+module.exports = PathChecks

test/profile/index.test.js

@@ -14,9 +14,11 @@ test.beforeEach((t) => {
     record: sinon.stub(),
     keys: {}
   }
-  Profile.prototype.inHome = (...args) => args.pop()
-  Profile.prototype.inConfig = (...args) => args.pop()
-  t.context.profile = new Profile({ config, runlog })
+  const pathChecks = {
+    inHome: (...args) => args.pop(),
+    inConfig: (...args) => args.pop()
+  }
+  t.context.profile = new Profile({ config, runlog, pathChecks })
 })
 
 test('writes to all shell and power profiles for system with all shells and power available', async (t) => {