vagrant-parallels 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7311b4684314d58491eeb5ca36fe1bb1c465b4f
-  data.tar.gz: 1c5d0a4d8b58826bde63c5ecb438203020435aa4
+  metadata.gz: d7e330e0bf4f7340f2aaf9c7ed6b79d0c52cc0b8
+  data.tar.gz: 52857d66b61b476eab91d9b66fe4af6a2f269ec7
 SHA512:
-  metadata.gz: 6e59b47ef130c503f23c5a1d5e16d25b632eaf88a73c5ae4cd3643af1ab882003f178c5d00e4b4f5a3c07c9d468eb89753987e03f18a8b1614ac5c14c8b228a9
-  data.tar.gz: b739a112420e6804379d01f97791f3cd02117d8d4fe67ef510f9d347ecd438d26a0926debd43b8613928c4344ae29f71b25b624dececbf0850a55e4112814233
+  metadata.gz: b65c6441960be8af4f3957a416af8c49fad42749033af657f9407afa2c23bdb5abb826b9ac77b328b946d33df2994f59a00724b495f18d6629115f25c4d4e5d9
+  data.tar.gz: 339138fdf2352086a31b85a5803229b1d265659ffe0cba3626f8add48a168876e35814088983b8bc28340de2e16eedf7766c41e7aca84d95528262738e9fe46c

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Parallels
+    module Cap
+      module HostAddress
+        def self.host_address(machine)
+
+          shared_iface = machine.provider.driver.read_shared_interface
+          return shared_iface[:ip] if shared_iface
+
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -151,6 +151,12 @@ module VagrantPlugins
         def read_network_interfaces
         end
 
+        # Returns info about shared network interface.
+        #
+        # @return [Hash]
+        def read_shared_interface
+        end
+
         # Returns the current state of this VM.
         #
         # @return [Symbol]

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

@@ -91,6 +91,7 @@ module VagrantPlugins
                        :read_host_only_interfaces,
                        :read_mac_address,
                        :read_network_interfaces,
+                       :read_shared_interface,
                        :read_settings,
                        :read_state,
                        :read_used_ports,

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

@@ -226,6 +226,10 @@ module VagrantPlugins
             end
           rescue Errno::EACCES
             raise Errors::DhcpLeasesNotAccessible, :leases_file => leases_file.to_s
+          rescue Errno::ENOENT
+            # File does not exist
+            # Perhaps, it is the fist start of Parallels Desktop
+            return nil
           end
 
           nil
@@ -307,6 +311,30 @@ module VagrantPlugins
           vm.last
         end
 
+        def read_shared_interface
+          # There should be only one Shared interface
+          shared_net = read_virtual_networks.detect { |net| net['Type'] == 'shared' }
+          return nil if !shared_net
+
+          net_info = json { execute(:prlsrvctl, 'net', 'info', shared_net['Network ID'], '--json') }
+          info = {
+            name:    net_info['Bound To'],
+            ip:      net_info['Parallels adapter']['IP address'],
+            netmask: net_info['Parallels adapter']['Subnet mask'],
+            status:  "Up"
+          }
+
+          if net_info.key?('DHCPv4 server')
+            info[:dhcp] = {
+              ip:    net_info['DHCPv4 server']['Server address'],
+              lower: net_info['DHCPv4 server']['IP scope start address'],
+              upper: net_info['DHCPv4 server']['IP scope end address']
+            }
+          end
+
+          info
+        end
+
         def read_state
           vm = json { execute('list', @uuid, '--json', retryable: true).gsub(/^INFO/, '') }
           return nil if !vm.last

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

@@ -226,6 +226,10 @@ module VagrantPlugins
             end
           rescue Errno::EACCES
             raise Errors::DhcpLeasesNotAccessible, :leases_file => leases_file.to_s
+          rescue Errno::ENOENT
+            # File does not exist
+            # Perhaps, it is the fist start of Parallels Desktop
+            return nil
           end
 
           nil
@@ -307,6 +311,30 @@ module VagrantPlugins
           vm.last
         end
 
+        def read_shared_interface
+          # There should be only one Shared interface
+          shared_net = read_virtual_networks.detect { |net| net['Type'] == 'shared' }
+          return nil if !shared_net
+
+          net_info = json { execute(:prlsrvctl, 'net', 'info', shared_net['Network ID'], '--json') }
+          info = {
+            name:    net_info['Bound To'],
+            ip:      net_info['Parallels adapter']['IP address'],
+            netmask: net_info['Parallels adapter']['Subnet mask'],
+            status:  "Up"
+          }
+
+          if net_info.key?('DHCPv4 server')
+            info[:dhcp] = {
+              ip:    net_info['DHCPv4 server']['Server address'],
+              lower: net_info['DHCPv4 server']['IP scope start address'],
+              upper: net_info['DHCPv4 server']['IP scope end address']
+            }
+          end
+
+          info
+        end
+
         def read_state
           vm = json { execute('list', @uuid, '--json', retryable: true) }
           return nil if !vm.last

data/lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb

@@ -4,35 +4,72 @@ module VagrantPlugins
       class MountParallelsSharedFolder
 
         def self.mount_parallels_shared_folder(machine, name, guestpath, options)
-          # Expand the guest path so we can handle things like "~/vagrant"
           expanded_guest_path = machine.guest.capability(
             :shell_expand_guest_path, guestpath)
 
-          machine.communicate.tap do |comm|
-            # clear prior symlink
-            if comm.test("test -L \"#{expanded_guest_path}\"", :sudo => true)
-              comm.sudo("rm \"#{expanded_guest_path}\"")
-            end
+          mount_commands = []
 
-            # clear prior directory if exists
-            if comm.test("test -d \"#{expanded_guest_path}\"", :sudo => true)
-              comm.sudo("rm -Rf \"#{expanded_guest_path}\"")
-            end
+          if options[:owner].is_a? Integer
+            mount_uid = options[:owner]
+          else
+            mount_uid = "`id -u #{options[:owner]}`"
+          end
+
+          if options[:group].is_a? Integer
+            mount_gid = options[:group]
+            mount_gid_old = options[:group]
+          else
+            mount_gid = "`getent group #{options[:group]} | cut -d: -f3`"
+            mount_gid_old = "`id -g #{options[:group]}`"
+          end
+
+          # First mount command uses getent to get the group
+          mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
+          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
+
+          # Second mount command uses the old style `id -g`
+          mount_options = "-o uid=#{mount_uid},gid=#{mount_gid_old}"
+          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_commands << "mount -t prl_fs #{mount_options} #{name} #{expanded_guest_path}"
 
-            # create intermediate directories if needed
-            intermediate_dir = File.dirname(expanded_guest_path)
-            if !comm.test("test -d \"#{intermediate_dir}\"", :sudo => true)
-              comm.sudo("mkdir -p \"#{intermediate_dir}\"")
+          # Clear prior symlink if exists
+          machine.communicate.sudo("test -L #{expanded_guest_path} && rm -f #{expanded_guest_path}")
+
+          # Create the guest path if it doesn't exist
+          machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+
+          # Attempt to mount the folder. We retry here a few times because
+          # it can fail early on.
+          attempts = 0
+          while true
+            success = true
+
+            mount_commands.each do |command|
+              no_such_device = false
+              status = machine.communicate.sudo(command, error_check: false) do |type, data|
+                no_such_device = true if type == :stderr && data =~ /No such device/i
+              end
+
+              success = status == 0 && !no_such_device
+              break if success
             end
 
-            # finally make the symlink
-            comm.sudo("ln -s \"/media/psf/#{name}\" \"#{expanded_guest_path}\"")
+            break if success
 
-            # Emit an upstart event if we can
-            if comm.test("test -x /sbin/initctl")
-              comm.sudo(
-                "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
+            attempts += 1
+            if attempts > 10
+              raise Vagrant::Errors::LinuxMountFailed,
+                    command: mount_commands.join("\n")
             end
+
+            sleep 2
+          end
+
+          # Emit an upstart event if we can
+          if machine.communicate.test("test -x /sbin/initctl")
+            machine.communicate.sudo(
+              "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
           end
         end
       end

data/lib/vagrant-parallels/plugin.rb

@@ -45,6 +45,11 @@ module VagrantPlugins
         Cap::PublicAddress
       end
 
+      provider_capability("parallels", "host_address") do
+        require_relative "cap/host_address"
+        Cap::HostAddress
+      end
+
       synced_folder(:parallels) do
         require File.expand_path("../synced_folder", __FILE__)
         SyncedFolder

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - lib/vagrant-parallels/action/setup_package_files.rb
 - lib/vagrant-parallels/action/suspend.rb
 - lib/vagrant-parallels/action.rb
+- lib/vagrant-parallels/cap/host_address.rb
 - lib/vagrant-parallels/cap/public_address.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb