rbvmomi 1.1.8 → 1.2.0

data/Rakefile

@@ -14,9 +14,8 @@ begin
     gem.add_dependency 'nokogiri', '>= 1.4.1'
     gem.add_dependency 'builder'
     gem.add_dependency 'trollop'
-    gem.add_dependency 'cdb-full'
     gem.required_ruby_version = '>= 1.8.7'
-    gem.files.include 'vmodl.cdb'
+    gem.files.include 'vmodl.db'
     gem.files.include '.yardopts'
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.2.0

data/examples/create_vm-1.9.rb

@@ -4,14 +4,13 @@ require 'rbvmomi'
 require 'rbvmomi/trollop'
 
 VIM = RbVmomi::VIM
-N = 2
 
 opts = Trollop.options do
   banner <<-EOS
-Create and destroy a couple of VMs.
+Create a VM.
 
 Usage:
-    create_vm.rb [options]
+    create_vm-1.9.rb [options]
 
 VIM connection options:
     EOS

data/lib/rbvmomi/connection.rb

@@ -7,6 +7,8 @@ require 'rbvmomi/type_loader'
 
 module RbVmomi
 
+IS_JRUBY = RUBY_PLATFORM == 'java'
+
 class DeserializationFailed < Exception; end
 
 class Connection < TrivialSoap
@@ -78,7 +80,14 @@ class Connection < TrivialSoap
   end
 
   def xml2obj xml, typename
-    typename = (xml.attribute_with_ns('type', NS_XSI) || typename).to_s
+    if IS_JRUBY
+      type_attr = xml.attribute_nodes.find { |a| a.name == 'type' &&
+                                                 a.namespace &&
+                                                 a.namespace.prefix == 'xsi' }
+    else
+      type_attr = xml.attribute_with_ns('type', NS_XSI)
+    end
+    typename = (type_attr || typename).to_s
 
     if typename =~ /^ArrayOf/
       typename = demangle_array_type $'

data/lib/rbvmomi/trollop.rb

@@ -56,7 +56,7 @@ class Parser
   #  !!!plain
   #  computer: -R --computer RBVMOMI_COMPUTER
   def rbvmomi_computer_opt
-    opt :computer, "Compute resource", :type => :string, :short => "R", :default => ENV['RBVMOMI_COMPUTER']
+    opt :computer, "Compute resource", :type => :string, :short => "R", :default => (ENV['RBVMOMI_COMPUTER']||'ha-compute-res')
   end
 
   # Select a datastore

data/lib/rbvmomi/type_loader.rb

@@ -1,21 +1,30 @@
 # Copyright (c) 2010 VMware, Inc.  All Rights Reserved.
-require 'cdb'
 require 'set'
 
 module RbVmomi
 
+class TypeStore
+  def initialize fn
+    File.open(fn, 'r') do |io|
+      @db = Marshal.load io
+    end
+  end
+
+  def [](k)
+    @db[k]
+  end
+end
+
 class TypeLoader
   attr_reader :typenames
 
   def initialize target, fn
     @target = target
-    @fn = fn
+    @db = TypeStore.new fn
   end
 
   def init
-    @db = CDB.new @fn
-    @vmodl = Hash.new { |h,k| if e = @db[k] then h[k] = Marshal.load(e) end }
-    @typenames = Set.new(Marshal.load(@db['_typenames']) + BasicTypes::BUILTIN)
+    @typenames = Set.new(@db['_typenames'] + BasicTypes::BUILTIN)
     @target.constants.select { |x| has_type? x.to_s }.each { |x| load_type x.to_s }
     BasicTypes::BUILTIN.each do |x|
       @target.const_set x, BasicTypes.const_get(x)
@@ -50,7 +59,7 @@ class TypeLoader
   def make_type name
     name = name.to_s
     fail if BasicTypes::BUILTIN.member? name
-    desc = @vmodl[name] or fail "unknown VMODL type #{name}"
+    desc = @db[name] or fail "unknown VMODL type #{name}"
     case desc['kind']
     when 'data' then make_data_type name, desc
     when 'managed' then make_managed_type name, desc

data/lib/rbvmomi/vim.rb

@@ -74,7 +74,7 @@ class VIM < Connection
     @extension_dirs
   end
 
-  load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.cdb"))
+  load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.db"))
 end
 
 end

data/test/test_deserialization.rb

@@ -118,8 +118,8 @@ def test_empty_array
     :linkUp => true,
     :blocked => false,
     :vlanIds => [],
-    vmDirectPathGen2InactiveReasonNetwork: [],
-    vmDirectPathGen2InactiveReasonOther: []
+    :vmDirectPathGen2InactiveReasonNetwork => [],
+    :vmDirectPathGen2InactiveReasonOther => []
   )
 
   check <<-EOS, obj, 'DVPortStatus'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbvmomi
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 1
-  - 8
-  version: 1.1.8
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rich Lane
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: rbvmomish
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 4
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,26 +53,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cdb-full
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: 
 email: rlane@vmware.com
 executables: 
@@ -133,7 +115,7 @@ files:
 - test/test_misc.rb
 - test/test_parse_response.rb
 - test/test_serialization.rb
-- vmodl.cdb
+- vmodl.db
 - README.html
 has_rdoc: true
 homepage: https://github.com/rlane/rbvmomi
@@ -149,7 +131,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
@@ -160,14 +141,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the VMware vSphere API