rbvmomi 1.8.0 → 1.8.1

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/rbvmomi/utils/deploy.rb

@@ -102,6 +102,13 @@ class CachedOvfDeployer
     # simplicity this function assumes we need to read the OVF file 
     # ourselves to know the names, and we map all of them to the same
     # VIM::Network.
+
+    # If we're handling a file:// URI we need to strip the scheme as open-uri
+    # can't handle them.
+    if URI(ovf_url).scheme == "file" && URI(ovf_url).host.nil?
+      ovf_url = URI(ovf_url).path
+    end
+
     ovf = open(ovf_url, 'r'){|io| Nokogiri::XML(io.read)}
     ovf.remove_namespaces!
     networks = ovf.xpath('//NetworkSection/Network').map{|x| x['name']}
@@ -206,7 +213,7 @@ class CachedOvfDeployer
   #                               or nil
   def lookup_template template_name
     template_path = "#{template_name}-#{@computer.name}"
-    template = @template_folder.traverse(template_path, VIM::VirtualMachine)
+    template = @template_folder.traverse(template_path, RbVmomi::VIM::VirtualMachine)
     if template
       config = template.config
       is_template = config && config.template

data/lib/rbvmomi/vim.rb

@@ -97,12 +97,12 @@ class VIM < Connection
   def get_log_lines logKey, lines=5, start=nil, host=nil
     diagMgr = self.serviceContent.diagnosticManager
     if !start
-      log = diagMgr.BrowseDiagnosticLog(host: host, key: logKey, start: 999999999)
+      log = diagMgr.BrowseDiagnosticLog(:host => host, :key => logKey, :start => 999999999)
       lineEnd = log.lineEnd
       start = lineEnd - lines
     end
     start = start < 0 ? 0 : start
-    log = diagMgr.BrowseDiagnosticLog(host: host, key: logKey, start: start)
+    log = diagMgr.BrowseDiagnosticLog(:host => host, :key => logKey, :start => start)
     if log.lineText.size > 0
       [log.lineText.slice(-lines, log.lineText.size), log.lineEnd]
     else
@@ -113,7 +113,7 @@ class VIM < Connection
   def get_log_keys host=nil
     diagMgr = self.serviceContent.diagnosticManager
     keys = []
-    diagMgr.QueryDescriptions(host: host).each do |desc|
+    diagMgr.QueryDescriptions(:host => host).each do |desc|
       keys << "#{desc.key}"
     end
     keys

data/lib/rbvmomi/vim/OvfManager.rb

@@ -95,13 +95,17 @@ class RbVmomi::VIM::OvfManager
           raise "Couldn't find deviceURL for device '#{fileItem.deviceId}'"
         end
 
-        # XXX handle file:// URIs
         ovfFilename = opts[:uri].to_s
         tmp = ovfFilename.split(/\//)
         tmp.pop
         tmp << fileItem.path
         filename = tmp.join("/")
 
+        # If filename doesn't have a URI scheme, we're considering it a local file
+        if URI(filename).scheme.nil?
+          filename = "file://" + filename
+        end
+
         method = fileItem.create ? "PUT" : "POST"
 
         keepAliveThread = Thread.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbvmomi
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri