diff --git a/CHANGELOG.md b/CHANGELOG.md index a21d96e..b40b415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 > - **Fixed**: for any bug fixes. > - **Security**: in case of vulnerabilities. -## PENDING (NOT RELEASED 3.6) +## [4.0.0] PENDING + +**Command line options have changed.** ### Added diff --git a/build/snapcraft.yaml b/build/snapcraft.yaml index 341d8e3..735c9ad 100644 --- a/build/snapcraft.yaml +++ b/build/snapcraft.yaml @@ -15,7 +15,7 @@ parts: gotop: source: . plugin: go - go-importpath: github.com/xxxserxxx/gotop/v3 + go-importpath: github.com/xxxserxxx/gotop/v4 build-packages: - git-core - gcc diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go index 5180baf..feacd6a 100644 --- a/cmd/gotop/main.go +++ b/cmd/gotop/main.go @@ -19,12 +19,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/shibukawa/configdir" - "github.com/xxxserxxx/gotop/v3" - "github.com/xxxserxxx/gotop/v3/colorschemes" - "github.com/xxxserxxx/gotop/v3/devices" - "github.com/xxxserxxx/gotop/v3/layout" - "github.com/xxxserxxx/gotop/v3/logging" - w "github.com/xxxserxxx/gotop/v3/widgets" + "github.com/xxxserxxx/gotop/v4" + "github.com/xxxserxxx/gotop/v4/colorschemes" + "github.com/xxxserxxx/gotop/v4/devices" + "github.com/xxxserxxx/gotop/v4/layout" + "github.com/xxxserxxx/gotop/v4/logging" + w "github.com/xxxserxxx/gotop/v4/widgets" ) const ( diff --git a/config.go b/config.go index 19f7589..3619c54 100644 --- a/config.go +++ b/config.go @@ -12,8 +12,8 @@ import ( "time" "github.com/shibukawa/configdir" - "github.com/xxxserxxx/gotop/v3/colorschemes" - "github.com/xxxserxxx/gotop/v3/widgets" + "github.com/xxxserxxx/gotop/v4/colorschemes" + "github.com/xxxserxxx/gotop/v4/widgets" ) type Config struct { diff --git a/config_test.go b/config_test.go index 3f4c4b5..5699444 100644 --- a/config_test.go +++ b/config_test.go @@ -6,7 +6,7 @@ import ( "time" "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 diff --git a/devices/temp_freebsd.go b/devices/temp_freebsd.go index 1a2104b..03eb770 100644 --- a/devices/temp_freebsd.go +++ b/devices/temp_freebsd.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/utils" ) func init() { diff --git a/go.mod b/go.mod index c81ba92..d144b3b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/xxxserxxx/gotop/v3 +module github.com/xxxserxxx/gotop/v4 require ( github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect diff --git a/go.sum b/go.sum index c3bef32..c4064cf 100644 --- a/go.sum +++ b/go.sum @@ -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.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= 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/go.mod h1:TGgNjU7BF2DZSuxiTft+BdzxzcujFJYqFfMCzcTl/aY= golang.org/x/arch v0.0.0-20181203225421-5a4828bb7045/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= diff --git a/layout/layout.go b/layout/layout.go index 6fb7c58..bc0ff2d 100644 --- a/layout/layout.go +++ b/layout/layout.go @@ -5,8 +5,8 @@ import ( "log" "sort" - "github.com/xxxserxxx/gotop/v3" - "github.com/xxxserxxx/gotop/v3/widgets" + "github.com/xxxserxxx/gotop/v4" + "github.com/xxxserxxx/gotop/v4/widgets" ui "github.com/gizak/termui/v3" ) diff --git a/logging/logging.go b/logging/logging.go index c79b5c8..7bc1f9e 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "github.com/xxxserxxx/gotop/v3" + "github.com/xxxserxxx/gotop/v4" ) const ( diff --git a/logging/logging_test.go b/logging/logging_test.go index b56a2a6..a1ac3d4 100644 --- a/logging/logging_test.go +++ b/logging/logging_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/xxxserxxx/gotop/v3" + "github.com/xxxserxxx/gotop/v4" ) func TestLogging(t *testing.T) { diff --git a/termui/entry.go b/termui/entry.go index 49b3b5b..6a43c5b 100644 --- a/termui/entry.go +++ b/termui/entry.go @@ -7,7 +7,7 @@ import ( . "github.com/gizak/termui/v3" rw "github.com/mattn/go-runewidth" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/utils" ) const ( diff --git a/termui/linegraph.go b/termui/linegraph.go index de6ca35..fd50520 100644 --- a/termui/linegraph.go +++ b/termui/linegraph.go @@ -5,7 +5,7 @@ import ( "sort" . "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. diff --git a/widgets/battery.go b/widgets/battery.go index c283c26..4e813e7 100644 --- a/widgets/battery.go +++ b/widgets/battery.go @@ -10,7 +10,7 @@ import ( "github.com/distatus/battery" "github.com/prometheus/client_golang/prometheus" - ui "github.com/xxxserxxx/gotop/v3/termui" + ui "github.com/xxxserxxx/gotop/v4/termui" ) type BatteryWidget struct { diff --git a/widgets/batterygauge.go b/widgets/batterygauge.go index 534c1cf..a379a84 100644 --- a/widgets/batterygauge.go +++ b/widgets/batterygauge.go @@ -9,7 +9,7 @@ import ( "github.com/distatus/battery" "github.com/prometheus/client_golang/prometheus" - . "github.com/xxxserxxx/gotop/v3/termui" + . "github.com/xxxserxxx/gotop/v4/termui" ) type BatteryGauge struct { diff --git a/widgets/cpu.go b/widgets/cpu.go index 5a352ba..c48273e 100644 --- a/widgets/cpu.go +++ b/widgets/cpu.go @@ -7,9 +7,9 @@ import ( "time" "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 { diff --git a/widgets/disk.go b/widgets/disk.go index e2b3eb2..54f4a33 100644 --- a/widgets/disk.go +++ b/widgets/disk.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/client_golang/prometheus" psDisk "github.com/shirou/gopsutil/disk" - ui "github.com/xxxserxxx/gotop/v3/termui" - "github.com/xxxserxxx/gotop/v3/utils" + ui "github.com/xxxserxxx/gotop/v4/termui" + "github.com/xxxserxxx/gotop/v4/utils" ) type Partition struct { diff --git a/widgets/mem.go b/widgets/mem.go index 7b42c42..4bf8550 100644 --- a/widgets/mem.go +++ b/widgets/mem.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/xxxserxxx/gotop/v3/devices" - ui "github.com/xxxserxxx/gotop/v3/termui" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/devices" + ui "github.com/xxxserxxx/gotop/v4/termui" + "github.com/xxxserxxx/gotop/v4/utils" ) type MemWidget struct { diff --git a/widgets/net.go b/widgets/net.go index 249d0c2..f851454 100644 --- a/widgets/net.go +++ b/widgets/net.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/client_golang/prometheus" psNet "github.com/shirou/gopsutil/net" - ui "github.com/xxxserxxx/gotop/v3/termui" - "github.com/xxxserxxx/gotop/v3/utils" + ui "github.com/xxxserxxx/gotop/v4/termui" + "github.com/xxxserxxx/gotop/v4/utils" ) const ( diff --git a/widgets/proc.go b/widgets/proc.go index 406a095..c691755 100644 --- a/widgets/proc.go +++ b/widgets/proc.go @@ -12,8 +12,8 @@ import ( psCPU "github.com/shirou/gopsutil/cpu" tui "github.com/gizak/termui/v3" - ui "github.com/xxxserxxx/gotop/v3/termui" - "github.com/xxxserxxx/gotop/v3/utils" + ui "github.com/xxxserxxx/gotop/v4/termui" + "github.com/xxxserxxx/gotop/v4/utils" ) const ( diff --git a/widgets/proc_freebsd.go b/widgets/proc_freebsd.go index f703c03..ed7a935 100644 --- a/widgets/proc_freebsd.go +++ b/widgets/proc_freebsd.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/utils" ) type processList struct { diff --git a/widgets/proc_other.go b/widgets/proc_other.go index d2a313f..46cef72 100644 --- a/widgets/proc_other.go +++ b/widgets/proc_other.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/utils" ) const ( diff --git a/widgets/temp.go b/widgets/temp.go index 2db648f..2f1f2cb 100644 --- a/widgets/temp.go +++ b/widgets/temp.go @@ -9,8 +9,8 @@ import ( ui "github.com/gizak/termui/v3" "github.com/prometheus/client_golang/prometheus" - "github.com/xxxserxxx/gotop/v3/devices" - "github.com/xxxserxxx/gotop/v3/utils" + "github.com/xxxserxxx/gotop/v4/devices" + "github.com/xxxserxxx/gotop/v4/utils" ) type TempScale rune