Merge pull request #7 from essentialkaos/develop

Improved readme, Makefile and TravisCI config
essentialkaos · Jun 9, 2018 · 225ef37 · 225ef37
2 parents 4cd1508 + e92352e
commit 225ef37
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ sudo: false
 language: go
 
 go:
-  - 1.7.x
   - 1.8.x
   - 1.9.x
+  - 1.10.x
   - tip
 
 os:

diff --git a/Makefile b/Makefile
@@ -1,27 +1,40 @@
-########################################################################################
+################################################################################
 
-# This Makefile generated by GoMakeGen 0.6.0 using next command:
+# This Makefile generated by GoMakeGen 0.8.0 using next command:
 # gomakegen .
 
-########################################################################################
+################################################################################
 
-.PHONY = fmt all clean deps
+.DEFAULT_GOAL := help
+.PHONY = fmt all clean deps help
 
-########################################################################################
+################################################################################
 
-all: redis-monitor-top
+all: redis-monitor-top ## Build all binaries
 
-redis-monitor-top:
+redis-monitor-top: ## Build redis-monitor-top binary
 	go build redis-monitor-top.go
 
-deps:
+install: ## Install binaries
+	cp redis-monitor-top /usr/bin/redis-monitor-top
+
+uninstall: ## Uninstall binaries
+	rm -f /usr/bin/redis-monitor-top
+
+deps: ## Download dependencies
 	git config --global http.https://pkg.re.followRedirects true
 	go get -d -v pkg.re/essentialkaos/ek.v9
 
-fmt:
+fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
-clean:
+clean: ## Remove generated files
 	rm -f redis-monitor-top
 
-########################################################################################
+help: ## Show this info
+	@echo -e '\nSupported targets:\n'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-12s\033[0m %s\n", $$1, $$2}'
+	@echo -e ''
+
+################################################################################
diff --git a/readme.md → README.md b/readme.md → README.md
@@ -1,22 +1,31 @@
-## Redis Monitor Top [![Build Status](https://travis-ci.org/essentialkaos/redis-monitor-top.svg?branch=master)](https://travis-ci.org/essentialkaos/redis-monitor-top) [![Go Report Card](https://goreportcard.com/badge/github.com/essentialkaos/redis-monitor-top)](https://goreportcard.com/report/github.com/essentialkaos/redis-monitor-top) [![codebeat badge](https://codebeat.co/badges/98c9f6ab-999c-498c-980f-44859b18aae7)](https://codebeat.co/projects/github-com-essentialkaos-redis-monitor-top-master) [![License](https://gh.kaos.io/ekol.svg)](https://essentialkaos.com/ekol)
+<p align="center"><a href="#readme"><img src="https://gh.kaos.st/redis-monitor-top.svg"/></a></p>
+
+<p align="center"><a href="#usage-demo">Usage demo</a> • <a href="#installation">Installation</a> • <a href="#usage">Usage</a> • <a href="#build-status">Build Status</a> • <a href="#license">License</a></p>
+
+<p align="center">
+  <a href="https://travis-ci.org/essentialkaos/redis-monitor-top"><img src="https://travis-ci.org/essentialkaos/redis-monitor-top.svg"></a>
+  <a href="https://goreportcard.com/report/github.com/essentialkaos/redis-monitor-top"><img src="https://goreportcard.com/badge/github.com/essentialkaos/redis-monitor-top"></a>
+  <a href="https://codebeat.co/projects/github-com-essentialkaos-redis-monitor-top-master"><img alt="codebeat badge" src="https://codebeat.co/badges/98c9f6ab-999c-498c-980f-44859b18aae7" /></a>
+  <a href="https://essentialkaos.com/ekol"><img src="https://gh.kaos.st/ekol.svg"></a>
+</p>
 
 Tiny Redis client for aggregating stats from MONITOR flow.
 
 ### Usage demo
 
-[![demo](https://gh.kaos.io/redis-monitor-top-100.gif)](#usage-demo)
+[![demo](https://gh.kaos.st/redis-monitor-top-100.gif)](#usage-demo)
 
 ### Installation
 
 #### From source
 
-Before the initial install allows git to use redirects for [pkg.re](https://github.com/essentialkaos/pkgre) service (reason why you should do this described [here](https://github.com/essentialkaos/pkgre#git-support)):
+Before the initial install allows git to use redirects for [pkg.re](https://github.com/essentialkaos/pkgre) service (_reason why you should do this described [here](https://github.com/essentialkaos/pkgre#git-support)_):
 
 ```
 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.7+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the `redis-monitor-top` from scratch, make sure you have a working Go 1.7+ workspace (_[instructions](https://golang.org/doc/install)_), then:
 
 ```
 go get github.com/essentialkaos/redis-monitor-top
@@ -31,20 +40,20 @@ go get -u github.com/essentialkaos/redis-monitor-top
 #### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
 
 ```bash
-[sudo] yum install -y https://yum.kaos.io/6/release/x86_64/kaos-repo-8.0-0.el6.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/6/release/x86_64/kaos-repo-9.1-0.el6.noarch.rpm
 [sudo] yum install redis-monitor-top
 ```
 
 #### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
 
 ```bash
-[sudo] yum install -y https://yum.kaos.io/7/release/x86_64/kaos-repo-8.0-0.el7.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/7/release/x86_64/kaos-repo-9.1-0.el7.noarch.rpm
 [sudo] yum install redis-monitor-top
 ```
 
 #### Prebuilt binaries
 
-You can download prebuilt binaries for Linux from [EK Apps Repository](https://apps.kaos.io/redis-monitor-top/latest).
+You can download prebuilt binaries for Linux from [EK Apps Repository](https://apps.kaos.st/redis-monitor-top/latest).
 
 ### Usage
 
@@ -83,4 +92,4 @@ Examples
 
 [EKOL](https://essentialkaos.com/ekol)
 
-<p align="center"><a href="https://essentialkaos.com"><img src="https://gh.kaos.io/ekgh.svg"/></a></p>
+<p align="center"><a href="https://essentialkaos.com"><img src="https://gh.kaos.st/ekgh.svg"/></a></p>
diff --git a/redis-monitor-top.go b/redis-monitor-top.go
@@ -4,7 +4,7 @@ package main
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 //                                                                                    //
-//                     Copyright (c) 2009-2017 ESSENTIAL KAOS                         //
+//                     Copyright (c) 2009-2018 ESSENTIAL KAOS                         //
 //        Essential Kaos Open Source License <https://essentialkaos.com/ekol>         //
 //                                                                                    //
 // ////////////////////////////////////////////////////////////////////////////////// //
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,9 @@ sudo: false @@
     language: go
     go:
-      - 1.7.x
       - 1.8.x
       - 1.9.x
+      - 1.10.x
       - tip
     os:
@@ Expand Down @@