Skip to content

Commit

Permalink
Merge pull request #74 from essentialkaos/develop
Browse files Browse the repository at this point in the history 
Version 0.19.3
  • Loading branch information
@andyone
andyone authored Jan 22, 2019
2 parents 8d29b15 + f2a49a0 commit 6b3731f
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 68 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
sudo: required

language: go

go:
- 1.8.x
- 1.9.x
- 1.10.x
- 1.11.x
- tip

os:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ uninstall: ## Uninstall binaries
deps: ## Download dependencies
git config --global http.https://pkg.re.followRedirects true
go get -d -v pkg.re/cheggaaa/pb.v1
go get -d -v pkg.re/essentialkaos/ek.v9
go get -d -v pkg.re/essentialkaos/z7.v7
go get -d -v pkg.re/essentialkaos/ek.v10
go get -d -v pkg.re/essentialkaos/z7.v8

fmt: ## Format source code with gofmt
find . -name "*.go" -exec gofmt -s -w {} \;
Expand Down
48 changes: 24 additions & 24 deletions cli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cli

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand All @@ -20,27 +20,27 @@ import (
"strings"
"time"

"pkg.re/essentialkaos/ek.v9/env"
"pkg.re/essentialkaos/ek.v9/fmtc"
"pkg.re/essentialkaos/ek.v9/fmtutil"
"pkg.re/essentialkaos/ek.v9/fsutil"
"pkg.re/essentialkaos/ek.v9/hash"
"pkg.re/essentialkaos/ek.v9/knf"
"pkg.re/essentialkaos/ek.v9/log"
"pkg.re/essentialkaos/ek.v9/options"
"pkg.re/essentialkaos/ek.v9/req"
"pkg.re/essentialkaos/ek.v9/signal"
"pkg.re/essentialkaos/ek.v9/sortutil"
"pkg.re/essentialkaos/ek.v9/strutil"
"pkg.re/essentialkaos/ek.v9/system"
"pkg.re/essentialkaos/ek.v9/terminal"
"pkg.re/essentialkaos/ek.v9/terminal/window"
"pkg.re/essentialkaos/ek.v9/tmp"
"pkg.re/essentialkaos/ek.v9/usage"
"pkg.re/essentialkaos/ek.v9/usage/update"
"pkg.re/essentialkaos/ek.v9/version"

"pkg.re/essentialkaos/z7.v7"
"pkg.re/essentialkaos/ek.v10/env"
"pkg.re/essentialkaos/ek.v10/fmtc"
"pkg.re/essentialkaos/ek.v10/fmtutil"
"pkg.re/essentialkaos/ek.v10/fsutil"
"pkg.re/essentialkaos/ek.v10/hash"
"pkg.re/essentialkaos/ek.v10/knf"
"pkg.re/essentialkaos/ek.v10/log"
"pkg.re/essentialkaos/ek.v10/options"
"pkg.re/essentialkaos/ek.v10/req"
"pkg.re/essentialkaos/ek.v10/signal"
"pkg.re/essentialkaos/ek.v10/sortutil"
"pkg.re/essentialkaos/ek.v10/strutil"
"pkg.re/essentialkaos/ek.v10/system"
"pkg.re/essentialkaos/ek.v10/terminal"
"pkg.re/essentialkaos/ek.v10/terminal/window"
"pkg.re/essentialkaos/ek.v10/tmp"
"pkg.re/essentialkaos/ek.v10/usage"
"pkg.re/essentialkaos/ek.v10/usage/update"
"pkg.re/essentialkaos/ek.v10/version"

"pkg.re/essentialkaos/z7.v8"

"pkg.re/cheggaaa/pb.v1"

Expand All @@ -52,8 +52,8 @@ import (
// App info
const (
APP = "RBInstall"
VER = "0.19.2"
DESC = "Utility for installing prebuilt ruby versions to rbenv"
VER = "0.19.3"
DESC = "Utility for installing prebuilt Ruby versions to rbenv"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
8 changes: 4 additions & 4 deletions cli/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package cli

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //

import (
"time"

"pkg.re/essentialkaos/ek.v9/fmtc"
"pkg.re/essentialkaos/ek.v9/options"
"pkg.re/essentialkaos/ek.v9/timeutil"
"pkg.re/essentialkaos/ek.v10/fmtc"
"pkg.re/essentialkaos/ek.v10/options"
"pkg.re/essentialkaos/ek.v10/timeutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
26 changes: 13 additions & 13 deletions clone/clone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package clone

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand All @@ -13,17 +13,17 @@ import (
"runtime"
"time"

"pkg.re/essentialkaos/ek.v9/fmtc"
"pkg.re/essentialkaos/ek.v9/fmtutil"
"pkg.re/essentialkaos/ek.v9/fsutil"
"pkg.re/essentialkaos/ek.v9/httputil"
"pkg.re/essentialkaos/ek.v9/jsonutil"
"pkg.re/essentialkaos/ek.v9/options"
"pkg.re/essentialkaos/ek.v9/path"
"pkg.re/essentialkaos/ek.v9/req"
"pkg.re/essentialkaos/ek.v9/terminal"
"pkg.re/essentialkaos/ek.v9/timeutil"
"pkg.re/essentialkaos/ek.v9/usage"
"pkg.re/essentialkaos/ek.v10/fmtc"
"pkg.re/essentialkaos/ek.v10/fmtutil"
"pkg.re/essentialkaos/ek.v10/fsutil"
"pkg.re/essentialkaos/ek.v10/httputil"
"pkg.re/essentialkaos/ek.v10/jsonutil"
"pkg.re/essentialkaos/ek.v10/options"
"pkg.re/essentialkaos/ek.v10/path"
"pkg.re/essentialkaos/ek.v10/req"
"pkg.re/essentialkaos/ek.v10/terminal"
"pkg.re/essentialkaos/ek.v10/timeutil"
"pkg.re/essentialkaos/ek.v10/usage"

"github.com/essentialkaos/rbinstall/index"
)
Expand All @@ -33,7 +33,7 @@ import (
// App info
const (
APP = "RBInstall Clone"
VER = "0.6.0"
VER = "0.6.1"
DESC = "Utility for cloning RBInstall repository"
)

Expand Down
16 changes: 10 additions & 6 deletions common/rbinstall.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@

################################################################################

Summary: Utility for installing prebuilt ruby to rbenv
Summary: Utility for installing prebuilt Ruby to rbenv
Name: rbinstall
Version: 0.19.2
Version: 0.19.3
Release: 0%{?dist}
Group: Applications/System
License: EKOL
Expand All @@ -56,21 +56,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires: rbenv ca-certificates p7zip >= 15

BuildRequires: golang >= 1.10
BuildRequires: golang >= 1.11

Provides: %{name} = %{version}-%{release}

################################################################################

%description
Utility for installing different prebuilt versions of ruby to rbenv.
Utility for installing different prebuilt versions of Ruby to rbenv.

################################################################################

%package gen

Summary: Utility for generating RBInstall index
Version: 0.9.0
Version: 0.9.1
Release: 0%{?dist}
Group: Development/Tools

Expand All @@ -82,7 +82,7 @@ Utility for generating RBInstall index.
%package clone

Summary: Utility for cloning RBInstall repository
Version: 0.6.0
Version: 0.6.1
Release: 0%{?dist}
Group: Development/Tools

Expand Down Expand Up @@ -143,6 +143,10 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Tue Jan 22 2019 Anton Novojilov <[email protected]> - 0.19.3-0
- [cli|gen|clone] ek package updated to v10
- [cli] z7 package updated to v8

* Fri Oct 19 2018 Anton Novojilov <[email protected]> - 0.19.2-0
- [cli] Minor UI improvements

Expand Down
22 changes: 11 additions & 11 deletions gen/gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package gen

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand All @@ -15,15 +15,15 @@ import (
"strings"
"time"

"pkg.re/essentialkaos/ek.v9/fmtc"
"pkg.re/essentialkaos/ek.v9/fsutil"
"pkg.re/essentialkaos/ek.v9/hash"
"pkg.re/essentialkaos/ek.v9/jsonutil"
"pkg.re/essentialkaos/ek.v9/options"
"pkg.re/essentialkaos/ek.v9/path"
"pkg.re/essentialkaos/ek.v9/sortutil"
"pkg.re/essentialkaos/ek.v9/timeutil"
"pkg.re/essentialkaos/ek.v9/usage"
"pkg.re/essentialkaos/ek.v10/fmtc"
"pkg.re/essentialkaos/ek.v10/fsutil"
"pkg.re/essentialkaos/ek.v10/hash"
"pkg.re/essentialkaos/ek.v10/jsonutil"
"pkg.re/essentialkaos/ek.v10/options"
"pkg.re/essentialkaos/ek.v10/path"
"pkg.re/essentialkaos/ek.v10/sortutil"
"pkg.re/essentialkaos/ek.v10/timeutil"
"pkg.re/essentialkaos/ek.v10/usage"

"github.com/essentialkaos/rbinstall/index"
)
Expand All @@ -33,7 +33,7 @@ import (
// App info
const (
APP = "RBInstall Gen"
VER = "0.9.0"
VER = "0.9.1"
DESC = "Utility for generating RBInstall index"
)

Expand Down
4 changes: 2 additions & 2 deletions index/index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package index

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand All @@ -14,7 +14,7 @@ import (
"strings"
"time"

"pkg.re/essentialkaos/ek.v9/sortutil"
"pkg.re/essentialkaos/ek.v10/sortutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
2 changes: 1 addition & 1 deletion rbinstall-clone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package main

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
2 changes: 1 addition & 1 deletion rbinstall-gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package main

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
2 changes: 1 addition & 1 deletion rbinstall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package main

// ////////////////////////////////////////////////////////////////////////////////// //
// //
// Copyright (c) 2009-2018 ESSENTIAL KAOS //
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
// Essential Kaos Open Source License <https://essentialkaos.com/ekol> //
// //
// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down

0 comments on commit 6b3731f

Please sign in to comment.