update to use gopkg, tweak build

Author: coryb

.dockerignore

@@ -0,0 +1,2 @@
+*
+!docker-root

.gitignore

@@ -0,0 +1,5 @@
+bin
+pkg
+src
+docker-root
+dfpp

Dockerfile

@@ -0,0 +1,4 @@
+FROM scratch
+COPY docker-root/ /
+WORKDIR /root
+ENTRYPOINT ["/bin/dfpp"]

Makefile

@@ -1,61 +1,76 @@
 PLATFORMS= \
-	freebsd-386 \
 	freebsd-amd64 \
-	freebsd-arm \
-	linux-386 \
 	linux-amd64 \
-	linux-arm \
-	openbsd-386 \
-	openbsd-amd64 \
-	windows-386 \
 	windows-amd64 \
-	darwin-386 \
 	darwin-amd64 \
 	$(NULL)
 
-DIST=$(shell pwd)/dist
-export GOPATH=$(shell pwd)
-GOBIN ?= $(shell pwd)
+NAME     = dfpp
+DIST     = $(shell pwd)/dist
+GOPATH   = $(shell pwd)
+GOBIN   ?= $(shell pwd)
+BIN     ?= $(GOBIN)/$(NAME)
+CURVER  ?= $(shell git describe --abbrev=0 --tags)
+NEWVER  ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
+TODAY   := $(shell date +%Y-%m-%d)
 
-build:
-	go get -v github.com/coryb/dfpp
-	go build -o $(GOBIN)/dfpp main/main.go
+export GOPATH
+
+build: src/gopkg.in/coryb/dfpp.v1
+	go build -ldflags "-w -s" -o $(BIN) main/main.go
+
+src/%:
+	mkdir -p $(@D)
+	test -L $@ || ln -sf ../../.. $@
+	go get -v $* $*/main
 
 install:
-	export GOBIN=~/bin && ${MAKE} build
+	${MAKE} GOBIN=~/bin build
+
+vet:
+	@go tool vet *.go main/*.go
+
+clean:
+	rm -rf pkg dist bin src ./$(NAME)
 
 cross-setup:
 	for p in $(PLATFORMS); do \
         echo "Building for $$p"; \
-		cd $(GOROOT)/src && sudo GOOS=$${p/-*/} GOARCH=$${p/*-/} bash ./make.bash --no-clean; \
+		cd $(GOROOT)/src && sudo GOROOT_BOOTSTRAP=$(GOROOT) GOOS=$${p/-*/} GOARCH=$${p/*-/} bash ./make.bash --no-clean; \
    done
 
 all:
 	rm -rf $(DIST); \
 	mkdir -p $(DIST); \
-	go get -d; \
 	for p in $(PLATFORMS); do \
         echo "Building for $$p"; \
-        GOOS=$${p/-*/} GOARCH=$${p/*-/} go build -v -ldflags -s -o $(DIST)/dfpp-$$p main/main.go; \
-   done
+        ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
+    done
 
 fmt:
 	gofmt -s -w *.go main/*.go
 
-CURVER ?= $(shell git fetch --tags && git tag | gsort -V | tail -1)
-NEWVER ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
-TODAY  := $(shell date +%Y-%m-%d)
-
 changes:
-	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^$(CURVER) HEAD *.go main/*.go | grep -vE 'gofmt|go fmt'
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^$(CURVER) HEAD main/*.go *.go | grep -vE 'gofmt|go fmt'
 
 update-changelog: 
 	@echo "# Changelog" > CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
 	echo "## $(NEWVER) - $(TODAY)" >> CHANGELOG.md.new; \
 	echo >> CHANGELOG.md.new; \
-	$(MAKE) changes | \
+	$(MAKE) --no-print-directory --silent changes | \
 	perl -pe 's{\[([a-f0-9]+)\]}{[[$$1](https://github.com/coryb/dfpp/commit/$$1)]}g' | \
 	perl -pe 's{\#(\d+)}{[#$$1](https://github.com/coryb/dfpp/issues/$$1)}g' >> CHANGELOG.md.new; \
-	tail +2 CHANGELOG.md >> CHANGELOG.md.new; \
-	mv CHANGELOG.md.new CHANGELOG.md
+	tail -n +2 CHANGELOG.md >> CHANGELOG.md.new; \
+	mv CHANGELOG.md.new CHANGELOG.md; \
+	git commit -m "Updated Changelog" CHANGELOG.md; \
+	git tag v$(NEWVER)
+
+version:
+	@echo $(patsubst v%,%,$(CURVER))
+
+docker:
+	mkdir -p docker-root/bin docker-root/etc/ssl/certs
+	/usr/bin/security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain > docker-root/etc/ssl/certs/ca-certificates.crt
+	${MAKE} GOBIN=./docker-root/bin GOOS=linux GOARCH=amd64 build
+	docker build -t coryb/dfpp:$(patsubst v%,%,$(CURVER)) .

dfpp.go

@@ -3,7 +3,7 @@ package dfpp
 import (
 	"bufio"
 	"fmt"
-	"github.com/op/go-logging"
+	"gopkg.in/op/go-logging.v1"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -123,19 +123,19 @@ func (pp *Dfpp) ProcessInclude(line string, fields []string) bool {
 		if _, err := os.Stat(uri); err == nil {
 			content, err := ioutil.ReadFile(uri)
 			if err != nil {
-				log.Error("Failed to read %s: %s", uri, err)
+				log.Errorf("Failed to read %s: %s", uri, err)
 				os.Exit(1)
 			}
 			docs = append(docs, string(content))
 		} else {
 			req, _ := http.NewRequest("GET", uri, nil)
 			ua := &http.Client{}
 			if resp, err := ua.Do(req); err != nil {
-				log.Error("Failed to %s %s: %s", req.Method, req.URL.String(), err)
+				log.Errorf("Failed to %s %s: %s", req.Method, req.URL.String(), err)
 				os.Exit(1)
 			} else {
 				if resp.StatusCode < 200 || resp.StatusCode >= 300 && resp.StatusCode != 401 {
-					log.Error("response status: %s", resp.Status)
+					log.Errorf("response status: %s", resp.Status)
 				}
 				runtime.SetFinalizer(resp, func(r *http.Response) {
 					r.Body.Close()

main/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"github.com/andrew-d/go-termutil"
-	"github.com/coryb/dfpp"
-	"github.com/op/go-logging"
+	"gopkg.in/coryb/dfpp.v1"
+	"gopkg.in/op/go-logging.v1"
 	"os"
 )