Merge branch 'release/1.0.1'

Author: dai0304

.circleci/config.yml

@@ -0,0 +1,18 @@
+# Golang CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version
+      - image: circleci/golang:1.8
+    working_directory: /go/src/github.com/classmethod/aurl
+    steps:
+      - checkout
+      - run: curl https://glide.sh/get | sh
+      - run: make deps
+      - run: make
+      - run:
+          name: Running test code
+          command: make test

Makefile

@@ -0,0 +1,53 @@
+GOFILES    := $(shell find . -name '*.go' -not -path './vendor/*')
+GOPACKAGES := $(shell go list ./... | grep -v /vendor/)
+NAME       := aurl
+DIST_DIRS  := find * - type d -exec
+
+
+.DEFAULT_GOAL := bin/$(NAME)
+bin/$(NAME): $(GOFILES)
+	go build -o bin/$(NAME)
+
+.PHONY: clean
+clean:
+	rm -rf vendor
+	rm -rf bin/*
+	rm -rf dist/*
+
+.PHONY: cross-build
+cross-build:
+	for os in darwin linux windows; do \
+		for arch in amd64 386; do \
+			GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build -o dist/$(NAME)-$$os-$$arch; \
+    done; \
+  done
+
+.PHONY: deps
+deps: glide
+	glide install
+
+.PHONY: dist
+dist:
+	cd dist && \
+	$(DIST_DIRS) cp ../LICENSE {} \; && \
+	$(DIST_DIRS) cp ../README.md {} \; && \
+	$(DIST_DIRS) tar -zcf $(NAME)-$(VERSION)-{}.tar.gz {} \; && \
+	$(DIST_DIRS) zip -r $(NAME)-$(VERSION)-{}.zip {} \; && \
+	cd ..
+
+.PHONY: build
+build:
+	go build $(LDFLAGS) -o bin/$(NAME)
+
+.PHONY: glide
+glide:
+ifeq ($(shell command -v glide 2> /dev/null),)
+	curl https://glide.sh/get | sh
+endif
+
+.PHONY: install
+install:
+	go install $(LDFLAGS)
+
+test:
+	go test -v $(GOPACKAGES)

README.md

@@ -1,11 +1,16 @@
 aurl
 ====
 
+[![CircleCI](https://img.shields.io/circleci/project/github/classmethod/aurl.svg)](https://circleci.com/gh/classmethod/aurl)
+[![License](https://img.shields.io/github/license/classmethod/aurl.svg)](https://github.com/classmethod/aurl/blob/master/LICENSE)
+
 ## Description
 
 HTTP CLI client with OAuth 2.0 authentication.
 
-You know `curl` is powerful command line tool and you can make any complex HTTP request to every servers.  But the target web server is secured by OAuth 2.0, you must send another HTTP request to the authorization server before making principal request.  And more, you should to manage issued access tokens for every resources.
+You know `curl` is powerful command line tool and you can make any complex HTTP request to every servers.
+But the target web server is secured by OAuth 2.0, you must send another HTTP request to the authorization server
+before making principal request.  And more, you should to manage issued access tokens for every resources.
 
 `aurl` is a command-line tool that process OAuth 2.0 dance and manage access/refresh tokens automatically.
 
@@ -160,6 +165,22 @@ $ aurl --no-print-body --print-headers -X OPTIONS http://api.example.com/path/to
 1. Run `gofmt -s`
 1. Create new Pull Request
 
+## Build
+
+```bash
+$ make deps
+$ make
+$ bin/aurl --help
+usage: aurl [<flags>] <url>
+
+Command line utility to make HTTP request with OAuth2.
+
+Flags:
+  -h, --help                     Show context-sensitive help (also try --help-long and --help-man).
+  ...
+```
+
+
 ## Author
 
-[Daisuke Miyamoto](https://github.com/dai0304)
+[Daisuke Miyamoto](https://github.com/dai0304)

request/oauth2.go

@@ -106,12 +106,13 @@ func tokenRequest(v url.Values,request *AurlExecution) (*string, error) {
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Add("Accept", "application/json")
 	req.SetBasicAuth(request.Profile.ClientId, request.Profile.ClientSecret)
 
 	if dumpReq, err := httputil.DumpRequestOut(req, true); err == nil {
 		log.Printf("Token request >>>\n%s\n<<<", string(dumpReq))
 	} else {
-		log.Printf("Token request dump failed: ", err)
+		log.Printf("Token request dump failed: %s", err)
 	}
 
 	client := &http.Client{
@@ -122,16 +123,17 @@ func tokenRequest(v url.Values,request *AurlExecution) (*string, error) {
 		},
 	}
 	resp, err := client.Do(req)
-	defer resp.Body.Close()
 	if err != nil {
 		log.Printf("Token request failed: %s", err.Error())
 		return nil, err
 	}
 
+	defer resp.Body.Close()
+
 	if dumpResp, err := httputil.DumpResponse(resp, true); err == nil {
 		log.Printf("Token response >>>\n%s\n<<<", string(dumpResp))
 	} else {
-		log.Printf("Token response dump failed: ", err)
+		log.Printf("Token response dump failed: %s", err)
 	}
 
 	if resp.StatusCode == 200 {

scripts/compile.sh

@@ -1,5 +1,5 @@
 package main
 
 const Name string = "aurl"
-const Version string = "1.0"
+const Version string = "1.0.1"
 const Author string = "Daisuke Miyamoto <[email protected]>"