vagrant-parallels 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc01455732e664712d913020806753766fa2c11
-  data.tar.gz: 83d9a5723aacfb1c01cbf210bc97aea553c87b44
+  metadata.gz: b967185c3b377e0b8ab1d1dd0c4cb44ee8065738
+  data.tar.gz: bbe12c18d4a46d956996ae08ad89c9bcb64e5e26
 SHA512:
-  metadata.gz: a8565bde8a49ec3bf398be9a0c11a5e22ccb21286780d919fd5cd8cd63bbbf2d21373446a4be3640ecd3d0bea7ff9731114c6f3ef611049db4acd56f81cbd504
-  data.tar.gz: ce70eee926a912ca2460fcbcea90078360385d26730f9c4d57f22f0a6a756b71f653432b921adbbcae403a5a7392f52a1eceb0e7669883ec890d94cd471619e6
+  metadata.gz: b92c89929a428136c43725e38e616e907e63ac099f6974cad676faec6b0520b5e7041f0f5585a02008b461857b52c2e1a64eabe05d64b8cb1907467073503084
+  data.tar.gz: 67ff54f46b5385216f38ccc61812add02cfc6171642e91e139af3f7090435f61d830d4112d51934e0aef108f0ea9717f864475f19a50f418960d4e7741c50b2a

data/lib/vagrant-parallels/action.rb

@@ -14,7 +14,6 @@ module VagrantPlugins
           b.use SetName
           b.use ClearForwardedPorts
           b.use Provision
-          b.use EnvSet, port_collision_repair: true
           b.use PrepareForwardedPortCollisionParams
           b.use HandleForwardedPortCollisions
           b.use PrepareNFSValidIds
@@ -104,7 +103,6 @@ module VagrantPlugins
 
             b1.use SetupPackageFiles
             b1.use action_halt
-            b1.use ClearForwardedPorts
             b1.use PrepareNFSValidIds
             b1.use SyncedFolderCleanup
             b1.use Package
@@ -165,9 +163,9 @@ module VagrantPlugins
               next
             end
 
-            b1.use EnvSet, port_collision_repair: false
             b1.use PrepareForwardedPortCollisionParams
             b1.use HandleForwardedPortCollisions
+            b1.use ForwardPorts
             b1.use Resume
             b1.use WaitForCommunicator, [:resuming, :running]
           end
@@ -256,6 +254,7 @@ module VagrantPlugins
               next
             end
 
+            b1.use ClearForwardedPorts
             b1.use Suspend
           end
         end

data/lib/vagrant-parallels/action/import.rb

@@ -48,9 +48,9 @@ module VagrantPlugins
         def register_template
           if !@env[:machine].provider.driver.read_vms_paths.has_key?(@template_path)
             @logger.info("Register the box template: '#{@template_path}'")
-            # We should also regenerate 'SourceVmUuid' to make sure that
-            # SMBIOS UUID is unique [GH-113]
-            @env[:machine].provider.driver.register(@template_path, regen_src_uuid=true)
+            regen_uuid = @env[:machine].provider_config.regen_box_uuid
+
+            @env[:machine].provider.driver.register(@template_path, regen_uuid)
           end
 
           # Return the uuid of registered template

data/lib/vagrant-parallels/action/prepare_forwarded_port_collision_params.rb

@@ -17,6 +17,10 @@ module VagrantPlugins
           env[:port_collision_extra_in_use] =
             env[:machine].provider.driver.read_used_ports
 
+          # We can always repair the collision because port forwarding
+          # are configured globally, not per each VM.
+          env[:port_collision_repair] = true
+
           # Build the remap for any existing collision detections
           remap = {}
           env[:port_collision_remap] = remap

data/lib/vagrant-parallels/config.rb

@@ -8,9 +8,9 @@ module VagrantPlugins
       attr_accessor :optimize_power_consumption
       attr_accessor :name
       attr_reader   :network_adapters
+      attr_accessor :regen_box_uuid
       attr_accessor :update_guest_tools
 
-
       # Compatibility with virtualbox provider's syntax
       alias :check_guest_additions= :check_guest_tools=
 
@@ -22,6 +22,7 @@ module VagrantPlugins
         @network_adapters  = {}
         @name              = UNSET_VALUE
         @optimize_power_consumption = UNSET_VALUE
+        @regen_box_uuid    = UNSET_VALUE
         @update_guest_tools = UNSET_VALUE
 
         network_adapter(0, :shared)
@@ -73,6 +74,8 @@ module VagrantPlugins
 
         @name = nil if @name == UNSET_VALUE
 
+        @regen_box_uuid = true if @regen_box_uuid == UNSET_VALUE
+
         if @update_guest_tools == UNSET_VALUE
           @update_guest_tools = false
         end

data/lib/vagrant-parallels/driver/base.rb

@@ -187,8 +187,9 @@ module VagrantPlugins
         # Registers the virtual machine
         #
         # @param [String] pvm_file Path to the machine image (*.pvm)
-        # @param [Boolean] regen_src_uuid Regenerate SourceVmUuid to avoid
-        # SMBIOS UUID collision
+        # @param [Boolean] regen_src_uuid Regenerate 'SourceVmUuid' to avoid
+        # SMBIOS UUID collision, or let it unchanged to keep activation status
+        # for Windows-based guests [GH-113]
         def register(pvm_file, regen_src_uuid)
         end
 

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.2.0.rc1"
+    VERSION = "1.2.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler