Merge pull request #7 from essentialkaos/develop

Version 1.3.1
essentialkaos · Dec 24, 2015 · 884dee4 · 884dee4
2 parents 9c425d5 + 975c5e1
commit 884dee4
Show file tree

Hide file tree

Showing 40 changed files with 87 additions and 46 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ env:
   - EK_TEST_PORT=8080
 
 before_install:
-  - go get gopkg.in/check.v1
+  - go get pkg.re/check.v1
 
 script:
   - .travis/script.sh .

diff --git a/.travis/script.sh b/.travis/script.sh
@@ -2,13 +2,44 @@
 
 ########################################################################################
 
+# Main func
+#
+# *: All arguments passed to script
+#
 main() {
   local dir="$1"
 
   if [[ ! -d $dir ]] ; then
     exit 1
   fi
 
+  makeLink
+  testWithCover "$dir"
+}
+
+# Create links for pkg.re import paths
+#
+makeLink() {
+  # TravicCI download last stable version of ek, but it not ok
+  # remove downloaded version for linking with current version for test
+  if [[ -e $GOPATH/src/pkg.re/essentialkaos/ek.v1 ]] ; then
+    echo "Directory pkg.re/essentialkaos/ek.v1 removed"
+    rm -rf $GOPATH/src/pkg.re/essentialkaos/ek.v1
+  fi
+
+  mkdir -p $GOPATH/src/pkg.re/essentialkaos
+
+  echo "Created link $GOPATH/src/pkg.re/essentialkaos/ek.v1 -> $GOPATH/src/github.com/essentialkaos/ek"
+  ln -sf $GOPATH/src/github.com/essentialkaos/ek $GOPATH/src/pkg.re/essentialkaos/ek.v1
+}
+
+# Test packaages and save coverage info to file
+#
+# 1: Dir with sources (String)
+#
+testWithCover() {
+  local dir="$1"
+
   local pkg has_errors
 
   rm -f coverage.tmp coverage.txt &> /dev/null

diff --git a/arg/arg.go b/arg/arg.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/essentialkaos/ek/mathutil"
+	"pkg.re/essentialkaos/ek.v1/mathutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/arg/arg_test.go b/arg/arg_test.go
@@ -8,9 +8,10 @@ package arg
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
 	"strings"
 	"testing"
+
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/cron/cron_test.go b/cron/cron_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
@@ -11,7 +11,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/crypto/passwd.go b/crypto/passwd.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/essentialkaos/ek/mathutil"
+	"pkg.re/essentialkaos/ek.v1/mathutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/csv/csv_test.go b/csv/csv_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/easing/ease_test.go b/easing/ease_test.go
@@ -10,7 +10,7 @@ package easing
 import (
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/errutil/errutil_test.go b/errutil/errutil_test.go
@@ -9,8 +9,9 @@ package errutil
 
 import (
 	"errors"
-	. "gopkg.in/check.v1"
 	"testing"
+
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fmtc/fmtc_test.go b/fmtc/fmtc_test.go
@@ -12,7 +12,7 @@ import (
 	"errors"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fmtutil/fmtutil.go b/fmtutil/fmtutil.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/essentialkaos/ek/mathutil"
+	"pkg.re/essentialkaos/ek.v1/mathutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fmtutil/fmtutil_test.go b/fmtutil/fmtutil_test.go
@@ -10,7 +10,7 @@ package fmtutil
 import (
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fmtutil/separator.go b/fmtutil/separator.go
@@ -8,7 +8,7 @@ package fmtutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	"github.com/essentialkaos/ek/fmtc"
+	"pkg.re/essentialkaos/ek.v1/fmtc"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fmtutil/termsize_linux_test.go b/fmtutil/termsize_linux_test.go
@@ -10,7 +10,7 @@ package fmtutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////

diff --git a/fsutil/fs.go b/fsutil/fs.go
@@ -17,7 +17,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/essentialkaos/ek/system"
+	"pkg.re/essentialkaos/ek.v1/system"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/fsutil/fs_test.go b/fsutil/fs_test.go
@@ -8,10 +8,11 @@ package fsutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	check "gopkg.in/check.v1"
 	"os"
 	"sort"
 	"testing"
+
+	check "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/httputil/httputil_test.go b/httputil/httputil_test.go
@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/jsonutil/jsonutil_test.go b/jsonutil/jsonutil_test.go
@@ -8,11 +8,12 @@ package jsonutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
 	"io/ioutil"
 	"testing"
 
-	"github.com/essentialkaos/ek/crypto"
+	. "pkg.re/check.v1"
+
+	"pkg.re/essentialkaos/ek.v1/crypto"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/knf/knf.go b/knf/knf.go
@@ -17,7 +17,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/essentialkaos/ek/fsutil"
+	"pkg.re/essentialkaos/ek.v1/fsutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/knf/knf_test.go b/knf/knf_test.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"testing"
 
-	check "gopkg.in/check.v1"
+	check "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/log/log_test.go b/log/log_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 
-	"github.com/essentialkaos/ek/fsutil"
+	"pkg.re/essentialkaos/ek.v1/fsutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/mathutil/mathutil_test.go b/mathutil/mathutil_test.go
@@ -8,8 +8,9 @@ package mathutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
 	"testing"
+
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/pid/pid.go b/pid/pid.go
@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/essentialkaos/ek/fsutil"
+	"pkg.re/essentialkaos/ek.v1/fsutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/pid/pid_test.go b/pid/pid_test.go
@@ -13,9 +13,9 @@ import (
 	"os"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 
-	"github.com/essentialkaos/ek/fsutil"
+	"pkg.re/essentialkaos/ek.v1/fsutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/rand/rand_test.go b/rand/rand_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/readme.md b/readme.md
@@ -9,7 +9,7 @@ Currently we support Linux and Mac OS X. Some packages have stubs for Windows (f
 ### Installation
 
 ````
-go get github.com/essentialkaos/ek
+go get pkg.re/essentialkaos/ek.v1
 ````
 
 ### Packages

diff --git a/req/req_test.go b/req/req_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/essentialkaos/ek/env"
+	. "pkg.re/check.v1"
 
-	. "gopkg.in/check.v1"
+	"pkg.re/essentialkaos/ek.v1/env"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/sliceutil/sliceutil_test.go b/sliceutil/sliceutil_test.go
@@ -11,7 +11,7 @@ import (
 	"errors"
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/sortutil/sortutil_test.go b/sortutil/sortutil_test.go
@@ -8,8 +8,9 @@ package sortutil
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
 	"testing"
+
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/spellcheck/spellcheck.go b/spellcheck/spellcheck.go
@@ -12,7 +12,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/essentialkaos/ek/mathutil"
+	"pkg.re/essentialkaos/ek.v1/mathutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/spellcheck/spellcheck_test.go b/spellcheck/spellcheck_test.go
@@ -8,8 +8,9 @@ package spellcheck
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	. "gopkg.in/check.v1"
 	"testing"
+
+	. "pkg.re/check.v1"
 )
 
 func Test(t *testing.T) { TestingT(t) }

diff --git a/strutil/strutil_test.go b/strutil/strutil_test.go
@@ -10,7 +10,7 @@ package strutil
 import (
 	"testing"
 
-	. "gopkg.in/check.v1"
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/terminal/terminal.go b/terminal/terminal.go
@@ -14,8 +14,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/essentialkaos/ek/fmtc"
-	"github.com/essentialkaos/go.linenoise"
+	"github.com/GeertJohan/go.linenoise"
+
+	"pkg.re/essentialkaos/ek.v1/fmtc"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/timeutil/timeutil.go b/timeutil/timeutil.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/essentialkaos/ek/fmtutil"
+	"pkg.re/essentialkaos/ek.v1/fmtutil"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //

diff --git a/timeutil/timeutil_test.go b/timeutil/timeutil_test.go
@@ -9,9 +9,10 @@ package timeutil
 
 import (
 	"bytes"
-	. "gopkg.in/check.v1"
 	"testing"
 	"time"
+
+	. "pkg.re/check.v1"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //