rvc 1.4.1 → 1.5.0

data/README.rdoc

@@ -131,6 +131,15 @@ is represented by a top-level node in the virtual filesystem. If more than one
 host is given on the command line, RVC will start in the root of the filesystem
 instead of automatically cd'ing to a connection.
 
+== VNC Clients
+=== OSX
+Using homebrew https://github.com/mxcl/homebrew install tiger-vnc using the
+command 
+	
+	"brew install tiger-vnc"
+
+this will allow you to use the vnc.view command
+
 == Extensibility
 
 RVC is designed to let users easily add commands they need. You can create a

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "rlane@vmware.com"
     #gem.homepage = ""
     gem.authors = ["Rich Lane"]
-    gem.add_dependency 'rbvmomi', '>= 1.2.3'
+    gem.add_dependency 'rbvmomi', '>= 1.3.0'
     gem.add_dependency 'trollop', '>= 1.16.2'
     gem.add_dependency 'backports', '>= 1.18.2'
     gem.add_dependency 'highline', '>= 1.6.1'

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/bin/rvc

@@ -53,8 +53,11 @@ EOS
   opt :path, "Initial directory", :short => :none, :default => ENV['RVC_PATH'], :type => :string
   opt :create_directory, "Create the initial directory if it doesn't exist", :short => :none
   opt :cmd, "command to evaluate", :short => 'c', :multi => true, :type => :string
+  opt :script, "file to execute", :short => 's', :type => :string
 end
 
+$interactive = $opts[:script].nil? and $stdin.tty?
+
 RVC.reload_modules false
 
 session = if ENV['RVC_SESSION'] and not ENV['RVC_SESSION'].empty?
@@ -66,7 +69,7 @@ end
 $shell = RVC::Shell.new session
 
 # Prompt for hostname if none given. Useful on win32.
-if $shell.session.connections.empty? and ARGV.empty?
+if $shell.session.connections.empty? and ARGV.empty? and $interactive
   ARGV << Readline.readline("Host to connect to (user@host): ")
 end
 
@@ -92,10 +95,12 @@ ARGV.each do |uri|
   end
 end
 
-RVC::Completion.install
-history_fn = "#{ENV['HOME']}/.rvc-history"
-IO.foreach(history_fn) { |l| Readline::HISTORY << l.chomp } rescue puts "Welcome to RVC. Try the 'help' command."
-history = File.open(history_fn, 'a')
+if $interactive
+  RVC::Completion.install
+  history_fn = "#{ENV['HOME']}/.rvc-history"
+  IO.foreach(history_fn) { |l| Readline::HISTORY << l.chomp } rescue puts "Welcome to RVC. Try the 'help' command."
+  history = File.open(history_fn, 'a')
+end
 
 if $opts[:path]
   begin
@@ -106,7 +111,7 @@ if $opts[:path]
     RVC::Util.lookup_single(parent_path).CreateFolder(:name => File.basename($opts[:path]))
     CMD.basic.cd RVC::Util.lookup_single($opts[:path])
   end
-elsif $shell.connections.size == 1
+elsif $shell.connections.size == 1 and $interactive
   conn_name, conn = $shell.connections.first
   if conn.serviceContent.about.apiType == 'VirtualCenter'
     CMD.basic.cd RVC::Util.lookup_single(conn_name)
@@ -121,24 +126,24 @@ if defined? Ocra
   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."
+if $interactive
+  $stderr.puts "VMRC is not installed. You will be unable to view virtual machine consoles. Use the vmrc.install command to install it." unless CMD.vmrc.find_vmrc 
+  $stderr.puts "Use the 'connect' command to connect to an ESX or VC server." if $shell.connections.empty?
+  CMD.basic.ls RVC::Util.lookup_single('.')
 end
 
-CMD.basic.ls RVC::Util.lookup_single('.')
-
-while true
-  begin
-    input = $opts[:cmd].shift || Readline.readline($shell.prompt, false) or break
-    input = input.strip
-    next if input.empty?
-    (history.puts input; Readline::HISTORY << input) unless input == Readline::HISTORY.to_a[-1]
-    $shell.eval_input input
-  rescue Interrupt
-    puts
+if $opts[:script]
+  $shell.eval_ruby File.read($opts[:script]), $opts[:script]
+else
+  while true
+    begin
+      input = $opts[:cmd].shift || Readline.readline($shell.prompt, false) or break
+      input = input.strip
+      next if input.empty?
+      (history.puts input; Readline::HISTORY << input) unless input == Readline::HISTORY.to_a[-1]
+      $shell.eval_input input
+    rescue Interrupt
+      puts
+    end
   end
 end

data/lib/rvc/extensions/VirtualMachine.rb

@@ -71,6 +71,7 @@ class RbVmomi::VIM::VirtualMachine
       'datastores' => RVC::FakeFolder.new(self, :rvc_children_datastores),
       'networks' => RVC::FakeFolder.new(self, :rvc_children_networks),
       'files' => RVC::FakeFolder.new(self, :rvc_children_files),
+      'snapshots' => RVC::RootSnapshotFolder.new(self),
     }
   end
 
@@ -96,3 +97,70 @@ class RbVmomi::VIM::VirtualMachine
     end]
   end
 end
+
+class RVC::RootSnapshotFolder
+  include RVC::InventoryObject
+
+  def initialize vm
+    @vm = vm
+  end
+
+  def children
+    info = @vm.snapshot
+    return {} unless info
+    Hash[info.rootSnapshotList.map { |x| [x.name, RVC::SnapshotFolder.new(@vm, [x.id])] }]
+  end
+
+  def display_info
+    puts "Root of a VM's snapshot tree"
+  end
+end
+
+class RVC::SnapshotFolder
+  include RVC::InventoryObject
+
+  def initialize vm, ids
+    @vm = vm
+    @ids = ids
+  end
+
+  def self.to_s
+    'Snapshot'
+  end
+
+  def find_tree
+    cur = nil
+    info = @vm.snapshot
+    fail "snapshot not found" unless info
+    children = info.rootSnapshotList
+    @ids.each do |id|
+      cur = children.find { |x| x.id == id }
+      fail "snapshot not found" unless cur
+      children = cur.childSnapshotList
+    end
+    cur
+  end
+
+  def children
+    tree = find_tree
+    {}.tap do |h|
+      tree.childSnapshotList.each do |x|
+        name = x.name
+        name = x.name + '.1' if h.member? x.name
+        while h.member? name
+          name = name.succ
+        end
+        h[name] = RVC::SnapshotFolder.new(@vm, @ids+[x.id])
+      end
+    end
+  end
+
+  def display_info
+    tree = find_tree
+    puts "id: #{tree.id}"
+    puts "name: #{tree.name}"
+    puts "description: #{tree.description}"
+    puts "state: #{tree.state}"
+    puts "creation time: #{tree.createTime}"
+  end
+end

data/lib/rvc/modules/basic.rb

@@ -42,7 +42,14 @@ rvc_alias :help
 HELP_ORDER = %w(basic vm)
 
 def help path
-  if tgt = RVC::ALIASES[path]
+  if mod = RVC::MODULES[path]
+    opts = mod.instance_variable_get(:@opts)
+    opts.each do |method_name,method_opts|
+      parser = RVC::OptionParser.new method_name, &method_opts
+      help_summary parser, path, method_name
+    end
+    return
+  elsif tgt = RVC::ALIASES[path]
     fail unless tgt =~ /^(.+)\.(.+)$/
     opts_block = RVC::MODULES[$1].opts_for($2.to_sym)
     RVC::OptionParser.new(tgt, &opts_block).educate
@@ -69,9 +76,7 @@ def help path
     opts.each do |method_name,method_opts|
       parser = RVC::OptionParser.new method_name, &method_opts
       next unless obj.nil? or parser.applicable.any? { |x| obj.is_a? x }
-      aliases = ALIASES.select { |k,v| v == "#{mod_name}.#{method_name}" }.map(&:first)
-      aliases_text = aliases.empty? ? '' : " (#{aliases*', '})"
-      puts "#{mod_name}.#{method_name}#{aliases_text}: #{parser.summary?}" if parser.summary?
+      help_summary parser, mod_name, method_name
     end
   end
 
@@ -84,6 +89,12 @@ To show only commands relevant to a specific object, use "help /path/to/object".
   end
 end
 
+def help_summary parser, mod_name, method_name
+  aliases = ALIASES.select { |k,v| v == "#{mod_name}.#{method_name}" }.map(&:first)
+  aliases_text = aliases.empty? ? '' : " (#{aliases*', '})"
+  puts "#{mod_name}.#{method_name}#{aliases_text}: #{parser.summary?}" if parser.summary?
+end
+
 
 opts :debug do
   summary "Toggle VMOMI logging to stderr"
@@ -253,20 +264,30 @@ end
 
 
 opts :mv do
-  summary "Move/rename an entity"
-  arg :src, "Source path"
-  arg :dst, "Destination path"
+  summary "Move entities to another folder"
+  text "The entities' names are unchanged."
+  arg :objs, "Entities to move", :lookup => VIM::ManagedEntity, :multi => true
 end
 
 rvc_alias :mv
 
-def mv src, dst
-  src_dir = File.dirname(src)
-  dst_dir = File.dirname(dst)
-  err "cross-directory mv not yet supported" unless src_dir == dst_dir
-  dst_name = File.basename(dst)
-  obj = lookup(src)
-  obj.Rename_Task(:newName => dst_name).wait_for_completion
+def mv objs
+  err "Destination entity missing" unless objs.size > 1
+  dst = objs.pop
+  progress [dst.MoveIntoFolder_Task(:list => objs)]
+end
+
+
+opts :rename do
+  summary "Rename an entity"
+  arg :objs, "Entity to rename", :lookup => VIM::ManagedEntity
+  arg :name, "New name"
+end
+
+rvc_alias :rename
+
+def rename obj, name
+  progress [obj.Rename_Task(:newName => name)]
 end
 
 

data/lib/rvc/modules/cluster.rb

@@ -51,6 +51,7 @@ def add_host cluster, hostname, opts
                                 :asConnected => false
     begin
       task.wait_for_completion
+      break
     rescue VIM::SSLVerifyFault
       puts "SSL thumbprint: #{$!.fault.thumbprint}"
       $stdout.write "Accept this thumbprint? (y/n) "

data/lib/rvc/modules/host.rb

@@ -140,3 +140,23 @@ def add_iscsi_target hosts, opts
     storage.RescanAllHba
   end
 end
+
+opts :add_nfs_datastore do
+  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+  opt :name, "Datastore name", :short => 'n', :type => :string, :required => true
+  opt :address, "Address of NFS server", :short => 'a', :type => :string, :required => true
+  opt :path, "Path on NFS server", :short => 'p', :type => :string, :required => true
+end
+
+def add_nfs_datastore hosts, opts
+  hosts.each do |host|
+    datastoreSystem, = host.collect 'configManager.datastoreSystem'
+    spec = {
+      :accessMode => 'readWrite',
+      :localPath => opts[:name],
+      :remoteHost => opts[:address],
+      :remotePath => opts[:path]
+    }
+    datastoreSystem.CreateNasDatastore :spec => spec
+  end
+end

data/lib/rvc/modules/snapshot.rb

@@ -0,0 +1,61 @@
+opts :create do
+  summary "Snapshot a VM"
+  arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :name, "Name of new snapshot"
+  opt :description, "Description", :short => 'd', :default => ""
+  opt :quiesce, "Quiesce", :short => 'q', :default => false
+  opt :memory, "Memory", :short => 'm', :default => true
+end
+
+def create vm, name, opts
+  tasks [vm], :CreateSnapshot, :description => opts[:description], :memory => opts[:memory], :name => name, :quiesce => opts[:quiesce]
+end
+
+rvc_alias :create, :snapshot
+
+
+opts :revert do
+  summary "Revert a VM to a snapshot. Defaults to the current snapshot."
+  arg :arg, nil, :lookup => [VIM::VirtualMachine, RVC::SnapshotFolder]
+end
+
+def revert arg
+  if arg.is_a? VIM::VirtualMachine
+    tasks [arg], :RevertToCurrentSnapshot
+  else
+    tasks [arg.find_tree.snapshot], :RevertToSnapshot
+  end
+end
+
+
+opts :rename do
+  summary "Rename a snapshot"
+  arg :snapshot, nil, :lookup => RVC::SnapshotFolder
+  arg :name, "New name", :type => :string
+end
+
+def rename snapshot, name
+  snapshot.find_tree.snapshot.RenameSnapshot :name => name
+end
+
+
+opts :describe do
+  summary "Change the description of a snapshot"
+  arg :snapshot, nil, :lookup => RVC::SnapshotFolder
+  arg :description, "New description", :type => :string
+end
+
+def describe snapshot, description
+  snapshot.find_tree.snapshot.RenameSnapshot :description => description
+end
+
+
+opts :remove do
+  summary "Remove a snapshot"
+  arg :snapshot, nil, :lookup => RVC::SnapshotFolder
+  opt :remove_children, "Whether to remove the snapshot's children too"
+end
+
+def remove snapshot, opts
+  tasks [snapshot.find_tree.snapshot], :RemoveSnapshot, :removeChildren => opts[:remove_children]
+end

data/lib/rvc/modules/statsinterval.rb

@@ -0,0 +1,89 @@
+# 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.
+
+#see vSphere Client: Administration -> vCenter Server Settings -> Statistics -> Statistics Intervals
+
+def stats_time secs
+  length = secs / 60
+
+  [[60, "Minutes"], [24, "Hours"], [7, "Days"], [4, "Weeks"], [12, "Months"]].each do |div, name|
+    if length < div
+      return "#{length} #{name}"
+    end
+    length = length / div
+  end
+
+  return "#{length} Years"
+end
+
+
+opts :list do
+  summary "List intervals for collecting vCenter statistics"
+end
+
+def list
+  conn = single_connection [$shell.fs.cur]
+  perfman = conn.serviceContent.perfManager
+
+  columns = ["    Name      ", "Interval Duration", "Save For   ", "Statistics Level"]
+  format = columns.map {|s| "%-#{s.size}s"}.join(" | ")
+  puts sprintf format, *columns
+  puts columns.map {|s| "-" * s.size }.join("-+-")
+
+  perfman.historicalInterval.each do |interval|
+    puts sprintf format, "[#{interval.enabled ? 'x' : ' '}] #{interval.name}",
+    stats_time(interval.samplingPeriod),
+    stats_time(interval.length), interval.level.to_s
+  end
+end
+
+
+opts :update do
+  summary "Update intervals for collecting vCenter statistics"
+  arg :name, "Name of the historical interval"
+  opt :period, "Number of seconds that data is sampled", :short => 's', :type => :int, :required => false
+  opt :length, "Number of seconds that the statistics are saved", :short => 'l', :type => :int, :required => false
+  opt :level, "Statistics collection level", :short => 'v', :type => :int, :required => false
+  opt :enabled, "Enable or disable the the interval", :short => 'e', :type => :string, :required => false
+end
+
+def update name, opts
+  conn = single_connection [$shell.fs.cur]
+  perfman = conn.serviceContent.perfManager
+
+  interval = perfman.historicalInterval.select {|i| i.name == name or i.name == "Past #{name}" }.first
+  err "no such interval" unless interval
+
+  interval.samplingPeriod = opts[:period] if opts[:period]
+  interval.length = opts[:length] if opts[:length]
+  interval.level = opts[:level] if opts[:level]
+  
+  case opts[:enabled]
+  when nil
+  when "false"
+    interval.enabled = false
+  when "true"
+    interval.enabled = true
+  else
+    err "invalid value for enabled option"
+  end
+
+  perfman.UpdatePerfInterval(:interval => interval)
+end

data/lib/rvc/modules/vim.rb

@@ -81,14 +81,19 @@ def connect uri, opts
   unless opts[:rev]
     # negotiate API version
     rev = vim.serviceContent.about.apiVersion
-    vim.rev = [rev, ENV['RVC_VIMREV'] || '4.1'].min
+    vim.rev = [rev, ENV['RVC_VIMREV'] || '5.0'].min
   end
 
   isVC = vim.serviceContent.about.apiType == "VirtualCenter"
 
   # authenticate
   if username == nil
-    username = isVC ? 'Administrator' : 'root'
+    if isVC
+      isLinux = vim.serviceContent.about.osType == "linux-x64"
+      username = isLinux ? 'root' : 'Administrator'
+    else
+      username = 'root'
+    end
     puts "Using default username #{username.inspect}."
   end
 

data/lib/rvc/modules/vm.rb

@@ -104,14 +104,46 @@ opts :create do
   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
-  opt :disksize, "Size in KB of primary disk", :short => 's', :type => :int, :default => 4000000
+  opt :disksize, "Size in KB of primary disk (or add a unit of <M|G|T>)", :short => 's', :type => :string, :default => "4000000"
   opt :memory, "Size in MB of memory", :short => 'm', :type => :int, :default => 128
   opt :cpucount, "Number of CPUs", :short => 'c', :type => :int, :default => 1
+  text <<-EOB
+
+Example:
+  vm.create -p ~foo/resourcePool/pools/prod -d ~data/bigdisk -s 10g ~vms/new
+
+  EOB
+end
+
+
+def realdisksize( size )
+  size.downcase!
+  if size =~ /([0-9][0-9,]*)([mgt])?/i
+    size = $1.delete(',').to_i
+    unit = $2
+
+    case unit
+    when 'm'
+      return size * 1024
+    when 'g'
+      return size * ( 1024 ** 2 )
+    when 't'
+      return size * ( 1024 ** 3 )
+    when nil
+      return size
+    else
+      err "Unknown size modifer of '#{unit}'"
+    end
+  else
+    err "Problem with #{size}"
+  end
 end
 
+
 def create dest, opts
   err "must specify resource pool (--pool)" unless opts[:pool]
   err "must specify datastore (--datastore)" unless opts[:datastore]
+  err "memory must be a multiple of 4MB" unless opts[:memory] % 4 == 0
   vmFolder, name = *dest
   datastore_path = "[#{opts[:datastore].name}]"
   config = {
@@ -140,7 +172,7 @@ def create dest, opts
           ),
           :controllerKey => 1000,
           :unitNumber => 0,
-          :capacityInKB => opts[:disksize]
+          :capacityInKB => realdisksize( opts[:disksize] )
         )
       }, {
         :operation => :add,
@@ -217,6 +249,58 @@ def register vmx_file, opts
                                      :pool => rp).wait_for_completion
 end
 
+opts :bootconfig do
+  summary "Alter the boot config settings"
+  arg :vm, nil, :lookup => VIM::VirtualMachine
+  opt :delay, "Time in milliseconds to delay boot", :short => 'd', :type => :int
+  opt :enablebootretry,  "Enable rebooting if no boot device found", :short => 'r'
+  opt :disablebootretry, "Disable rebooting if no boot device found"
+  opt :retrydelay, "Time to wait before rebooting to retry", :short => 't', :type => :int
+  opt :show, "Show the current bootoptions", :short => 's'
+  conflicts :enablebootretry, :disablebootretry   # not that this currently works nicely, but still.
+end
+
+def bootconfig vm, opts
+
+  if opts[:show]
+    pp vm.config.bootOptions
+    return
+  end
+
+  cur_delay        = vm.config.bootOptions.bootDelay
+  cur_retrydelay   = vm.config.bootOptions.bootRetryDelay
+  cur_retryenabled = vm.config.bootOptions.bootRetryEnabled
+
+  if opts[:delay] and opts[:delay] != cur_delay
+    new_delay = opts[:delay]
+  else
+    new_delay = cur_delay
+  end
+
+  if opts[:retrydelay] and opts[:retrydelay] != cur_retrydelay
+    new_retrydelay = opts[:retrydelay]
+    new_retryenabled = true
+  else
+    new_retrydelay = cur_retrydelay
+  end
+
+  if opts[:enablebootretry]
+    new_retryenabled = true
+  elsif opts[:disablebootretry]
+    new_retryenabled = false
+  else
+    new_retryenabled = cur_retryenabled
+  end
+
+  spec = { :bootOptions => {
+    :bootDelay => new_delay,
+    :bootRetryDelay => new_retrydelay,
+    :bootRetryEnabled => new_retryenabled,
+    }
+  }
+
+  vm.ReconfigVM_Task(:spec => spec).wait_for_completion
+end
 
 opts :unregister do
   summary "Unregister a VM"
@@ -250,6 +334,8 @@ opts :answer do
 end
 
 def answer vm, str
+  q = vm.runtime.question
+  err "no question" unless q
   choice = q.choice.choiceInfo.find { |x| x.label == str }
   err("invalid answer") unless choice
   vm.AnswerVM :questionid => q.path, :answerChoice => choice.key
@@ -391,17 +477,18 @@ end
 opts :rvc do
   summary "RVC to a VM"
   arg :vm, nil, :lookup => VIM::VirtualMachine
+  opt :user, "Username", :type => :string
 end
 
 rvc_alias :rvc
 
-def rvc vm
+def rvc vm, opts
   ip = vm_ip vm
 
   env = Hash[%w(RBVMOMI_PASSWORD RBVMOMI_HOST RBVMOMI_USER RBVMOMI_SSL RBVMOMI_PORT
                 RBVMOMI_FOLDER RBVMOMI_DATASTORE RBVMOMI_PATH RBVMOMI_DATACENTER
                 RBVMOMI_COMPUTER).map { |k| [k,nil] }]
-  cmd = "rvc #{Shellwords.escape ip}"
+  cmd = "rvc #{opts[:user] && Shellwords.escape("#{opts[:user]}@")}#{Shellwords.escape ip}"
   system_fg(cmd, env)
 end
 
@@ -515,48 +602,6 @@ def remove_device vm, label
 end
 
 
-opts :snapshot do
-  summary "Snapshot a VM"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
-  arg :name, "Name of new snapshot"
-  opt :description, "Description", :short => 'd', :default => ""
-  opt :quiesce, "Quiesce", :short => 'q', :default => false
-  opt :memory, "Memory", :short => 'm', :default => true
-end
-
-def snapshot vm, name, opts
-  tasks [vm], :CreateSnapshot, :description => opts[:description], :memory => opts[:memory], :name => name, :quiesce => opts[:quiesce]
-end
-
-
-# TODO make fake folder
-opts :snapshots do
-  summary "Display VM snapshot tree"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
-end
-
-def snapshots vm
-  _display_snapshot_tree vm.snapshot.rootSnapshotList, 0
-end
-
-def _display_snapshot_tree nodes, indent
-  nodes.each do |node|
-    puts "#{' '*indent}#{node.name} #{node.createTime}"
-    _display_snapshot_tree node.childSnapshotList, (indent+1)
-  end
-end
-
-
-opts :revert do
-  summary "Revert a VM to its current snapshot"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
-end
-
-def revert vm
-  tasks [vm], :RevertToCurrentSnapshot
-end
-
-
 opts :migrate do
   summary "Migrate a VM"
   arg :vm, nil, :lookup => VIM::VirtualMachine, :multi => true
@@ -639,6 +684,30 @@ def annotate vm, str
 end
 
 
+opts :modify_cpu do
+  summary "Change CPU configuration"
+  arg :vm, nil, :lookup => VIM::VirtualMachine
+  opt :num, "New number of CPUs", :type => :int, :required => true
+end
+
+def modify_cpu vm, opts
+  spec = { :numCPUs => opts[:num] }
+  tasks [vm], :ReconfigVM, :spec => spec
+end
+
+
+opts :modify_memory do
+  summary "Change memory configuration"
+  arg :vm, nil, :lookup => VIM::VirtualMachine
+  opt :size, "New memory size in MB", :type => :int, :required => true
+end
+
+def modify_memory vm, opts
+  spec = { :memoryMB => opts[:size] }
+  tasks [vm], :ReconfigVM, :spec => spec
+end
+
+
 def find_vmx_files ds
   datastorePath = "[#{ds.name}] /"
   searchSpec = {

data/lib/rvc/modules/vnc.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-VNC = ENV['VNC'] || search_path('vinagre') || search_path('tightvnc')
+VNC = ENV['VNC'] || search_path('vinagre') || search_path('tightvnc') || search_path('vncviewer')
 
 opts :view do
   summary "Spawn a VNC client"

data/lib/rvc/option_parser.rb

@@ -76,7 +76,8 @@ class OptionParser < Trollop::Parser
     @args << [name,spec]
     description = "Path to a" if description == nil and spec[:lookup]
     description = "Child of a" if description == nil and spec[:lookup_parent]
-    text "  #{name}: " + [description, spec[:lookup], spec[:lookup_parent]].compact.join(' ')
+    lookups = [spec[:lookup], spec[:lookup_parent]].flatten.compact
+    text "  #{name}: " + [description, lookups*' or '].compact.join(' ')
   end
 
   def parse argv

data/lib/rvc/shell.rb

@@ -113,14 +113,15 @@ class Shell
     nil
   end
 
-  def eval_ruby input
-    result = @ruby_evaluator.do_eval input
-    if input =~ /\#$/
-      introspect_object result
-    else
-      pp result
+  def eval_ruby input, file="<input>"
+    result = @ruby_evaluator.do_eval input, file
+    if $interactive
+      if input =~ /\#$/
+        introspect_object result
+      else
+        pp result
+      end
     end
-    nil
   end
 
   def prompt
@@ -187,13 +188,27 @@ class Shell
 end
 
 class RubyEvaluator
+  include RVC::Util
+
   def initialize fs
-    @binding = binding
+    @binding = toplevel
     @fs = fs
   end
 
-  def do_eval input
-    eval input, @binding
+  def toplevel
+    binding
+  end
+
+  def do_eval input, file
+    begin
+      eval input, @binding, file
+    rescue Exception => e
+      bt = e.backtrace
+      bt = bt.reverse.drop_while { |x| !(x =~ /toplevel/) }.reverse
+      bt[-1].gsub! ':in `toplevel\'', ''
+      e.set_backtrace bt
+      raise
+    end
   end
 
   def this
@@ -209,6 +224,7 @@ class RubyEvaluator
   end
 
   def method_missing sym, *a
+    super unless $shell
     str = sym.to_s
     if a.empty?
       if MODULES.member? str

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -07:00
+date: 2011-09-02 00:00:00 -07:00
 default_executable: rvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,8 @@ files:
 - lib/rvc/modules/permissions.rb
 - lib/rvc/modules/resource_pool.rb
 - lib/rvc/modules/role.rb
+- lib/rvc/modules/snapshot.rb
+- lib/rvc/modules/statsinterval.rb
 - lib/rvc/modules/vim.rb
 - lib/rvc/modules/vm.rb
 - lib/rvc/modules/vmrc.rb