Merge pull request #13 from sks/feature/point_to_shirou

Feature/cut release using .travis

.gitignore

@@ -0,0 +1,2 @@
+vendor/
+build/

.travis.yml

@@ -0,0 +1,15 @@
+language: go
+
+go:
+  - master
+
+script: make
+
+deploy:
+  provider: releases
+  api_key: $GITHUB_TOKEN
+  file_glob: true
+  file: "build/*"
+  skip_cleanup: true
+  on:
+    tags: true

Gopkg.toml

@@ -0,0 +1,50 @@
+# 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/Sirupsen/logrus"
+  version = "1.0.5"
+
+[[constraint]]
+  name = "github.com/bitly/go-simplejson"
+  version = "0.5.0"
+
+[[constraint]]
+  name = "github.com/eclipse/paho.mqtt.golang"
+  version = "1.1.1"
+
+[[constraint]]
+  name = "github.com/mattn/go-colorable"
+  version = "0.0.9"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  version = "1.20.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -0,0 +1,80 @@
+GREEN  := $(shell tput -Txterm setaf 2)
+YELLOW := $(shell tput -Txterm setaf 3)
+WHITE  := $(shell tput -Txterm setaf 7)
+RESET  := $(shell tput -Txterm sgr0)
+
+
+.PHONY: all
+
+GO_PROJECT = github.com/shirou/mqttcli
+BUILD_DEST = build
+COMMIT_HASH=`git rev-parse --short HEAD`
+GIT_COMMIT = $(shell git rev-parse HEAD)
+GIT_SHA    = $(shell git rev-parse --short HEAD)
+GIT_DIRTY  = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean")
+
+LDFLAGS += -w -s -extldflags -static
+
+ifndef VERSION
+	VERSION = DEV
+endif
+
+GOFLAGS := -ldflags "$(LDFLAGS)"
+
+## Download dependencies and the run unit test and build the binary
+all: install clean test build
+
+## Clean the dist directory
+clean:
+	@rm -rf $(BUILD_DEST)
+
+## download dependencies to run this project
+install:
+	@which gox > /dev/null || go get github.com/mitchellh/gox
+	@which dep > /dev/null || go get github.com/golang/dep/cmd/dep
+	dep ensure -vendor-only
+
+## Run unit test
+test:
+	go test .
+## Run for local development
+start:
+	DATA_DIRECTORY="$$PWD/data" \
+	go run *.go
+
+## Build the linux binary
+build:
+	@rm -rf $(BUILD_DEST)
+	@mkdir -p $(BUILD_DEST) > /dev/null
+	@CGO_ENABLED=0 \
+	gox \
+	-output "$(BUILD_DEST)/{{.Dir}}_{{.OS}}_{{.Arch}}" \
+	$(GOFLAGS) \
+	.
+
+## Prints the version info about the project
+info:
+	 @echo "Version:           ${VERSION}"
+	 @echo "Git Commit:        ${GIT_COMMIT}"
+	 @echo "Git Tree State:    ${GIT_DIRTY}"
+
+## Print the dependency graph and open in MAC
+dependencygraph:
+	dep status -dot | dot -T png | open -f -a /Applications/Preview.app
+
+## Prints this help command
+help:
+	@echo ''
+	@echo 'Usage:'
+	@echo '  ${YELLOW}make${RESET} ${GREEN}<target>${RESET}'
+	@echo ''
+	@echo 'Targets:'
+	@awk '/^[a-zA-Z\-\_0-9]+:/ { \
+		helpMessage = match(lastLine, /^## (.*)/); \
+		if (helpMessage) { \
+			helpCommand = substr($$1, 0, index($$1, ":")-1); \
+			helpMessage = substr(lastLine, RSTART + 3, RLENGTH); \
+			printf "  ${YELLOW}%-$(TARGET_MAX_CHAR_NUM)s${RESET}: ${GREEN}%s${RESET}\n", helpCommand, helpMessage; \
+		} \
+	} \
+	{ lastLine = $$0 }' $(MAKEFILE_LIST)

README.rst

@@ -8,9 +8,15 @@ pubsub command which is suite for the shell script pipelining.
 Install
 ==============
 
-Download from here. Please choose your artitecture. (and chmod ugo+x if needed)
+Download from `here`_. Please choose your artitecture. (and chmod ugo+x if needed)
+
+.. _here: https://github.com/shirou/mqttcli/releases/latest
+
+
+::
+
+  curl https://raw.githubusercontent.com/shirou/mqttcli/master/install.sh | sh
 
-https://drone.io/github.com/shirou/mqttcli/files
 
 Or if you have golang environment, type this to build on your host.
 

config_test.go

@@ -42,6 +42,6 @@ func Test_ConfigCert(t *testing.T) {
 		t.Error(err)
 	}
 	if c.CaCert != "ca" || c.ClientCert != "client" || c.PrivateKey != "key" {
-		t.Error("parse failed, %#v", c)
+		t.Errorf("parse failed, %+v", c)
 	}
 }

install.sh

@@ -0,0 +1,127 @@
+#!/bin/sh -e
+
+# Based on https://raw.githubusercontent.com/golang/dep/master/install.sh
+
+RELEASES_URL="https://github.com/shirou/mqttcli/releases"
+INSTALL_NAME="mqttcli"
+if [ -z ${INSTALL_DIRECTORY} ]
+then
+    INSTALL_DIRECTORY="${HOME}/bin"
+fi
+
+downloadJSON() {
+    url="$2"
+
+    echo "Fetching $url.."
+    if test -x "$(command -v curl)"; then
+        response=$(curl -s -L -w 'HTTPSTATUS:%{http_code}' -H 'Accept: application/json' "$url")
+        body=$(echo "$response" | sed -e 's/HTTPSTATUS\:.*//g')
+        code=$(echo "$response" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
+    elif test -x "$(command -v wget)"; then
+        temp=$(mktemp)
+        body=$(wget -q --header='Accept: application/json' -O - --server-response "$url" 2> "$temp")
+        code=$(awk '/^  HTTP/{print $2}' < "$temp" | tail -1)
+        rm "$temp"
+    else
+        echo "Neither curl nor wget was available to perform http requests."
+        exit 1
+    fi
+    if [ "$code" != 200 ]; then
+        echo "Request failed with code $code"
+        exit 1
+    fi
+
+    eval "$1='$body'"
+}
+
+downloadFile() {
+    url="$1"
+    destination="$2"
+
+    echo "Fetching $url.."
+    if test -x "$(command -v curl)"; then
+        code=$(curl -s -w '%{http_code}' -L "$url" -o "$destination")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -q -O "$destination" --server-response "$url" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        echo "Neither curl nor wget was available to perform http requests."
+        exit 1
+    fi
+
+    if [ "$code" != 200 ]; then
+        echo "Request failed with code $code"
+        exit 1
+    fi
+}
+
+initArch() {
+    ARCH=$(uname -m)
+    if [ -n "$DEP_ARCH" ]; then
+        echo "Using DEP_ARCH"
+        ARCH="$DEP_ARCH"
+    fi
+    case $ARCH in
+        amd64) ARCH="amd64";;
+        x86_64) ARCH="amd64";;
+        i386) ARCH="386";;
+        *) echo "Architecture ${ARCH} is not supported by this installation script"; exit 1;;
+    esac
+    echo "ARCH = $ARCH"
+}
+
+initOS() {
+    OS=$(uname | tr '[:upper:]' '[:lower:]')
+    if [ -n "$DEP_OS" ]; then
+        echo "Using DEP_OS"
+        OS="$DEP_OS"
+    fi
+    case "$OS" in
+        darwin) OS='darwin';;
+        linux) OS='linux';;
+        freebsd) OS='freebsd';;
+        mingw*) OS='windows';;
+        msys*) OS='windows';;
+        *) echo "OS ${OS} is not supported by this installation script"; exit 1;;
+    esac
+    echo "OS = $OS"
+}
+
+# identify platform based on uname output
+initArch
+initOS
+
+# determine install directory if required
+echo "Will install into $INSTALL_DIRECTORY"
+
+# assemble expected release artifact name
+BINARY="mqttcli_${OS}_${ARCH}"
+
+# add .exe if on windows
+if [ "$OS" = "windows" ]; then
+    BINARY="$BINARY.exe"
+fi
+
+# if DEP_RELEASE_TAG was not provided, assume latest
+if [ -z "$DEP_RELEASE_TAG" ]; then
+    downloadJSON LATEST_RELEASE "$RELEASES_URL/latest"
+    DEP_RELEASE_TAG=$(echo "${LATEST_RELEASE}" | tr -s '\n' ' ' | sed 's/.*"tag_name":"//' | sed 's/".*//' )
+fi
+echo "Release Tag = $DEP_RELEASE_TAG"
+
+# fetch the real release data to make sure it exists before we attempt a download
+downloadJSON RELEASE_DATA "$RELEASES_URL/tag/$DEP_RELEASE_TAG"
+
+BINARY_URL="$RELEASES_URL/download/$DEP_RELEASE_TAG/$BINARY"
+DOWNLOAD_FILE=$(mktemp)
+
+downloadFile "$BINARY_URL" "$DOWNLOAD_FILE"
+
+echo "Setting executable permissions."
+chmod +x "$DOWNLOAD_FILE"
+
+if [ "$OS" = "windows" ]; then
+    INSTALL_NAME="$INSTALL_NAME.exe"
+fi
+
+echo "Moving executable to $INSTALL_DIRECTORY/$INSTALL_NAME"
+mv "$DOWNLOAD_FILE" "$INSTALL_DIRECTORY/$INSTALL_NAME"