lib/rbvmomi/vim.rb in rbvmomi-1.12.0 vs lib/rbvmomi/vim.rb in rbvmomi-1.13.0
- old
+ new
@@ -37,12 +37,11 @@
opts[:ssl] = true unless opts.member? :ssl or opts[:"no-ssl"]
opts[:insecure] ||= false
opts[:port] ||= (opts[:ssl] ? 443 : 80)
opts[:path] ||= '/sdk'
opts[:ns] ||= 'urn:vim25'
- rev_given = opts[:rev] != nil
- opts[:rev] = '6.5' unless rev_given
+ opts[:rev] = '6.5' if opts[:rev].nil?
opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
conn = new(opts).tap do |vim|
unless opts[:cookie]
if WIN32 && opts[:password] == ''
@@ -59,13 +58,11 @@
end
else
vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
end
end
- unless rev_given
- rev = vim.serviceContent.about.apiVersion
- vim.rev = [rev, '6.5'].min
- end
+ rev = vim.serviceContent.about.apiVersion
+ vim.rev = [rev, opts[:rev]].min { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
end
at_exit { conn.close }
conn
end