From 826dcd28365bc8ac7562dc97c7651b4748a1547a Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 9 Mar 2017 09:02:02 -0500 Subject: [PATCH] ek package updated to v7 --- Makefile | 2 +- cli/cli.go | 35 +++++++++++++++++------------------ common/init-exporter.spec | 7 +++++-- export/export_test.go | 4 ++-- export/exporter.go | 8 ++++---- export/provider.go | 2 +- export/systemd.go | 4 ++-- export/upstart.go | 2 +- glide.lock | 11 +++++++---- glide.yaml | 2 +- procfile/procfile.go | 8 ++++---- 11 files changed, 45 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index cc0ba50..723defa 100644 --- 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 index b226994..7fe67b7 100644 --- 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 index ace7be1..38a10f7 100644 --- 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 - 0.8.0-0 +- ek package updated to v7 + * Fri Mar 03 2017 Anton Novojilov - 0.7.2-1 - Fixed wrong path to upsrtart-exporter binary diff --git a/export/export_test.go b/export/export_test.go index 8ece1b8..a5555dc 100644 --- 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 index 8bcab9f..227f6a7 100644 --- 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 index 0af3d67..ddd91d3 100644 --- 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 index 5bb3168..5020501 100644 --- 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 index 8f47be5..781428e 100644 --- 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 index 6af03cd..08ec389 100644 --- a/glide.lock +++ b/glide.lock @@ -1,8 +1,8 @@ -hash: 352daf3640af334921e1e295d0738306592c7c4609878e4653936e2e6c7cc749 -updated: 2017-02-22T05:27:53.50635214-05:00 +hash: d0ad21877a61be0154f38a0688dc0e990d5890b8ee35d40abbbab00b23bc3745 +updated: 2017-03-09T08:59:53.842431364-05:00 imports: -- name: pkg.re/essentialkaos/ek.v6 - version: c292a0da0a81e93c1161a291370c87369db8fc2c +- name: pkg.re/essentialkaos/ek.v7 + version: 9cdc1dfb973b2fd7086fcfc9a36a009f591b1166 subpackages: - arg - env @@ -13,9 +13,12 @@ imports: - log - path - pluralize + - req - system - timeutil - usage + - usage/update + - version - name: pkg.re/essentialkaos/go-simpleyaml.v1 version: 49b94a0b61131c037bc599d4c69de265c7cc1c4e - name: pkg.re/yaml.v2 diff --git a/glide.yaml b/glide.yaml index 67c3ce3..b549de6 100644 --- 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 index b58d0c4..1fd9088 100644 --- 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" )