vpsadmin-client 3.0.0.master.20221118.pre.0.99dcc6de → 3.0.0.master.202211181.pre.0.ac358990

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8e44144778361fe0bd564030b80f66efcdf734c6b81a1ae13c816c5d6ad853
-  data.tar.gz: e6e0ed82d681b2c7f980430a4f141e687e867784a9a941ae66a6901ce6b1e1c6
+  metadata.gz: 9014c08e0f38faa0c2ef3ff240d919521ff77609f7c638c3497fdf730d76a2d9
+  data.tar.gz: 4639e16cc11b5b4a81ebd787e6dedf15ec6da46177920de95e442ff8bc13ad86
 SHA512:
-  metadata.gz: 9f5ae2ef0e02b51ada7bc284457f3fb9ffadadcc0636a42ef8c82465642d2bd5c616b333f40769ed49d4ce4ac38db7f16a884ccf62e0abc33f9194e72db1930e
-  data.tar.gz: fb68a389dc4602e2891d0b44d3e03556ca523cb2e647094fbedb1d0a069bdb16fee0508deaa7037ed25c708c7b2483a8b3b3d1a722b65cdc0ed9d14988d412f5
+  metadata.gz: 63cec139647a45f1b78e31189634c3f876d5531efd3abb9ab535146cb2d34d3e13cb27f9d9a1cdf0fe8c7031cd4bee87774f1d1f1387fa349f21dce5d1a87792
+  data.tar.gz: 5431b10cbef22f09b69e7a4968bf3b0959dae30df08e2e3f24363ca5513931bec674b98fd203a77b326abffe4f87e4377638473031db122fef50d86fa0ad4e40

data/lib/vpsadmin/cli/commands/network_top.rb

@@ -212,7 +212,7 @@ module VpsAdmin::CLI::Commands
         p = c[:name]
 
         attron(A_BOLD) if p == @sort_param
-        addstr(sprintf(" %#{c[:width]}s", unitize(data.send(p), data.delta)))
+        addstr(sprintf(" %#{c[:width]}s", unitize_param(p, data.send(p), data.delta)))
         attroff(A_BOLD) if p == @sort_param
       end
     end
@@ -259,18 +259,18 @@ module VpsAdmin::CLI::Commands
       ))
 
       setpos(lines-3, 0)
-      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize(stats[:"#{f}_in"], avg_delta) }))
+      addstr(sprintf(fmt, 'In', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"], avg_delta) }))
 
       setpos(lines-2, 0)
-      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize(stats[:"#{f}_out"], avg_delta) }))
+      addstr(sprintf(fmt, 'Out', *fields.map { |f| unitize_param(f, stats[:"#{f}_out"], avg_delta) }))
 
       setpos(lines-1, 0)
       attron(A_BOLD)
-      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize(stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
+      addstr(sprintf(fmt, 'Total', *fields.map { |f| unitize_param(f, stats[:"#{f}_in"] + stats[:"#{f}_out"], avg_delta) }))
       attroff(A_BOLD)
     end
 
-    def unitize(n, delta)
+    def unitize_bytes(n, delta)
       if @opts[:unit] == :bytes
         per_s = n / delta.to_f
       else
@@ -278,7 +278,7 @@ module VpsAdmin::CLI::Commands
       end
 
       bits = 39
-      units = %i(T G M K)
+      units = %w(T G M k)
 
       units.each do |u|
         threshold = 2 << bits
@@ -291,6 +291,31 @@ module VpsAdmin::CLI::Commands
       per_s.round(2).to_s
     end
 
+    def unitize_number(n, delta)
+      per_s = n / delta.to_f
+      threshold = 1_000_000_000_000
+      units = %w(T G M k)
+
+      units.each do |u|
+        return "#{(per_s / threshold).round(2)}#{u}" if per_s >= threshold
+
+        threshold /= 1000
+      end
+
+      per_s.round(2).to_s
+    end
+
+    def unitize_param(param, n, delta)
+      case param
+      when :bytes, :bytes_in, :bytes_out
+        unitize_bytes(n, delta)
+      when :packets, :packets_in, :packets_out
+        unitize_number(n, delta)
+      else
+        fail "unknown param to unitize: #{param.inspect}"
+      end
+    end
+
     def sort_next(n)
       cur_i = @params.index(@sort_param)
       next_i = cur_i + n

data/lib/vpsadmin/client/version.rb

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

data/vpsadmin-client.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency 'haveapi-client', '~> 0.15.1'
+  spec.add_runtime_dependency 'haveapi-client', '~> 0.16.1'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'curses'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpsadmin-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0.master.20221118.pre.0.99dcc6de
+  version: 3.0.0.master.202211181.pre.0.ac358990
 platform: ruby
 authors:
 - Jakub Skokan
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement