Merge branch 'release/0.0.5'

Makefile

@@ -9,16 +9,15 @@ build:
 	go build -v ${LDFLAGS}
 
 test:
-	go test -v ./... --cover
-
-cover:
-	go test -coverprofile cover.out
-	goveralls -repotoken k7kIkhp7ub6iz1gIEBGOjmOvhuPJB7Dki
+	./contrib/go.test.sh
 
 lint:
 	golint ./...
 	go vet ./...
 
+dev-deps:
+	go get -u github.com/golang/lint/golint
+
 dist: dist-linux dist-darwin dist-windows
 
 dist-linux:
@@ -42,7 +41,7 @@ dist-windows:
 clean:
 	go clean
 	rm -rf psh-*
-	rm cover.out
+	rm -rf cover.out
 
 reload:
 	source ./contrib/install.sh

README.md

@@ -2,9 +2,35 @@
 
 A prompt generator
 
-Master : [![CircleCI](https://circleci.com/gh/repejota/psh/tree/master.svg?style=svg)](https://circleci.com/gh/repejota/psh/tree/master)
+* Master : [![CircleCI](https://circleci.com/gh/repejota/psh/tree/master.svg?style=svg)](https://circleci.com/gh/repejota/psh/tree/master)
+* Develop : [![CircleCI](https://circleci.com/gh/repejota/psh/tree/develop.svg?style=svg)](https://circleci.com/gh/repejota/psh/tree/develop)
 
-![psh screenshot](https://github.com/repejota/psh/raw/master/shot.png "psh screenshot")
+* Coverage Master: [![codecov](https://codecov.io/gh/repejota/psh/branch/master/graph/badge.svg)](https://codecov.io/gh/repejota/psh)
+* Coverage Develop: [![codecov](https://codecov.io/gh/repejota/psh/branch/develop/graph/badge.svg)](https://codecov.io/gh/repejota/psh)
+
+* Go Report Card: [![Go Report Card](https://goreportcard.com/badge/github.com/repejota/psh)](https://goreportcard.com/report/github.com/repejota/psh)
+
+## Installation
+
+How to install:
+
+```
+$ go get -u github.com/repejota/sh
+```
 
+And use this on your `.bash_profile`
 
-Coverage Master: [![Coverage Status](https://coveralls.io/repos/github/repejota/psh/badge.svg?branch=master)](https://coveralls.io/github/repejota/psh?branch=master)
+```
+# Usage:
+# $ source install.sh
+
+function __psh {
+	PS1="$(psh)"
+}
+export PS1="$(psh)"
+PROMPT_COMMAND=__psh
+```
+
+## Screenshot
+
+![psh screenshot](https://github.com/repejota/psh/raw/master/shot.png "psh screenshot")

VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

circle.yml

@@ -0,0 +1,5 @@
+test:
+  override:
+    - make test
+  post:
+    - bash <(curl -s https://codecov.io/bash)

contrib/go.test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+echo "" > cover.out
+
+for d in $(go list ./... | grep -v vendor); do
+    go test -coverprofile=profile.out -covermode=atomic $d
+    if [ -f profile.out ]; then
+        cat profile.out >> cover.out
+        rm profile.out
+    fi
+done

git.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 )
 
+// getGitBranch returns the current git branch name
 func getGitBranch() string {
 	out, err := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD").Output()
 	if err != nil {
@@ -16,6 +17,7 @@ func getGitBranch() string {
 	return strings.Trim(string(out), "\n")
 }
 
+// getGitChanges counts the number of changes on this repo
 func getGitChanges() int {
 	out, err := exec.Command("git", "status", "-s", "--porcelain").Output()
 	if err != nil {
@@ -29,6 +31,7 @@ func getGitChanges() int {
 	return changes
 }
 
+// getGitPartial builds Git partial string
 func getGitPartial() string {
 	partial := ""
 	if existsPath(".git") {

options_test.go

@@ -0,0 +1,21 @@
+package main
+
+import "testing"
+
+func TestDefaultOptions(t *testing.T) {
+	var options Options
+
+	options.setDefaults()
+
+	if !options.JobsPartial {
+		t.Error("Expected true but found ", options.JobsPartial)
+	}
+
+	if !options.PathPartial {
+		t.Error("Expected true but found ", options.PathPartial)
+	}
+
+	if !options.GitPartial {
+		t.Error("Expected true but found ", options.GitPartial)
+	}
+}

utils_test.go

@@ -0,0 +1,17 @@
+package main
+
+import "testing"
+
+func TestExistPath(t *testing.T) {
+	ep := existsPath(".git")
+	if !ep {
+		t.Error("Expected true, got ", ep)
+	}
+}
+
+func TestDoNotExistPath(t *testing.T) {
+	ep := existsPath("foobar")
+	if ep {
+		t.Error("Expected false, got ", ep)
+	}
+}