vagrant-persistent-storage 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4094fb8daabaa141f9b2eba3dc058a096baccf4c
-  data.tar.gz: 11083b648cba97e4dafc1f958130e3d7ebb83f85
+  metadata.gz: ae11dde0a9a20e45403492d7f1d6de44699b5717
+  data.tar.gz: a9c1efd12626619b7a84c475d1cfbf6796ed68a5
 SHA512:
-  metadata.gz: 6ff1e067ffab5494cbda46af0e2898e0bb0dbe8a91f97909fb161378a8586090f999268321e8cf2c6b32465fdf8f319186e07949608548063369fa4db76b72a5
-  data.tar.gz: 50075c6db9a2cf90f4dae245385e7a884f306bc264e5bedbb83979b92f85ff2ddb9bdc03062ec45a1976e7bc19273eb78d81cb4c1c891afa4773e95fdfd49c8d
+  metadata.gz: c7f5469c5e5c6c610072f94dbe5f89aa757cc4ed098cfce20704de38235a2b2aa9bef6befbce14874da285bb892b9733b1388a570b3a58caff4fc7cfbed80e87
+  data.tar.gz: 416335aee9c1e5e6b42cb5783e77d98388ea64ebcb1d46a6319e1853bb39c88e3592a05bcdf400fa3c5dc16be097ef4d22f325b0b162ac112694e5fe5fcff352

data/lib/vagrant-persistent-storage/action/create_storage.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           # check config to see if the disk should be created
           return @app.call(env) unless env[:machine].config.persistent_storage.create?
 
-          if File.exists?(env[:machine].config.persistent_storage.location)
+          if File.exists?(File.expand_path(env[:machine].config.persistent_storage.location))
             @logger.info '** Persistent Storage Volume exists, not creating **'
             env[:ui].info I18n.t("vagrant_persistent_storage.action.not_creating")
             @app.call(env)

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

@@ -1,3 +1,4 @@
+require "log4r"
 require 'pathname'
 
 module VagrantPlugins
@@ -16,7 +17,7 @@ module VagrantPlugins
         end
 
         def create_storage(location, size)
-          execute("createhd", "--filename", location, "--size", "#{size}")
+          execute("createhd", "--filename", File.expand_path(location), "--size", "#{size}")
         end
 
         def attach_storage(location)
@@ -25,30 +26,42 @@ module VagrantPlugins
             controller_name = "SATA Controller"
           end
 
+          location_realpath = File.expand_path(location)
+
           if controller_name.start_with?("IDE")
-              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}")
+              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "4", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}")
+          elsif controller_name.start_with?("SCSI")
+              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "15", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}")
           else
-              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}", "--hotpluggable", "on")
+              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "4", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}", "--hotpluggable", "on")
           end
 
 
         end
 
         def detach_storage(location)
-          persistent_storage = read_persistent_storage()
-          if location and persistent_storage and persistent_storage != "none" and identical_files(persistent_storage, location)
-            execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "none")
+          location_realpath = File.expand_path(location)
+          persistent_storage_data = read_persistent_storage(location_realpath)
+          if location and persistent_storage_data and identical_files(persistent_storage_data.location, location_realpath)
+              execute("storageattach", @uuid, "--storagectl", persistent_storage_data.controller, "--port", persistent_storage_data.port, "--device", "0", "--type", "hdd", "--medium", "none")
           end
         end
 
-        def read_persistent_storage()
+        def read_persistent_storage(location)
           ## Ensure previous operations are complete - bad practise yes, not sure how to avoid this:
           sleep 3
+          storage_data = nil
+          controller_name = get_controller_name
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
           info.split("\n").each do |line|
-            return $1.to_s if line =~ /^"#{get_controller_name}-1-0"="(.+?)"$/
+              tmp_storage_data = nil
+              tmp_storage_data = PersistentStorageData.new(controller_name, $1, $3) if line =~ /^"#{controller_name}-(\d+)-(\d+)"="(.*)"/
+
+              if !tmp_storage_data.nil? and tmp_storage_data.location != 'none' and identical_files(File.expand_path(location), tmp_storage_data.location)
+                  storage_data = tmp_storage_data
+              end
           end
-          nil
+          return storage_data
         end
 
         def identical_files(file1, file2)
@@ -61,7 +74,7 @@ module VagrantPlugins
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
           info.split("\n").each do |line|
             controllers[$1] = $2 if line =~ /^storagecontrollername(\d+)="(.*)"/
-            controller_number = $1 if line =~ /^storagecontrollertype(\d+)="(IntelAhci|PIIX4)"/
+            controller_number = $1 if line =~ /^storagecontrollertype(\d+)="(IntelAhci|PIIX4|LsiLogic)"/
           end
 
           if controller_number.nil?
@@ -71,6 +84,19 @@ module VagrantPlugins
           return controllers[controller_number]
         end
 
+        class PersistentStorageData
+
+          attr_accessor :controller
+          attr_accessor :port
+          attr_accessor :location
+
+          def initialize(controller,port,location)
+            @controller = controller
+            @port = port
+            @location = location
+          end
+        end
+
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.21"
+    VERSION = "0.0.22"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that creates a persistent storage and attaches it to guest