LK/xmtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Version bump to v4

Browse Source
This commit is contained in:
Sean E. Russell 2020-04-23 14:07:08 -05:00
parent 61e080e518
commit ccbc71755f
23 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
> - **Fixed**: for any bug fixes. > - **Fixed**: for any bug fixes.
> - **Security**: in case of vulnerabilities. > - **Security**: in case of vulnerabilities.
## PENDING (NOT RELEASED 3.6) ## [4.0.0] PENDING
**Command line options have changed.**
### Added ### Added

2
build/snapcraft.yaml
View File

@ -15,7 +15,7 @@ parts:
gotop: gotop:
source: . source: .
plugin: go plugin: go
go-importpath: github.com/xxxserxxx/gotop/v3 go-importpath: github.com/xxxserxxx/gotop/v4
build-packages: build-packages:
- git-core - git-core
- gcc - gcc

12
cmd/gotop/main.go
View File

@ -19,12 +19,12 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/shibukawa/configdir" "github.com/shibukawa/configdir"
"github.com/xxxserxxx/gotop/v3" "github.com/xxxserxxx/gotop/v4"
"github.com/xxxserxxx/gotop/v3/colorschemes" "github.com/xxxserxxx/gotop/v4/colorschemes"
"github.com/xxxserxxx/gotop/v3/devices" "github.com/xxxserxxx/gotop/v4/devices"
"github.com/xxxserxxx/gotop/v3/layout" "github.com/xxxserxxx/gotop/v4/layout"
"github.com/xxxserxxx/gotop/v3/logging" "github.com/xxxserxxx/gotop/v4/logging"
w "github.com/xxxserxxx/gotop/v3/widgets" w "github.com/xxxserxxx/gotop/v4/widgets"
) )
const ( const (

4
config.go
View File

@ -12,8 +12,8 @@ import (
"time" "time"
"github.com/shibukawa/configdir" "github.com/shibukawa/configdir"
"github.com/xxxserxxx/gotop/v3/colorschemes" "github.com/xxxserxxx/gotop/v4/colorschemes"
"github.com/xxxserxxx/gotop/v3/widgets" "github.com/xxxserxxx/gotop/v4/widgets"
) )
type Config struct { type Config struct {

2
config_test.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/xxxserxxx/gotop/v3/widgets" "github.com/xxxserxxx/gotop/v4/widgets"
) )
// FIXME This is totally broken since the updates // FIXME This is totally broken since the updates

2
devices/temp_freebsd.go
View File

@ -7,7 +7,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
func init() { func init() {

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/xxxserxxx/gotop/v3 module github.com/xxxserxxx/gotop/v4
require ( require (
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect

3
go.sum
View File

@ -100,6 +100,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/xxxserxxx/gotop v0.0.0-20200228201131-d16cf1c6d2b9 h1:Sn+TuKkfF+CVaJjm4oVmeADtrOaHtrWpgqVLtsMpUqg=
github.com/xxxserxxx/gotop/v3 v3.5.1 h1:aBf++Oxg7qCZpKqYpPPnXKFOxT1KYLPtiEXRh57ywu0=
github.com/xxxserxxx/gotop/v3 v3.5.1/go.mod h1:DGPTiAmUhqE21xvokK64BuMxW+EmnOptaxpdOlqiH6s=
github.com/xxxserxxx/iSMC v1.0.1 h1:M9Gkwnnkl+evvnugoB5yRYrbUP+cRIVOPM+xrHZc3Hs= github.com/xxxserxxx/iSMC v1.0.1 h1:M9Gkwnnkl+evvnugoB5yRYrbUP+cRIVOPM+xrHZc3Hs=
github.com/xxxserxxx/iSMC v1.0.1/go.mod h1:TGgNjU7BF2DZSuxiTft+BdzxzcujFJYqFfMCzcTl/aY= github.com/xxxserxxx/iSMC v1.0.1/go.mod h1:TGgNjU7BF2DZSuxiTft+BdzxzcujFJYqFfMCzcTl/aY=
golang.org/x/arch v0.0.0-20181203225421-5a4828bb7045/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= golang.org/x/arch v0.0.0-20181203225421-5a4828bb7045/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=

4
layout/layout.go
View File

@ -5,8 +5,8 @@ import (
"log" "log"
"sort" "sort"
"github.com/xxxserxxx/gotop/v3" "github.com/xxxserxxx/gotop/v4"
"github.com/xxxserxxx/gotop/v3/widgets" "github.com/xxxserxxx/gotop/v4/widgets"
ui "github.com/gizak/termui/v3" ui "github.com/gizak/termui/v3"
) )

2
logging/logging.go
View File

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"sync" "sync"
"github.com/xxxserxxx/gotop/v3" "github.com/xxxserxxx/gotop/v4"
) )
const ( const (

2
logging/logging_test.go
View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/xxxserxxx/gotop/v3" "github.com/xxxserxxx/gotop/v4"
) )
func TestLogging(t *testing.T) { func TestLogging(t *testing.T) {

2
termui/entry.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/gizak/termui/v3" . "github.com/gizak/termui/v3"
rw "github.com/mattn/go-runewidth" rw "github.com/mattn/go-runewidth"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
const ( const (

2
termui/linegraph.go
View File

@ -5,7 +5,7 @@ import (
"sort" "sort"
. "github.com/gizak/termui/v3" . "github.com/gizak/termui/v3"
drawille "github.com/xxxserxxx/gotop/v3/termui/drawille-go" drawille "github.com/xxxserxxx/gotop/v4/termui/drawille-go"
) )
// LineGraph implements a line graph of data points. // LineGraph implements a line graph of data points.

2
widgets/battery.go
View File

@ -10,7 +10,7 @@ import (
"github.com/distatus/battery" "github.com/distatus/battery"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
) )
type BatteryWidget struct { type BatteryWidget struct {

2
widgets/batterygauge.go
View File

@ -9,7 +9,7 @@ import (
"github.com/distatus/battery" "github.com/distatus/battery"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
. "github.com/xxxserxxx/gotop/v3/termui" . "github.com/xxxserxxx/gotop/v4/termui"
) )
type BatteryGauge struct { type BatteryGauge struct {

4
widgets/cpu.go
View File

@ -7,9 +7,9 @@ import (
"time" "time"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/xxxserxxx/gotop/v3/devices" "github.com/xxxserxxx/gotop/v4/devices"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
) )
type CpuWidget struct { type CpuWidget struct {

4
widgets/disk.go
View File

@ -10,8 +10,8 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
psDisk "github.com/shirou/gopsutil/disk" psDisk "github.com/shirou/gopsutil/disk"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
type Partition struct { type Partition struct {

6
widgets/mem.go
View File

@ -6,9 +6,9 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/xxxserxxx/gotop/v3/devices" "github.com/xxxserxxx/gotop/v4/devices"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
type MemWidget struct { type MemWidget struct {

4
widgets/net.go
View File

@ -9,8 +9,8 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
psNet "github.com/shirou/gopsutil/net" psNet "github.com/shirou/gopsutil/net"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
const ( const (

4
widgets/proc.go
View File

@ -12,8 +12,8 @@ import (
psCPU "github.com/shirou/gopsutil/cpu" psCPU "github.com/shirou/gopsutil/cpu"
tui "github.com/gizak/termui/v3" tui "github.com/gizak/termui/v3"
ui "github.com/xxxserxxx/gotop/v3/termui" ui "github.com/xxxserxxx/gotop/v4/termui"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
const ( const (

2
widgets/proc_freebsd.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
type processList struct { type processList struct {

2
widgets/proc_other.go
View File

@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
const ( const (

4
widgets/temp.go
View File

@ -9,8 +9,8 @@ import (
ui "github.com/gizak/termui/v3" ui "github.com/gizak/termui/v3"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/xxxserxxx/gotop/v3/devices" "github.com/xxxserxxx/gotop/v4/devices"
"github.com/xxxserxxx/gotop/v3/utils" "github.com/xxxserxxx/gotop/v4/utils"
) )
type TempScale rune type TempScale rune