Make Path Handling More Robust

- 🐛 Handle GOPATH with multiple entries (fixes #18)
- 💄 Replace `~` and `$HOME` in paths with appropriate value
- 💄 Enhance fix for #17 with patch to go (https://code.google.com/p/go/issues/detail?id=7724)

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.0.3 (April 7th, 2014)
+
+* :bug: Handle GOPATH with multiple entries (fixes #18)
+* :lipstick: Replace `~` and `$HOME` in paths with appropriate value
+* :lipstick: Enhance fix for #17 with patch to go (https://code.google.com/p/go/issues/detail?id=7724)
+
 ## v1.0.2 (April 7th, 2014)
 
 * :lipstick: Redirect build output to temporary directory (fixes #17)

lib/dispatch.coffee

@@ -151,7 +151,27 @@ class Dispatch
     gopath = gopathEnv if gopathEnv? and gopathEnv isnt ''
     gopath = gopathConfig if not environmentOverridesConfig and gopathConfig? and gopathConfig isnt ''
     gopath = gopathConfig if gopath is ''
-    return gopath
+    return @replaceTokensInPath(gopath, true)
+
+  replaceTokensInPath: (path, skipGoPath) ->
+    return '' unless path?
+    unless skipGoPath or path.toUpperCase().indexOf('$GOPATH') is -1
+      path = @replaceGoPathToken(path)
+    unless path.indexOf('~') is -1
+      home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
+      path = path.replace(/~/i, home)
+    unless path.toUpperCase().indexOf('$HOME') is -1
+      home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
+      path = path.replace(/\$HOME/i, home)
+    return path
+
+  replaceGoPathToken: (path) ->
+    gopath = @buildGoPath()
+    return path unless gopath? and gopath isnt ''
+    return path.replace(/^\$GOPATH\//i, gopath.replace(/^\s+|\s+$/g, "") + '/') if path.indexOf(':') is -1
+    gopaths = gopath.split(':')
+    return path.replace(/^\$GOPATH\//i, gopaths[0].replace(/^\s+|\s+$/g, "") + '/') if gopaths? and _.size(gopaths) > 0 and gopaths[0]? and gopaths[0] isnt ''
+    return path
 
   isValidEditorView: (editorView) ->
     editorView?.getEditor()?.getGrammar()?.scopeName is 'source.go'

lib/gobuild.coffee

@@ -69,6 +69,7 @@ class Gobuild
       outputPath = path.join(@tempDir, output)
       args = ['build', '-o', outputPath, '.']
     cmd = atom.config.get('go-plus.goExecutablePath')
+    cmd = @dispatch.replaceTokensInPath(cmd, true)
     errored = false
     proc = spawn(cmd, args, {cwd: cwd, env: env})
     proc.on 'error', (error) =>

lib/gofmt.coffee

@@ -37,7 +37,7 @@ class Gofmt
     gopath = @dispatch.buildGoPath()
     args = ['-w', buffer.getPath()]
     cmd = atom.config.get('go-plus.gofmtPath')
-    cmd = cmd.replace(/^\$GOPATH\//i, gopath + '/') if gopath? and gopath isnt ''
+    cmd = @dispatch.replaceTokensInPath(cmd)
     errored = false
     proc = spawn(cmd, args)
     proc.on 'error', (error) =>

lib/golint.coffee

@@ -37,7 +37,7 @@ class Golint
     gopath = @dispatch.buildGoPath()
     args = [buffer.getPath()]
     cmd = atom.config.get('go-plus.golintPath')
-    cmd = cmd.replace(/^\$GOPATH\//i, gopath + '/') if gopath? and gopath isnt ''
+    cmd = @dispatch.replaceTokensInPath(cmd)
     errored = false
     proc = spawn(cmd, args)
     proc.on 'error', (error) =>

lib/govet.coffee

@@ -36,6 +36,7 @@ class Govet
       return
     args = [@name, buffer.getPath()]
     cmd = atom.config.get('go-plus.goExecutablePath')
+    cmd = @dispatch.replaceTokensInPath(cmd, true)
     errored = false
     proc = spawn(cmd, args)
     proc.on 'error', (error) =>