rvc 1.3.5 → 1.3.6

data/README.rdoc

@@ -12,6 +12,8 @@ efficient than clicking through a GUI.
 
     gem install rvc
 
+To upgrade to the latest version: <tt>gem update rvc</tt>
+
 == Usage
 
   % rvc 192.168.1.105

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/bin/rvc

@@ -58,8 +58,6 @@ EOS
   opt :cmd, "command to evaluate", :short => 'c', :multi => true, :type => :string
 end
 
-Trollop.die "At least 1 argument expected" unless ARGV.length >= 1
-
 RVC.reload_modules false
 
 $shell = RVC::Shell.new
@@ -97,10 +95,20 @@ elsif $shell.connections.size == 1
   end
 end
 
+if defined? Ocra
+  require "net/https"
+  require "digest/sha2"
+  exit
+end
+
 unless CMD.vmrc.find_vmrc
   $stderr.puts "VMRC is not installed. You will be unable to view virtual machine consoles. Use the vmrc.install command to install it."
 end
 
+if $shell.connections.empty?
+  $stderr.puts "Use the 'connect' command to connect to an ESX or VC server."
+end
+
 CMD.basic.ls lookup_single('.')
 
 while true

data/lib/rvc/modules/basic.rb

@@ -42,6 +42,18 @@ rvc_alias :help
 HELP_ORDER = %w(basic vm)
 
 def help path
+  if tgt = RVC::ALIASES[path]
+    fail unless tgt =~ /^(.+)\.(.+)$/
+    opts_block = RVC::MODULES[$1].opts_for($2.to_sym)
+    RVC::OptionParser.new(tgt, &opts_block).educate
+    return
+  elsif path =~ /^(.+)\.(.+)$/ and
+        mod = RVC::MODULES[$1] and
+        opts_block = mod.opts_for($2.to_sym)
+    RVC::OptionParser.new(path, &opts_block).educate
+    return
+  end
+
   obj = lookup_single(path) if path
 
   if obj

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-04-20 00:00:00 -07:00
 default_executable: rvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,8 +123,6 @@ files:
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb
-- test/_test_completion.rb
-- test/_test_option_parser.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -149,13 +147,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: vSphere console UI
 test_files: 
-- test/_test_completion.rb
-- test/_test_option_parser.rb
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb

data/test/_test_completion.rb

@@ -1,27 +0,0 @@
-require 'test/unit'
-require 'rvc'
-require 'inventory_fixtures'
-
-class CompletionTest < Test::Unit::TestCase
-  NodeBaz = FixtureNode.new
-  NodeBar = FixtureNode.new
-  NodeFoo = FixtureNode.new('bar' => NodeBar, 'baz' => NodeBaz)
-  Root = FixtureNode.new('foo' => NodeFoo)
-
-  def check word, expected
-    got = RVC::Completion::Completor[word]
-    assert_equal expected, got
-  end
-
-  def setup
-    @context = RVC::Context.new Root
-  end
-
-  def teardown
-    @context = nil
-  end
-
-  def test_simple
-    check 
-  end
-end

data/test/_test_option_parser.rb

@@ -1,6 +0,0 @@
-require 'test/unit'
-require 'rvc'
-require 'inventory_fixtures'
-
-class OptionParserTest < Test::Unit::TestCase
-end