Switch to dep

Gopkg.toml

@@ -0,0 +1,63 @@
+required = [
+  # Utilities
+  "github.com/onsi/ginkgo/ginkgo",
+  "github.com/golang/mock/mockgen",
+
+  # Transitive Forks
+  "github.com/opencontainers/runc/libcontainer/system",
+  "golang.org/x/net/context",
+]
+
+# App
+
+[[constraint]]
+  name = "code.cloudfoundry.org/cli"
+  version = "=6.32.0"
+
+[[constraint]]
+  name = "github.com/fsnotify/fsevents"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/fsnotify/fsnotify"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/hashicorp/go-version"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/kardianos/osext"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/nu7hatch/gouuid"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/sclevine/forge"
+  branch = "master"
+
+# Test
+
+[[constraint]]
+  name = "github.com/onsi/ginkgo"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/golang/mock"
+  branch = "master"
+
+# Transitive Forks
+
+[[constraint]]
+  name = "github.com/opencontainers/runc"
+  source = "https://github.com/docker/runc.git"
+
+[[constraint]]
+  name = "golang.org/x/net"
+  source = "https://github.com/tonistiigi/net.git"

cf/cmd/cmd.go

@@ -35,19 +35,19 @@ type App interface {
 
 //go:generate mockgen -package mocks -destination mocks/stager.go github.com/sclevine/cflocal/cf/cmd Stager
 type Stager interface {
-	Stage(config *local.StageConfig) (droplet engine.Stream, err error)
+	Stage(config *forge.StageConfig) (droplet engine.Stream, err error)
 	Download(path string) (stream engine.Stream, err error)
 }
 
 //go:generate mockgen -package mocks -destination mocks/runner.go github.com/sclevine/cflocal/cf/cmd Runner
 type Runner interface {
-	Run(config *local.RunConfig) (status int64, err error)
-	Export(config *local.ExportConfig) (imageID string, err error)
+	Run(config *forge.RunConfig) (status int64, err error)
+	Export(config *forge.ExportConfig) (imageID string, err error)
 }
 
 //go:generate mockgen -package mocks -destination mocks/forwarder.go github.com/sclevine/cflocal/cf/cmd Forwarder
 type Forwarder interface {
-	Forward(config *local.ForwardConfig) (health <-chan string, done func(), id string, err error)
+	Forward(config *forge.ForwardConfig) (health <-chan string, done func(), id string, err error)
 }
 
 //go:generate mockgen -package mocks -destination mocks/fs.go github.com/sclevine/cflocal/cf/cmd FS
@@ -68,8 +68,8 @@ type Help interface {
 
 //go:generate mockgen -package mocks -destination mocks/config.go github.com/sclevine/cflocal/cf/cmd Config
 type Config interface {
-	Load() (*local.LocalYML, error)
-	Save(localYML *local.LocalYML) error
+	Load() (*forge.LocalYML, error)
+	Save(localYML *forge.LocalYML) error
 }
 
 func parseOptions(args []string, f func(name string, set *flag.FlagSet)) error {
@@ -88,15 +88,15 @@ func parseOptions(args []string, f func(name string, set *flag.FlagSet)) error {
 	return nil
 }
 
-func getAppConfig(name string, localYML *local.LocalYML) *local.AppConfig {
-	var app *local.AppConfig
+func getAppConfig(name string, localYML *forge.LocalYML) *forge.AppConfig {
+	var app *forge.AppConfig
 	for _, appConfig := range localYML.Applications {
 		if appConfig.Name == name {
 			app = appConfig
 		}
 	}
 	if app == nil {
-		app = &local.AppConfig{Name: name}
+		app = &forge.AppConfig{Name: name}
 		localYML.Applications = append(localYML.Applications, app)
 	}
 	return app

cf/cmd/export.go

@@ -48,7 +48,7 @@ func (e *Export) Run(args []string) error {
 	}
 	defer launcher.Close()
 
-	id, err := e.Runner.Export(&local.ExportConfig{
+	id, err := e.Runner.Export(&forge.ExportConfig{
 		Droplet:   engine.NewStream(droplet, dropletSize),
 		Launcher:  launcher,
 		Ref:       options.reference,

cf/cmd/export_test.go

@@ -63,8 +63,8 @@ var _ = Describe("Export", func() {
 		It("should export a droplet as a Docker image", func() {
 			droplet := sharedmocks.NewMockBuffer("some-droplet")
 			launcher := sharedmocks.NewMockBuffer("some-launcher")
-			localYML := &local.LocalYML{
-				Applications: []*local.AppConfig{
+			localYML := &forge.LocalYML{
+				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{
 						Name:     "some-app",
@@ -77,11 +77,11 @@ var _ = Describe("Export", func() {
 			mockFS.EXPECT().ReadFile("./some-app.droplet").Return(droplet, int64(100), nil)
 			mockStager.EXPECT().Download("/tmp/lifecycle/launcher").Return(engine.NewStream(launcher, 200), nil)
 			mockRunner.EXPECT().Export(gomock.Any()).Do(
-				func(config *local.ExportConfig) {
+				func(config *forge.ExportConfig) {
 					Expect(ioutil.ReadAll(config.Droplet)).To(Equal([]byte("some-droplet")))
 					Expect(ioutil.ReadAll(config.Launcher)).To(Equal([]byte("some-launcher")))
 					Expect(config.Ref).To(Equal("some-reference"))
-					Expect(config.AppConfig).To(Equal(&local.AppConfig{
+					Expect(config.AppConfig).To(Equal(&forge.AppConfig{
 						Name:     "some-app",
 						Env:      map[string]string{"a": "b"},
 						Services: service.Services{"some": {{Name: "services"}}},

cf/cmd/mocks/config.go

@@ -5,7 +5,7 @@ package mocks
 
 import (
 	gomock "github.com/golang/mock/gomock"
-	local "github.com/sclevine/forge"
+	forge "github.com/sclevine/forge"
 )
 
 // Mock of Config interface
@@ -29,9 +29,9 @@ func (_m *MockConfig) EXPECT() *_MockConfigRecorder {
 	return _m.recorder
 }
 
-func (_m *MockConfig) Load() (*local.LocalYML, error) {
+func (_m *MockConfig) Load() (*forge.LocalYML, error) {
 	ret := _m.ctrl.Call(_m, "Load")
-	ret0, _ := ret[0].(*local.LocalYML)
+	ret0, _ := ret[0].(*forge.LocalYML)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -40,7 +40,7 @@ func (_mr *_MockConfigRecorder) Load() *gomock.Call {
 	return _mr.mock.ctrl.RecordCall(_mr.mock, "Load")
 }
 
-func (_m *MockConfig) Save(_param0 *local.LocalYML) error {
+func (_m *MockConfig) Save(_param0 *forge.LocalYML) error {
 	ret := _m.ctrl.Call(_m, "Save", _param0)
 	ret0, _ := ret[0].(error)
 	return ret0

cf/cmd/mocks/forwarder.go

@@ -5,7 +5,7 @@ package mocks
 
 import (
 	gomock "github.com/golang/mock/gomock"
-	local "github.com/sclevine/forge"
+	forge "github.com/sclevine/forge"
 )
 
 // Mock of Forwarder interface
@@ -29,7 +29,7 @@ func (_m *MockForwarder) EXPECT() *_MockForwarderRecorder {
 	return _m.recorder
 }
 
-func (_m *MockForwarder) Forward(_param0 *local.ForwardConfig) (<-chan string, func(), string, error) {
+func (_m *MockForwarder) Forward(_param0 *forge.ForwardConfig) (<-chan string, func(), string, error) {
 	ret := _m.ctrl.Call(_m, "Forward", _param0)
 	ret0, _ := ret[0].(<-chan string)
 	ret1, _ := ret[1].(func())

cf/cmd/mocks/runner.go

@@ -5,7 +5,7 @@ package mocks
 
 import (
 	gomock "github.com/golang/mock/gomock"
-	local "github.com/sclevine/forge"
+	forge "github.com/sclevine/forge"
 )
 
 // Mock of Runner interface
@@ -29,7 +29,7 @@ func (_m *MockRunner) EXPECT() *_MockRunnerRecorder {
 	return _m.recorder
 }
 
-func (_m *MockRunner) Export(_param0 *local.ExportConfig) (string, error) {
+func (_m *MockRunner) Export(_param0 *forge.ExportConfig) (string, error) {
 	ret := _m.ctrl.Call(_m, "Export", _param0)
 	ret0, _ := ret[0].(string)
 	ret1, _ := ret[1].(error)
@@ -40,7 +40,7 @@ func (_mr *_MockRunnerRecorder) Export(arg0 interface{}) *gomock.Call {
 	return _mr.mock.ctrl.RecordCall(_mr.mock, "Export", arg0)
 }
 
-func (_m *MockRunner) Run(_param0 *local.RunConfig) (int64, error) {
+func (_m *MockRunner) Run(_param0 *forge.RunConfig) (int64, error) {
 	ret := _m.ctrl.Call(_m, "Run", _param0)
 	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)