rvc 1.7.0 → 1.8.0

data/lib/rvc/util.rb

@@ -1,15 +1,15 @@
 # Copyright (c) 2011 VMware, Inc.  All Rights Reserved.
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,6 +24,12 @@ module RVC
 module Util
   extend self
 
+  if RbConfig::CONFIG['host_os'] =~ /^darwin/
+    TCSETPGRP = 0x80047476
+  else
+    TCSETPGRP = 0x5410
+  end
+
   def menu items
     items.each_with_index { |x, i| puts "#{i} #{x}" }
     input = Readline.readline("? ", false)
@@ -64,9 +70,22 @@ module Util
   end
 
   def tasks objs, sym, args={}
-    progress(objs.map { |obj| obj._call :"#{sym}_Task", args })
+    # Stores valid objs to send to progress method
+    taskobjs = []
+
+    objs.each do |obj|
+      begin
+        taskobjs.push (obj._call :"#{sym}_Task", args)
+      rescue Exception => ex
+        puts "util.rb:tasks: Skipping current object #{obj} due to Exception: #{ex.message}"
+      end
+    end
+
+    #Process only those objects which haven't raised any exception
+    progress (taskobjs)
   end
 
+
   if ENV['LANG'] =~ /UTF/ and RUBY_VERSION >= '1.9.1'
     PROGRESS_BAR_LEFT = "\u2772"
     PROGRESS_BAR_MIDDLE = "\u25AC"
@@ -90,6 +109,7 @@ module Util
             text = "#{name} #{entityName}: #{state} "
             progress = props['info.progress']
             barlen = terminal_columns - text.size - 2
+            barlen = 0 if barlen < 0 # we can't draw -ive bars, simple fix TODO: draw on next line
             progresslen = ((progress||0)*barlen)/100
             progress_bar = "#{PROGRESS_BAR_LEFT}#{PROGRESS_BAR_MIDDLE * progresslen}#{' ' * (barlen-progresslen)}#{PROGRESS_BAR_RIGHT}"
             $stdout.write "\e[K#{text}#{progress_bar}\n"
@@ -132,7 +152,7 @@ module Util
   def tcsetpgrp pgrp=Process.getpgrp
     return unless $stdin.tty?
     trap('TTOU', 'SIG_IGN')
-    $stdin.ioctl 0x5410, [pgrp].pack('I')
+    $stdin.ioctl TCSETPGRP, [pgrp].pack('I')
     trap('TTOU', 'SIG_DFL')
   end
 
@@ -206,7 +226,7 @@ module Util
         retry
       end
     end
-    
+
     buckets = {}
     objs.each do |o|
       metrics = o.perfmetrics(fields)
@@ -223,8 +243,8 @@ module Util
           stats = perfmgr.retrieve_stats os, metric[:metrics], metric[:opts]
           os.each do |o|
             perf_values[o] = {}
-            metric[:metrics].map do |x| 
-              if stats[o] 
+            metric[:metrics].map do |x|
+              if stats[o]
                 perf_values[o][x] = stats[o][:metrics][x]
               end
             end
@@ -235,11 +255,11 @@ module Util
         end
       end
     end
-    
+
     Hash[objs.map do |o|
       begin
-        [o, Hash[fields.map do |f| 
-          [f, o.field(f, props_values[o], perf_values[o])] 
+        [o, Hash[fields.map do |f|
+          [f, o.field(f, props_values[o], perf_values[o])]
         end]]
       rescue VIM::ManagedObjectNotFound
         next

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rvc
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
 - Rich Lane
+- Christian Dickmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -170,13 +171,16 @@ files:
 - lib/rvc/modules/resource_pool.rb
 - lib/rvc/modules/role.rb
 - lib/rvc/modules/snapshot.rb
+- lib/rvc/modules/spbm.rb
 - lib/rvc/modules/statsinterval.rb
+- lib/rvc/modules/syslog.rb
 - lib/rvc/modules/vds.rb
 - lib/rvc/modules/vim.rb
 - lib/rvc/modules/vm.rb
 - lib/rvc/modules/vm_guest.rb
 - lib/rvc/modules/vmrc.rb
 - lib/rvc/modules/vnc.rb
+- lib/rvc/modules/vsan.rb
 - lib/rvc/namespace.rb
 - lib/rvc/option_parser.rb
 - lib/rvc/path.rb
@@ -200,7 +204,7 @@ files:
 - test/test_parse_path.rb
 - test/test_shell.rb
 - test/test_uri.rb
-homepage: 
+homepage: https://github.com/vmware/rvc
 licenses: []
 post_install_message: 
 rdoc_options: []