vagrant-parallels 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a40565034c3032c1536e75c37bd10287c87200e0
-  data.tar.gz: fcf16876294f17f6843c1acbe698ba111cbfee5f
+  metadata.gz: 85e2c532a3b4223860ba143a446100ef6c3744f9
+  data.tar.gz: c99d45686b5d6c5463c9d65ad93559f19ea48cbf
 SHA512:
-  metadata.gz: f983701a46e36b8d189d80c6906868d91b3a35840b849cdcdc301ec8f660cc851de3ebbb045eb924dd8dd201b1aebe3fd2c8a69f1db8425b2bb2380d30b7b6b0
-  data.tar.gz: bb2f8d87c5fa5b3332cdcbdea5a9e411ddf3941bfcc12cc4e8b5693edb114aa7295f3ab63f627721fe3a87c860d1a4a42b7e3f3a066e498b1861522cea1a1999
+  metadata.gz: 43842f0c8f79ffdf6be311cf7bcac234697a1f82d70da62760604536ffa40eaf7a4d1c12f16c366988ccab1c3ea636606dc5c1bb6299c2bc3e98609f9683bbd6
+  data.tar.gz: f5dd3bced88d5f7d0721232dcd25f7f455856ed38391dd1dadbe045c712f891ba381831ebccfc0d8ed579c56bc854ec8a8d88307b23d8cde409f4556b677a9a3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.1 (April 23, 2019)
+BUG FIXES:
+  - Fixed the error message for host-only network collision
+  [[GH-340](https://github.com/Parallels/vagrant-parallels/issues/340)]
+
 ## 2.0.0 (November 19, 2018)
 BREAKING CHANGES:
   - **Linked Clone feature is enabled by default.**

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

@@ -291,7 +291,12 @@ module VagrantPlugins
             @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
               next if interface[:status] == 'Down'
               that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
-              raise Vagrant::Errors::NetworkCollision if netaddr.include? that_netaddr
+              if netaddr.include? that_netaddr
+                raise VagrantPlugins::Parallels::Errors::NetworkCollision,
+                  hostonly_netaddr: netaddr,
+                  bridge_netaddr:   that_netaddr,
+                  bridge_interface: interface[:name]
+              end
             end
           end
 

data/lib/vagrant-parallels/errors.rb

@@ -39,6 +39,10 @@ module VagrantPlugins
         error_key(:mac_os_x_required)
       end
 
+      class NetworkCollision < VagrantParallelsError
+        error_key(:network_collision)
+      end
+
       class NetworkInvalidAddress < VagrantParallelsError
         error_key(:network_invalid_address)
       end
@@ -104,4 +108,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/locales/en.yml

@@ -58,6 +58,14 @@ en:
         which are not supported by "prl_fs" file system.
 
         Invalid mount options: %{options}
+      network_collision: |-
+        The specified host network collides with a non-hostonly network!
+        This will cause your specified IP to be inaccessible. Please change
+        the IP or name of your host only network so that it no longer matches that of
+        a bridged or non-hostonly network.
+
+        Host-only Network Address: '%{hostonly_netaddr}'
+        Bridged Network '%{bridge_interface}': '%{bridge_netaddr}'
       network_invalid_address: |-
         Network settings specified in your Vagrantfile are invalid:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri