bosh_deployer 1.2.0 → 1.3.0

data/lib/deployer/config.rb

@@ -37,13 +37,7 @@ module Bosh::Deployer
 
         @db = Sequel.sqlite
 
-        @db.create_table :vsphere_disk do
-          primary_key :id
-          column :path, :text
-          column :datacenter, :text
-          column :datastore, :text
-          column :size, :integer
-        end
+        migrate_cpi
 
         @db.create_table :instances do
           primary_key :id
@@ -114,6 +108,20 @@ module Bosh::Deployer
 
       private
 
+      def migrate_cpi
+        cpi = @cloud_options["plugin"]
+        require_path = File.join("cloud", cpi)
+        cpi_path = $LOAD_PATH.find { |p| File.exist?(
+            File.join(p, require_path)) }
+        migrations = File.expand_path("../db/migrations", cpi_path)
+
+        if File.directory?(migrations)
+          Sequel.extension :migration
+          Sequel::TimestampMigrator.new(
+              @db, migrations, :table => "#{cpi}_cpi_schema").run
+        end
+      end
+
       def deep_merge(src, dst)
         src.merge(dst) do |key, old, new|
           if new.respond_to?(:blank) && new.blank?

data/lib/deployer/instance_manager/vsphere.rb

@@ -29,11 +29,11 @@ module Bosh::Deployer
 
     # @return [Integer] size in MiB
     def disk_size(cid)
-      disk_model[cid].size
+      disk_model.first(:uuid => cid).size
     end
 
     def persistent_disk_changed?
-      Config.resources['persistent_disk'] != disk_size(state.disk_cid)
+      Config.resources["persistent_disk"] != disk_size(state.disk_cid)
     end
 
     def check_dependencies

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -208,22 +208,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2681661945241081021
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2681661945241081021
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Micro BOSH Deployer
 test_files: []
+has_rdoc: