Merge pull request #22 from pecigonzalo/release/v1.0.10

Update documentation and makefiles for release

.gitignore

@@ -1,3 +1,6 @@
+# Glide
+vendor/
+
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
@@ -23,4 +26,4 @@ _testmain.go
 *.test
 *.prof
 
-./bin
+bin/

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## 1.0.10
+IMPROVEMENTS:
+ * Mount on both /c/Users and /Users for compatibility
+ * Use glide for dependancy vendoring
+ * Update documentation
 
 ## 1.0.0
 

Makefile

@@ -1,18 +1,20 @@
 #export GO15VENDOREXPERIMENT = 1
 
-default: test build
+default: deps test build
 
-test: clean
-	go get -d -v -t ./...
-	go get golang.org/x/tools/cmd/vet
-	go test -v ./...
-	go vet ./...
+deps: clean
+	go get github.com/Masterminds/glide
+	glide install
 
-build: clean
-	go get -d -v -t ./...
+test:
+	go test -v $(glide novendor)
+	go vet $(glide novendor)
+
+build:
 	go build -i -o ./bin/docker-machine-driver-vmwareworkstation.exe ./cmd/
 
 clean:
+	$(RM) -rf vendor
 	$(RM) bin/*
 
-.PHONY: clean test build
+.PHONY: clean deps test build

README.md

@@ -26,7 +26,7 @@ As the title says this is still WIP and im working to add functionality listed o
 ## Requirements
 * Windows 7+ (for now)
 * [Docker Machine](https://docs.docker.com/machine/) 0.5.0+
-* [VMware Workstation](https://www.vmware.com/products/workstation)
+* [VMware Workstation](https://www.vmware.com/products/workstation) Workstation Free/Pro 10 +
 
 ## Installation
 
@@ -74,14 +74,14 @@ Environment variables and default values:
 | `--vmwareworkstation-cpu-count`       | `WORKSTATION_CPU_COUNT`       | `1`                      |
 | `--vmwareworkstation-disk-size`       | `WORKSTATION_DISK_SIZE`       | `20000`                  |
 | `--vmwareworkstation-memory-size`     | `WORKSTATION_MEMORY_SIZE`     | `1024`                   |
-| `--vmwareworkstation-ssh-user`        | `WORKSTATION_SSH_USER`        | `B2DUser`                |
-| `--vmwareworkstation-ssh-password`    | `WORKSTATION_SSH_PASSWORD`    | `B2DPass`                |
+| `--vmwareworkstation-ssh-user`        | `WORKSTATION_SSH_USER`        | `docker`                 |
+| `--vmwareworkstation-ssh-password`    | `WORKSTATION_SSH_PASSWORD`    | `tcuser`                 |
 
 ## Development
 
 ### Build from Source
 If you wish to work on VMWare Workstation Driver for Docker machine, you'll first need
-* [Go](http://www.golang.org) installed (version 1.5+ is required).
+* [Go](http://www.golang.org) installed (version 1.6+ is required).
   * Make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH).
 * [MSYS](https://msys2.github.io/)
   * **Make** We well need to use pacman to install make

appveyor.yml

@@ -16,38 +16,38 @@ clone_depth: 5
 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
 
 init:
-  - git config --global core.autocrlf input
+  - ps: git config --global core.autocrlf input
+  - pacman -Sy
+  - pacman -S --noconfirm make wget curl bzr git mercurial subversion
 
 # Build
-
 install:
-  - set Path=c:\go\bin;%Path%
-  - echo %Path%
   - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi
   - msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q
-  - go version
-  - go env
-  - go get -d -v -t ./...
+  - ps: echo $env:Path
+  - make deps
 
 build_script:
-  - go test -v ./...
-  - go vet ./...
   - git rev-parse HEAD
-  - go build -i -o ./bin/docker-machine-driver-vmwareworkstation_windows-%GOARCH%.exe ./cmd/
+  - make test
+  - make build
 
 test: off
 
 # Deploy
 artifacts:
-  - path: /bin/docker-machine-driver-vmwareworkstation_*-*.exe
+  - path: //bin/docker-machine-driver-vmwareworkstation.exe
 
 deploy:
   provider: GitHub

glide.yaml

@@ -0,0 +1,20 @@
+package: github.com/pecigonzalo/docker-machine-vmwareworkstation
+import:
+- package: github.com/docker/machine
+  version: v0.7.0
+  subpackages:
+  - libmachine/drivers
+  - libmachine/drivers/plugin
+  - libmachine/log
+  - libmachine/mcnflag
+  - libmachine/mcnutils
+  - libmachine/ssh
+  - libmachine/state
+- package: golang.org/x/crypto
+  subpackages:
+  - ssh
+testImport:
+- package: github.com/stretchr/testify
+  version: v1.1.3
+  subpackages:
+  - assert