pve 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4403d2c47d0a7ad1227316669d3144c80e220c7ec06b78231d9dfba40dd15c
-  data.tar.gz: 82d428b604bc88d4ad9d4db5c81eee48f235ff0dbac632ae4c73d6b2bd44e253
+  metadata.gz: 0af90de01a1f74dac6c799494f4e70fe13b534fc3b3bf95f3b333aa801d117e8
+  data.tar.gz: d8ce0656f04dec34d33c434093b7982e7cefe22869f8abd3ff4fa2ce574b224a
 SHA512:
-  metadata.gz: e6082e769da895cc86203e0d77ff1d3bfaf3a570ace8ae67b5ad575392a5cdc6ab7232b23367a1725d65e53ef4fae5888fed811409aab6a22d108d0a5bea963b
-  data.tar.gz: c453b9016a30df56c831f5589509805ae60544433ffb8124b9ea44373126e3ec91f57b8c1b1b6ff76e8d6e1caec6a626bdb095c476137207a106303cb756eb24
+  metadata.gz: b68f8317b05050d46dc938afd83eea40929bf7628caa2db280f091d111dc26f51a4f4875220938c3b8dcba2b55cd3c48ae5a6db997e65d708027029ce6d5d705
+  data.tar.gz: 41dc8f9345162f1003eb27f37f1429fc525073828271dde81716520ad8de1ad01ec806a0154fa1c4582c5cdfe4d030dfd4b8be891482e36e38bc05bc8e52c296

data/.gitignore

@@ -1,2 +1,3 @@
 *.sw[pomnqrst]
 *.gem
+Gemfile.lock

data/lib/pve/cli/base.rb

@@ -27,6 +27,7 @@ def cli_base
         lambda {|n| to.virt n }
       end
     nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+    nodes.each &push
     nodes.
       flat_map {|n| [ Thread.new( n, &:lxc), Thread.new( n, &:qemu) ] }.
       each {|n| n.value.each &push }

data/lib/pve/cli/ct.rb

@@ -9,16 +9,25 @@ def cli_ct
       end.sort.each {|c| puts c }
     }
 
-    ct_cli.cmd :status, "List CTs with status", aliases: [nil], &lambda {|node=nil|
+    ct_cli.cmd( :status, "Lists CTs with status", aliases: [nil], &lambda {|target=nil, sort: 'n', node: nil|
       connect
-      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU Mem/MiB Disk/MiB]
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
-      nodes.each do |n|
-        n.lxc.each &to.method( :virt)
-      end
-      to.print order: [3]
-    }
+      node &&= /\A#{node}\z/
+      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU/% Mem/MiB Mem/% Disk/MiB Disk/%]
+      push =
+        if target
+          target = /\A#{target}\z/
+          lambda {|n| to.virt n  if n === target }
+        else
+          lambda {|n| to.virt n }
+        end
+      nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+      nodes.
+        map {|n| Thread.new( n, &:lxc) }.
+        each {|n| n.value.each &push }
+      to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
+    }).
+      opt( :sort, '-s', '--sort=COLUMNS', "Sort by COLUMNs eg hn for host and name ([s]tatus, h[a], [i]d, [n]ame (default), [h]ost, [u]ptime, [c]pu, [m]em, [d]isk)").
+      opt( :node, '-n', '--node=NODE', "List only hosted by this NODE")
 
     ct_cli.cmd :enter, "Enter Console of CT", &lambda {|name_or_id|
       connect

data/lib/pve/cli/qm.rb

@@ -10,16 +10,25 @@ def cli_qm
       end.sort.each {|c| puts c }
     }
 
-    qm.cmd :status, "List VMs with status", aliases: [nil], &lambda {|node=nil|
+    qm.cmd( :status, "Lists CTs with status", aliases: [nil], &lambda {|target=nil, sort: 'n', node: nil|
       connect
-      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU Mem/MiB Disk/MiB]
-      nodes = Proxmox::Node.all
-      nodes = nodes.select {|n| node == n.name }  if node
-      nodes.each do |n|
-        n.qemu.each &to.method( :virt)
-      end
-      to.print order: [3]
-    }
+      node &&= /\A#{node}\z/
+      to = TablizedOutput.new %w[Status HA ID Name Host Uptime CPU/% Mem/MiB Mem/% Disk/MiB Disk/%]
+      push =
+        if target
+          target = /\A#{target}\z/
+          lambda {|n| to.virt n  if n === target }
+        else
+          lambda {|n| to.virt n }
+        end
+      nodes = node ? Proxmox::Node.find_by_name( name) : Proxmox::Node.all
+      nodes.
+        map {|n| Thread.new( n, &:qemu) }.
+        each {|n| n.value.each &push }
+      to.print order: sort.each_char.map {|c| (2*c.ord[5]-1) * (' sainhucmd'.index( c.downcase)) }
+    }).
+      opt( :sort, '-s', '--sort=COLUMNS', "Sort by COLUMNs eg hn for host and name ([s]tatus, h[a], [i]d, [n]ame (default), [h]ost, [u]ptime, [c]pu, [m]em, [d]isk)").
+      opt( :node, '-n', '--node=NODE', "List only hosted by this NODE")
 
     qm.cmd :exec, "Executes Command in VM via qemu-guest-agent", min: 4, &lambda {|name_or_id, *command|
       connect

data/lib/pve/helper.rb

@@ -13,17 +13,24 @@ end
 
 
 class Measured
+  class V
+    attr_reader :value, :length
+
+    def initialize( value, length = nil) @value, @length = value, length || value.length end
+    def inspect() "#<Measured::V #{@value.inspect} (#{@length})>" end
+    alias :to_s :value
+    alias :to_str :value
+  end
+
   class <<self
     def bytes1 v
       v = v.to_f
-      return "%d B" % v  if 512 > v
+      return units '%d ' % v , :B  if 512 > v
       %w[KiB MiBy GiByt TiByte ExiByte PetiByte].each_with_index do |m|
         v /= 1024
-        #return "%.1f %s" % [v, m]  if 10 > v
-        #return "%d %s" % [v, m]  if 512 > v
-        return "%.1f %s" % [v, m]  if 512 > v
+        return units '%.1f ' % v, m  if 512 > v
       end
-      "%d  PetiByte" % v
+      units '%d ' % v, :PetiByte
     end
 
     def bytes2 v
@@ -40,21 +47,28 @@ class Measured
     end
     alias bytes bytes2
 
+    def units val, unit
+      v = "#{val}\e[1;30m#{unit}\e[0m"
+      V.new v, v.length - 11
+    end
+
     def seconds i
       i = i.to_i
-      return '·'  if 0 == i
-      return "%d s" % i  if 90 > i
+      return V.new "\e[1;30m·\e[0m", 1  if 0 == i
+      return units '%d ' % i, :s  if 90 > i
       i /= 60
-      return "%d mi" % i  if 90 > i
+      return units '%d ' % i, :mi  if 90 > i
       i /= 60
-      return "%d hou" % i  if 36 > i
+      return units '%d ' % i, :hou  if 36 > i
       i /= 24
-      return "%d days" % i  if 14 > i
+      return units '%d ' % i, :days  if 14 > i
       j = i / 7
-      return "%d weeks" % j  if 25 > j
-      i /= 365
-      return "%.1f years"  if 550 > i
-      "%dy" % i
+      return units '%d ' % j, :weeks  if 8 > j
+      j = i / 30
+      return units '%d ' % j, :months  if 11 > j
+      i /= 365.0
+      return units '%.2f ' % i, :years  if 550 > i
+      units '%d ' % i, :years
     end
   end
 end
@@ -72,10 +86,8 @@ class ColoredString
 
   def length() @string.length end
   alias size length
-  #def to_str() self end 
   def to_s() "\e[#{@color_codes}m#{@string}\e[0m" end
   alias to_str to_s
-  #alias inspect to_str
   
   include Comparable
   def <=>(o) @string <=> o.string end
@@ -101,7 +113,7 @@ class TablizedOutput
   class V < B
     attr_reader :v, :s
     def initialize( v, s=nil) @v, @s = v, s || "#{v}" end
-    def to_s() @s end
+    def to_s() @s.to_s end
     def length() @s.length end
     def inspect() "#<TO:V #{@v.inspect} #{@s.inspect}>" end
   end
@@ -113,11 +125,9 @@ class TablizedOutput
     def inspect() "#<TO:Percentage #{@v}%>" end
 
     def to_s
-      #y = w - (v*w).round
       y = (v*w).round
       x = (100*v).round
       r = "%*s" % [w, 0==x ? '·' : x]
-      #"\e[0m#{r[0...y]}\e[1;4;#{0.75>v ? 32 : 31}m#{r[y..-1]}\e[0m"
       "\e[1;4;#{0.75>v ? 32 : 31}m#{r[0...y]}\e[0m#{r[y..-1]}"
     end
   end
@@ -139,7 +149,6 @@ class TablizedOutput
   end
 
   def print order: nil
-    format = "#{@format.map {|f| "\e[%%sm%%#{case f when '<' then '-' else ' ' end}%ds\e[0m"}.join( '  ') % @maxs}\n"
     ls = @lines
     if order
       eval <<-EOC, binding, __FILE__, 1+__LINE__
@@ -149,9 +158,22 @@ class TablizedOutput
         }
       EOC
     end
-    #ls = ls.sort_by {|e| p e; order.map &e.method(:[]) }  if order
-    @stdout.printf format, *@header.flat_map {|s|['',s]}
-    ls.each {|l| @stdout.printf format, *l.flat_map {|s| s.is_a?(ColoredString) ? [s.color_codes, s.string] : ["", s.to_s] } }
+    @stdout.puts \
+      @header.each_with_index.map {|s, i|
+        "#{' ' * (@maxs[i] - s.length)}#{s}"
+      }.join( '  ')
+    ls.each_with_index do |l|
+      @stdout.puts \
+        l.each_with_index.map {|s, i|
+          pad = ' ' * (@maxs[i] - s.length)
+          case @format[i]
+          when '<'
+            "#{s}#{pad}"
+          else
+            "#{pad}#{s}"
+          end
+        }.join( '  ')
+    end
   end
 
   def virt v

data/lib/pve/version.rb

@@ -1,3 +1,3 @@
 module PVE
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pve
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dencli
@@ -104,7 +104,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pve (0.2.1)
-      activesupport (>= 2)
-      dencli (~> 0.4)
-      ipaddress (~> 0.8.3)
-      pmap (~> 1.1)
-      rest-client (~> 2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
-    dencli (0.5.3)
-    diff-lcs (1.4.4)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    ipaddress (0.8.3)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
-    minitest (5.14.4)
-    netrc (0.11.0)
-    pmap (1.1.1)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
-    zeitwerk (2.5.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  pve!
-  rspec (~> 3.2)
-
-BUNDLED WITH
-   2.2.15