Merge pull request #27 from adamreese/merge-prep

ref(*) move lib code into pkg

Makefile

@@ -55,11 +55,11 @@ test-style:
 	@if [ $(shell gofmt -e -l -s $(GO_DIRS)) ]; then \
 		echo "gofmt check failed:"; gofmt -e -d -s $(GO_DIRS); exit 1; \
 	fi
-	@for i in . $(GO_DIRS); do \
+	@for i in $(GO_PKGS); do \
 		golint $$i; \
 	done
-	@for i in . $(GO_DIRS); do \
-		go vet github.com/deis/helm-dm/$$i; \
+	@for i in $(GO_DIRS); do \
+		go tool vet $$i; \
 	done
 
 .PHONY: bootstrap \

cmd/helm/chart_upload.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/aokoli/goutils"
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/format"
 	"github.com/kubernetes/deployment-manager/chart"
 )
 

cmd/helm/delete.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/format"
 )
 
 func init() {

cmd/helm/dm.go

@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/dm"
-	"github.com/deis/helm-dm/format"
-	"github.com/deis/helm-dm/kubectl"
+	"github.com/deis/helm-dm/pkg/dm"
+	"github.com/deis/helm-dm/pkg/format"
+	"github.com/deis/helm-dm/pkg/kubectl"
 )
 
 // ErrAlreadyInstalled indicates that DM is already installed.

cmd/helm/doctor.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/dm"
-	"github.com/deis/helm-dm/format"
-	"github.com/deis/helm-dm/kubectl"
+	"github.com/deis/helm-dm/pkg/dm"
+	"github.com/deis/helm-dm/pkg/format"
+	"github.com/deis/helm-dm/pkg/kubectl"
 )
 
 func init() {

cmd/helm/get.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/format"
 )
 
 func init() {

cmd/helm/helm.go

@@ -4,8 +4,8 @@ import (
 	"os"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/dm"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/dm"
+	"github.com/deis/helm-dm/pkg/format"
 )
 
 var version = "0.0.1"

cmd/helm/list.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/format"
 )
 
 func init() {

cmd/helm/pack.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/helm-dm/format"
+	"github.com/deis/helm-dm/pkg/format"
 	"github.com/kubernetes/deployment-manager/chart"
 )
 

cmd/helm/target.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/deis/helm-dm/format"
-	"github.com/deis/helm-dm/kubectl"
+	"github.com/deis/helm-dm/pkg/format"
+	"github.com/deis/helm-dm/pkg/kubectl"
 )
 
 func target(dryRun bool) error {

dm/install.go → pkg/dm/install.go

 package dm
 
 import (
-	"github.com/deis/helm-dm/format"
-	"github.com/deis/helm-dm/kubectl"
+	"github.com/deis/helm-dm/pkg/format"
+	"github.com/deis/helm-dm/pkg/kubectl"
 )
 
 // Install uses kubectl to install the base DM.

dm/uninstall.go → pkg/dm/uninstall.go

 package dm
 
 import (
-	"github.com/deis/helm-dm/kubectl"
+	"github.com/deis/helm-dm/pkg/kubectl"
 )
 
 // Uninstall uses kubectl to uninstall the base DM.