rbvmomi 1.0.1 → 1.0.2

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.add_dependency 'nokogiri', '>= 1.4.1'
     gem.add_dependency 'builder'
     gem.add_dependency 'trollop'
-    gem.add_dependency 'tokyocabinet'
+    gem.add_dependency 'cdb-full'
     gem.required_ruby_version = '>= 1.9.1'
-    gem.files.include 'vmodl.tc'
+    gem.files.include 'vmodl.cdb'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/devel/analyze-vim-declarations.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
-require 'tokyocabinet'
-
-include TokyoCabinet
+require 'cdb'
 
 # usage: analyze-vim-declarations.rb vim-declarations.xml foo-declarations.xml vmodl.db
 
@@ -14,11 +12,6 @@ XML_FNS.each do |x|
   abort "XML file #{x} does not exist" unless File.exists? x
 end
 
-db = HDB.new
-if !db.open(OUT_FN, HDB::OWRITER | HDB::OCREAT | HDB::OTRUNC | HDB::TDEFLATE)
-  abort "VMODL db open error: #{db.errmsg(db.ecode)}"
-end
-
 TYPES = {}
 VERSIONS = []
 
@@ -182,6 +175,8 @@ TYPES.each do |k,t|
   end
 end
 
+db = CDBMake.new(OUT_FN)
+
 TYPES.each do |k,t|
   db[k] = Marshal.dump t
 end
@@ -189,7 +184,7 @@ end
 db['_typenames'] = Marshal.dump TYPES.keys
 db['_versions'] = Marshal.dump VERSIONS
 
-db.close
+db.finish
 
 if filename = ENV['VERSION_GRAPH']
   File.open(filename, 'w') do |io|

data/lib/rbvmomi.rb

@@ -277,7 +277,7 @@ end
 end
 
 require 'rbvmomi/types'
-vmodl_fn = ENV['VMODL'] || File.join(File.dirname(__FILE__), "../vmodl.tc")
+vmodl_fn = ENV['VMODL'] || File.join(File.dirname(__FILE__), "../vmodl.cdb")
 RbVmomi::VIM.load vmodl_fn
 
 require 'rbvmomi/extensions'

data/lib/rbvmomi/trollop.rb

@@ -24,6 +24,6 @@ class Trollop::Parser
   end
 
   def rbvmomi_datastore_opt
-    opt :datastore, "Datastore", short: 's', default: (ENV['RBVMOMI_DATASTORE'] || 'datstore1')
+    opt :datastore, "Datastore", short: 's', default: (ENV['RBVMOMI_DATASTORE'] || 'datastore1')
   end
 end

data/lib/rbvmomi/types.rb

@@ -1,10 +1,8 @@
 # Copyright (c) 2010 VMware, Inc.  All Rights Reserved.
-require 'tokyocabinet'
+require 'cdb'
 require 'pp'
 require 'set'
 
-include TokyoCabinet
-
 class Class
   def wsdl_name
     self.class.name
@@ -18,10 +16,7 @@ module VIM
 BUILTIN_TYPES = %w(ManagedObject TypeName PropertyPath ManagedObjectReference MethodName MethodFault LocalizedMethodFault)
 
 def self.load fn
-  @db = HDB.new
-  if !@db.open(fn, HDB::OREADER | HDB::ONOLCK)
-    raise "VMODL db open error: #{@db.errmsg(@db.ecode)}"
-  end
+  @db = CDB.new fn
   @vmodl = Hash.new { |h,k| if e = @db[k] then h[k] = Marshal.load(e) end }
   @typenames = Marshal.load(@db['_typenames']) + BUILTIN_TYPES
   Object.constants.select { |x| @typenames.member? x.to_s }.each { |x| load_type x }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbvmomi
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Rich Lane
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: tokyocabinet
+  name: cdb-full
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +105,7 @@ files:
 - test/test_emit_request.rb
 - test/test_parse_response.rb
 - test/test_serialization.rb
-- vmodl.tc
+- vmodl.cdb
 has_rdoc: true
 homepage: https://github.com/rlane/rbvmomi
 licenses: []