vagrant-persistent-storage 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e6213d9ca791c31e2c7fed2c93621e787002a7
-  data.tar.gz: b4cdb3519aacc50be8585cca8c2148bf547b79f1
+  metadata.gz: 759602c1db9e4c506b7ab8490677bef33d706298
+  data.tar.gz: 0d11cc889c70e69e32f8ba9804ca3925b9384552
 SHA512:
-  metadata.gz: d940162663e3885e7cde935e0f561b50882cbf7a01bbd0593684e2526a6fb140c13f3acc310caeef1df441bdac4a6894f785a529b4891b15c896f01a1738fb52
-  data.tar.gz: 2d3208fb62492f34e78eb69300d7c26ebf6a9d8fda5960dad96df2a4b176f5e8fa7fe692e1e79e6e77917a077f2a01d4dff4fbd991559a602dadbe2d85bfe701
+  metadata.gz: 690416da1c16126b504b705cce233be336ef72f2712ba15cf54b619019a507832a5cf0c66f0950cb26a16269299cc472dfd16d0cda4ff62b4a2d3fb3324573ec
+  data.tar.gz: c3deb57309441d4f6790d148a745a02c4fc4b459cbfbf05125e904afff5f44b34a666ef99152b5bd4016f0a3f008696d675f94164642ab4ed7c7a2fbd9a8636d

data/lib/vagrant-persistent-storage/providers/virtualbox/driver/base.rb

@@ -6,12 +6,12 @@ module VagrantPlugins
       class Base
 
         def create_adapter
-          sata_controller_name = get_sata_controller_name
-          if sata_controller_name.nil?
-            sata_controller_name = "SATA Controller"
-            execute("storagectl", @uuid, "--name", sata_controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2", "--add", "sata")
+          controller_name = get_controller_name
+          if controller_name.nil?
+            controller_name = "SATA Controller"
+            execute("storagectl", @uuid, "--name", controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2", "--add", "sata")
           else
-            execute("storagectl", @uuid, "--name", sata_controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2")
+            execute("storagectl", @uuid, "--name", controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2")
           end
         end
 
@@ -20,13 +20,13 @@ module VagrantPlugins
         end
 
         def attach_storage(location)
-          execute("storageattach", @uuid, "--storagectl", get_sata_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}")
+          execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}")
         end
 
         def detach_storage(location)
           persistent_storage = read_persistent_storage()
           if location and persistent_storage != "none" and identical_files(persistent_storage, location)
-            execute("storageattach", @uuid, "--storagectl", get_sata_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "none")
+            execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "none")
           end
         end
 
@@ -35,7 +35,7 @@ module VagrantPlugins
           sleep 3
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
           info.split("\n").each do |line|
-            return $1.to_s if line =~ /^"#{get_sata_controller_name}-1-0"="(.+?)"$/
+            return $1.to_s if line =~ /^"#{get_controller_name}-1-0"="(.+?)"$/
           end
           nil
         end
@@ -44,15 +44,20 @@ module VagrantPlugins
           return File.identical?(Pathname.new(file1).realpath, Pathname.new(file2).realpath)
         end
 
-        def get_sata_controller_name
+        def get_controller_name
+        controller_number = nil
           controllers = Hash.new
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
           info.split("\n").each do |line|
             controllers[$1] = $2 if line =~ /^storagecontrollername(\d+)="(.*)"/
-            sata_controller_number = $1 if line =~ /^storagecontrollertype(\d+)="IntelAhci"/
-            return controllers[sata_controller_number] unless controllers[sata_controller_number].nil?
+            controller_number = $1 if line =~ /^storagecontrollertype(\d+)="(IntelAhci|PIIX4)"/
           end
-          return nil
+
+          if controller_number.nil?
+            return nil
+          end
+
+          return controllers[controller_number]
         end
 
       end

data/lib/vagrant-persistent-storage/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin that creates a persistent storage and attaches it to
@@ -46,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that creates a persistent storage and attaches it to guest