Updated Changelog

publish windows binaries as .exe

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.2 - 2016-06-29
+
+* [[#44](https://github.com/Netflix-Skunkworks/go-jira/issues/44)] Close tmpfile before rename to work around "The process cannot access the file because it is being used by another process" error on windows. [Cory Bennett] [[0980f8e](https://github.com/Netflix-Skunkworks/go-jira/commit/0980f8e)]
+
 ## 0.1.1 - 2016-06-28
 
 * use USERPROFILE instead of HOME for windows, rework paths to use filepath.Join for better cross platform support [Cory Bennett] [[adcedc4](https://github.com/Netflix-Skunkworks/go-jira/commit/adcedc4)]

Makefile

@@ -1,18 +1,19 @@
 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)
 
+	# freebsd-386 \
+	# freebsd-arm \
+	# linux-arm \
+	# openbsd-386 \
+	# openbsd-amd64 \
+	# darwin-386
+
 NAME=jira
 
 OS=$(shell uname -s)
@@ -33,8 +34,8 @@ DIST=$(CWD)$(SEP)dist
 
 GOBIN ?= $(CWD)
 
-CURVER ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags || grep ^\#\# CHANGELOG.md | awk '{print $$2; exit}')
-LDFLAGS:=-X jira.VERSION=$(patsubst v%,%,$(CURVER)) -w
+CURVER ?= $(patsubst v%,%,$(shell [ -d .git ] && git describe --abbrev=0 --tags || grep ^\#\# CHANGELOG.md | awk '{print $$2; exit}'))
+LDFLAGS:=-X jira.VERSION=$(CURVER) -w
 
 # use make DEBUG=1 and you can get a debuggable golang binary
 # see https://github.com/mailgun/godebug
@@ -65,6 +66,7 @@ all:
         echo "Building for $$p"; \
         ${MAKE} build GOOS=$${p/-*/} GOARCH=$${p/*-/} BIN=$(DIST)/$(NAME)-$$p; \
     done
+	for x in $(DIST)/jira-windows-*; do mv $$x $$x.exe; done
 
 fmt:
 	gofmt -s -w main/*.go *.go
@@ -76,7 +78,7 @@ 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 main/*.go *.go | grep -vE 'gofmt|go fmt'
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD main/*.go *.go | grep -vE 'gofmt|go fmt'
 
 update-changelog:
 	@echo "# Changelog" > CHANGELOG.md.new; \
@@ -92,7 +94,7 @@ update-changelog:
 	git tag v$(NEWVER)
 
 version:
-	@echo $(patsubst v%,%,$(CURVER))
+	@echo $(CURVER)
 
 clean:
 	rm -rf pkg dist bin src ./$(NAME)

cli.go

@@ -261,13 +261,25 @@ func (c *Cli) editTemplate(template string, tmpFilePrefix string, templateData m
 		log.Errorf("Failed to make temp file in %s: %s", tmpdir, err)
 		return err
 	}
-	defer fh.Close()
 
-	tmpFileName := fmt.Sprintf("%s.yml", fh.Name())
-	if err := os.Rename(fh.Name(), tmpFileName); err != nil {
-		log.Errorf("Failed to rename %s to %s: %s", fh.Name(), fmt.Sprintf("%s.yml", fh.Name()), err)
+	oldFileName := fh.Name()
+	tmpFileName := fmt.Sprintf("%s.yml", oldFileName)
+
+	// close tmpfile so we can rename on windows
+	fh.Close()
+
+	if err := os.Rename(oldFileName, tmpFileName); err != nil {
+		log.Errorf("Failed to rename %s to %s: %s", oldFileName, tmpFileName, err)
 		return err
 	}
+
+	fh, err = os.OpenFile(tmpFileName, os.O_RDWR|os.O_EXCL, 0600)
+	if err != nil {
+		log.Errorf("Failed to reopen temp file file in %s: %s", tmpFileName, err)
+		return err
+	}
+
+	defer fh.Close()
 	defer func() {
 		os.Remove(tmpFileName)
 	}()