vmesh 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ba0f64fbefa7fc6b06ae99b0599a257ba1da06
-  data.tar.gz: 4d2dae0a283f3d6b67356cb41b8a82ec1e6aa54c
+  metadata.gz: 13acc89f7123087a1be93e4e2f58888372bbab23
+  data.tar.gz: 51ce17731a26efaa36b16cb8dd6c982c8b15277e
 SHA512:
-  metadata.gz: 3e8f2cd2bdb9700d7c23e552c1d3ef02aec231991f8604923a4fbf59adfb8effafcd6f42428f87e647fc4f4e0b9ec9b8fe165d9f56542a121713cef3cf361807
-  data.tar.gz: 546804af173c6ae8e7542bfc5c654c9823e218c3fc9a507b604dcd2dac9cfaae7f550d19d9d1e07f1a5a635109a23e64b9239fe0cefd0ae8f30531e0483f1205
+  metadata.gz: a14c8c8b35a3ef39bab783f5b54a364d816c74086c6b762e5720138138e18543b746c9155838685f8d0c0d76bae378b6014379739f1b2715773d0aa4883f72e1
+  data.tar.gz: 86f5d7ac04306cfa0d79047bd71947ce62db8b50b4a23ea4e6512fe44152ff4524821342679c56d7e874a198ab0976d2da81c37f4a915248c73b3b564b1e158c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmesh (0.1.5)
+    vmesh (0.1.6)
       gli (= 2.9.0)
       highline (~> 1.6)
       logger (= 1.2.8)

data/lib/vmesh/commands/df.rb

@@ -3,20 +3,36 @@ desc 'report datastore space usage'
 arg_name '[name]'
 
 command [:df,:diskspace] do |c|
+  c.desc 'Display sizes in GB'
+  c.long_desc 'Display disk usage and sizes in GB'
+  c.switch [:g]
+
+  c.desc 'Display sizes in MB'
+  c.long_desc 'Display disk usage and sizes in MB'
+  c.switch [:m]
 
   c.action do |global_options,options,args|
     name = ARGV.shift if ARGV.any?
+    size_divisor = 1024
+    size_heading = '1K-blocks'
+    if options[:g]
+      size_divisor = 1024 ** 3
+      size_heading = '1G-blocks'
+    elsif options[:m]
+      size_divisor = 1024 ** 2
+      size_heading = '1M-blocks'
+    end
     vm_manager = Vmesh::VSphere.new global_options
     if name.to_s == ''
       all_datastores = Vmesh::Datastore.get_all(vm_manager.vim, vm_manager.get_datacenter(global_options[:datacenter]))
     else
       all_datastores = Vmesh::Datastore.get_all_matching(vm_manager.vim, name, vm_manager.get_datacenter(global_options[:datacenter]))
     end
-    puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' %  ["Name","Size","Available","Used","Use%"]
+    puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' %  ["Name",size_heading,"Available","Used","Use%"]
     all_datastores.each do |ds|
       ds_used = ds.capacity - ds.free_space
       pc_used = (ds_used.to_i * 100) / ds.capacity.to_i
-      puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' % ["#{ds.name}","#{ds.capacity}","#{ds.free_space}","#{ds_used}","#{pc_used}%"]
+      puts '%-30.30s%15.15s%15.15s%15.15s%8.8s' % ["#{ds.name}","#{ds.capacity/size_divisor}","#{ds.free_space/size_divisor}","#{ds_used/size_divisor}","#{pc_used}%"]
     end
   end
 end

data/lib/vmesh/version.rb

@@ -1,3 +1,3 @@
 module Vmesh
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmesh
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Kurt Gardiner