vagrant-parallels 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de33693db1716fa532ac466100960e204d0a2aab
-  data.tar.gz: 4cef81cca0b698a57786354d774776aae8b20eeb
+  metadata.gz: 1a13c25bcdb28367ff315b90af6afc37eb8788e3
+  data.tar.gz: f0b172f3e8ba722ec295fa2216db182cfcdc769a
 SHA512:
-  metadata.gz: 66039bc48af7c1104d279e0b52e57fbe250ebc3feb5eeb0b2d01326aa34b178b16c4cdd0681128ad4ecf4cc0f50779b1657a2236335113850bef8a3a08d4aee3
-  data.tar.gz: 3311b730676476f1e4fbc216e0d7926b8ae3920b99834c488bd12162233fe0db004701a7e3fae7f10b726839a7f6f8dc4a76ea6c846429e654aeae6996bdb977
+  metadata.gz: 813e9edbabbffb8d4b913d549f8808298d3e2c8e1aa0e63f88a92eb9ff331bfc19251abe4ec5d63ef7842b77f85cb6ff90af7517957d175b5cb811b14b35908c
+  data.tar.gz: 75a2ee142077fa988267656c4613d97f270ae2310381481c499993707ffa9f0ebbc02ec6978c438be77682e01bd80862375cf620fc30b1c43596cd44c3e8a265

data/lib/vagrant-parallels/action.rb

@@ -29,6 +29,7 @@ module VagrantPlugins
           b.use Boot
           b.use Customize, "post-boot"
           b.use WaitForCommunicator, [:starting, :running]
+          b.use Customize, "post-comm"
           b.use HandleGuestTools
         end
       end
@@ -285,8 +286,27 @@ module VagrantPlugins
         end
       end
 
+      # This action simply reboots the VM. It is executed right after
+      # Parallels Tools installation or upgrade.
+      def self.action_simple_reboot
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, GracefulHalt, :stopped, :running do |env2, b2|
+            if !env2[:result]
+              b2.use ForcedHalt
+            end
+          end
+
+          b.use Customize, "pre-boot"
+          b.use Boot
+          b.use Customize, "post-boot"
+          b.use WaitForCommunicator, [:starting, :running]
+          b.use Customize, "post-comm"
+        end
+      end
+
       autoload :Boot, File.expand_path("../action/boot", __FILE__)
       autoload :HandleGuestTools, File.expand_path("../action/handle_guest_tools", __FILE__)
+      autoload :HandleForwardedPortCollisions, File.expand_path("../action/handle_forwarded_port_collisions.rb", __FILE__)
       autoload :ClearNetworkInterfaces, File.expand_path("../action/clear_network_interfaces", __FILE__)
       autoload :ClearForwardedPorts, File.expand_path("../action/clear_forwarded_ports", __FILE__)
       autoload :Customize, File.expand_path("../action/customize", __FILE__)

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

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module Parallels
+    module Action
+      class HandleForwardedPortCollisions < Vagrant::Action::Builtin::HandleForwardedPortCollisions
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_parallels::action::handle_port_collisions')
+        end
+
+        # This middleware just wraps the builtin action and allows to skip it if
+        # port forwarding is not supported for current Parallels Desktop version.
+        def call(env)
+          # Port Forwarding feature is available only with PD >= 10
+          if !env[:machine].provider.pd_version_satisfies?('>= 10')
+            return @app.call(env)
+          end
+
+          # Call the builtin action
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -37,6 +37,11 @@ module VagrantPlugins
           if @machine.guest.capability?(:install_parallels_tools)
             env[:ui].output(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.installing"))
             @machine.guest.capability(:install_parallels_tools)
+
+            # The VM should be rebooted to enable kernel modules
+            # bundled with Parallels Tools.
+            env[:ui].output(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.rebooting"))
+            @machine.action(:simple_reboot)
           else
             env[:ui].warn(I18n.t("vagrant_parallels.actions.vm.handle_guest_tools.cant_install"))
           end

data/lib/vagrant-parallels/config.rb

@@ -83,7 +83,7 @@ module VagrantPlugins
 
       def validate(machine)
         errors = _detected_errors
-        valid_events = ["pre-import", "pre-boot", "post-boot"]
+        valid_events = ["pre-import", "pre-boot", "post-boot", "post-comm"]
         @customizations.each do |event, _|
           if !valid_events.include?(event)
             errors << I18n.t("vagrant_parallels.config.invalid_event",

data/lib/vagrant-parallels/errors.rb

@@ -11,6 +11,10 @@ module VagrantPlugins
         error_key(:dhcp_leases_file_not_accessible)
       end
 
+      class LinuxMountFailed < VagrantParallelsError
+        error_key(:linux_mount_failed)
+      end
+
       class MacOSXRequired < VagrantParallelsError
         error_key(:mac_os_x_required)
       end

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

@@ -60,7 +60,7 @@ module VagrantPlugins
 
             attempts += 1
             if attempts > 10
-              raise Vagrant::Errors::LinuxMountFailed,
+              raise VagrantPlugins::Parallels::Errors::LinuxMountFailed,
                 command: mount_commands.join("\n")
             end
 

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/locales/en.yml

@@ -22,6 +22,16 @@ en:
         Command: %{command}
 
         Stderr: %{stderr}
+
+      linux_mount_failed: |-
+        Failed to mount folders in Linux guest. This is usually because
+        the "prl_fs" file system is not available. Please verify that
+        Parallels Tools are properly installed in the guest and
+        can work properly. If so, the VM reboot can solve a problem.
+        The command attempted was:
+
+        %{command}
+
       mac_os_x_required: |-
         Parallels provider works only on OS X (Mac OS X) systems.
       parallels_install_incomplete: |-
@@ -118,6 +128,8 @@ en:
             If SSH fails or shared folders are not working on this machine,
             please install Parallels Tools within the virtual machine and
             reload your VM.
+          rebooting: |-
+            Parallels Tools have been installed. Rebooting the VM...
           outdated: |-
             Parallels Tools installed on this VM are outdated! In most cases
             this is fine but in rare cases it can cause things such as shared

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,82 +9,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.9
 description: Enables Vagrant to manage Parallels virtual machines.
@@ -95,9 +95,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- config/i18n-tasks.yml.erb
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- config/i18n-tasks.yml.erb
+- lib/vagrant-parallels.rb
+- lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/action/boot.rb
 - lib/vagrant-parallels/action/clear_forwarded_ports.rb
 - lib/vagrant-parallels/action/clear_network_interfaces.rb
@@ -108,6 +115,7 @@ files:
 - lib/vagrant-parallels/action/export.rb
 - lib/vagrant-parallels/action/forced_halt.rb
 - lib/vagrant-parallels/action/forward_ports.rb
+- lib/vagrant-parallels/action/handle_forwarded_port_collisions.rb
 - lib/vagrant-parallels/action/handle_guest_tools.rb
 - lib/vagrant-parallels/action/import.rb
 - lib/vagrant-parallels/action/network.rb
@@ -121,7 +129,6 @@ files:
 - lib/vagrant-parallels/action/set_name.rb
 - lib/vagrant-parallels/action/setup_package_files.rb
 - lib/vagrant-parallels/action/suspend.rb
-- lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/cap/forwarded_ports.rb
 - lib/vagrant-parallels/cap/host_address.rb
 - lib/vagrant-parallels/cap/nic_mac_addresses.rb
@@ -142,11 +149,7 @@ files:
 - lib/vagrant-parallels/synced_folder.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
 - lib/vagrant-parallels/version.rb
-- lib/vagrant-parallels.rb
-- LICENSE.txt
 - locales/en.yml
-- Rakefile
-- README.md
 - tasks/bundler.rake
 - tasks/test.rake
 - test/unit/base.rb
@@ -159,8 +162,6 @@ files:
 - test/unit/support/shared/pd_driver_examples.rb
 - test/unit/synced_folder_test.rb
 - vagrant-parallels.gemspec
-- .gitignore
-- .travis.yml
 homepage: http://github.com/Parallels/vagrant-parallels
 licenses:
 - MIT
@@ -171,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-parallels
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Parallels provider for Vagrant.