Allow ship init to be pointed to valid go-getter ship.yaml path

integration/init/integration_test.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 	"testing"
 
 	"github.com/docker/docker/client"
@@ -19,9 +20,9 @@ import (
 )
 
 type TestMetadata struct {
-	Upstream string   `yaml:"upstream"`
-	Args     []string `yaml:"args"`
-
+	Upstream     string   `yaml:"upstream"`
+	Args         []string `yaml:"args"`
+	MakeAbsolute bool     `yaml:"make_absolute"`
 	// debugging
 	SkipCleanup bool `yaml:"skip_cleanup"`
 }
@@ -78,20 +79,33 @@ var _ = Describe("ship init with arbitrary upstream", func() {
 				}, 20)
 
 				It("Should output the expected files", func() {
+					replacements := map[string]string{}
+					absoluteUpstream := testMetadata.Upstream
+
+					if testMetadata.MakeAbsolute {
+						relativePath := testMetadata.Upstream
+						pwdRoot, err := os.Getwd()
+						Expect(err).NotTo(HaveOccurred())
+						pwdRoot, err = filepath.Abs(pwdRoot)
+						Expect(err).NotTo(HaveOccurred())
+						absolutePath := filepath.Join(pwdRoot, "..")
+						absoluteUpstream = fmt.Sprintf("file::%s", filepath.Join(absolutePath, relativePath))
+						replacements["__upstream__"] = absoluteUpstream
+					}
 					cmd := cli.RootCmd()
 					buf := new(bytes.Buffer)
 					cmd.SetOutput(buf)
 					cmd.SetArgs(append([]string{
 						"init",
-						testMetadata.Upstream,
+						absoluteUpstream,
 						"--headless",
 						"--log-level=off",
 					}, testMetadata.Args...))
 					err := cmd.Execute()
 					Expect(err).NotTo(HaveOccurred())
 
 					// compare the files in the temporary directory with those in the "expected" directory
-					result, err := integration.CompareDir(path.Join(testPath, "expected"), testOutputPath, map[string]string{})
+					result, err := integration.CompareDir(path.Join(testPath, "expected"), testOutputPath, replacements)
 					Expect(err).NotTo(HaveOccurred())
 					Expect(result).To(BeTrue())
 				}, 60)

integration/init/local-single-file-gogetter/expected/.ship/state.json

@@ -0,0 +1,9 @@
+{
+  "v1": {
+    "config": null,
+    "releaseName": "ship",
+    "upstream": "__upstream__",
+    "metadata": null,
+    "contentSHA": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+  }
+}

integration/init/local-single-file-gogetter/input/ship.yaml

@@ -0,0 +1,4 @@
+lifecycle:
+  v1:
+    - message:
+       contents: "test message"

integration/init/local-single-file-gogetter/metadata.yaml

@@ -0,0 +1,4 @@
+upstream: "input/ship.yaml"
+make_absolute: true
+args: []
+skip_cleanup: false

pkg/specs/apptype/determine_type.go

@@ -79,6 +79,9 @@ func (r *inspector) DetermineApplicationType(
 	}
 
 	upstream, subdir, isSingleFile := gogetter.UntreeGithub(upstream)
+	if !isSingleFile {
+		isSingleFile = gogetter.IsShipYaml(upstream)
+	}
 	if gogetter.IsGoGettable(upstream) {
 		// get with go-getter
 		fetcher := gogetter.GoGetter{Logger: r.logger, FS: r.fs, Subdir: subdir, IsSingleFile: isSingleFile}
@@ -137,10 +140,9 @@ func (r *inspector) determineTypeFromContents(
 		if err != nil {
 			return "", "", errors.Wrapf(err, "check for %s", filename)
 		}
-	}
-
-	if isReplicatedApp {
-		return "inline.replicated.app", finalPath, nil
+		if isReplicatedApp {
+			return "inline.replicated.app", finalPath, nil
+		}
 	}
 
 	// if there's a Chart.yaml, assume its a chart

pkg/specs/gogetter/go_getter.go

@@ -96,3 +96,8 @@ func UntreeGithub(path string) (string, string, bool) {
 	}
 	return fmt.Sprintf("github.com/%s/%s?ref=%s//", githubURL.Owner, githubURL.Repo, githubURL.Ref), githubURL.Subdir, githubURL.IsBlob
 }
+
+func IsShipYaml(path string) bool {
+	base := filepath.Base(path)
+	return base == "ship.yaml" || base == "ship.yml"
+}