rvc 1.1.0 → 1.2.0

data/README.rdoc

@@ -52,6 +52,15 @@ the "vm" module, but since it is a common operation it has been aliased to
 Commands and paths can be tab completed in the usual fashion. Whitespace must
 be escaped with a backslash.
 
+=== Wildcards
+
+Many commands such as "vm.on" can operate on multiple objects at once. RVC
+supports simple globbing using "*" as well as advanced regex syntax. To use a
+regex, prefix the path element with "%". For example: "vm.on myvms/%^(linux|windows)"
+will power on VMs whose names start with "linux" or "windows" in the "myvms" folder.
+Note that it is necessary to explicitly anchor the pattern with "^" and "$" if you
+wish to match the whole path element.
+
 === Marks
 
   192.168.1.105:/> mark a dc/vm/foo

data/TODO

@@ -1,4 +1,8 @@
 add commands for more entities
 add fake subfolders for more entities
 add fastpass authentication
-globbing?
+
+commands:
+storage vmotion
+edit clusters
+add/remove hosts from clusters

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/rvc

@@ -81,8 +81,13 @@ if $opts[:path]
     lookup(parent_path).CreateFolder(:name => File.basename($opts[:path]))
     CMD.basic.cd $opts[:path]
   end
-elsif ARGV.size == 1
-  CMD.basic.cd $shell.connections.keys.first
+elsif $shell.connections.size == 1
+  conn_name, conn = $shell.connections.first
+  if conn.serviceContent.about.apiType == 'VirtualCenter'
+    CMD.basic.cd conn_name
+  else
+    CMD.basic.cd "#{conn_name}/ha-datacenter/vm"
+  end
 end
 
 unless CMD.vmrc.find_vmrc

data/lib/rvc/completion.rb

@@ -91,7 +91,7 @@ module Completion
     last = trailing_slash ? '' : (els.pop || '')
     els.map! { |x| x.gsub '\\', '' }
     base_loc = absolute ? Location.new($shell.fs.root) : $shell.fs.loc
-    found_loc = $shell.fs.traverse(base_loc, els) or return []
+    found_loc = $shell.fs.traverse(base_loc, els).first or return []
     cur = found_loc.obj
     els.unshift '' if absolute
     children = Cache[cur, :children] rescue []

data/lib/rvc/extensions/ComputeResource.rb

@@ -21,7 +21,12 @@
 class RbVmomi::VIM::ComputeResource
   # TODO expand, optimize
   def display_info
+    stats = self.stats
+    pct_cpu_used = 100.0*stats[:usedCPU]/stats[:totalCPU]
+    pct_mem_used = 100.0*stats[:usedMem]/stats[:totalMem]
     puts "name: #{name}"
+    puts "cpu #{stats[:totalCPU]} GHz (#{pct_cpu_used.to_i}% used)"
+    puts "memory #{stats[:totalMem]} GB (#{pct_mem_used.to_i}% used)"
     puts "hosts:"
     host.each do |h|
       puts " #{h.name}"

data/lib/rvc/fs.rb

@@ -52,7 +52,9 @@ end
 class FS
   attr_reader :root, :loc, :marks
 
-  MARK_REGEX = /^~(?:([\d\w]*|~|@))$/
+  MARK_PATTERN = /^~(?:([\d\w]*|~|@))$/
+  REGEX_PATTERN = /^%/
+  GLOB_PATTERN = /\*/
 
   def initialize root
     @root = root
@@ -68,15 +70,13 @@ class FS
     @loc.path * '/'
   end
 
-  def lookup path
-    (lookup_loc(path) || return).obj
-  end
-
-  def cd path
-    new_loc = lookup_loc(path) or return false
+  def cd new_loc
     mark '~', @loc
     @loc = new_loc
-    true
+  end
+
+  def lookup path
+    lookup_loc(path).map(&:obj)
   end
 
   def lookup_loc path
@@ -85,30 +85,51 @@ class FS
     traverse(base_loc, els)
   end
 
-  def traverse base_loc, els
-    loc = base_loc.dup
-    els.each_with_index do |el,i|
-      case el
-      when '.'
-      when '..'
-        loc.pop unless loc.obj == @root
-      when '...'
-        loc.push(el, loc.obj.parent) unless loc.obj == @root
-      when MARK_REGEX
-        return unless i == 0
-        loc = @marks[$1] or return
-        loc = loc.dup
+  def traverse_one loc, el, first
+    case el
+    when '.'
+      [loc]
+    when '..'
+      loc.pop unless loc.obj == @root
+      [loc]
+    when '...'
+      loc.push(el, loc.obj.parent) unless loc.obj == @root
+      [loc]
+    when MARK_PATTERN
+      return unless first
+      loc = @marks[$1] or return []
+      [loc.dup]
+    when REGEX_PATTERN
+      regex = Regexp.new($')
+      loc.obj.children.
+        select { |k,v| k =~ regex }.
+        map { |k,v| loc.dup.tap { |x| x.push(k, v) } }
+    when GLOB_PATTERN
+      regex = glob_to_regex el
+      loc.obj.children.
+        select { |k,v| k =~ regex }.
+        map { |k,v| loc.dup.tap { |x| x.push(k, v) } }
+    else
+      # XXX check for ambiguous child
+      if first and el =~ /^\d+$/ and @marks.member? el
+        loc = @marks[el].dup
       else
-        # XXX check for ambiguous child
-        if i == 0 and el =~ /^\d+$/ and @marks.member? el
-          loc = @marks[el].dup
-        else
-          x = loc.obj.traverse_one(el) or return
-          loc.push el, x
-        end
+        x = loc.obj.traverse_one(el) or return []
+        loc.push el, x
       end
+      [loc]
+    end
+  end
+
+  # Starting from base_loc, traverse each path element in els. Since the path
+  # may contain wildcards, this function returns a list of matches.
+  def traverse base_loc, els
+    locs = [base_loc.dup]
+    els.each_with_index do |el,i|
+      locs.map! { |loc| traverse_one loc, el, i==0 }
+      locs.flatten!
     end
-    loc
+    locs
   end
 
   def mark key, loc
@@ -118,6 +139,10 @@ class FS
       @marks[key] = loc
     end
   end
+
+  def glob_to_regex str
+    Regexp.new "^#{Regexp.escape(str.gsub('*', "\0")).gsub("\0", ".*")}$"
+  end
 end
 
 end

data/lib/rvc/modules/basic.rb

@@ -42,7 +42,7 @@ rvc_alias :help
 HELP_ORDER = %w(basic vm)
 
 def help path
-  obj = lookup(path) if path
+  obj = lookup_single(path) if path
 
   if obj
     puts "Relevant commands for #{obj.class}:"
@@ -119,7 +119,9 @@ end
 rvc_alias :cd
 
 def cd path
-  $shell.fs.cd(path) or err "Not found: #{path.inspect}"
+  # XXX check for multiple matches
+  new_loc = $shell.fs.lookup_loc(path).first or err "Not found: #{path.inspect}"
+  $shell.fs.cd(new_loc)
   $shell.fs.mark '', find_ancestor_loc(RbVmomi::VIM::Datacenter)
   $shell.fs.mark '@', find_ancestor_loc(RbVmomi::VIM)
   $shell.fs.marks.delete_if { |k,v| k =~ /^\d+$/ }
@@ -141,7 +143,8 @@ rvc_alias :ls
 rvc_alias :ls, :l
 
 def ls path
-  loc = $shell.fs.lookup_loc(path) or err "Not found: #{path.inspect}"
+  # XXX check for multiple matches
+  loc = $shell.fs.lookup_loc(path).first or err "Not found: #{path.inspect}"
   obj = loc.obj
   children = obj.children
   name_map = children.invert
@@ -177,7 +180,7 @@ def ls path
 
   results.each do |r|
     name = name_map[r.obj]
-    text = r.obj.ls_text r
+    text = r.obj.ls_text(r) rescue " (error)"
     realname = r['name'] if name != r['name']
     puts "#{i} #{name}#{realname && " [#{realname}]"}#{text}"
     mark_loc = loc.dup.tap { |x| x.push name, r.obj }
@@ -227,7 +230,8 @@ rvc_alias :mark, :m
 
 def mark key, path
   err "invalid mark name" unless key =~ /^\w+$/
-  obj = $shell.fs.lookup_loc(path) or err "Not found: #{path.inspect}" 
+  # XXX aggregate marks
+  obj = $shell.fs.lookup_loc(path).first or err "Not found: #{path.inspect}" 
   $shell.fs.mark key, obj
 end
 
@@ -271,6 +275,6 @@ rvc_alias :mkdir
 
 # TODO dispatch to datastore.mkdir if path is in a datastore
 def mkdir path
-  parent = lookup! File.dirname(path), RbVmomi::VIM::Folder
+  parent = lookup_single! File.dirname(path), RbVmomi::VIM::Folder
   parent.CreateFolder(:name => File.basename(path))
 end

data/lib/rvc/modules/cluster.rb

@@ -0,0 +1,63 @@
+# 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
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+opts :create do
+  summary "Create a cluster"
+  arg :dest, nil, :lookup_parent => VIM::Folder
+end
+
+def create dest
+  folder, name = *dest
+  folder.CreateClusterEx(:name => name, :spec => {})
+end
+
+
+opts :add_host do
+  summary "Add a host to a cluster"
+  arg :cluster, nil, :lookup => VIM::ClusterComputeResource
+  arg :hostname, nil
+  opt :username, "Username", :short => 'u', :default => 'root'
+  opt :password, "Password", :short => 'p', :default => ''
+end
+
+def add_host cluster, hostname, opts
+  sslThumbprint = nil
+  while true
+    spec = {
+      :force => false,
+      :hostName => hostname,
+      :userName => opts[:username],
+      :password => opts[:password],
+      :sslThumbprint => sslThumbprint,
+    }
+    task = cluster.AddHost_Task :spec => spec,
+                                :asConnected => false
+    begin
+      task.wait_for_completion
+    rescue VIM::SSLVerifyFault
+      puts "SSL thumbprint: #{$!.fault.thumbprint}"
+      $stdout.write "Accept this thumbprint? (y/n) "
+      $stdout.flush
+      answer = $stdin.readline.chomp
+      err "Aborted" unless answer == 'y' or answer == 'yes'
+      sslThumbprint = $!.fault.thumbprint
+    end
+  end
+end

data/lib/rvc/modules/datacenter.rb

@@ -0,0 +1,30 @@
+# 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
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+opts :create do
+  summary "Create a datacenter"
+  arg :dest, nil, :lookup_parent => [VIM::Folder, VIM]
+end
+
+def create dest
+  folder, name = *dest
+  folder = folder.rootFolder if folder.is_a? VIM
+  folder.CreateDatacenter(:name => name)
+end

data/lib/rvc/modules/datastore.rb

@@ -25,7 +25,7 @@ opts :download do
 end
 
 def download datastore_path, local_path
-  file = lookup(datastore_path)
+  file = lookup_single(datastore_path)
   err "not a datastore file" unless file.is_a? RbVmomi::VIM::Datastore::FakeDatastoreFile
   file.datastore.download file.path, local_path
 end
@@ -38,7 +38,7 @@ end
 
 def upload local_path, datastore_path
   datastore_dir_path = File.dirname datastore_path
-  dir = lookup(datastore_dir_path)
+  dir = lookup_single(datastore_dir_path)
   err "datastore directory does not exist" unless dir.is_a? RbVmomi::VIM::Datastore::FakeDatastoreFolder
   err "local file does not exist" unless File.exists? local_path
   real_datastore_path = "#{dir.path}/#{File.basename(datastore_path)}"
@@ -52,7 +52,7 @@ end
 
 def mkdir datastore_path
   datastore_dir_path = File.dirname datastore_path
-  dir = lookup(datastore_dir_path)
+  dir = lookup_single(datastore_dir_path)
   err "datastore directory does not exist" unless dir.is_a? RbVmomi::VIM::Datastore::FakeDatastoreFolder
   ds = dir.datastore
   dc = ds.path.find { |o,x| o.is_a? RbVmomi::VIM::Datacenter }[0]

data/lib/rvc/modules/host.rb

@@ -92,3 +92,30 @@ end
 def exit_maintenance_mode hosts, opts
   tasks hosts, :ExitMaintenanceMode, :timeout => opts[:timeout]
 end
+
+
+opts :disconnect do
+  summary "Disconnect a host"
+  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+end
+
+def disconnect hosts
+  tasks hosts, :DisconnectHost
+end
+
+
+opts :reconnect do
+  summary "Reconnect a host"
+  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+  opt :username, "Username", :short => 'u', :default => 'root'
+  opt :password, "Password", :short => 'p', :default => ''
+end
+
+def reconnect hosts, opts
+  spec = {
+    :force => false,
+    :userName => opts[:username],
+    :password => opts[:password],
+  }
+  tasks hosts, :ReconnectHost
+end

data/lib/rvc/modules/vm.rb

@@ -68,21 +68,51 @@ def suspend vms
 end
 
 
+opts :shutdown_guest do
+  summary "Shut down guest OS"
+  arg :vm, nil, :multi => true, :lookup => VIM::VirtualMachine
+end
+
+def shutdown_guest vms
+  vms.each(&:ShutdownGuest)
+end
+
+
+opts :standby_guest do
+  summary "Suspend guest OS"
+  arg :vm, nil, :multi => true, :lookup => VIM::VirtualMachine
+end
+
+def standby_guest vms
+  vms.each(&:StandbyGuest)
+end
+
+
+opts :reboot_guest do
+  summary "Reboot guest OS"
+  arg :vm, nil, :multi => true, :lookup => VIM::VirtualMachine
+end
+
+def reboot_guest vms
+  vms.each(&:RebootGuest)
+end
+
+
 opts :create do
   summary "Create a new VM"
-  arg :name, "Name"
+  arg :name, "Destination", :lookup_parent => VIM::Folder
   opt :pool, "Resource pool", :short => 'p', :type => :string, :lookup => VIM::ResourcePool
   opt :host, "Host", :short => 'h', :type => :string, :lookup => VIM::HostSystem
   opt :datastore, "Datastore", :short => 'd', :type => :string, :lookup => VIM::Datastore
 end
 
-def create name, opts
+def create dest, opts
   err "must specify resource pool (--pool)" unless opts[:pool]
   err "must specify datastore (--datastore)" unless opts[:datastore]
-  vmFolder = lookup!(File.dirname(name), VIM::Folder)
+  vmFolder, name = *dest
   datastore_path = "[#{opts[:datastore].name}]"
   config = {
-    :name => File.basename(name),
+    :name => name,
     :guestId => 'otherGuest',
     :files => { :vmPathName => datastore_path },
     :numCPUs => 1,
@@ -99,7 +129,7 @@ def create name, opts
         :operation => :add,
         :fileOperation => :create,
         :device => VIM.VirtualDisk(
-          :key => 0,
+          :key => -1,
           :backing => VIM.VirtualDiskFlatVer2BackingInfo(
             :fileName => datastore_path,
             :diskMode => :persistent,
@@ -112,7 +142,7 @@ def create name, opts
       }, {
         :operation => :add,
         :device => VIM.VirtualCdrom(
-          :key => 0,
+          :key => -2,
           :connectable => {
             :allowGuestControl => true,
             :connected => true,
@@ -127,7 +157,7 @@ def create name, opts
       }, {
         :operation => :add,
         :device => VIM.VirtualE1000(
-          :key => 0,
+          :key => -3,
           :deviceInfo => {
             :label => 'Network Adapter 1',
             :summary => 'VM Network'
@@ -341,13 +371,15 @@ end
 opts :ssh do
   summary "SSH to a VM"
   arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :cmd, "Optional command", :required => false, :default => nil
+  opt :login, "Username", :short => 'l', :default => 'root'
 end
 
 rvc_alias :ssh
 
-def ssh vm
+def ssh vm, cmd, opts
   ip = vm_ip vm
-  ssh_cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip}"
+  ssh_cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l #{opts[:login]} #{ip} #{cmd}"
   system_fg(ssh_cmd)
 end
 
@@ -610,8 +642,8 @@ def find_vmx_files ds
   files
 end
 
-def change_device_connectivity id, label, connected
-  dev = vm(id).config.hardware.device.find { |x| x.deviceInfo.label == label }
+def change_device_connectivity vm, label, connected
+  dev = vm.config.hardware.device.find { |x| x.deviceInfo.label == label }
   err "no such device" unless dev
   dev.connectable.connected = connected
   spec = {
@@ -619,7 +651,7 @@ def change_device_connectivity id, label, connected
       { :operation => :edit, :device => dev },
     ]
   }
-  vm(id).ReconfigVM_Task(:spec => spec).wait_for_completion
+  vm.ReconfigVM_Task(:spec => spec).wait_for_completion
 end
 
 def vm_ip vm

data/lib/rvc/option_parser.rb

@@ -55,18 +55,21 @@ class OptionParser < Trollop::Parser
     @has_options
   end
 
-  def arg name, description, opts={}
-    opts = {
+  def arg name, description, spec={}
+    spec = {
+      :description => description,
       :required => true,
       :default => nil,
       :multi => false,
-    }.merge opts
-    opts[:default] = [] if opts[:multi] and opts[:default].nil?
+    }.merge spec
+    spec[:default] = [] if spec[:multi] and spec[:default].nil?
     fail "Multi argument must be the last one" if @seen_multi
-    fail "Can't have required argument after optional ones" if opts[:required] and @seen_not_required
-    @applicable << opts[:lookup] if opts[:lookup]
-    @args << [name, description, opts[:required], opts[:default], opts[:multi], opts[:lookup]]
-    text "  #{name}: " + [description, opts[:lookup]].compact.join(' ')
+    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]
+    @args << [name,spec]
+    text "  #{name}: " + [description, spec[:lookup], spec[:lookup_parent]].compact.join(' ')
   end
 
   def parse argv
@@ -74,35 +77,48 @@ class OptionParser < Trollop::Parser
 
     @specs.each do |name,spec|
       next unless klass = spec[:lookup] and path = opts[name]
-      opts[name] = lookup! path, klass
+      opts[name] = lookup_single! path, klass
     end
 
     argv = leftovers
     args = []
-    @args.each do |name,desc,required,default,multi,lookup_klass|
-      if multi
-        err "missing argument '#{name}'" if required and argv.empty?
-        a = (argv.empty? ? default : argv.dup)
-        a.map! { |x| lookup! x, lookup_klass } if lookup_klass
+    @args.each do |name,spec|
+      if spec[:multi]
+        err "missing argument '#{name}'" if spec[:required] and argv.empty?
+        a = (argv.empty? ? spec[:default] : argv.dup)
+        a = a.map { |x| postprocess_arg x, spec }.inject(:+)
+        err "no matches for '#{name}'" if spec[:required] and a.empty?
         args << a
         argv.clear
       else
         x = argv.shift
-        err "missing argument '#{name}'" if required and x.nil?
-        x = default if x.nil?
-        x = lookup! x, lookup_klass if lookup_klass
-        args << x
+        err "missing argument '#{name}'" if spec[:required] and x.nil?
+        x = spec[:default] if x.nil?
+        a = x.nil? ? [] : postprocess_arg(x, spec)
+        err "more than one match for #{name}" if a.size > 1
+        err "no match for '#{name}'" if spec[:required] and a.empty?
+        args << a.first
       end
     end
     err "too many arguments" unless argv.empty?
     return args, opts
   end
 
+  def postprocess_arg x, spec
+    if spec[:lookup]
+      lookup! x, spec[:lookup]
+    elsif spec[:lookup_parent]
+      lookup!(File.dirname(x), spec[:lookup_parent]).map { |y| [y, File.basename(x)] }
+    else
+      [x]
+    end
+  end
+
   def educate
-    arg_texts = @args.map do |name,desc,required,default,multi,lookup_klass|
+    arg_texts = @args.map do |name,spec|
       text = name
-      text = "[#{text}]" if not required
-      text = "#{text}..." if multi
+      text = "[#{text}]" if not spec[:required]
+      text = "#{text}..." if spec[:multi]
       text
     end
     arg_texts.unshift "[opts]" if has_options?

data/lib/rvc/shell.rb

@@ -80,7 +80,7 @@ class Shell
     return unless cmd
     err "invalid command" unless cmd.is_a? String
     case cmd
-    when RVC::FS::MARK_REGEX
+    when RVC::FS::MARK_PATTERN
       CMD.basic.cd cmd
     else
       if cmd.include? '.'
@@ -192,11 +192,11 @@ class RubyEvaluator
   end
 
   def dc
-    @fs.lookup("~")
+    @fs.lookup("~").first
   end
 
   def conn
-    @fs.lookup("~@")
+    @fs.lookup("~@").first
   end
 
   def method_missing sym, *a

data/lib/rvc/util.rb

@@ -22,17 +22,34 @@ module RVC
 module Util
   extend self
 
+  # XXX just use an optional argument for type
   def lookup path
     $shell.fs.lookup path
   end
 
-  def lookup! path, type
-    lookup(path).tap do |obj|
-      err "Not found: #{path.inspect}" unless obj
-      err "Expected #{type} but got #{obj.class} at #{path.inspect}" unless obj.is_a? type
+  def lookup_single path
+    objs = lookup(path, type)
+    err "Not found: #{path.inspect}" if objs.empty?
+    err "More than one match for #{path.inspect}" if objs.size > 1
+    objs.first
+  end
+
+  def lookup! path, types
+    types = [types] unless types.is_a? Enumerable
+    lookup(path).tap do |objs|
+      objs.each do |obj|
+        err "Expected #{types*'/'} but got #{obj.class} at #{path.inspect}" unless types.any? { |type| obj.is_a? type }
+      end
     end
   end
 
+  def lookup_single! path, type
+    objs = lookup!(path, type)
+    err "Not found: #{path.inspect}" if objs.empty?
+    err "More than one match for #{path.inspect}" if objs.size > 1
+    objs.first
+  end
+
   def menu items
     items.each_with_index { |x, i| puts "#{i} #{x}" }
     input = Readline.readline("? ", false)

data/test/test_fs.rb

@@ -3,10 +3,16 @@ require 'rvc'
 require 'inventory_fixtures'
 
 class FSTest < Test::Unit::TestCase
+  NodeDaa = FixtureNode.new 'Daa'
+  NodeDab = FixtureNode.new 'Dab'
+  NodeDabc = FixtureNode.new 'Dabc'
+  NodeDac = FixtureNode.new 'Dac'
   NodeB = FixtureNode.new 'B'
   NodeC = FixtureNode.new 'C'
+  NodeD = FixtureNode.new('D', 'daa' => NodeDaa, 'dab' => NodeDab,
+                               'dabc' => NodeDabc, 'dac' => NodeDac)
   NodeA = FixtureNode.new('A', 'b' => NodeB, 'c' => NodeC)
-  Root = FixtureNode.new('ROOT', 'a' => NodeA)
+  Root = FixtureNode.new('ROOT', 'a' => NodeA, 'd' => NodeD)
 
   def setup
     @context = RVC::FS.new Root
@@ -25,31 +31,31 @@ class FSTest < Test::Unit::TestCase
   end
 
   def test_lookup_simple
-    assert_equal nil, @context.lookup('nonexistent')
-    assert_equal Root, @context.lookup('.')
-    assert_equal Root, @context.lookup('..')
-    assert_equal Root, @context.lookup('...')
-    assert_equal NodeA, @context.lookup('a')
-    assert_equal NodeB, @context.lookup('a/b')
-    assert_equal NodeC, @context.lookup('a/b/../c')
-    assert_equal NodeC, @context.lookup('a/b/.../c')
+    assert_equal [], @context.lookup('nonexistent')
+    assert_equal [Root], @context.lookup('.')
+    assert_equal [Root], @context.lookup('..')
+    assert_equal [Root], @context.lookup('...')
+    assert_equal [NodeA], @context.lookup('a')
+    assert_equal [NodeB], @context.lookup('a/b')
+    assert_equal [NodeC], @context.lookup('a/b/../c')
+    assert_equal [NodeC], @context.lookup('a/b/.../c')
   end
 
   def test_lookup_loc_nonexistent
     loc = @context.lookup_loc 'nonexistent'
-    assert_equal nil, loc
+    assert_equal [], loc
   end
 
   def test_lookup_loc_simple
     %w(a /a ./a ./a/.).each do |path|
-      loc = @context.lookup_loc path
+      loc = @context.lookup_loc(path)[0]
       assert_equal NodeA, loc.obj
       assert_equal ['', 'a'], loc.path
       assert_equal [['', Root], ['a', NodeA]], loc.stack
     end
 
     %w(a/b /a/b ./a/b /a/b/.).each do |path|
-      loc = @context.lookup_loc path
+      loc = @context.lookup_loc(path)[0]
       assert_equal NodeB, loc.obj
       assert_equal ['', 'a', 'b'], loc.path
       assert_equal [['', Root], ['a', NodeA], ['b', NodeB]], loc.stack
@@ -57,57 +63,82 @@ class FSTest < Test::Unit::TestCase
   end
 
   def test_lookup_loc_parent
-    loc = @context.lookup_loc '..'
+    loc = @context.lookup_loc('..')[0]
     assert_equal [['', Root]], loc.stack
 
-    loc = @context.lookup_loc 'a/..'
+    loc = @context.lookup_loc('a/..')[0]
     assert_equal [['', Root]], loc.stack
 
-    loc = @context.lookup_loc 'a/b/..'
+    loc = @context.lookup_loc('a/b/..')[0]
     assert_equal [['', Root], ['a', NodeA]], loc.stack
   end
 
   def test_lookup_loc_realparent
-    loc = @context.lookup_loc '...'
+    loc = @context.lookup_loc('...')[0]
     assert_equal [['', Root]], loc.stack
 
-    loc = @context.lookup_loc 'a/...'
+    loc = @context.lookup_loc('a/...')[0]
     assert_equal [['', Root], ['a', NodeA], ['...', Root]], loc.stack
 
-    loc = @context.lookup_loc 'a/b/...'
+    loc = @context.lookup_loc('a/b/...')[0]
     assert_equal [['', Root], ['a', NodeA], ['b', NodeB], ['...', NodeA]], loc.stack
   end
 
   def test_lookup_loc_mark
-    b_loc = @context.lookup_loc 'a/b'
+    b_loc = @context.lookup_loc('a/b')[0]
     assert_not_nil b_loc
 
-    loc = @context.lookup_loc '~foo'
+    loc = @context.lookup_loc('~foo')[0]
     assert_equal nil, loc
 
     ['foo', '~', '7', ''].each do |mark|
       @context.mark mark, b_loc
-      loc = @context.lookup_loc "~#{mark}"
+      loc = @context.lookup_loc("~#{mark}")[0]
       assert_equal [['', Root], ['a', NodeA], ['b', NodeB]], loc.stack
 
       @context.mark mark, nil
-      loc = @context.lookup_loc "~#{mark}"
+      loc = @context.lookup_loc("~#{mark}")[0]
       assert_equal nil, loc
     end
 
     @context.mark '7', b_loc
-    loc = @context.lookup_loc "7"
+    loc = @context.lookup_loc("7")[0]
     assert_equal [['', Root], ['a', NodeA], ['b', NodeB]], loc.stack
 
     @context.mark '7', nil
-    loc = @context.lookup_loc "7"
+    loc = @context.lookup_loc("7")[0]
     assert_equal nil, loc
   end
 
   def test_cd
-    assert_equal false, @context.cd("nonexistent")
     assert_equal [['', Root]], @context.loc.stack
-    assert_equal true, @context.cd("a")
+    @context.cd(@context.lookup_loc("a")[0])
     assert_equal [['', Root], ['a', NodeA]], @context.loc.stack
   end
+
+  def test_regex
+    daa = [['', Root], ['d', NodeD], ['daa', NodeDaa]]
+    dab = [['', Root], ['d', NodeD], ['dab', NodeDab]]
+    dabc = [['', Root], ['d', NodeD], ['dabc', NodeDabc]]
+    dac = [['', Root], ['d', NodeD], ['dac', NodeDac]]
+    locs = @context.lookup_loc '/d/%^daa'
+    assert_equal [daa], locs.map(&:stack)
+    locs = @context.lookup_loc '/d/%^daa.*'
+    assert_equal [daa], locs.map(&:stack)
+    locs = @context.lookup_loc '/d/%^da.*c'
+    assert_equal [dabc, dac], locs.map(&:stack)
+  end
+
+  def test_glob
+    daa = [['', Root], ['d', NodeD], ['daa', NodeDaa]]
+    dab = [['', Root], ['d', NodeD], ['dab', NodeDab]]
+    dabc = [['', Root], ['d', NodeD], ['dabc', NodeDabc]]
+    dac = [['', Root], ['d', NodeD], ['dac', NodeDac]]
+    locs = @context.lookup_loc '/d/*daa*'
+    assert_equal [daa], locs.map(&:stack)
+    locs = @context.lookup_loc '/d/d*a'
+    assert_equal [daa], locs.map(&:stack)
+    locs = @context.lookup_loc '/d/da*c'
+    assert_equal [dabc, dac], locs.map(&:stack)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: rvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,8 @@ files:
 - lib/rvc/inventory.rb
 - lib/rvc/modules.rb
 - lib/rvc/modules/basic.rb
+- lib/rvc/modules/cluster.rb
+- lib/rvc/modules/datacenter.rb
 - lib/rvc/modules/datastore.rb
 - lib/rvc/modules/host.rb
 - lib/rvc/modules/resource_pool.rb