rbvmomi 1.1.4 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/bin/rbvmomish

@@ -43,7 +43,7 @@ rescue Errno::EHOSTUNREACH
   abort $!.message
 end
 
-typenames = VIM.instance_variable_get(:@typenames)
+typenames = VIM.loader.typenames
 Readline.completion_append_character = " "
 Readline.completion_proc = lambda do |word|
   return unless word

data/examples/vdf.rb

@@ -51,8 +51,8 @@ def b n
   unit(n,'B',3)
 end
 
-puts "Filesystem#{' '*43}Size    Used    Avail   Use%    Mounted on"
-fmt = "%-52s %-7s %-7s %-7s %-7s %s"
+puts "Filesystem#{' '*53}Size     Used     Avail    Use%     Mounted on"
+fmt = "%-62s %-8s %-8s %-8s %-8s %s"
 
 if false
   # simple version

data/lib/rbvmomi/connection.rb

@@ -211,6 +211,8 @@ class Connection < TrivialSoap
     fail "must be implemented in subclass"
   end
 
+  def self.loader; @loader; end
+
 protected
 
   def self.const_missing sym
@@ -233,6 +235,7 @@ protected
 
   def self.load_vmodl fn
     @loader = RbVmomi::TypeLoader.new self, fn
+    @loader.init
   end
 end
 

data/lib/rbvmomi/type_loader.rb

@@ -5,16 +5,25 @@ require 'set'
 module RbVmomi
 
 class TypeLoader
+  attr_reader :typenames
+
   def initialize target, fn
     @target = target
-    @db = CDB.new fn
+    @fn = 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)
     @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)
+      @target.const_set x, BasicTypes.const_get(x)
       load_extension x
     end
+    Object.constants.map(&:to_s).select { |x| has_type? x }.each do |x|
+      load_type x
+    end
   end
 
   def has_type? name

data/lib/rbvmomi/vim.rb

@@ -33,7 +33,7 @@ class VIM < Connection
     new(opts).tap do |vim|
       vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
       rev = vim.serviceContent.about.apiVersion
-      vim.rev = rev if %w(4.0 4.1).member? rev
+      vim.rev = [rev, '4.1'].min
     end
   end
 

data/test/test_misc.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'rbvmomi'
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+
+class MiscTest < Test::Unit::TestCase
+  def test_overridden_const
+    assert(VIM::SecurityError < RbVmomi::BasicTypes::Base)
+    assert_equal 'SecurityError', VIM::SecurityError.wsdl_name
+  end
+
+  # XXX
+  def disabled_test_dynamically_overridden_const
+    assert !VIM.const_defined?(:ClusterAttemptedVmInfo)
+    Object.const_set :ClusterAttemptedVmInfo, :override
+    assert VIM::ClusterAttemptedVmInfo.is_a?(Class)
+    assert(VIM::ClusterAttemptedVmInfo < RbVmomi::BasicTypes::Base)
+    assert_equal 'ClusterAttemptedVmInfo', VIM::ClusterAttemptedVmInfo.wsdl_name
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Rich Lane
@@ -124,6 +124,7 @@ files:
 - test/test_deserialization.rb
 - test/test_emit_request.rb
 - test/test_exceptions.rb
+- test/test_misc.rb
 - test/test_parse_response.rb
 - test/test_serialization.rb
 - vmodl.cdb
@@ -175,5 +176,6 @@ test_files:
 - test/test_deserialization.rb
 - test/test_emit_request.rb
 - test/test_exceptions.rb
+- test/test_misc.rb
 - test/test_parse_response.rb
 - test/test_serialization.rb