vagrant-parallels 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b271fd1ed2f08b026d9317bf6ee17c9496d5b922
-  data.tar.gz: aa561b076317de9620478d4b30c0cac2177a4b8b
+  metadata.gz: 6bdb95da989e46677cd7c63e85eabf039e464720
+  data.tar.gz: 072e752e92233ce0e8f1da2431f1cf435872e66c
 SHA512:
-  metadata.gz: a8d65174aca4de8bd57ea2d4c8c51f5e72bd5203430cc178c7caa4ce2aa4f71ce59cb5bc06398de08e50451eb4e1b6805f8c313cbd8bc29085eacb979f8d50ba
-  data.tar.gz: b15155423725c42436433722ec1cf5dd79252dcdace3b5912cb2ce7b8c5c4f0f10b6c0685e398299c7969dc3ca248d7d14074d3f56dd632ed95f33cd2d400301
+  metadata.gz: 652fd511add11eb4016615ed50848090003f40bedc94ab2df8d52f16a487b6f54981fbf0cb5c5af60fb341947d96917350fdaa6aa5327a848e507c0673f19847
+  data.tar.gz: 43e877190dc0c166d3fd3922f04f9a71a675e4bac3b2343ec71b0f63ba6569cbc666a196a3aa81e95ac9a4fe5d7c8b773c77713235fbb70e35213a8135de44f8

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 before_install:
-  - gem install bundler -v '1.6.6'
+  - rvm @global do gem uninstall bundler -x
+  - gem install bundler -v "< 1.7.0"
 rvm:
   - 2.0.0
 script: rake test:unit

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

@@ -24,6 +24,7 @@ module VagrantPlugins
 
         def call(env)
           @env = env
+          @lock = Mutex.new
 
           # Get the list of network adapters from the configuration
           network_adapters_config = env[:machine].provider_config.network_adapters.dup
@@ -86,9 +87,20 @@ module VagrantPlugins
             @logger.debug("Normalized configuration: #{config.inspect}")
 
             # Get the virtual network adapter configuration
-            adapter = send("#{type}_adapter", config)
-            adapters << adapter
-            @logger.debug("Adapter configuration: #{adapter.inspect}")
+            # We wrap this in locks to avoid race conditions between multiple
+            # Vagrant threads and/or processes.
+            @lock.synchronize do
+              begin
+                env[:machine].env.lock('parallels-network-adapters') do
+                  adapter = send("#{type}_adapter", config)
+                  adapters << adapter
+                  @logger.debug("Adapter configuration: #{adapter.inspect}")
+                end
+              rescue Vagrant::Errors::EnvironmentLockedError
+                sleep 1
+                retry
+              end
+            end
 
             # Get the network configuration
             network = send("#{type}_network_config", config)

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/test/unit/driver/pd_10_test.rb

@@ -28,10 +28,4 @@ describe VagrantPlugins::Parallels::Driver::PD_10 do
     end
   end
 
-  describe "ssh_ip" do
-    it "returns 127.0.0.1" do
-      subject.ssh_ip.should == "127.0.0.1"
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler