Update forge, update dep, refactor

.travis.yml

@@ -6,7 +6,7 @@ go:
 - 1.9.x
 install:
 - set -e
-- curl -fsSLo "$GOPATH/bin/dep" "https://github.com/golang/dep/releases/download/v0.3.1/dep-linux-amd64"
+- curl -fsSLo "$GOPATH/bin/dep" "https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64"
 - chmod +x "$GOPATH/bin/dep"
 - curl -fsSL "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar -C "$GOPATH/bin" -xz cf
 - bin/vendor

cf/cmd/cmd.go

@@ -10,8 +10,8 @@ import (
 	"github.com/sclevine/cflocal/fs"
 	"github.com/sclevine/cflocal/remote"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 	"github.com/sclevine/forge/engine"
-	"github.com/sclevine/forge/service"
 )
 
 const LatestStack = "cloudfoundry/cflinuxfs2:latest"
@@ -31,8 +31,8 @@ type RemoteApp interface {
 	Env(name string) (*remote.AppEnv, error)
 	SetEnv(name string, env map[string]string) error
 	Restart(name string) error
-	Services(name string) (service.Services, error)
-	Forward(name string, services service.Services) (service.Services, *service.ForwardConfig, error)
+	Services(name string) (forge.Services, error)
+	Forward(name string, services forge.Services) (forge.Services, *forge.ForwardDetails, error)
 }
 
 //go:generate mockgen -package mocks -destination mocks/local_app.go github.com/sclevine/cflocal/cf/cmd LocalApp
@@ -74,8 +74,8 @@ type Help interface {
 
 //go:generate mockgen -package mocks -destination mocks/config.go github.com/sclevine/cflocal/cf/cmd Config
 type Config interface {
-	Load() (*forge.LocalYML, error)
-	Save(localYML *forge.LocalYML) error
+	Load() (*app.LocalYML, error)
+	Save(localYML *app.LocalYML) error
 }
 
 func parseOptions(args []string, f func(name string, set *flag.FlagSet)) error {
@@ -94,7 +94,7 @@ func parseOptions(args []string, f func(name string, set *flag.FlagSet)) error {
 	return nil
 }
 
-func getAppConfig(name string, localYML *forge.LocalYML) *forge.AppConfig {
+func getAppConfig(name string, localYML *app.LocalYML) *forge.AppConfig {
 	var app *forge.AppConfig
 	for _, appConfig := range localYML.Applications {
 		if appConfig.Name == name {
@@ -108,8 +108,8 @@ func getAppConfig(name string, localYML *forge.LocalYML) *forge.AppConfig {
 	return app
 }
 
-func getRemoteServices(app RemoteApp, serviceApp, forwardApp string) (service.Services, *service.ForwardConfig, error) {
-	var services service.Services
+func getRemoteServices(app RemoteApp, serviceApp, forwardApp string) (forge.Services, *forge.ForwardDetails, error) {
+	var services forge.Services
 
 	if serviceApp == "" {
 		serviceApp = forwardApp

cf/cmd/export_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/sclevine/cflocal/cf/cmd/mocks"
 	sharedmocks "github.com/sclevine/cflocal/mocks"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 	"github.com/sclevine/forge/engine"
-	"github.com/sclevine/forge/service"
 )
 
 var _ = Describe("Export", func() {
@@ -63,13 +63,13 @@ 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 := &forge.LocalYML{
+			localYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{
 						Name:     "some-app",
 						Env:      map[string]string{"a": "b"},
-						Services: service.Services{"some": {{Name: "services"}}},
+						Services: forge.Services{"some": {{Name: "services"}}},
 					},
 				},
 			}
@@ -85,7 +85,7 @@ var _ = Describe("Export", func() {
 					Expect(config.AppConfig).To(Equal(&forge.AppConfig{
 						Name:     "some-app",
 						Env:      map[string]string{"a": "b"},
-						Services: service.Services{"some": {{Name: "services"}}},
+						Services: forge.Services{"some": {{Name: "services"}}},
 					}))
 				},
 			).Return("some-id", nil)

cf/cmd/pull_test.go

@@ -11,6 +11,7 @@ import (
 	sharedmocks "github.com/sclevine/cflocal/mocks"
 	"github.com/sclevine/cflocal/remote"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 )
 
 var _ = Describe("Pull", func() {
@@ -62,7 +63,7 @@ var _ = Describe("Pull", func() {
 				Running: map[string]string{"c": "d"},
 				App:     map[string]string{"e": "f"},
 			}
-			oldLocalYML := &forge.LocalYML{
+			oldLocalYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{
@@ -74,7 +75,7 @@ var _ = Describe("Pull", func() {
 					},
 				},
 			}
-			newLocalYML := &forge.LocalYML{
+			newLocalYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{

cf/cmd/push_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/sclevine/cflocal/cf/cmd/mocks"
 	sharedmocks "github.com/sclevine/cflocal/mocks"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 )
 
 var _ = Describe("Push", func() {
@@ -58,7 +59,7 @@ var _ = Describe("Push", func() {
 	Describe("#Run", func() {
 		It("should replace an app's droplet and env vars, then restart it", func() {
 			droplet := sharedmocks.NewMockBuffer("some-droplet")
-			localYML := &forge.LocalYML{
+			localYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{

cf/cmd/run.go

@@ -14,7 +14,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/sclevine/forge"
 	"github.com/sclevine/forge/engine"
-	"github.com/sclevine/forge/wait"
 )
 
 type Run struct {
@@ -109,17 +108,17 @@ func (r *Run) Run(args []string) error {
 			return err
 		}
 		defer sshpass.Close()
-		waiter, waiterDone := wait.New(5 * time.Second)
+		waiter, waiterDone := newWaiter(5 * time.Second)
 		defer waiterDone()
 		health, done, id, err := r.Forwarder.Forward(&forge.ForwardConfig{
-			AppName:       appConfig.Name,
-			Stack:         LatestStack,
-			SSHPass:       sshpass,
-			Color:         color.GreenString,
-			ForwardConfig: forwardConfig,
-			HostIP:        netConfig.HostIP,
-			HostPort:      netConfig.HostPort,
-			Wait:          waiter,
+			AppName:  appConfig.Name,
+			Stack:    LatestStack,
+			SSHPass:  sshpass,
+			Color:    color.GreenString,
+			Details:  forwardConfig,
+			HostIP:   netConfig.HostIP,
+			HostPort: netConfig.HostPort,
+			Wait:     waiter,
 		})
 		if err != nil {
 			return err

cf/cmd/run_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/sclevine/cflocal/cf/cmd/mocks"
 	sharedmocks "github.com/sclevine/cflocal/mocks"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 	"github.com/sclevine/forge/engine"
-	"github.com/sclevine/forge/service"
 )
 
 var _ = Describe("Run", func() {
@@ -73,23 +73,23 @@ var _ = Describe("Run", func() {
 			droplet := sharedmocks.NewMockBuffer("some-droplet")
 			launcher := sharedmocks.NewMockBuffer("some-launcher")
 			sshpass := sharedmocks.NewMockBuffer("some-sshpass")
-			services := service.Services{"some": {{Name: "services"}}}
-			forwardedServices := service.Services{"some": {{Name: "forwarded-services"}}}
+			services := forge.Services{"some": {{Name: "services"}}}
+			forwardedServices := forge.Services{"some": {{Name: "forwarded-services"}}}
 			restart := make(<-chan time.Time)
 			watchDone := make(chan struct{})
 			health := make(chan string, 3)
 			forwardDone, forwardDoneCalls := sharedmocks.NewMockFunc()
 
-			forwardConfig := &service.ForwardConfig{
+			forwardConfig := &forge.ForwardDetails{
 				Host: "some-ssh-host",
 			}
-			localYML := &forge.LocalYML{
+			localYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{Name: "some-other-app"},
 					{
 						Name:     "some-app",
 						Env:      map[string]string{"a": "b"},
-						Services: service.Services{"some": {{Name: "overwritten-services"}}},
+						Services: forge.Services{"some": {{Name: "overwritten-services"}}},
 					},
 				},
 			}
@@ -110,7 +110,7 @@ var _ = Describe("Run", func() {
 						Expect(config.AppName).To(Equal("some-app"))
 						Expect(config.Stack).To(Equal(LatestStack))
 						Expect(config.Color("some-text")).To(Equal(color.GreenString("some-text")))
-						Expect(config.ForwardConfig).To(Equal(forwardConfig))
+						Expect(config.Details).To(Equal(forwardConfig))
 						Expect(config.HostIP).To(Equal("0.0.0.0"))
 						Expect(config.HostPort).To(Equal("3000"))
 						Eventually(config.Wait).Should(Receive())

cf/cmd/stage.go

@@ -4,9 +4,9 @@ import (
 	"crypto/md5"
 	"flag"
 	"fmt"
+	"io"
 
 	"github.com/fatih/color"
-
 	"github.com/sclevine/forge"
 	"github.com/sclevine/forge/engine"
 )
@@ -15,7 +15,7 @@ type Stage struct {
 	UI        UI
 	Stager    Stager
 	RemoteApp RemoteApp
-	LocalApp  LocalApp
+	TarApp    func(string) (io.ReadCloser, error)
 	FS        FS
 	Help      Help
 	Config    Config
@@ -51,7 +51,7 @@ func (s *Stage) Run(args []string) error {
 		return err
 	}
 
-	appTar, err := s.LocalApp.Tar(options.app)
+	appTar, err := s.TarApp(options.app)
 	if err != nil {
 		return err
 	}

cf/cmd/stage_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/sclevine/cflocal/cf/cmd/mocks"
 	sharedmocks "github.com/sclevine/cflocal/mocks"
 	"github.com/sclevine/forge"
+	"github.com/sclevine/forge/app"
 	"github.com/sclevine/forge/engine"
-	"github.com/sclevine/forge/service"
 )
 
 var _ = Describe("Stage", func() {
@@ -45,7 +45,7 @@ var _ = Describe("Stage", func() {
 			UI:        mockUI,
 			Stager:    mockStager,
 			RemoteApp: mockRemoteApp,
-			LocalApp:  mockLocalApp,
+			TarApp:    mockLocalApp.Tar,
 			FS:        mockFS,
 			Help:      mockHelp,
 			Config:    mockConfig,
@@ -74,13 +74,13 @@ var _ = Describe("Stage", func() {
 			droplet := sharedmocks.NewMockBuffer("some-droplet")
 			dropletFile := sharedmocks.NewMockBuffer("")
 
-			services := service.Services{"some": {{Name: "services"}}}
-			forwardedServices := service.Services{"some": {{Name: "forwarded-services"}}}
-			forwardConfig := &service.ForwardConfig{
+			services := forge.Services{"some": {{Name: "services"}}}
+			forwardedServices := forge.Services{"some": {{Name: "forwarded-services"}}}
+			forwardConfig := &forge.ForwardDetails{
 				Host: "some-ssh-host",
 			}
 
-			localYML := &forge.LocalYML{
+			localYML := &app.LocalYML{
 				Applications: []*forge.AppConfig{
 					{
 						Name: "some-other-app",
@@ -93,7 +93,7 @@ var _ = Describe("Stage", func() {
 							"some-other-buildpack-two",
 						},
 						Env:      map[string]string{"a": "b"},
-						Services: service.Services{"some": {{Name: "overwritten-services"}}},
+						Services: forge.Services{"some": {{Name: "overwritten-services"}}},
 					},
 				},
 			}