rvc 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/bin/rvc

@@ -34,8 +34,11 @@ include RVC::Util
 Thread.abort_on_exception = true
 
 CMD = Module.new
+RVC::VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
 
 $opts = Trollop.options do
+  version RVC::VERSION
+
   banner <<-EOS
 Ruby vSphere Console.
 

data/lib/rvc/completion.rb

@@ -22,8 +22,14 @@ require 'readline'
 require 'rvc/ttl_cache'
 
 begin
-  require 'rvc/readline-ffi'
-rescue Exception
+  require 'ffi'
+  begin
+    require 'rvc/readline-ffi'
+  rescue Exception
+    $stderr.puts "Error loading readline-ffi: #{$!.message}. Tab completion will be limited."
+  end
+rescue LoadError
+  $stderr.puts "Install the \"ffi\" gem for better tab completion."
 end
 
 module RVC
@@ -39,11 +45,6 @@ module Completion
   end
 
   def self.install
-    unless Readline.respond_to? :line_buffer and
-           Readline.respond_to? :char_is_quoted=
-      $stderr.puts "Install the \"ffi\" gem for better tab completion."
-    end
-
     if Readline.respond_to? :char_is_quoted=
       Readline.completer_word_break_characters = " \t\n\"'"
       Readline.completer_quote_characters = "\"\\"

data/lib/rvc/modules/vm.rb

@@ -620,6 +620,18 @@ def deltaize_disks vm
   end
 end
 
+
+opts :annotate do
+  summary "Change a VM's annotation"
+  arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :annotation, nil
+end
+
+def annotate vm, str
+  vm.ReconfigVM_Task(:spec => { :annotation => str }).wait_for_completion
+end
+
+
 def find_vmx_files ds
   datastorePath = "[#{ds.name}] /"
   searchSpec = {

data/lib/rvc/modules/vmrc.rb

@@ -40,6 +40,7 @@ end
 
 opts :view do
   summary "Spawn a VMRC"
+  text "The VMware Remote Console allows you to interact with a VM's virtual mouse, keyboard, and screen."
   arg :vm, nil, :lookup => VIM::VirtualMachine, :multi => true
 end
 

data/lib/rvc/option_parser.rb

@@ -66,8 +66,13 @@ class OptionParser < Trollop::Parser
     fail "Multi argument must be the last one" if @seen_multi
     fail "Can't have required argument after optional ones" if spec[:required] and @seen_not_required
     fail "lookup and lookup_parent are mutually exclusive" if spec[:lookup] and spec[:lookup_parent]
-    @applicable << spec[:lookup] if spec[:lookup]
-    @applicable << spec[:lookup_parent] if spec[:lookup_parent]
+    [:lookup, :lookup_parent].each do |sym|
+      if spec[sym].is_a? Enumerable
+        spec[sym].each { |x| @applicable << x }
+      elsif spec[sym]
+        @applicable << spec[sym]
+      end
+    end
     @args << [name,spec]
     text "  #{name}: " + [description, spec[:lookup], spec[:lookup_parent]].compact.join(' ')
   end

data/lib/rvc/util.rb

@@ -28,7 +28,7 @@ module Util
   end
 
   def lookup_single path
-    objs = lookup(path, type)
+    objs = lookup path
     err "Not found: #{path.inspect}" if objs.empty?
     err "More than one match for #{path.inspect}" if objs.size > 1
     objs.first

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Rich Lane