rvc 1.6.0 → 1.7.0

data/lib/rvc/{memory_session.rb → vim.rb}

@@ -18,42 +18,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module RVC
+require 'rvc/connection'
 
-class MemorySession
-  def initialize
-    @marks = {}
-    @connections = {}
-  end
-
-  def marks
-    @marks.keys
-  end
-
-  def get_mark key
-    @marks[key]
-  end
+require 'rbvmomi'
+VIM = RbVmomi::VIM
+VIM.add_extension_dir File.join(File.dirname(__FILE__), "extensions")
 
-  def set_mark key, objs
-    if objs == nil
-      @marks.delete key
-    else
-      fail "not an array" unless objs.is_a? Array
-      @marks[key] = objs
-    end
-  end
-
-  def connections
-    @connections.keys
-  end
+class RbVmomi::VIM
+  include RVC::Connection
 
-  def get_connection key
-    @connections[key]
+  def children
+    rootFolder.children
   end
 
-  def set_connection key, conn
-    @connections[key] = conn
+  def display_info
+    puts serviceContent.about.fullName
   end
 end
-
-end

data/test/modules/foo.rb

@@ -0,0 +1,9 @@
+opts :foo do
+  summary "Foo it"
+end
+
+rvc_alias :foo, :foo
+
+def foo
+  42
+end

data/test/modules/foo/bar.rb

@@ -0,0 +1,9 @@
+opts :bar do
+  summary "bar it"
+end
+
+rvc_alias :bar, :bar
+
+def bar
+  13
+end

data/test/test_completion.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class CompletionTest < Test::Unit::TestCase
+  def setup
+    @shell = RVC::Shell.new
+    @shell.reload_modules false
+  end
+
+  def teardown
+    @shell = nil
+  end
+
+  def test_cmd_candidates
+    assert_equal [['basic.mkdir', ' ']], @shell.completion.cmd_candidates('basic.mkdi')
+    assert_equal [['quit', ' ']], @shell.completion.cmd_candidates('qui')
+  end
+end

data/test/test_fs.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'rvc'
+require 'test_helper'
 require 'inventory_fixtures'
 
 class FSTest < Test::Unit::TestCase
@@ -18,20 +17,19 @@ class FSTest < Test::Unit::TestCase
 
   def setup
     @context = RVC::FS.new Root
-    session = RVC::MemorySession.new
-    $shell = RVC::Shell.new session
-    $shell.instance_variable_set :@fs, @context
+    @shell = RVC::Shell.new
+    @shell.instance_variable_set :@fs, @context
   end
 
   def teardown
     @context = nil
-    $shell = nil
+    @shell = nil
   end
 
   def test_new
     assert_equal Root, @context.cur
     assert_equal "", @context.display_path
-    assert_equal 0, $shell.session.marks.size
+    assert_equal 0, @shell.fs.marks.size
     assert_equal [['', Root]], @context.cur.rvc_path
   end
 
@@ -97,20 +95,20 @@ class FSTest < Test::Unit::TestCase
     assert_equal nil, obj
 
     ['foo', '~', '7', ''].each do |mark|
-      $shell.session.set_mark mark, [b_obj]
+      @shell.fs.marks[mark] = [b_obj]
       obj = @context.lookup("~#{mark}")[0]
       assert_equal [['', Root], ['a', NodeA], ['b', NodeB]], obj.rvc_path
 
-      $shell.session.set_mark mark, []
+      @shell.fs.marks[mark] = []
       obj = @context.lookup("~#{mark}")[0]
       assert_equal nil, obj
     end
 
-    $shell.session.set_mark '7', [b_obj]
+    @shell.fs.marks['7'] = [b_obj]
     obj = @context.lookup("7")[0]
     assert_equal [['', Root], ['a', NodeA], ['b', NodeB]], obj.rvc_path
 
-    $shell.session.set_mark '7', []
+    @shell.fs.marks['7'] = []
     obj = @context.lookup("7")[0]
     assert_equal nil, obj
   end

data/test/test_help.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class HelpTest < Test::Unit::TestCase
+  def setup
+    @shell = RVC::Shell.new
+    @shell.reload_modules false
+  end
+
+  def teardown
+    @shell = nil
+  end
+
+  def redirect
+    orig = $stdout
+    begin
+      $stdout = File.new('/dev/null', 'w')
+      yield
+    ensure
+      $stdout = orig
+    end
+  end
+
+  def test_all
+    redirect do
+      @shell.cmds.basic.help nil
+    end
+  end
+
+  def test_ns
+    redirect do
+      @shell.cmds.basic.help 'basic'
+    end
+  end
+
+  def test_cmd
+    redirect do
+      @shell.cmds.basic.help 'basic.info'
+    end
+  end
+
+  def test_alias
+    redirect do
+      @shell.cmds.basic.help 'i'
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+coverage_tool = :simplecov if ENV['RVC_COVERAGE']
+
+case coverage_tool
+when :simplecov
+  require 'simplecov'
+  SimpleCov.start
+when :cover_me
+  require 'cover_me'
+end
+
+require 'test/unit'
+require 'rvc'

data/test/test_metric.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'rvc'
+require 'test_helper'
 
 class MetricTest < Test::Unit::TestCase
   def test_decimal_str

data/test/test_modules.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+MODULES_DIR = File.join(File.dirname(__FILE__), 'modules')
+
+class ModulesTest < Test::Unit::TestCase
+  def setup
+    @shell = RVC::Shell.new
+    @shell.cmds = RVC::Namespace.new 'root', @shell, nil
+    @shell.load_module_dir MODULES_DIR, @shell.cmds, false
+  end
+
+  def teardown
+    @shell = nil
+  end
+
+  def test_modules
+    foo = @shell.cmds.foo
+    assert_equal 42, foo.foo
+
+    cmd = @shell.cmds[:foo]
+    assert_equal @shell.cmds.foo, cmd
+
+    cmd = @shell.cmds.lookup [:foo]
+    assert_equal @shell.cmds.foo.commands[:foo], cmd
+
+    assert_equal 13, foo.bar.bar
+
+    ns = @shell.cmds.lookup [:foo], RVC::Namespace
+    assert_equal @shell.cmds[:foo], ns
+
+    ns = @shell.cmds.lookup [:foo, :bar], RVC::Namespace
+    assert_equal @shell.cmds.foo.bar, ns
+
+    cmd = @shell.cmds.lookup [:foo, :bar, :bar]
+    assert_equal @shell.cmds.foo.bar.commands[:bar], cmd
+    assert_equal cmd, @shell.cmds[:foo].bar.commands[:bar]
+  end
+end

data/test/test_parse_path.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'rvc/path'
+require 'test_helper'
 
 class ParsePathTest < Test::Unit::TestCase
   def test_empty

data/test/test_shell.rb

@@ -0,0 +1,138 @@
+require 'test_helper'
+
+FOO_MODULE = <<-EOS
+opts :foo do
+  summary "Foo it"
+end
+
+def foo
+end
+
+rvc_alias :foo
+rvc_alias :foo, :f
+EOS
+
+FOO_BAR_MODULE = <<-EOS
+opts :bar do
+  summary "Bar it"
+end
+
+def bar
+end
+
+rvc_alias :bar
+EOS
+
+def redirect
+  orig = $stdout
+  begin
+    $stdout = File.new('/dev/null', 'w')
+    yield
+  ensure
+    $stdout = orig
+  end
+end
+
+class ShellTest < Test::Unit::TestCase
+  def setup
+    @shell = RVC::Shell.new
+    @shell.cmds = RVC::Namespace.new 'root', @shell, nil
+    @shell.cmds.child_namespace(:foo).load_code FOO_MODULE, 'inline'
+    @shell.cmds.child_namespace(:foo).child_namespace(:bar).load_code FOO_BAR_MODULE, 'inline'
+  end
+
+  def teardown
+    @shell = nil
+  end
+
+  def test_parse_input
+    cmdpath, args = RVC::Shell.parse_input 'module.cmd --longarg -s vm1 vm2 "spacy vm"'
+    assert_equal [:module, :cmd], cmdpath
+    assert_equal ['--longarg', '-s', 'vm1', 'vm2', 'spacy vm'], args
+
+    cmdpath, args = RVC::Shell.parse_input 'module.cmd --longarg -s vm1 vm2 "spacy vm'
+    assert_equal [:module, :cmd], cmdpath
+    assert_equal ['--longarg', '-s', 'vm1', 'vm2', 'spacy vm'], args
+  end
+
+  def test_lookup_cmd
+    ns = @shell.cmds.lookup [], RVC::Namespace
+    assert_equal @shell.cmds, ns
+
+    ret = @shell.cmds.lookup [], RVC::Command
+    assert_equal nil, ret
+
+    cmd = @shell.cmds.lookup [:foo, :foo]
+    assert_equal @shell.cmds.foo.commands[:foo], cmd
+
+    ret = @shell.cmds.lookup [:foo, :foo], RVC::Namespace
+    assert_equal nil, ret
+
+    cmd = @shell.cmds.lookup [:foo]
+    assert_equal @shell.cmds.foo.commands[:foo], cmd
+
+    ns = @shell.cmds.lookup [:foo], RVC::Namespace
+    assert_equal @shell.cmds.foo, ns
+
+    cmd = @shell.cmds.lookup [:f]
+    assert_equal @shell.cmds.foo.commands[:foo], cmd
+
+    ns = @shell.cmds.lookup [:foo, :bar], RVC::Namespace
+    assert_equal @shell.cmds.foo.bar, ns
+
+    cmd = @shell.cmds.lookup [:foo, :bar, :bar]
+    assert_equal @shell.cmds.foo.bar.commands[:bar], cmd
+
+    cmd = @shell.cmds.lookup [:bar]
+    assert_equal @shell.cmds.foo.bar.commands[:bar], cmd
+
+    ret = @shell.cmds.lookup [:nonexistent], RVC::Namespace
+    assert_equal nil, ret
+
+    ret = @shell.cmds.lookup [:nonexistent, :foo]
+    assert_equal nil, ret
+  end
+
+  def test_ruby_mode
+    $ruby_mod_result = 0
+
+    redirect do
+      @shell.eval_input '/$ruby_mode_result = 1'
+    end
+    assert_equal 1, $ruby_mode_result
+
+    redirect do
+      @shell.eval_input '//'
+      @shell.eval_input '$ruby_mode_result = 2'
+    end
+    assert_equal 2, $ruby_mode_result
+
+    redirect do
+      @shell.cmds.foo.foo
+    end
+
+    redirect do
+      @shell.eval_input '/nonexistent_command'
+    end
+
+    redirect do
+      @shell.eval_input '//'
+      @shell.eval_input '/$ruby_mode_result = 3'
+    end
+    assert_equal 3, $ruby_mode_result
+  end
+
+  def test_eval_command
+    assert_raise RVC::Util::UserError do
+      @shell.eval_command ''
+    end
+
+    assert_raise RVC::Util::UserError do
+      @shell.eval_command '.'
+    end
+
+    assert_raise RVC::Util::UserError do
+      @shell.eval_command '?'
+    end
+  end
+end

data/test/test_uri.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+require 'rvc/uri_parser'
+
+class UriTest < Test::Unit::TestCase
+  def test_only_host
+    uri = RVC::URIParser.parse "host.example.com"
+    assert_equal "//host.example.com", uri.to_s
+  end
+
+  def test_scheme
+    uri = RVC::URIParser.parse "vim://host"
+    assert_equal "vim://host", uri.to_s
+  end
+
+  def test_port
+    uri = RVC::URIParser.parse "host:80"
+    assert_equal "//host:80", uri.to_s
+  end
+
+  def test_user
+    uri = RVC::URIParser.parse "user@host"
+    assert_equal "//user@host", uri.to_s
+  end
+
+  def test_user_and_password
+    uri = RVC::URIParser.parse "user:password@host"
+    assert_equal "//user:password@host", uri.to_s
+  end
+
+  def test_user_and_password_and_port
+    uri = RVC::URIParser.parse "user:password@host:80"
+    assert_equal "//user:password@host:80", uri.to_s
+  end
+end

metadata

@@ -1,103 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rvc
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.0
   prerelease: 
-  version: 1.6.0
 platform: ruby
-authors: 
+authors:
 - Rich Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-03 00:00:00 -08:00
-default_executable: rvc
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rbvmomi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.18.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.18.2
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: zip
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 description: 
 email: rlane@vmware.com
-executables: 
+executables:
 - rvc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
 - TODO
 - VERSION
 - bin/rvc
+- devel/test-dependencies.sh
 - lib/rvc.rb
+- lib/rvc/command.rb
+- lib/rvc/command_slate.rb
 - lib/rvc/completion.rb
+- lib/rvc/connection.rb
 - lib/rvc/extensions/ClusterComputeResource.rb
 - lib/rvc/extensions/ComputeResource.rb
 - lib/rvc/extensions/DVPortSetting.rb
@@ -111,27 +142,24 @@ files:
 - lib/rvc/extensions/ManagedEntity.rb
 - lib/rvc/extensions/Network.rb
 - lib/rvc/extensions/ParaVirtualSCSIController.rb
-- lib/rvc/extensions/PerfCounterInfo.rb
-- lib/rvc/extensions/PerformanceManager.rb
 - lib/rvc/extensions/ResourcePool.rb
 - lib/rvc/extensions/VirtualDevice.rb
 - lib/rvc/extensions/VirtualDisk.rb
 - lib/rvc/extensions/VirtualEthernetCard.rb
 - lib/rvc/extensions/VirtualMachine.rb
 - lib/rvc/field.rb
-- lib/rvc/filesystem_session.rb
 - lib/rvc/fs.rb
 - lib/rvc/inventory.rb
 - lib/rvc/known_hosts.rb
-- lib/rvc/memory_session.rb
-- lib/rvc/modules.rb
 - lib/rvc/modules/alarm.rb
 - lib/rvc/modules/basic.rb
 - lib/rvc/modules/cluster.rb
+- lib/rvc/modules/connection.rb
 - lib/rvc/modules/core.rb
 - lib/rvc/modules/datacenter.rb
 - lib/rvc/modules/datastore.rb
 - lib/rvc/modules/device.rb
+- lib/rvc/modules/diagnostics.rb
 - lib/rvc/modules/esxcli.rb
 - lib/rvc/modules/find.rb
 - lib/rvc/modules/host.rb
@@ -146,48 +174,54 @@ files:
 - 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/namespace.rb
 - lib/rvc/option_parser.rb
 - lib/rvc/path.rb
 - lib/rvc/readline-ffi.rb
+- lib/rvc/ruby_evaluator.rb
 - lib/rvc/shell.rb
 - lib/rvc/ttl_cache.rb
+- lib/rvc/uri_parser.rb
 - lib/rvc/util.rb
+- lib/rvc/version.rb
+- lib/rvc/vim.rb
 - test/inventory_fixtures.rb
+- test/modules/foo.rb
+- test/modules/foo/bar.rb
+- test/test_completion.rb
 - test/test_fs.rb
+- test/test_help.rb
+- test/test_helper.rb
 - test/test_metric.rb
+- test/test_modules.rb
 - test/test_parse_path.rb
-has_rdoc: true
+- test/test_shell.rb
+- test/test_uri.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: vSphere console UI
-test_files: 
-- test/inventory_fixtures.rb
-- test/test_fs.rb
-- test/test_metric.rb
-- test/test_parse_path.rb
+test_files: []