vpsadmin-client 3.0.0.master.20220121.pre.0.b5a81113 → 3.0.0.master.20221118.pre.0.99dcc6de

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce5635948bc213752357b413d4e92f8b7f2089306b9a3e02194b76f44f3617c3
-  data.tar.gz: 4304acd24bbecf0389a954d61ce680fece999e1128651f84e75306cf61889195
+  metadata.gz: be8e44144778361fe0bd564030b80f66efcdf734c6b81a1ae13c816c5d6ad853
+  data.tar.gz: e6e0ed82d681b2c7f980430a4f141e687e867784a9a941ae66a6901ce6b1e1c6
 SHA512:
-  metadata.gz: b3c0c9029f6d14639adb9f901f4b1cc133d1518360be85d8e506e8aa285fa5a1b3e8be5cfa475ae87d8147fadf78dd55bd168593e945f59c1dc237412f714705
-  data.tar.gz: 35e2c3b730bf246d1a14c0a6a7cdf77c08910efa4d460aeb878a52a9d4a0210058a7450c556c7e30a08199b011464a45b17b155b13d965c2da057e14a3878309
+  metadata.gz: 9f5ae2ef0e02b51ada7bc284457f3fb9ffadadcc0636a42ef8c82465642d2bd5c616b333f40769ed49d4ce4ac38db7f16a884ccf62e0abc33f9194e72db1930e
+  data.tar.gz: fb68a389dc4602e2891d0b44d3e03556ca523cb2e647094fbedb1d0a069bdb16fee0508deaa7037ed25c708c7b2483a8b3b3d1a722b65cdc0ed9d14988d412f5

data/lib/vpsadmin/cli/commands/{ip_traffic_top.rb → network_top.rb}

@@ -1,15 +1,15 @@
 require 'curses'
 
 module VpsAdmin::CLI::Commands
-  class IpTrafficTop < BackupDataset
+  class NetworkTop < HaveAPI::CLI::Command
     include Curses
 
     REFRESH_RATE = 10
-    FILTERS = %i(limit ip_address ip_version environment location network ip_range node vps)
+    FILTERS = %i(limit user environment location node vps network_interface)
 
-    cmd :ip_traffic, :top
+    cmd :network, :top
     args ''
-    desc 'Live IP traffic monitor'
+    desc 'Live network traffic monitor'
 
     def options(opts)
       @opts = {
@@ -24,24 +24,8 @@ module VpsAdmin::CLI::Commands
         @opts[:limit] = v
       end
 
-      opts.on('--ip-address ADDR', 'ADDR or ID of IP addresses to monitor') do |v|
-        id = ip_address_id(v)
-
-        if id
-          @opts[:ip_address] = id
-
-        else
-          warn "IP address '#{v}' not found"
-          exit(1)
-        end
-      end
-
-      opts.on('--ip-version VER', [4, 6], 'Filter IP addresses by version') do |v|
-        @opts[:ip_version] = v
-      end
-
-      (FILTERS - %i(limit ip_address ip_version)).each do |f|
-        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter IP addresses by #{f}") do |v|
+      (FILTERS - %i(limit)).each do |f|
+        opts.on("--#{f.to_s.gsub(/_/, '-')} ID", Integer, "Filter network interfaces by #{f}") do |v|
           @opts[f] = v
         end
       end
@@ -49,12 +33,13 @@ module VpsAdmin::CLI::Commands
 
     def exec(args)
       if @global_opts[:list_output]
-        exclude = %i(id ip_address user updated_at delta)
+        exclude = %i(id network_interface updated_at delta)
 
-        @api.ip_traffic_monitor.actions[:index].params.each_key do |name|
+        @api.network_interface_monitor.actions[:index].params.each_key do |name|
           next if exclude.include?(name)
           puts name
         end
+
         exit
       end
 
@@ -113,9 +98,8 @@ module VpsAdmin::CLI::Commands
     def set_global_opts
       if @global_opts[:output]
         @params = @global_opts[:output].split(',').map(&:to_sym)
-
       else
-        @params = %i(bytes_in bytes_out bytes)
+        @params = %i(bytes bytes_in bytes_out packets packets_in packets_out)
       end
 
       if @global_opts[:sort]
@@ -158,7 +142,7 @@ module VpsAdmin::CLI::Commands
       params =  {
         limit: limit > 0 ? limit : 25,
         order: "#{@sort_desc ? '-' : ''}#{@sort_param}",
-        meta: {includes: 'ip_address__network_interface'}
+        meta: {includes: 'network_interface'},
       }
 
       FILTERS.each do |f|
@@ -167,7 +151,7 @@ module VpsAdmin::CLI::Commands
         params[f] = @opts[f]
       end
 
-      @data = @api.ip_traffic_monitor.list(params)
+      @data = @api.network_interface_monitor.list(params)
     end
 
     def render(t, refresh)
@@ -177,7 +161,7 @@ module VpsAdmin::CLI::Commands
       end
 
       setpos(0, 0)
-      addstr("#{File.basename($0)} ip_traffic top - #{t.strftime('%H:%M:%S')}, ")
+      addstr("#{File.basename($0)} network top - #{t.strftime('%H:%M:%S')}, ")
       addstr("next update at #{(t + REFRESH_RATE).strftime('%H:%M:%S')}")
 
       attron(color_pair(1))
@@ -202,12 +186,12 @@ module VpsAdmin::CLI::Commands
 
     def header
       unless @header
-        fmt = (['%-30s', '%6s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
+        fmt = (['%8s', '%-15s'] + @columns.map { |c| "%#{c[:width]}s" }).join(' ')
 
         @header = sprintf(
           fmt,
-          'IP Address',
           'VPS',
+          'Interface',
           *@columns.map { |c| c[:title] },
         )
 
@@ -219,9 +203,9 @@ module VpsAdmin::CLI::Commands
 
     def print_row(data)
       addstr(sprintf(
-        '%-30s %6s',
-        data.ip_address.addr,
-        data.ip_address.network_interface.vps_id
+        '%8s %-15s',
+        data.network_interface.vps_id,
+        data.network_interface.name,
       ))
 
       @columns.each do |c|
@@ -234,7 +218,7 @@ module VpsAdmin::CLI::Commands
     end
 
     def stats
-      fields = %i(packets bytes public_bytes private_bytes)
+      fields = %i(bytes packets)
       stats = {}
       delta_sum = 0
 
@@ -263,17 +247,15 @@ module VpsAdmin::CLI::Commands
       setpos(lines-5, 0)
       addstr('─' * cols)
 
-      fmt = '%10s %10s %10s %14s %14s'
+      fmt = '%10s %10s %10s'
       unit = @opts[:unit].to_s.capitalize
 
       setpos(lines-4, 0)
       addstr(sprintf(
         fmt,
         '',
-        'Packets/s',
         "#{unit}/s",
-        "Public#{unit}/s",
-        "Private#{unit}/s"
+        'Packets/s',
       ))
 
       setpos(lines-3, 0)

data/lib/vpsadmin/cli/stream_downloader.rb

@@ -7,8 +7,8 @@ module VpsAdmin::CLI
   class DownloadError < StandardError ; end
 
   class StreamDownloader
-    def self.download(*args)
-      new(*args)
+    def self.download(*args, **kwargs)
+      new(*args, **kwargs)
     end
 
     def initialize(api, dl, io, progress: STDOUT, position: 0, max_rate: nil,

data/lib/vpsadmin/cli.rb

@@ -22,4 +22,4 @@ require 'vpsadmin/cli/commands/snapshot_download'
 require 'vpsadmin/cli/commands/snapshot_send'
 require 'vpsadmin/cli/commands/backup_dataset'
 require 'vpsadmin/cli/commands/backup_vps'
-require 'vpsadmin/cli/commands/ip_traffic_top'
+require 'vpsadmin/cli/commands/network_top'

data/lib/vpsadmin/client/version.rb

@@ -1,5 +1,5 @@
 module VpsAdmin
   module Client
-    VERSION = '3.0.0.master.20220121-0.b5a81113'
+    VERSION = '3.0.0.master.20221118-0.99dcc6de'
   end
 end

data/shell.nix

@@ -17,7 +17,6 @@ in stdenv.mkDerivation rec {
     mkdir -p /tmp/dev-ruby-gems
     export GEM_HOME="/tmp/dev-ruby-gems"
     export GEM_PATH="$GEM_HOME:$PWD/lib"
-    export PATH="$GEM_HOME/bin:$PATH"
 
     BUNDLE="$GEM_HOME/bin/bundle"
 
@@ -29,5 +28,6 @@ in stdenv.mkDerivation rec {
     $BUNDLE install
 
     export RUBYOPT=-rbundler/setup
+    export PATH="$(ruby -e 'puts Gem.bindir'):$PATH"
   '';
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpsadmin-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0.master.20220121.pre.0.b5a81113
+  version: 3.0.0.master.20221118.pre.0.99dcc6de
 platform: ruby
 authors:
 - Jakub Skokan
@@ -100,7 +100,7 @@ files:
 - lib/vpsadmin/cli/commands/backup_dataset.rb
 - lib/vpsadmin/cli/commands/backup_vps.rb
 - lib/vpsadmin/cli/commands/base_download.rb
-- lib/vpsadmin/cli/commands/ip_traffic_top.rb
+- lib/vpsadmin/cli/commands/network_top.rb
 - lib/vpsadmin/cli/commands/snapshot_download.rb
 - lib/vpsadmin/cli/commands/snapshot_send.rb
 - lib/vpsadmin/cli/commands/vps_migrate_many.rb