Merge pull request #742 from atom-minimap/canvas-drawer

Author: aminya

lib/minimap-plugin-generator-element.js

@@ -63,7 +63,7 @@ class MinimapPluginGeneratorElement {
   setPathText (placeholderName, rangeToSelect) {
     if (!rangeToSelect) { rangeToSelect = [0, placeholderName.length] }
 
-    const packagesDirectory = this.getPackagesDirectory()
+    const packagesDirectory = getPackagesDirectory()
 
     this.editor.setText(path.join(packagesDirectory, placeholderName))
 
@@ -112,12 +112,6 @@ class MinimapPluginGeneratorElement {
     return path.join(path.dirname(packagePath), packageName)
   }
 
-  getPackagesDirectory () {
-    return atom.config.get('core.projectHome') ||
-           process.env.ATOM_REPOS_HOME ||
-           path.join(getHomeDirectory(), 'github')
-  }
-
   validPackagePath () {
     if (existsSync(this.getPackagePath())) {
       this.error.textContent = `Path already exists at '${this.getPackagePath()}'`
@@ -130,52 +124,58 @@ class MinimapPluginGeneratorElement {
 
   initPackage (packagePath, callback) {
     const templatePath = path.resolve(__dirname, path.join('..', 'templates', `plugin-${this.template}`))
-    this.runCommand(atom.packages.getApmPath(), ['init', '-p', `${packagePath}`, '--template', templatePath], callback)
-  }
-
-  linkPackage (packagePath, callback) {
-    const args = ['link']
-    if (atom.config.get('minimap.createPluginInDevMode')) { args.push('--dev') }
-    args.push(packagePath.toString())
-
-    this.runCommand(atom.packages.getApmPath(), args, callback)
-  }
-
-  installPackage (packagePath, callback) {
-    const args = ['install']
-
-    this.runCommand(atom.packages.getApmPath(), args, callback, { cwd: packagePath })
-  }
-
-  isStoredInDotAtom (packagePath) {
-    const packagesPath = path.join(atom.getConfigDirPath(), 'packages', path.sep)
-    if (packagePath.indexOf(packagesPath) === 0) { return true }
-
-    const devPackagesPath = path.join(atom.getConfigDirPath(), 'dev', 'packages', path.sep)
-
-    return packagePath.indexOf(devPackagesPath) === 0
+    runCommand(atom.packages.getApmPath(), ['init', '-p', `${packagePath}`, '--template', templatePath], callback)
   }
 
   createPackageFiles (callback) {
     const packagePath = this.getPackagePath()
 
-    if (this.isStoredInDotAtom(packagePath)) {
+    if (isStoredInDotAtom(packagePath)) {
       this.initPackage(packagePath, () => {
-        this.installPackage(packagePath, callback)
+        installPackage(packagePath, callback)
       })
     } else {
       this.initPackage(packagePath, () => {
-        this.linkPackage(packagePath, () => {
-          this.installPackage(packagePath, callback)
+        linkPackage(packagePath, () => {
+          installPackage(packagePath, callback)
         })
       })
     }
   }
-
-  runCommand (command, args, exit, options = {}) {
-    return new BufferedProcess({ command, args, exit, options })
-  }
 }
 
 const minimapPluginGeneratorElement = MinimapPluginGeneratorElement.initClass()
 export default minimapPluginGeneratorElement
+
+function linkPackage (packagePath, callback) {
+  const args = ['link']
+  if (atom.config.get('minimap.createPluginInDevMode')) { args.push('--dev') }
+  args.push(packagePath.toString())
+
+  runCommand(atom.packages.getApmPath(), args, callback)
+}
+
+function installPackage (packagePath, callback) {
+  const args = ['install']
+
+  runCommand(atom.packages.getApmPath(), args, callback, { cwd: packagePath })
+}
+
+function getPackagesDirectory () {
+  return atom.config.get('core.projectHome') ||
+           process.env.ATOM_REPOS_HOME ||
+           path.join(getHomeDirectory(), 'github')
+}
+
+function isStoredInDotAtom (packagePath) {
+  const packagesPath = path.join(atom.getConfigDirPath(), 'packages', path.sep)
+  if (packagePath.indexOf(packagesPath) === 0) { return true }
+
+  const devPackagesPath = path.join(atom.getConfigDirPath(), 'dev', 'packages', path.sep)
+
+  return packagePath.indexOf(devPackagesPath) === 0
+}
+
+function runCommand (command, args, exit, options = {}) {
+  return new BufferedProcess({ command, args, exit, options })
+}