better make file

gobuffalo · Sep 26, 2018 · b6302e7 · b6302e7
1 parent 6037196
commit b6302e7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/genny/goreleaser/options.go b/genny/goreleaser/options.go
@@ -2,6 +2,7 @@ package goreleaser
 
 import (
 	"os/user"
+	"path/filepath"
 
 	"github.com/pkg/errors"
 )
@@ -29,5 +30,10 @@ func (opts *Options) Validate() error {
 		}
 		opts.BrewOwner = user.Username
 	}
+	if len(opts.MainFile) > 0 {
+		if filepath.Ext(opts.MainFile) != ".go" {
+			return errors.Errorf("%s is not a .go file", opts.MainFile)
+		}
+	}
 	return nil
 }
diff --git a/genny/initgen/init.go b/genny/initgen/init.go
@@ -26,6 +26,7 @@ func New(opts *Options) (*genny.Group, error) {
 	g, err := makefile.New(&makefile.Options{
 		Force:       opts.Force,
 		VersionFile: opts.VersionFile,
+		MainFile:    opts.MainFile,
 	})
 	if err != nil {
 		return gg, errors.WithStack(err)

diff --git a/genny/initgen/options.go b/genny/initgen/options.go
@@ -1,5 +1,11 @@
 package initgen
 
+import (
+	"path/filepath"
+
+	"github.com/pkg/errors"
+)
+
 type Options struct {
 	VersionFile string
 	Version     string
@@ -15,5 +21,10 @@ func (opts *Options) Validate() error {
 	if len(opts.VersionFile) == 0 {
 		opts.Version = "version.go"
 	}
+	if len(opts.MainFile) > 0 {
+		if filepath.Ext(opts.MainFile) != ".go" {
+			return errors.Errorf("%s is not a .go file", opts.MainFile)
+		}
+	}
 	return nil
 }
diff --git a/genny/makefile/a_makefile-packr.go b/genny/makefile/a_makefile-packr.go
diff --git a/genny/makefile/options.go b/genny/makefile/options.go
@@ -1,7 +1,15 @@
 package makefile
 
+import (
+	"path/filepath"
+
+	"github.com/pkg/errors"
+)
+
 type Options struct {
 	Force       bool
+	MainFile    string
+	BuildPath   string
 	VersionFile string
 }
 
@@ -10,5 +18,14 @@ func (opts *Options) Validate() error {
 	if len(opts.VersionFile) == 0 {
 		opts.VersionFile = "version.go"
 	}
+	if len(opts.BuildPath) == 0 {
+		opts.BuildPath = "."
+	}
+	if len(opts.MainFile) > 0 {
+		if filepath.Ext(opts.MainFile) != ".go" {
+			return errors.Errorf("%s is not a .go file", opts.MainFile)
+		}
+		opts.BuildPath = filepath.Dir(opts.MainFile)
+	}
 	return nil
 }
diff --git a/genny/makefile/templates/Makefile.plush b/genny/makefile/templates/Makefile.plush
@@ -3,13 +3,15 @@ GO_BIN ?= go
 
 install:
 	packr
-	$(GO_BIN) install -v .
+	$(GO_BIN) install -v <%= opts.BuildPath %>
 
 deps:
 	$(GO_BIN) get github.com/gobuffalo/release
 	$(GO_BIN) get github.com/gobuffalo/packr/packr
 	$(GO_BIN) get -tags ${TAGS} -t ./...
+ifeq ($(GO111MODULE),on)
 	$(GO_BIN) mod tidy
+endif
 
 build:
 	packr
@@ -19,19 +21,23 @@ test:
 	packr
 	$(GO_BIN) test -tags ${TAGS} ./...
 
-ci-test: deps
+ci-test:
 	$(GO_BIN) test -tags ${TAGS} -race ./...
 
 lint:
 	gometalinter --vendor ./... --deadline=1m --skip=internal
 
 update:
 	$(GO_BIN) get -u -tags ${TAGS}
+ifeq ($(GO111MODULE),on)
 	$(GO_BIN) mod tidy
+endif
 	packr
 	make test
 	make install
+ifeq ($(GO111MODULE),on)
 	$(GO_BIN) mod tidy
+endif
 
 release-test:
 	$(GO_BIN) test -tags ${TAGS} -race ./...