Merge pull request #54 from Shopify/v120-take2

finalize v1.2.0

Gopkg.toml

@@ -0,0 +1,34 @@
+# 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"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  version = "1.20.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -23,12 +23,12 @@ man: $(MANFILES)
 
 build/man/%.gz: man/%.ronn
 	mkdir -p "$(@D)"
-	$(BUNDLE_EXEC) ronn -r --pipe "$<" | gzip > "$@"
+	set -euo pipefail ; $(BUNDLE_EXEC) ronn -r --pipe "$<" | gzip > "$@" || (rm -f "$<" ; false)
 
 build/bin/linux-amd64: $(GOFILES) cmd/$(NAME)/version.go
-	GOPATH=$(GODEP_PATH):$$GOPATH GOOS=linux GOARCH=amd64 go build -o "$@" "$(PACKAGE)/cmd/$(NAME)"
+	GOOS=linux GOARCH=amd64 go build -o "$@" "$(PACKAGE)/cmd/$(NAME)"
 build/bin/darwin-amd64: $(GOFILES) cmd/$(NAME)/version.go
-	GOPATH=$(GODEP_PATH):$$GOPATH GOOS=darwin GOARCH=amd64 go build -o "$@" "$(PACKAGE)/cmd/$(NAME)"
+	GOOS=darwin GOARCH=amd64 go build -o "$@" "$(PACKAGE)/cmd/$(NAME)"
 
 $(GEM): rubygem/$(NAME)-$(VERSION).gem
 	mkdir -p $(@D)
@@ -77,7 +77,7 @@ $(DEB): build/bin/linux-amd64 man
 		--no-depends \
 		--no-auto-depends \
 		--architecture=amd64 \
-		--maintainer="Burke Libbey <burke.libbey@shopify.com>" \
+		--maintainer="Shopify <admins@shopify.com>" \
 		--description="utility for managing a collection of secrets in source control. Secrets are encrypted using public key, elliptic curve cryptography." \
 		--url="https://github.com/Shopify/ejson" \
 		./build/man/=/usr/share/man/ \

README.md

@@ -26,6 +26,9 @@ The main benefits provided by `ejson` are:
 
 See [the manpages](https://shopify.github.io/ejson) for more technical documentation.
 
+See [ejson2env](https://github.com/Shopify/ejson2env) for a useful tool to help with exporting
+a portion of secrets as environment variables for environments/tools that require this pattern.
+
 ## Installation
 
 You can download the `.deb` package from [Github Releases](https://github.com/Shopify/ejson/releases).

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

cmd/ejson/version.go

@@ -1,3 +1,3 @@
 package main
 
-const VERSION string = "1.1.0"
+const VERSION string = "1.2.0"