Merge pull request #13 from funbox/develop

Version 0.8.0
funbox · Mar 10, 2017 · 986241f · 986241f
2 parents e0e7452 + 8035496
commit 986241f
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 40 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ all: bin
 
 deps:
 	go get -v pkg.re/check.v1
-	go get -v pkg.re/essentialkaos/ek.v6
+	go get -v pkg.re/essentialkaos/ek.v7
 	go get -v pkg.re/essentialkaos/go-simpleyaml.v1
 	go get -v pkg.re/yaml.v2
 

diff --git a/cli/cli.go b/cli/cli.go
@@ -11,14 +11,15 @@ import (
 	"os"
 	"runtime"
 
-	"pkg.re/essentialkaos/ek.v6/arg"
-	"pkg.re/essentialkaos/ek.v6/env"
-	"pkg.re/essentialkaos/ek.v6/fmtc"
-	"pkg.re/essentialkaos/ek.v6/fsutil"
-	"pkg.re/essentialkaos/ek.v6/knf"
-	"pkg.re/essentialkaos/ek.v6/log"
-	"pkg.re/essentialkaos/ek.v6/system"
-	"pkg.re/essentialkaos/ek.v6/usage"
+	"pkg.re/essentialkaos/ek.v7/arg"
+	"pkg.re/essentialkaos/ek.v7/env"
+	"pkg.re/essentialkaos/ek.v7/fmtc"
+	"pkg.re/essentialkaos/ek.v7/fsutil"
+	"pkg.re/essentialkaos/ek.v7/knf"
+	"pkg.re/essentialkaos/ek.v7/log"
+	"pkg.re/essentialkaos/ek.v7/system"
+	"pkg.re/essentialkaos/ek.v7/usage"
+	"pkg.re/essentialkaos/ek.v7/usage/update"
 
 	"github.com/funbox/init-exporter/export"
 	"github.com/funbox/init-exporter/procfile"
@@ -29,7 +30,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter"
-	VER  = "0.7.2"
+	VER  = "0.8.0"
 	DESC = "Utility for exporting services described by Procfile to init system"
 )
 
@@ -422,8 +423,6 @@ func printErrorAndExit(message string, a ...interface{}) {
 
 // showUsage print usage info to console
 func showUsage() {
-	usage.Breadcrumbs = true
-
 	info := usage.NewInfo("", "app-name")
 
 	info.AddOption(ARG_PROCFILE, "Path to procfile", "file")
@@ -446,13 +445,13 @@ func showUsage() {
 // showAbout print version info to console
 func showAbout() {
 	about := &usage.About{
-		App:        APP,
-		Version:    VER,
-		Desc:       DESC,
-		Year:       2006,
-		Owner:      "FB Group",
-		License:    "MIT License",
-		Repository: "funbox/init-exporter",
+		App:           APP,
+		Version:       VER,
+		Desc:          DESC,
+		Year:          2006,
+		Owner:         "FB Group",
+		License:       "MIT License",
+		UpdateChecker: usage.UpdateChecker{"funbox/init-exporter", update.GitHubChecker},
 	}
 
 	about.Render()

diff --git a/common/init-exporter.spec b/common/init-exporter.spec
@@ -42,8 +42,8 @@
 
 Summary:         Utility for exporting services described by Procfile to init system
 Name:            init-exporter
-Version:         0.7.2
-Release:         1%{?dist}
+Version:         0.8.0
+Release:         0%{?dist}
 Group:           Development/Tools
 License:         MIT
 URL:             https://github.com/funbox/init-exporter
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 ###############################################################################
 
 %changelog
+* Thu Mar 09 2017 Anton Novojilov <[email protected]> - 0.8.0-0
+- ek package updated to v7
+
 * Fri Mar 03 2017 Anton Novojilov <[email protected]> - 0.7.2-1
 - Fixed wrong path to upsrtart-exporter binary
 

diff --git a/export/export_test.go b/export/export_test.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/funbox/init-exporter/procfile"
 
-	"pkg.re/essentialkaos/ek.v6/fsutil"
-	"pkg.re/essentialkaos/ek.v6/log"
+	"pkg.re/essentialkaos/ek.v7/fsutil"
+	"pkg.re/essentialkaos/ek.v7/log"
 
 	. "pkg.re/check.v1"
 )

diff --git a/export/exporter.go b/export/exporter.go
@@ -11,9 +11,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"pkg.re/essentialkaos/ek.v6/fsutil"
-	"pkg.re/essentialkaos/ek.v6/log"
-	"pkg.re/essentialkaos/ek.v6/path"
+	"pkg.re/essentialkaos/ek.v7/fsutil"
+	"pkg.re/essentialkaos/ek.v7/log"
+	"pkg.re/essentialkaos/ek.v7/path"
 
 	"github.com/funbox/init-exporter/procfile"
 )
@@ -208,7 +208,7 @@ func (e *Exporter) helperPath(name string) string {
 func deleteByMask(dir, mask string) error {
 	files := fsutil.List(
 		dir, true,
-		&fsutil.ListingFilter{
+		fsutil.ListingFilter{
 			MatchPatterns: []string{mask},
 		},
 	)

diff --git a/export/provider.go b/export/provider.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"text/template"
 
-	"pkg.re/essentialkaos/ek.v6/log"
+	"pkg.re/essentialkaos/ek.v7/log"
 
 	"github.com/funbox/init-exporter/procfile"
 )

diff --git a/export/systemd.go b/export/systemd.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"pkg.re/essentialkaos/ek.v6/system"
-	"pkg.re/essentialkaos/ek.v6/timeutil"
+	"pkg.re/essentialkaos/ek.v7/system"
+	"pkg.re/essentialkaos/ek.v7/timeutil"
 
 	"github.com/funbox/init-exporter/procfile"
 )

diff --git a/export/upstart.go b/export/upstart.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"time"
 
-	"pkg.re/essentialkaos/ek.v6/timeutil"
+	"pkg.re/essentialkaos/ek.v7/timeutil"
 
 	"github.com/funbox/init-exporter/procfile"
 )

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,6 +1,6 @@
 package: github.com/funbox/init-exporter
 import:
-- package: pkg.re/essentialkaos/ek.v6
+- package: pkg.re/essentialkaos/ek.v7
   subpackages:
   - arg
   - env

diff --git a/procfile/procfile.go b/procfile/procfile.go
@@ -15,10 +15,10 @@ import (
 	"sort"
 	"strings"
 
-	"pkg.re/essentialkaos/ek.v6/errutil"
-	"pkg.re/essentialkaos/ek.v6/fsutil"
-	"pkg.re/essentialkaos/ek.v6/log"
-	"pkg.re/essentialkaos/ek.v6/path"
+	"pkg.re/essentialkaos/ek.v7/errutil"
+	"pkg.re/essentialkaos/ek.v7/fsutil"
+	"pkg.re/essentialkaos/ek.v7/log"
+	"pkg.re/essentialkaos/ek.v7/path"
 
 	"pkg.re/essentialkaos/go-simpleyaml.v1"
 )