vagrant-parallels 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34465669a7296fe6bf908b039f849e9221202c8b
-  data.tar.gz: 77b42b45473b87cd97917cba693100b7c9be71c5
+  metadata.gz: 727a5615d19f3fff40b44693a73f342cc06b9001
+  data.tar.gz: b1e332a7d7e33212ab4d2a667793164d072e2808
 SHA512:
-  metadata.gz: 21acbf45f344cb8a1fbbff871f6285d6eff031ee7b1440a13e3fbc638e8d7f05ac41923669bf21df7d33c918b131af58719592b0c68fbdac92e9d659cf3d512c
-  data.tar.gz: 4dbd6eb8a9264d84e391b73569295017749fa38c7479ec7cf9589b7ef0d31af520b377946b3d30c128be74b348b3dcc13957c607f83072bd55919c6ee998e1fc
+  metadata.gz: 4370287033f4ac59521630571d7b9bdc968aee1131f671a0cb38dabe1225cd02228ee93b41447706c77cd43797a07b1b4d901579cda297895c93da69fb8e0118
+  data.tar.gz: 7abeeba088fc9797c2ad6aae3d7ab3587c553fd70cb9bffcbc4fcb4fb7a423fc313bd886650be633b22d680097b6150af23b80b979c43894d8ee17806109d763

data/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure('2') do |config|
 
     u.vm.provider 'parallels' do |prl|
        prl.regen_box_uuid = false
-       prl.linked_clone = true
+       #prl.linked_clone = true
      #  prl.customize("pre-boot" , ["set", :id, "--device-add", "serial", "--output", "/path/to/serial_out.txt"])
     end
 
@@ -41,17 +41,22 @@ Vagrant.configure('2') do |config|
       v.regen_box_uuid = false
     end
 
-c.vm.provider "parallels" do |v|
-      v.customize ["set", :id, "--smart-mount", "off"]
-      v.customize ["set", :id, "--shared-profile", "off"]
-      v.customize ["set", :id, "--shared-cloud", "off"] 
-
-end
-
-c.vm.provider "parallels" do |v|
-  v.customize("post-import", ["set", :id, "--device-add", "serial", "--output", "/Users/legal/serial_out.txt"])
-  v.customize ["set", :id, "--device-set", "serial0", "--output", "/Users/legal/serial_out.txt"]
-end
+    # c.vm.provider "parallels" do |v|
+    #       v.customize ["set", :id, "--smart-mount", "off"]
+    #       v.customize ["set", :id, "--shared-profile", "off"]
+    #       v.customize ["set", :id, "--shared-cloud", "off"]
+    #
+    # end
+    #
+    # c.vm.provider "parallels" do |v|
+    #   v.customize("post-import", ["set", :id, "--device-add", "serial", "--output", "/Users/legal/serial_out.txt"])
+    #   v.customize ["set", :id, "--device-set", "serial0", "--output", "/Users/legal/serial_out.txt"]
+    # end
+
+    c.vm.provider :parallels do |prl, config_override|
+      config_override.vm.network :public_network, adapter: 0
+      prl.network_adapter(1, :shared)
+    end
 
 #    c.vm.network 'private_network', ip: '192.168.60.4'
 #    c.vm.network 'private_network', ip: '10.2.0.220', netmask: '255.255.0.0'

data/lib/vagrant-parallels/cap/nic_mac_addresses.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
           nic_macs = machine.provider.driver.read_mac_addresses
 
           # Make numeration starting from 1, as it is expected in Vagrant.
-          Hash[nic_macs.map{ |index, mac| [index+1, mac] }]
+          Hash[nic_macs.map.with_index{ |mac, index| [index+1, mac] }]
         end
       end
     end

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

@@ -148,15 +148,15 @@ module VagrantPlugins
         def read_host_only_interfaces
         end
 
-        # Returns the MAC address of the first network interface.
+        # Returns the MAC address of the first Shared network interface.
         #
         # @return [String]
         def read_mac_address
         end
 
-        # Returns the network interface card MAC addresses
+        # Returns the array of network interface card MAC addresses
         #
-        # @return [Hash<Integer, String>] Adapter => MAC address
+        # @return [Array<String>]
         def read_mac_addresses
         end
 

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

@@ -302,13 +302,20 @@ module VagrantPlugins
         end
 
         def read_mac_address
-          # Get MAC of Shared network interface (net0)
-          read_vm_option('mac').strip.split(' ').first.gsub(':', '')
+          hw_info = read_settings.fetch('Hardware', {})
+          shared_ifaces = hw_info.select do |name, params|
+            name.start_with?('net') && params['type'] == 'shared'
+          end
+
+          if shared_ifaces.empty?
+            raise Errors::SharedAdapterNotFound
+          end
+
+          shared_ifaces.values.first.fetch('mac', nil)
         end
 
         def read_mac_addresses
-          macs = read_vm_option('mac').strip.split(' ')
-          Hash[macs.map.with_index{ |mac, ind| [ind, mac.gsub(':', '')] }]
+          read_vm_option('mac').strip.gsub(':', '').split(' ')
         end
 
         def read_network_interfaces
@@ -465,7 +472,7 @@ module VagrantPlugins
           # If we reach this point, it means that we consistently got the
           # failure, do a standard execute now. This will raise an
           # exception if it fails again.
-          execute_prlctl(*args)
+          execute(*args)
         end
 
         def registered?(uuid)
@@ -534,7 +541,7 @@ module VagrantPlugins
           # If we reach this point, it means that we consistently got the
           # failure, do a standard execute now. This will raise an
           # exception if it fails again.
-          execute_prlctl(*args)
+          execute(*args)
         end
 
         def unshare_folders(names)

data/lib/vagrant-parallels/errors.rb

@@ -55,6 +55,10 @@ module VagrantPlugins
         error_key(:parallels_vm_option_not_found)
       end
 
+      class SharedAdapterNotFound < VagrantParallelsError
+        error_key(:shared_adapter_not_found)
+      end
+
       class VMImportFailure < VagrantParallelsError
         error_key(:vm_import_failure)
       end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.3.12'
+    VERSION = '1.3.13'
   end
 end

data/locales/en.yml

@@ -75,6 +75,10 @@ en:
         Could not find a required option of Parallels Desktop virtual machine:
           %{vm_option}
         This is an internal error that should be reported as a bug.
+      shared_adapter_not_found: |-
+        Shared network adapter was not found in your virtual machine configuration.
+        It is required to communicate with VM and forward ports. Please check
+        network configuration in your Vagrantfile.
       vm_import_failure: |-
         The VM import failed! Please verify that the box you're using is not
         corrupted and try again.

data/test/unit/support/shared/parallels_context.rb

@@ -223,7 +223,7 @@ shared_context 'parallels' do
     subprocess.stub(:execute).
       with('prlctl', 'list', kind_of(String), '--no-header', '-o', 'mac',
            kind_of(Hash)) do
-      subprocess_result(stdout: "001C42B4B074\n")
+      subprocess_result(stdout: "00:1C:42:B4:B0:74 00:1C:42:B4:B0:90\n")
     end
 
   end

data/test/unit/support/shared/pd_driver_examples.rb

@@ -186,9 +186,9 @@ shared_examples "parallels desktop driver" do |options|
 
   describe "read_mac_addresses" do
     it "returns MAC addresses of all network interface cards" do
-      subject.read_mac_addresses.should be_kind_of(Hash)
-      subject.read_mac_addresses.should include(0)
-      subject.read_mac_addresses[0].should be_kind_of(String)
+      subject.read_mac_addresses.should be_kind_of(Array)
+      subject.read_mac_addresses.should include('001C42B4B074')
+      subject.read_mac_addresses.should include('001C42B4B090')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler