First commit

- Clear out some cruft tightly coupling libmachine to filestore
- Comment out drivers other than virtualbox for now

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Change way too many things

Mostly, break out the code to be more modular.

Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix mis-managed config passthru

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Remove a few instances of state stored in env vars

This should be explicitly communicated in Go-land, not through the
shell.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Rename "store" module to "persist"

This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Rip out repetitive antipattern for getting store

This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

First steps towards fixing up tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Test progress continues

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Replace unit tests with integration tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

MAKE ALL UNIT TESTS PASS YAY

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Add helper test files

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Don't write to disk in libmachine/host

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Heh.. coverage check strikes again

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix remove code

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move cert code around

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Continued progress: simplify Driver

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fixups and make creation work with new model

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move drivers module inside of libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move ssh module inside of libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move state module to libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move utils module to libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move version module to libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move log module to libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Modify some constructor methods around

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Change Travis build dep structure

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Boring gofmt fix

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Add version module

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Move NewHost to store

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Update some boring cert path infos to make API easier to use

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix up some issues around the new model

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Clean up some cert path stuff

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Don't use shady functions to get store path :D

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Continue artifact work

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix silly machines dir bug

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Continue fixing silly path issues

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Change up output of vbm a bit

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Continue work to make example go

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Change output a little more

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Last changes needed to make create finish properly

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix config.go to use libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Cut down code duplication and make both methods work with libmachine

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Add pluggable logging implementation

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Return error when machine already in desired state

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Update example to show log method

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix file:// bug

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix Swarm defaults

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Remove unused TLS settings from Engine and Swarm options

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Remove spurious error

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Correct bug detecting if migration was performed

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix compilation errors from tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix most of remaining test issues

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Fix final silly bug in tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Remove extraneous debug code

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Add -race to test command

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Appease the gofmt

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Appease the generate coverage

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

.travis.yml

@@ -1,14 +1,12 @@
 language: go
 sudo: false
 go:
-- 1.3
+- 1.4.2
 install:
 - export GOPATH=${TRAVIS_BUILD_DIR}/Godeps/_workspace:$GOPATH
 - export PATH=${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH
-- go get -t -v ./...
-- go get code.google.com/p/go.tools/cmd/cover
+- go get golang.org/x/tools/cmd/cover
 script:
 - script/validate-dco
 - script/validate-gofmt
 - go test -v -short ./...
-- script/generate-coverage

Makefile

@@ -2,8 +2,6 @@
 
 default: build
 
-remote: build-remote
-
 test:
 	script/test
 
@@ -18,9 +16,12 @@ validate: validate-dco validate-gofmt test
 build: clean
 	script/build
 
-build-remote: clean
+remote: clean
 	script/build-remote
 
+rmi:
+	docker rmi docker-machine-build
+
 clean:
 	rm -f docker-machine_*
 	rm -rf Godeps/_workspace/pkg

commands/active.go

@@ -4,30 +4,16 @@ import (
 	"fmt"
 
 	"github.com/codegangsta/cli"
-	"github.com/docker/machine/log"
+	"github.com/docker/machine/libmachine/log"
 )
 
 func cmdActive(c *cli.Context) {
 	if len(c.Args()) > 0 {
 		log.Fatal("Error: Too many arguments given.")
 	}
 
-	certInfo := getCertPathInfo(c)
-	defaultStore, err := getDefaultStore(
-		c.GlobalString("storage-path"),
-		certInfo.CaCertPath,
-		certInfo.CaKeyPath,
-	)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	provider, err := newProvider(defaultStore)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	host, err := provider.GetActive()
+	store := getStore(c)
+	host, err := store.GetActive()
 	if err != nil {
 		log.Fatalf("Error getting active host: %s", err)
 	}