Merge pull request #11 from funbox/develop

Version 0.11.0
funbox · Jul 30, 2020 · aefe691 · aefe691
2 parents 2f46c1f + d273a12
commit aefe691
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: go
 
 go:
-  - 1.10.x
-  - 1.11.x
   - 1.12.x
+  - 1.13.x
+  - 1.14.x
   - tip
 
 branches:

diff --git a/Makefile b/Makefile
@@ -1,14 +1,14 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.1.2 using next command:
+# This Makefile generated by GoMakeGen 1.3.1 using next command:
 # gomakegen .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt all clean git-config deps help
+.PHONY = fmt vet all clean git-config deps help
 
 ################################################################################
 
@@ -28,12 +28,15 @@ git-config: ## Configure git redirects for stable import path services
 
 deps: git-config ## Download dependencies
 	go get -d -v github.com/funbox/init-exporter
-	go get -d -v pkg.re/essentialkaos/ek.v10
-	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v1
+	go get -d -v pkg.re/essentialkaos/ek.v12
+	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v2
 
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
+vet: ## Runs go vet over sources
+	go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
+
 clean: ## Remove generated files
 	rm -f init-exporter-converter
 
@@ -42,6 +45,6 @@ help: ## Show this info
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-25s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 1.1.2\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -24,24 +24,17 @@ If you want to update `init-exporter-converter` to latest stable release, do:
 go get -u github.com/funbox/init-exporter-converter
 ```
 
-#### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
+#### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
 
 ```
-[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
-[sudo] yum install init-exporter-converter
-```
-
-#### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
-
-```
-[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
-[sudo] yum install init-exporter-converter
+sudo yum install -y https://yum.kaos.st/get/$(uname -r).rpm
+sudo yum install init-exporter-converter
 ```
 
 ### Usage
 
 ```
-Usage: init-exporter-converter {options} procfile...
+Usage: init-exporter-converter {options} procfile…
 
 Options
 

diff --git a/common/init-exporter-converter.spec b/common/init-exporter-converter.spec
@@ -42,7 +42,7 @@
 
 Summary:         Utility for converting init-exporter procfiles from v1 to v2 format
 Name:            init-exporter-converter
-Version:         0.10.1
+Version:         0.11.0
 Release:         0%{?dist}
 Group:           Development/Tools
 License:         MIT
@@ -52,7 +52,7 @@ Source0:         %{name}-%{version}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:   golang >= 1.12
+BuildRequires:   golang >= 1.14
 
 Provides:        %{name} = %{version}-%{release}
 
@@ -93,11 +93,15 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Thu Jul 30 2020 Anton Novojilov <[email protected]> - 0.11.0-0
+- Package ek updated to v12
+- Package go-simpleyaml updated to v2
+
 * Mon Aug 05 2019 Anton Novojilov <[email protected]> - 0.10.1-0
 - Updated for compatibility with the latest version of ek package
 
 * Thu Jan 10 2019 Anton Novojilov <[email protected]> - 0.10.0-0
-- ek package updated to v10
+- Package ek updated to v10
 
 * Thu Nov 01 2018 Anton Novojilov <[email protected]> - 0.9.1-0
 - Rebuilt with the latest procfile parser

diff --git a/init-exporter-converter.go b/init-exporter-converter.go
@@ -12,13 +12,13 @@ import (
 	"os"
 	"runtime"
 
-	"pkg.re/essentialkaos/ek.v10/fmtc"
-	"pkg.re/essentialkaos/ek.v10/knf"
-	"pkg.re/essentialkaos/ek.v10/options"
-	"pkg.re/essentialkaos/ek.v10/usage"
-	"pkg.re/essentialkaos/ek.v10/usage/update"
+	"pkg.re/essentialkaos/ek.v12/fmtc"
+	"pkg.re/essentialkaos/ek.v12/knf"
+	"pkg.re/essentialkaos/ek.v12/options"
+	"pkg.re/essentialkaos/ek.v12/usage"
+	"pkg.re/essentialkaos/ek.v12/usage/update"
 
-	"pkg.re/essentialkaos/go-simpleyaml.v1"
+	"pkg.re/essentialkaos/go-simpleyaml.v2"
 
 	"github.com/funbox/init-exporter/procfile"
 )
@@ -28,7 +28,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter-converter"
-	VER  = "0.10.1"
+	VER  = "0.11.0"
 	DESC = "Utility for converting procfiles from v1 to v2 format"
 )
 
@@ -316,7 +316,7 @@ func printErrorAndExit(f string, a ...interface{}) {
 
 // showUsage print usage info to console
 func showUsage() {
-	info := usage.NewInfo("", "procfile...")
+	info := usage.NewInfo("", "procfile…")
 
 	info.AddOption(OPT_CONFIG, "Path to init-exporter config", "file")
 	info.AddOption(OPT_IN_PLACE, "Edit procfile in place")