vagrant-parallels 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357deec9b5427708e14fc8d7bafc0df42ef06b4d
-  data.tar.gz: d997bba5f56330d1bc7a69c0602aa613e0be08cb
+  metadata.gz: c7311b4684314d58491eeb5ca36fe1bb1c465b4f
+  data.tar.gz: 1c5d0a4d8b58826bde63c5ecb438203020435aa4
 SHA512:
-  metadata.gz: b5c9089a4c56fa43631d1ca66284e112898e374709ddcea08c3931c641cefdabe5a542279ab853880435052fe423d7cc03780f9341b170c9405f8602ce361835
-  data.tar.gz: eb0c5ed9cfad34c70225c60cac47131c3458549a64ae958eafb49b55379e499199f12d852057158002368378671e77ec0dd6de4845644bc69d516c4d1691a6a4
+  metadata.gz: 6e59b47ef130c503f23c5a1d5e16d25b632eaf88a73c5ae4cd3643af1ab882003f178c5d00e4b4f5a3c07c9d468eb89753987e03f18a8b1614ac5c14c8b228a9
+  data.tar.gz: b739a112420e6804379d01f97791f3cd02117d8d4fe67ef510f9d347ecd438d26a0926debd43b8613928c4344ae29f71b25b624dececbf0850a55e4112814233

data/.gitignore

@@ -4,16 +4,16 @@
 # Vagrant stuff
 acceptance_config.yml
 boxes/*
-/Vagrantfile
-/.vagrant
-/vagrant-spec.config.rb
+Vagrantfile
+.vagrant
+vagrant-spec.config.rb
 
 # Bundler/Rubygems
 *.gem
 .bundle
 pkg/*
 tags
-/Gemfile.lock
+Gemfile.lock
 test/tmp/
 
 # Python

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

@@ -48,7 +48,7 @@ module VagrantPlugins
           @machine.provider.driver.read_network_interfaces.each do |adapter, opts|
             if opts[:type] == :hostonly
               @machine.provider.driver.read_host_only_interfaces.each do |interface|
-                if interface[:bound_to] == opts[:hostonly]
+                if interface[:name] == opts[:hostonly]
                   return adapter, interface[:ip]
                 end
               end

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

@@ -45,7 +45,7 @@ module VagrantPlugins
         #
         # @param [Hash] options Options to create the host only network.
         # @return [Hash] The details of the host only network, including
-        #   keys `:name`, `:bound_to`, `:ip`, `:netmask` and `:dhcp`
+        #   keys `:name`, `:ip`, `:netmask` and `:dhcp`
         def create_host_only_network(options)
         end
 
@@ -68,7 +68,7 @@ module VagrantPlugins
         # {
         #   :type     => :hostonly,
         #   :hostonly => "vagrant-vnet0",
-        #   :bound_to => "vnic2",
+        #   :name     => "vnic2",
         #   :nic_type => "virtio"
         # }
         #

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

@@ -219,10 +219,13 @@ module VagrantPlugins
 
         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
+          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

data/lib/vagrant-parallels/version.rb

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

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

@@ -146,6 +146,26 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe "read_guest_ip" do
+    let(:content) {'10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
+
+    it "returns an IP address assigned to the specified MAC" do
+      driver.should_receive(:read_mac_address).and_return("001C420000FF")
+      File.should_receive(:open).with(an_instance_of(String)).
+        and_return(StringIO.new(content))
+
+      subject.read_guest_ip.should == "10.200.0.99"
+    end
+
+    it "rises DhcpLeasesNotAccessible exception when file is not accessible" do
+      File.stub(:open).and_call_original
+      File.should_receive(:open).with(an_instance_of(String)).
+        and_raise(Errno::EACCES)
+      expect { subject.read_guest_ip }.
+        to raise_error(VagrantPlugins::Parallels::Errors::DhcpLeasesNotAccessible)
+    end
+  end
+
   describe "read_settings" do
     it "returns a hash with detailed info about the VM" do
       subject.read_settings.should be_kind_of(Hash)
@@ -230,7 +250,7 @@ shared_examples "parallels desktop driver" do |options|
       subject.version.should match(/(#{parallels_version}[\d\.]+)/)
     end
 
-    it "rises ParallelsInstallIncomplete exception when output is invalid" do
+    it "rises ParallelsInvalidVersion exception when output is invalid" do
       subprocess.should_receive(:execute).
         with("prlctl", "--version", an_instance_of(Hash)).
         and_return(subprocess_result(exit_code: 0))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,6 @@ extra_rdoc_files: []
 files:
 - config/i18n-tasks.yml.erb
 - Gemfile
-- Gemfile.lock
 - lib/vagrant-parallels/action/boot.rb
 - lib/vagrant-parallels/action/check_accessible.rb
 - lib/vagrant-parallels/action/check_created.rb
@@ -138,8 +137,6 @@ files:
 - test/unit/support/shared/pd_driver_examples.rb
 - test/unit/synced_folder_test.rb
 - vagrant-parallels.gemspec
-- vagrant-spec.config.rb
-- Vagrantfile
 - .gitignore
 - .travis.yml
 homepage: http://github.com/Parallels/vagrant-parallels