Add Executable class to abstract CLI beautifiers

Author: Glavin001

docs/index.coffee

@@ -157,6 +157,8 @@ Handlebars.registerHelper('beautifiers-info', (beautifiers, options) ->
   rows = _.map(beautifiers, (beautifier, k) ->
     name = beautifier.name
     isPreInstalled = beautifier.isPreInstalled
+    if typeof isPreInstalled is "function"
+      isPreInstalled = beautifier.isPreInstalled()
     link = beautifier.link
     installationInstructions = if isPreInstalled then "Nothing!" else "Go to #{link} and follow the instructions."
     return "| #{name} | #{if isPreInstalled then ':white_check_mark:' else ':x:'} | #{installationInstructions} |"

package.json

@@ -179,6 +179,8 @@
     "pug-beautify": "^0.1.1",
     "remark": "^6.0.1",
     "season": "^5.3.0",
+    "semver": "^5.3.0",
+    "shell-env": "^0.3.0",
     "space-pen": "^5.1.1",
     "strip-json-comments": "^2.0.1",
     "temp": "^0.8.3",

spec/atom-beautify-spec.coffee

@@ -1,4 +1,5 @@
 Beautifiers = require "../src/beautifiers"
+Executable = require "../src/beautifiers/executable"
 beautifiers = new Beautifiers()
 Beautifier = require "../src/beautifiers/beautifier"
 Languages = require('../src/languages/')
@@ -124,15 +125,15 @@ describe "Atom-Beautify", ->
             pathOption: "Lang - Test Program Path"
           }
           # Force to be Windows
-          beautifier.isWindows = true
+          Executable.isWindows = () ->true
           terminal = 'CMD prompt'
           whichCmd = "where.exe"
           # Process
           p = beautifier.run("program", [], help: help)
           expect(p).not.toBe(null)
           expect(p instanceof beautifier.Promise).toBe(true)
           cb = (v) ->
-            # console.log(v)
+            console.log("error", v, v.description)
             expect(v).not.toBe(null)
             expect(v instanceof Error).toBe(true)
             expect(v.code).toBe("CommandNotFound")
@@ -167,7 +168,7 @@ describe "Atom-Beautify", ->
               pathOption: "Lang - Test Program Path"
             }
             # Force to be Mac/Linux (not Windows)
-            beautifier.isWindows = false
+            Executable.isWindows = () ->false
             terminal = "Terminal"
             whichCmd = "which"
             # Process

spec/beautifier-php-cs-fixer-spec.coffee

@@ -1,5 +1,6 @@
 PHPCSFixer = require "../src/beautifiers/php-cs-fixer"
 Beautifier = require "../src/beautifiers/beautifier"
+Executable = require "../src/beautifiers/executable"
 path = require 'path'
 
 # Use the command `window:run-package-specs` (cmd-alt-ctrl-p) to run specs.
@@ -30,10 +31,15 @@ describe "PHP-CS-Fixer Beautifier", ->
   describe "Beautifier::beautify", ->
 
     beautifier = null
+    execSpawn = null
 
     beforeEach ->
       beautifier = new PHPCSFixer()
       # console.log('new beautifier')
+      execSpawn = Executable.prototype.spawn
+
+    afterEach ->
+      Executable.prototype.spawn = execSpawn
 
     OSSpecificSpecs = ->
       text = "<?php echo \"test\"; ?>"
@@ -49,13 +55,14 @@ describe "PHP-CS-Fixer Beautifier", ->
             levels: ""
           }
           # Mock spawn
-          beautifier.spawn = (exe, args, options) ->
+          # beautifier.spawn
+          Executable.prototype.spawn = (exe, args, options) ->
             # console.log('spawn', exe, args, options)
             er = new Error('ENOENT')
             er.code = 'ENOENT'
             return beautifier.Promise.reject(er)
           # Beautify
-          p = beautifier.beautify(text, language, options)
+          p = beautifier.loadExecutables().then(() -> beautifier.beautify(text, language, options))
           expect(p).not.toBe(null)
           expect(p instanceof beautifier.Promise).toBe(true)
           cb = (v) ->
@@ -74,7 +81,7 @@ describe "PHP-CS-Fixer Beautifier", ->
           expect(beautifier).not.toBe(null)
           expect(beautifier instanceof Beautifier).toBe(true)
 
-          if not beautifier.isWindows and failingProgram is "php"
+          if not Executable.isWindows and failingProgram is "php"
             # Only applicable on Windows
             return
 
@@ -104,8 +111,9 @@ describe "PHP-CS-Fixer Beautifier", ->
                 # console.log('fake exe path', exe)
                 beautifier.Promise.resolve("/#{exe}")
 
-            oldSpawn = beautifier.spawn.bind(beautifier)
-            beautifier.spawn = (exe, args, options) ->
+            # oldSpawn = beautifier.spawn.bind(beautifier)
+            # beautifier.spawn
+            Executable.prototype.spawn = (exe, args, options) ->
               # console.log('spawn', exe, args, options)
               if exe is failingProgram
                 er = new Error('ENOENT')
@@ -117,28 +125,28 @@ describe "PHP-CS-Fixer Beautifier", ->
                   stdout: 'stdout',
                   stderr: ''
                   })
-            p = beautifier.beautify(text, language, options)
+            p = beautifier.loadExecutables().then(() -> beautifier.beautify(text, language, options))
             expect(p).not.toBe(null)
             expect(p instanceof beautifier.Promise).toBe(true)
             p.then(cb, cb)
             return p
 
-      # failWhichProgram('php')
-      failWhichProgram('php-cs-fixer')
+      failWhichProgram('PHP')
+      # failWhichProgram('php-cs-fixer')
 
     unless isWindows
       describe "Mac/Linux", ->
 
         beforeEach ->
           # console.log('mac/linx')
-          beautifier.isWindows = false
+          Executable.isWindows = () -> false
 
         do OSSpecificSpecs
 
     describe "Windows", ->
 
       beforeEach ->
         # console.log('windows')
-        beautifier.isWindows = true
+        Executable.isWindows = () -> true
 
       do OSSpecificSpecs