Skip to content

Commit

Permalink
Merge pull request #13 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.3.1
  • Loading branch information
andyone authored Oct 17, 2019
2 parents 72ae47e + 77fd7fd commit d923544
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: go

go:
- 1.10.x
- 1.11.x
- 1.12.x
- 1.13.x
- tip

os:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################

# This Makefile generated by GoMakeGen 1.1.0 using next command:
# This Makefile generated by GoMakeGen 1.2.0 using next command:
# gomakegen .
#
# More info: https://kaos.sh/gomakegen
Expand All @@ -27,7 +27,7 @@ git-config: ## Configure git redirects for stable import path services
git config --global http.https://pkg.re.followRedirects true

deps: git-config ## Download dependencies
go get -d -v pkg.re/essentialkaos/ek.v10
go get -d -v pkg.re/essentialkaos/ek.v11

fmt: ## Format source code with gofmt
find . -name "*.go" -exec gofmt -s -w {} \;
Expand All @@ -40,6 +40,6 @@ help: ## Show this info
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-19s\033[0m %s\n", $$1, $$2}'
@echo -e ''
@echo -e '\033[90mGenerated by GoMakeGen 1.1.0\033[0m\n'
@echo -e '\033[90mGenerated by GoMakeGen 1.2.0\033[0m\n'

################################################################################
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Before the initial install allows git to use redirects for [pkg.re](https://gith
git config --global http.https://pkg.re.followRedirects true
```

To build the `redis-monitor-top` from scratch, make sure you have a working Go 1.10+ workspace (_[instructions](https://golang.org/doc/install)_), then:
To build the `redis-monitor-top` from scratch, make sure you have a working Go 1.11+ workspace (_[instructions](https://golang.org/doc/install)_), then:

```
go get github.com/essentialkaos/redis-monitor-top
Expand Down Expand Up @@ -57,6 +57,12 @@ go get -u github.com/essentialkaos/redis-monitor-top

You can download prebuilt binaries for Linux from [EK Apps Repository](https://apps.kaos.st/redis-monitor-top/latest).

To install the latest prebuilt version, do:

```bash
bash <(curl -fsSL https://apps.kaos.st/get) redis-monitor-top
```

### Usage

```
Expand Down
7 changes: 5 additions & 2 deletions common/redis-monitor-top.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Tiny Redis client for monitor command output top
Name: redis-monitor-top
Version: 1.3.0
Version: 1.3.1
Release: 0%{?dist}
Group: Applications/System
License: EKOL
Expand All @@ -20,7 +20,7 @@ Source0: https://source.kaos.st/%{name}/%{name}-%{version}.tar.bz2

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: golang >= 1.12
BuildRequires: golang >= 1.13

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

Expand Down Expand Up @@ -85,6 +85,9 @@ fi
################################################################################

%changelog
* Thu Oct 17 2019 Anton Novojilov <[email protected]> - 1.3.1-0
- ek package updated to the latest stable version

* Sat Jun 15 2019 Anton Novojilov <[email protected]> - 1.3.0-0
- ek package updated to the latest stable version
- Added completion generation for bash, zsh and fish
Expand Down
26 changes: 13 additions & 13 deletions redis-monitor-top.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ import (
"strings"
"time"

"pkg.re/essentialkaos/ek.v10/fmtc"
"pkg.re/essentialkaos/ek.v10/fmtutil"
"pkg.re/essentialkaos/ek.v10/fmtutil/table"
"pkg.re/essentialkaos/ek.v10/mathutil"
"pkg.re/essentialkaos/ek.v10/options"
"pkg.re/essentialkaos/ek.v10/strutil"
"pkg.re/essentialkaos/ek.v10/system/procname"
"pkg.re/essentialkaos/ek.v10/timeutil"
"pkg.re/essentialkaos/ek.v10/usage"
"pkg.re/essentialkaos/ek.v10/usage/completion/bash"
"pkg.re/essentialkaos/ek.v10/usage/completion/fish"
"pkg.re/essentialkaos/ek.v10/usage/completion/zsh"
"pkg.re/essentialkaos/ek.v11/fmtc"
"pkg.re/essentialkaos/ek.v11/fmtutil"
"pkg.re/essentialkaos/ek.v11/fmtutil/table"
"pkg.re/essentialkaos/ek.v11/mathutil"
"pkg.re/essentialkaos/ek.v11/options"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v11/system/procname"
"pkg.re/essentialkaos/ek.v11/timeutil"
"pkg.re/essentialkaos/ek.v11/usage"
"pkg.re/essentialkaos/ek.v11/usage/completion/bash"
"pkg.re/essentialkaos/ek.v11/usage/completion/fish"
"pkg.re/essentialkaos/ek.v11/usage/completion/zsh"
)

// ////////////////////////////////////////////////////////////////////////////////// //

const (
APP = "Redis Monitor Top"
VER = "1.3.0"
VER = "1.3.1"
DESC = "Tiny Redis client for aggregating stats from MONITOR flow"
)

Expand Down

0 comments on commit d923544

Please sign in to comment.