rvc 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/rvc/modules/vim.rb

@@ -36,6 +36,7 @@ opts :connect do
   summary 'Open a connection to ESX/VC'
   arg :uri, "Host to connect to"
   opt :insecure, "don't verify ssl certificate", :short => 'k', :default => (ENV['RBVMOMI_INSECURE'] == '1')
+  opt :rev, "Override protocol revision", :type => :string
 end
 
 rvc_alias :connect
@@ -57,7 +58,7 @@ def connect uri, opts
                               :port => 443,
                               :path => '/sdk',
                               :ns => 'urn:vim25',
-                              :rev => '4.0',
+                              :rev => (opts[:rev]||'4.0'),
                               :ssl => true,
                               :insecure => insecure
       break
@@ -69,9 +70,12 @@ def connect uri, opts
     end
   end
 
-  # negotiate API version
-  rev = vim.serviceContent.about.apiVersion
-  vim.rev = [rev, '4.1'].min
+  unless opts[:rev]
+    # negotiate API version
+    rev = vim.serviceContent.about.apiVersion
+    vim.rev = [rev, '4.1'].min
+  end
+
   isVC = vim.serviceContent.about.apiType == "VirtualCenter"
 
   # authenticate

data/lib/rvc/modules/vm.rb

@@ -379,7 +379,8 @@ rvc_alias :ssh
 
 def ssh vm, cmd, opts
   ip = vm_ip vm
-  ssh_cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l #{opts[:login]} #{ip} #{cmd}"
+  cmd_arg = cmd ? Shellwords.escape(cmd) : ""
+  ssh_cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l #{Shellwords.escape opts[:login]} #{Shellwords.escape ip} #{cmd_arg}"
   system_fg(ssh_cmd)
 end
 
@@ -397,7 +398,7 @@ def rvc 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 #{ip}"
+  cmd = "rvc #{Shellwords.escape ip}"
   system_fg(cmd, env)
 end
 
@@ -411,7 +412,7 @@ rvc_alias :ping
 
 def ping vm
   ip = vm_ip vm
-  system_fg "ping #{ip}"
+  system_fg "ping #{Shellwords.escape ip}"
 end
 
 
@@ -567,7 +568,7 @@ end
 opts :clone do
   summary "Clone a VM"
   arg :src, nil, :lookup => VIM::VirtualMachine
-  arg :dst, "Path to new VM"
+  arg :dst, "Path to new VM", :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 :template, "Create a template", :short => 't'
@@ -576,7 +577,7 @@ opts :clone do
 end
 
 def clone src, dst, opts
-  folder = lookup! File.dirname(dst), VIM::Folder
+  folder, name = *dst
   diskMoveType = nil
 
   if opts[:linked]
@@ -585,7 +586,7 @@ def clone src, dst, opts
   end
 
   task = src.CloneVM_Task(:folder => folder,
-                          :name => File.basename(dst),
+                          :name => name,
                           :spec => {
                             :location => {
                               :diskMoveType => diskMoveType,

data/lib/rvc/option_parser.rb

@@ -91,7 +91,7 @@ class OptionParser < Trollop::Parser
       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(:+)
+        a = a.map { |x| postprocess_arg x, spec }.inject([], :+)
         err "no matches for '#{name}'" if spec[:required] and a.empty?
         args << a
         argv.clear

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: rvc
 dependencies: 
 - !ruby/object:Gem::Dependency