Merge pull request #20 from JulzDiverse/wip-gopatch

Enable spruce goPatch

Gopkg.toml

@@ -0,0 +1,61 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "code.cloudfoundry.org/commandrunner"
+
+[[constraint]]
+  name = "github.com/JulzDiverse/goml"
+
+[[constraint]]
+  name = "github.com/JulzDiverse/mingoak"
+
+[[constraint]]
+  name = "github.com/JulzDiverse/osenv"
+
+[[constraint]]
+  name = "github.com/cppforlife/go-patch"
+
+[[constraint]]
+  name = "github.com/geofffranks/simpleyaml"
+
+[[constraint]]
+  name = "github.com/geofffranks/spruce"
+
+[[constraint]]
+  name = "github.com/onsi/ginkgo"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+
+[[constraint]]
+  name = "github.com/starkandwayne/goutils"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"

cockpit/cockpit.go

@@ -16,7 +16,7 @@ import (
 
 type Cockpit struct {
 	spruceProcessor aviator.SpruceProcessor
-	flyExecutor     aviator.Executor
+	flyExecutor     aviator.FlyExecuter
 	validator       aviator.Validator
 }
 
@@ -27,7 +27,7 @@ type Aviator struct {
 
 func Init(
 	spruceProcessor aviator.SpruceProcessor,
-	flyExecuter aviator.Executor,
+	flyExecuter aviator.FlyExecuter,
 	validator aviator.Validator,
 ) *Cockpit {
 	return &Cockpit{spruceProcessor, flyExecuter, validator}

filemanager/filemanager_test.go

@@ -45,14 +45,13 @@ var _ = Describe("Filemanager", func() {
 		})
 	})
 
-	Context("Setting a file that already exists", func() {
-		It("returns an error", func() {
+	Context("overwrting a file", func() {
+		It("is successful", func() {
 			err := store.WriteFile("{{keyD}}", []byte("content D"))
 			Expect(err).ToNot(HaveOccurred())
 
 			err = store.WriteFile("{{keyD}}", []byte("content D"))
-			Expect(err).To(HaveOccurred())
-			Expect(err).To(MatchError(ContainSubstring("file keyD in virtual filestore already exists")))
+			Expect(err).ToNot(HaveOccurred())
 		})
 	})