vagrant-parallels 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f2802c08f2dca252035eebdba9346ca7e8ca1d
-  data.tar.gz: 5c67f4b8efb10f42d9062ef63a4009b92f64a60f
+  metadata.gz: 357deec9b5427708e14fc8d7bafc0df42ef06b4d
+  data.tar.gz: d997bba5f56330d1bc7a69c0602aa613e0be08cb
 SHA512:
-  metadata.gz: 42a742b4c31a08b698902c283d29145ffeb9ef3abaac6584030b823790ae5756a06f162f42d78aa67e4f531aa5ac1d74def2e24ff6094cd22fcf983bd4162bff
-  data.tar.gz: 0bfa98293a6d5aace8a2cb4617837cce15e74c0b70ff9491f8e9d6f8a73e1df598e6e2f5f58ccde4d68b7a2e58f8d6daccbfc985f837871d84ae19238ff9fb92
+  metadata.gz: b5c9089a4c56fa43631d1ca66284e112898e374709ddcea08c3931c641cefdabe5a542279ab853880435052fe423d7cc03780f9341b170c9405f8602ce361835
+  data.tar.gz: eb0c5ed9cfad34c70225c60cac47131c3458549a64ae958eafb49b55379e499199f12d852057158002368378671e77ec0dd6de4845644bc69d516c4d1691a6a4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 914d177346815a6516133e9471cb2ab8e1346250
+  revision: d0cf22dd5fc5fcb8ee49577c0a93e7c6eeda56b1
   specs:
-    vagrant (1.5.0.dev)
+    vagrant (1.5.1.dev)
       bundler (~> 1.5.2)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-parallels (1.0.0)
+    vagrant-parallels (1.0.1)
 
 GEM
   remote: http://rubygems.org/
@@ -84,7 +84,7 @@ GEM
       atomic (>= 1.1.7, < 2)
     timers (1.1.0)
     tins (1.0.0)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     wdm (0.1.0)
 
 PLATFORMS

data/Vagrantfile

@@ -3,8 +3,7 @@ Vagrant.configure("2") do |config|
   # Configure base box parameters
   config.vm.define 'ubuntu' do |u|
     u.vm.hostname = "my-super-vm.do.sw.ru"
-    u.vm.box = "ubuntu-13.10_x64.box"
-    u.vm.box_url = "http://download.parallels.com/desktop/vagrant/saucy64.box"
+    u.vm.box = "parallels/ubuntu-13.10"
   end
 
   config.vm.define 'centos' do |c|
@@ -16,7 +15,7 @@ Vagrant.configure("2") do |config|
     end
 
     c.vm.network "private_network", ip: "33.33.30.25", netmask: "255.255.252.0"
-    #c.vm.network "public_network", bridge: "en0"
+    c.vm.network "public_network", bridge: "en0"
 
     #c.vm.network "private_network", type: :dhcp
     #c.vm.network "public_network", dhcp: "yes", bridge: "en0"
@@ -24,8 +23,7 @@ Vagrant.configure("2") do |config|
 
 
     c.vm.hostname = "my-funny-centos.do.sw.ru"
-    c.vm.box = "centos-6.5_x64"
-    c.vm.box_url = "http://download.parallels.com/desktop/vagrant/centos64.box"
+    c.vm.box = "parallels/centos-6.5"
 
     #c.vm.box = "graylog2"
     #c.vm.box = "TEST_1.4"

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Parallels
+    module Cap
+      module PublicAddress
+        def self.public_address(machine)
+          return nil if machine.state.id != :running
+
+          ssh_info = machine.ssh_info
+          return nil if !ssh_info
+          ssh_info[:host]
+        end
+      end
+    end
+  end
+end

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

@@ -73,7 +73,6 @@ module VagrantPlugins
         end
 
         def_delegators :@driver,
-                       #:clear_forwarded_ports,
                        :clear_shared_folders,
                        :compact,
                        :create_host_only_network,
@@ -83,11 +82,8 @@ module VagrantPlugins
                        :enable_adapters,
                        :execute_command,
                        :export,
-                       #:forward_ports,
                        :halt,
                        :import,
-                       :read_ip_dhcp,
-                       #:read_forwarded_ports,
                        :read_bridged_interfaces,
                        :read_guest_tools_version,
                        :read_guest_ip,

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

@@ -184,21 +184,18 @@ module VagrantPlugins
         end
 
         def read_bridged_interfaces
-          net_list = read_virtual_networks
-
-          # Skip 'vnicXXX' and 'Default' interfaces
-          net_list.delete_if do |net|
-            net['Type'] != "bridged" or
-              net['Bound To'] =~ /^(vnic(.+?))$/ or
-              net['Network ID'] == "Default"
+          host_hw_info = read_host_info.fetch("Hardware info")
+          net_list = host_hw_info.select do |name, attrs|
+            # Get all network interfaces except 'vnicXXX'
+            attrs.fetch("type") == "net" and name !~ /^(vnic(.+?))$/
           end
 
           bridged_ifaces = []
-          net_list.collect do |iface|
+          net_list.keys.each do |iface|
             info = {}
-            ifconfig = execute(:ifconfig, iface['Bound To'])
+            ifconfig = execute(:ifconfig, iface)
             # Assign default values
-            info[:name]    = iface['Bound To']
+            info[:name]    = iface
             info[:ip]      = "0.0.0.0"
             info[:netmask] = "0.0.0.0"
             info[:status]  = "Down"
@@ -220,16 +217,31 @@ module VagrantPlugins
           bridged_ifaces
         end
 
+        def read_guest_ip
+          mac_addr = read_mac_address.downcase
+          File.foreach("/Library/Preferences/Parallels/parallels_dhcp_leases") do |line|
+            if line.include? mac_addr
+              return line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
+            end
+          end
+
+          nil
+        end
+
         def read_guest_tools_version
           read_settings.fetch('GuestTools', {}).fetch('version', nil)
         end
 
+        def read_host_info
+          json { execute('server', 'info', '--json', retryable: true) }
+        end
+
         def read_host_only_interfaces
           net_list = read_virtual_networks
           net_list.keep_if { |net| net['Type'] == "host-only" }
 
           hostonly_ifaces = []
-          net_list.collect do |iface|
+          net_list.each do |iface|
             info = {}
             net_info = json { execute(:prlsrvctl, 'net', 'info', iface['Network ID'], '--json') }
             # Really we need to work with bounded virtual interface
@@ -254,16 +266,6 @@ module VagrantPlugins
           hostonly_ifaces
         end
 
-        def read_ip_dhcp
-          mac_addr = read_mac_address.downcase
-          File.foreach("/Library/Preferences/Parallels/parallels_dhcp_leases") do |line|
-            if line.include? mac_addr
-              ip = line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
-              return ip
-            end
-          end
-        end
-
         def read_mac_address
           read_settings.fetch('Hardware', {}).fetch('net0', {}).fetch('mac', nil)
         end

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

@@ -184,21 +184,18 @@ module VagrantPlugins
         end
 
         def read_bridged_interfaces
-          net_list = read_virtual_networks
-
-          # Skip 'vnicXXX' and 'Default' interfaces
-          net_list.delete_if do |net|
-            net['Type'] != "bridged" or
-              net['Bound To'] =~ /^(vnic(.+?))$/ or
-              net['Network ID'] == "Default"
+          host_hw_info = read_host_info.fetch("Hardware info")
+          net_list = host_hw_info.select do |name, attrs|
+            # Get all network interfaces except 'vnicXXX'
+            attrs.fetch("type") == "net" and name !~ /^(vnic(.+?))$/
           end
 
           bridged_ifaces = []
-          net_list.collect do |iface|
+          net_list.keys.each do |iface|
             info = {}
-            ifconfig = execute(:ifconfig, iface['Bound To'])
+            ifconfig = execute(:ifconfig, iface)
             # Assign default values
-            info[:name]    = iface['Bound To']
+            info[:name]    = iface
             info[:ip]      = "0.0.0.0"
             info[:netmask] = "0.0.0.0"
             info[:status]  = "Down"
@@ -220,16 +217,34 @@ module VagrantPlugins
           bridged_ifaces
         end
 
+        def read_guest_ip
+          mac_addr = read_mac_address.downcase
+          leases_file = "/Library/Preferences/Parallels/parallels_dhcp_leases"
+          begin
+            File.open(leases_file).grep(/#{mac_addr}/) do |line|
+              return line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
+            end
+          rescue Errno::EACCES
+            raise Errors::DhcpLeasesNotAccessible, :leases_file => leases_file.to_s
+          end
+
+          nil
+        end
+
         def read_guest_tools_version
           read_settings.fetch('GuestTools', {}).fetch('version', nil)
         end
 
+        def read_host_info
+          json { execute('server', 'info', '--json', retryable: true) }
+        end
+
         def read_host_only_interfaces
           net_list = read_virtual_networks
           net_list.keep_if { |net| net['Type'] == "host-only" }
 
           hostonly_ifaces = []
-          net_list.collect do |iface|
+          net_list.each do |iface|
             info = {}
             net_info = json { execute(:prlsrvctl, 'net', 'info', iface['Network ID'], '--json') }
             # Really we need to work with bounded virtual interface
@@ -254,16 +269,6 @@ module VagrantPlugins
           hostonly_ifaces
         end
 
-        def read_ip_dhcp
-          mac_addr = read_mac_address.downcase
-          File.foreach("/Library/Preferences/Parallels/parallels_dhcp_leases") do |line|
-            if line.include? mac_addr
-              ip = line[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
-              return ip
-            end
-          end
-        end
-
         def read_mac_address
           read_settings.fetch('Hardware', {}).fetch('net0', {}).fetch('mac', nil)
         end

data/lib/vagrant-parallels/errors.rb

@@ -7,6 +7,10 @@ module VagrantPlugins
         error_namespace("vagrant_parallels.errors")
       end
 
+      class DhcpLeasesNotAccessible < VagrantParallelsError
+        error_key(:dhcp_leases_file_not_accessible)
+      end
+
       class PrlCtlError < VagrantParallelsError
         error_key(:prlctl_error)
       end

data/lib/vagrant-parallels/plugin.rb

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

data/lib/vagrant-parallels/provider.rb

@@ -52,11 +52,11 @@ module VagrantPlugins
         # we return nil.
         return nil if state.id == :not_created
 
-        detected_ip = @machine.config.ssh.host || @driver.read_ip_dhcp
+        detected_ip = @driver.read_guest_ip
 
         # If ip couldn't be detected then we cannot possibly SSH into it,
         # and should return nil too.
-        return nil if detected_ip.nil?
+        return nil if !detected_ip
 
         # Return ip from running machine, use ip from config if available
         return {

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/locales/en.yml

@@ -9,6 +9,12 @@ en:
 # Translations for exception classes
 #-------------------------------------------------------------------------------
     errors:
+      dhcp_leases_file_not_accessible: |-
+        Parallels DHCP leases file is not accessible. The Parallels provider
+        uses it to detect an IP address of virtual machine. This file must be
+        readable for the user that is running Vagrant.
+
+        Parallels DHCP leases file: %{leases_file}
       mac_os_x_required: |-
         Parallels provider only works on OS X (or Mac OS X).
       prlctl_error: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,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/public_address.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb
 - lib/vagrant-parallels/driver/meta.rb