Merge pull request #36 from pecigonzalo/feature/symlink_paths

Feature/symlink paths

Author: pecigonzalo

.gitignore

@@ -1,5 +1,6 @@
 # Glide
 vendor/
+.glide/
 
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.0
+IMPROVEMENTS:
+* Updated docker-machine deps
+* Updated testImport deps
+* Fixes #32 (Unable to complete build when .docker folder is on a symlink)
+
 ## 1.0.10
 IMPROVEMENTS:
  * Mount on both /c/Users and /Users for compatibility

Makefile

@@ -2,7 +2,7 @@
 
 default: deps test build
 
-deps: clean
+deps:
 	go get github.com/Masterminds/glide
 	glide install
 

appveyor.yml

@@ -1,6 +1,6 @@
 # appveyor.yml reference : http://www.appveyor.com/docs/appveyor-yml
 
-version: "1.0.10.{build}"
+version: "1.1.0.{build}"
 
 # Source Config
 pull_requests:
@@ -12,30 +12,25 @@ clone_folder: c:\gopath\src\github.com\pecigonzalo\docker-machine-vmwareworkstat
 clone_depth: 5
 
 # Build host
-
 os: Windows Server 2012 R2
 
 environment:
   MSYSTEM: MINGW64
   Msys: winsymlink:nativestrict
   GOPATH: c:\gopath
-  Path: c:\go\bin;c:\gopath\bin;C:\msys64\usr\local\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
-  matrix:
-  - GOARCH: 386
-    GOVERSION: 1.6
-  - GOARCH: amd64
-    GOVERSION: 1.6
+  Path: c:\go\bin;%GOPATH%\bin;C:\msys64\usr\local\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
 
 init:
   - ps: git config --global core.autocrlf input
   - pacman -Sy
-  - pacman -S --noconfirm make wget curl bzr git mercurial subversion
+  - pacman -S --noconfirm --needed make wget curl
 
 # Build
 install:
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi
-  - msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q
+  - go version
+  - go env
   - ps: echo $env:Path
+  - make clean
   - make deps
 
 cache:
@@ -50,7 +45,7 @@ test: off
 
 # Deploy
 artifacts:
-  - path: //bin/docker-machine-driver-vmwareworkstation.exe
+  - path: /bin/docker-machine-driver-vmwareworkstation.exe
 
 deploy:
   provider: GitHub

glide.lock

@@ -1,7 +1,7 @@
 package: github.com/pecigonzalo/docker-machine-vmwareworkstation
 import:
 - package: github.com/docker/machine
-  version: v0.7.0
+  version: v0.9.0
   subpackages:
   - libmachine/drivers
   - libmachine/drivers/plugin
@@ -15,6 +15,6 @@ import:
   - ssh
 testImport:
 - package: github.com/stretchr/testify
-  version: v1.1.3
+  version: v1.1.4
   subpackages:
   - assert

glide.yaml

@@ -14,7 +14,6 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
-	"path/filepath"
 	"regexp"
 	"runtime"
 	"strings"
@@ -193,13 +192,13 @@ func (d *Driver) GetIP() (string, error) {
 	return ip, nil
 }
 
+// GetState returns the current state of the machine.
 func (d *Driver) GetState() (state.State, error) {
 	// VMRUN only tells use if the vm is running or not
-	vmxp, err := filepath.EvalSymlinks(d.vmxPath())
-	if err != nil {
+	if _, err := os.Stat(d.vmxPath()); os.IsNotExist(err) {
 		return state.Error, err
 	}
-	if stdout, _, _ := vmrun("list"); strings.Contains(stdout, vmxp) {
+	if stdout, _, _ := vmrun("list"); strings.Contains(stdout, d.vmxPath()) {
 		return state.Running, nil
 	}
 	return state.Stopped, nil
@@ -451,7 +450,7 @@ func (d *Driver) Remove() error {
 
 func (d *Driver) Restart() error {
 	_, _, err := vmrun("reset", d.vmxPath(), "nogui")
-	
+
 	log.Debugf("Mounting Shared Folders...")
 	var shareName, shareDir, guestFolder, guestCompatLink string // TODO configurable at some point
 	switch runtime.GOOS {
@@ -484,7 +483,7 @@ func (d *Driver) Restart() error {
 			vmrun("-gu", B2DUser, "-gp", B2DPass, "runScriptInGuest", d.vmxPath(), "/bin/sh", command)
 		}
 	}
-	
+
 	return err
 }