vagrant-parallels 1.0.9.rc1 → 1.1.0

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

@@ -16,12 +16,12 @@ module VagrantPlugins
         end
 
         def read_settings
-          vm = json { execute('list', @uuid, '--info', '--json', retryable: true) }
+          vm = json { execute_prlctl('list', @uuid, '--info', '--json') }
           vm.last
         end
 
         def read_state
-          vm = json { execute('list', @uuid, '--json', retryable: true) }
+          vm = json { execute_prlctl('list', @uuid, '--json') }
           return nil if !vm.last
           vm.last.fetch('status').to_sym
         end
@@ -29,10 +29,10 @@ module VagrantPlugins
         def read_vms
           results = {}
           vms_arr = json([]) do
-            execute('list', '--all', '--json', retryable: true)
+            execute_prlctl('list', '--all', '--json')
           end
           templates_arr = json([]) do
-            execute('list', '--all', '--json', '--template', retryable: true)
+            execute_prlctl('list', '--all', '--json', '--template')
           end
           vms = vms_arr | templates_arr
           vms.each do |item|
@@ -45,17 +45,17 @@ module VagrantPlugins
         # Parse the JSON from *all* VMs and templates. Then return an array of objects (without duplicates)
         def read_vms_info
           vms_arr = json([]) do
-            execute('list', '--all','--info', '--json', retryable: true)
+            execute_prlctl('list', '--all','--info', '--json')
           end
           templates_arr = json([]) do
-            execute('list', '--all','--info', '--json', '--template', retryable: true)
+            execute_prlctl('list', '--all','--info', '--json', '--template')
           end
           vms_arr | templates_arr
         end
 
         def set_power_consumption_mode(optimized)
           state = optimized ? 'on' : 'off'
-          execute('set', @uuid, '--longer-battery-life', state)
+          execute_prlctl('set', @uuid, '--longer-battery-life', state)
         end
       end
     end

data/lib/vagrant-parallels/errors.rb

@@ -15,8 +15,8 @@ module VagrantPlugins
         error_key(:mac_os_x_required)
       end
 
-      class PrlCtlError < VagrantParallelsError
-        error_key(:prlctl_error)
+      class ExecutionError < VagrantParallelsError
+        error_key(:execution_error)
       end
 
       class ParallelsInstallIncomplete < VagrantParallelsError
@@ -35,8 +35,12 @@ module VagrantPlugins
         error_key(:parallels_no_room_for_high_level_network)
       end
 
-      class VMInaccessible < VagrantParallelsError
-        error_key(:vm_inaccessible)
+      class ParallelsToolsIsoNotFound < VagrantParallelsError
+        error_key(:parallels_tools_iso_not_found)
+      end
+
+      class VMImportFailure < VagrantParallelsError
+        error_key(:vm_import_failure)
       end
 
       class VMNameExists < VagrantParallelsError

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

@@ -0,0 +1,53 @@
+module VagrantPlugins
+  module Parallels
+    module GuestLinuxCap
+      class InstallParallelsTools
+
+        def self.install_parallels_tools(machine)
+          if ptiagent_usable?(machine)
+            # Argument '--info' means that Parallels Tools version will be
+            # checked before the installing.
+            machine.communicate.sudo("ptiagent-cmd --info")
+          else
+            machine.communicate.tap do |comm|
+              tools_iso_path = File.expand_path(
+                machine.provider.driver.read_guest_tools_iso_path("linux"),
+                machine.env.root_path
+              )
+              remote_file = "/tmp/prl-tools-lin.iso"
+              mount_point = "/media/prl-tools-lin_#{rand(100000)}/"
+
+              comm.upload(tools_iso_path, remote_file)
+
+              # Create mount point directory if needed
+              if !comm.test("test -d \"#{mount_point}\"", :sudo => true)
+                comm.sudo("mkdir -p \"#{mount_point}\"")
+              end
+
+              # Mount ISO and install Parallels Tools
+              comm.sudo("mount -o loop #{remote_file} #{mount_point}")
+              comm.sudo("#{mount_point}/install --install-unattended-with-deps")
+              comm.sudo("umount -f \"#{mount_point}\"")
+
+              comm.sudo("rm -Rf \"#{mount_point}\"")
+              comm.sudo("rm -f \"#{remote_file}\"")
+            end
+          end
+        end
+
+        private
+
+        # This helper detects is Parallels Tools Installation Agent (PTIAgent)
+        # available and can be used
+        def self.ptiagent_usable?(machine)
+          # Parallels Desktop 9 or higher should be installed on the host and
+          # 'ptiagent-cmd' binary should be available on the guest
+
+          machine.provider_name == :parallels &&
+          Gem::Version.new(machine.provider.driver.version) >= Gem::Version.new("9") &&
+          machine.communicate.test("which ptiagent-cmd", :sudo => true)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/plugin.rb

@@ -45,11 +45,16 @@ module VagrantPlugins
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
-      guest_capability(:linux, :unmount_virtualbox_shared_folder) do
-        require_relative "guest_cap/linux/mount_virtualbox_shared_folder"
+      guest_capability(:linux, :unmount_parallels_shared_folder) do
+        require_relative "guest_cap/linux/mount_parallels_shared_folder"
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
+      guest_capability(:linux, :install_parallels_tools) do
+        require_relative "guest_cap/linux/install_parallels_tools"
+        GuestLinuxCap::InstallParallelsTools
+      end
+
       provider_capability(:parallels, :public_address) do
         require_relative "cap/public_address"
         Cap::PublicAddress

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.0.9.rc1"
+    VERSION = "1.1.0"
   end
 end

data/locales/en.yml

@@ -1,8 +1,6 @@
 en:
   vagrant_parallels:
     parallels:
-      checking_guest_tools: |-
-        Checking for Parallels Tools installed on the VM...
       power_consumption:
         set_mode: |-
           Setting power consumption mode: "%{mode}"
@@ -18,15 +16,14 @@ en:
         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: |-
-        There was an error while executing `prlctl`, a CLI used by Vagrant
-        for controlling Parallels Desktop. The command and stderr is shown below.
+      execution_error: |-
+        There was an error while command execution. The command and stderr is shown below.
 
         Command: %{command}
 
         Stderr: %{stderr}
+      mac_os_x_required: |-
+        Parallels provider works only on OS X (Mac OS X) systems.
       parallels_install_incomplete: |-
         Parallels Desktop is complaining that the installation is incomplete.
         Try to reinstall Parallels Desktop or contact Parallels support.
@@ -48,11 +45,16 @@ en:
         Vagrant uses the `prlctl` binary that ships with Parallels Desktop, and requires
         this to be available on the PATH. If Parallels Desktop is installed, please find
         the `prlctl` binary and add it to the PATH environmental variable.
-      vm_inaccessible: |-
-        Your VM has become "inaccessible." Unfortunately, this is a critical error
-        with Parallels Desktop that Vagrant can not cleanly recover from.
-        Please open VirtualBox and clear out your inaccessible virtual machines
-        or find a way to fix them.
+      parallels_tools_iso_not_found: |-
+        Parallels Tools ISO file does not exists. The Parallels provider uses it
+        to install or update Parallels Tools in the guest machine. Try to
+        reinstall Parallels Desktop.
+
+        Expected ISO path: "%{iso_path}"
+      vm_import_failure: |-
+        The VM import failed! Please verify that the box you're using is not
+        corrupted and try again.
+
       vm_name_exists: |-
         Parallels Desktop virtual machine with the name '%{name}' already exists.
         Please use another name or delete the machine with the existing
@@ -101,23 +103,26 @@ en:
 #-------------------------------------------------------------------------------
     actions:
       vm:
-        check_guest_tools:
+        handle_guest_tools:
+          cant_install: |-
+            Vagrant doesn't support installing Parallels Tools for the guest OS
+            running in the machine. Vagrant attempt to continue, assuming that
+            Parallels Tools will be installed later.
+          checking: |-
+            Checking for Parallels Tools installed on the VM...
+          installing: |-
+            Installing the proper version of Parallels Tools. This may take a few minutes...
           not_detected: |-
-            No Parallels Tools were detected on the base box for this VM! Parallels
-            Tools are required for forwarded ports, shared folders, host only
-            networking, and more. If SSH fails on this machine, please install
-            the Parallels Tools and repackage the box to continue.
-
-            This is not an error message; everything may continue to work properly,
-            in which case you may ignore this message.
-          version_mismatch: |-
-            The Parallels Tools on this VM do not match the installed version of
-            Parallels Desktop! In most cases this is fine, but in rare cases it can
-            cause things such as shared folders to not work properly. If you see
-            shared folder errors, please update the Parallels Tools within the
-            virtual machine and reload your VM.
-
-            Parallels Tools Version: %{tools_version}
-            Parallels Desktop Version: %{parallels_version}
+            Parallels Tools were not detected on this VM! They are required
+            for forwarded ports, shared folders, host only networking and more.
+            If SSH fails or shared folders are not working on this machine,
+            please install Parallels Tools within the virtual machine and
+            reload your 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
+            folders to not work properly. If you see shared folder errors,
+            please update Parallels Tools within the virtual machine and 
+            reload your VM.
         export:
           compacting: Compacting exported HDDs...

data/test/unit/driver/pd_8_test.rb

@@ -9,6 +9,7 @@ describe VagrantPlugins::Parallels::Driver::PD_8 do
   let(:tpl_uuid) {'1234-some-template-uuid-5678'}
   let(:tpl_name) {'Some_Template_Name'}
 
+  let(:tools_state) {'installed'}
   let(:tools_version) {'8.0.18615.123456'}
 
   let(:hostonly_iface) {'vnic10'}
@@ -75,6 +76,7 @@ INFO[
     "State": "stopped",
     "Home": "/path/to/#{vm_name}.pvm/",
     "GuestTools": {
+      "state": "#{tools_state}",
       "version": "#{tools_version}"
     },
     "Hardware": {
@@ -135,6 +137,7 @@ INFO[
     "State": "stopped",
     "Home": "/path/to/#{tpl_name}.pvm/",
     "GuestTools": {
+      "state": "#{tools_state}",
       "version": "#{tools_version}"
     },
     "Hardware": {

data/test/unit/driver/pd_9_test.rb

@@ -9,6 +9,7 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
   let(:tpl_uuid) {'1234-some-template-uuid-5678'}
   let(:tpl_name) {'Some_Template_Name'}
 
+  let(:tools_state) {'installed'}
   let(:tools_version) {'9.0.23062.123456'}
 
   let(:hostonly_iface) {'vnic10'}
@@ -75,6 +76,7 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
     "State": "stopped",
     "Home": "/path/to/#{vm_name}.pvm/",
     "GuestTools": {
+      "state": "#{tools_state}",
       "version": "#{tools_version}"
     },
     "Hardware": {
@@ -135,6 +137,7 @@ describe VagrantPlugins::Parallels::Driver::PD_9 do
     "State": "stopped",
     "Home": "/path/to/#{tpl_name}.pvm/",
     "GuestTools": {
+      "state": "#{tools_state}",
       "version": "#{tools_version}"
     },
     "Hardware": {

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

@@ -146,18 +146,16 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
-  describe "read_guest_tools_version" do
-    let(:tools_version) {'9.0.23062.123456-something-else'}
+  describe "read_guest_tools_state" do
+    let(:tools_state) {'outdated'}
 
-    it "returns Guest Tools version in semantic format: 'x.y.z'" do
-      subject.read_guest_tools_version.should match(/^\d+.\d+\.\d+$/)
-      subject.read_guest_tools_version.should == "9.0.23062"
+    it "returns Guest Tools state as a symbol" do
+      subject.read_guest_tools_state.should be(:outdated)
     end
 
-    it "returns nil if Guest Tools version is invalid" do
-      settings = {"GuestTools" => {"vesion" => "something_wrong"}}
-      driver.should_receive(:read_settings).and_return(settings)
-      subject.read_guest_tools_version.should be_nil
+    it "returns :not_installed if Guest Tools state can't be reached" do
+      driver.should_receive(:read_settings).and_return(exit_code: 0)
+      subject.read_guest_tools_state.should be(:not_installed)
     end
   end
 
@@ -181,6 +179,32 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
+  describe "read_guest_tools_iso_path" do
+    before do
+      subprocess.stub(:execute).
+        with("mdfind", /^kMDItemCFBundleIdentifier ==/, an_instance_of(Hash)).
+        and_return(subprocess_result(stdout: "/Applications/Parallels Desktop.app"))
+    end
+
+    it "returns a valid path to the ISO" do
+      File.stub(:exist?).and_return(true)
+      iso_path = subject.read_guest_tools_iso_path("linux")
+      iso_path.should be_kind_of(String)
+      iso_path.should match(/prl-tools-lin\.iso$/)
+    end
+
+    it "raises an exception if ISO file does not exists" do
+      File.stub(:exist?).and_return(false)
+      expect { subject.read_guest_tools_iso_path("windows") }.
+        to raise_error(VagrantPlugins::Parallels::Errors::ParallelsToolsIsoNotFound)
+    end
+
+    it "returns nil if guest OS is unsupported or invalid" do
+      subject.read_guest_tools_iso_path("").should be_nil
+      subject.read_guest_tools_iso_path("bolgenos").should be_nil
+    end
+  end
+
   describe "read_mac_addresses" do
     it "returns MAC addresses of all network interface cards" do
       subject.read_mac_addresses.should be_kind_of(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.9.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,26 +98,16 @@ files:
 - config/i18n-tasks.yml.erb
 - Gemfile
 - lib/vagrant-parallels/action/boot.rb
-- lib/vagrant-parallels/action/check_accessible.rb
-- lib/vagrant-parallels/action/check_created.rb
-- lib/vagrant-parallels/action/check_guest_tools.rb
-- lib/vagrant-parallels/action/check_parallels.rb
-- lib/vagrant-parallels/action/check_running.rb
 - lib/vagrant-parallels/action/clear_network_interfaces.rb
 - lib/vagrant-parallels/action/clear_shared_folders.rb
-- lib/vagrant-parallels/action/created.rb
 - lib/vagrant-parallels/action/customize.rb
 - lib/vagrant-parallels/action/destroy.rb
 - lib/vagrant-parallels/action/destroy_unused_network_interfaces.rb
 - lib/vagrant-parallels/action/export.rb
 - lib/vagrant-parallels/action/forced_halt.rb
+- lib/vagrant-parallels/action/handle_guest_tools.rb
 - lib/vagrant-parallels/action/import.rb
-- lib/vagrant-parallels/action/is_running.rb
-- lib/vagrant-parallels/action/is_suspended.rb
-- lib/vagrant-parallels/action/message_already_running.rb
-- lib/vagrant-parallels/action/message_not_created.rb
-- lib/vagrant-parallels/action/message_not_running.rb
-- lib/vagrant-parallels/action/message_will_not_destroy.rb
+- lib/vagrant-parallels/action/is_driver_version.rb
 - lib/vagrant-parallels/action/network.rb
 - lib/vagrant-parallels/action/package.rb
 - lib/vagrant-parallels/action/package_config_files.rb
@@ -139,6 +129,7 @@ files:
 - lib/vagrant-parallels/driver/pd_9.rb
 - lib/vagrant-parallels/errors.rb
 - lib/vagrant-parallels/guest_cap/darwin/mount_parallels_shared_folder.rb
+- lib/vagrant-parallels/guest_cap/linux/install_parallels_tools.rb
 - lib/vagrant-parallels/guest_cap/linux/mount_parallels_shared_folder.rb
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb

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

@@ -1,23 +0,0 @@
-module VagrantPlugins
-  module Parallels
-    module Action
-      class CheckAccessible
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:machine].state.id == :inaccessible
-            # The VM we are attempting to manipulate is inaccessible. This
-            # is a very bad situation and can only be fixed by the user. It
-            # also prohibits us from actually doing anything with the virtual
-            # machine, so we raise an error.
-            raise VagrantPlugins::Parallels::Errors::VMInaccessible
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module VagrantPlugins
-  module Parallels
-    module Action
-      # This middleware checks that the VM is created, and raises an exception
-      # if it is not, notifying the user that creation is required.
-      class CheckCreated
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:machine].state.id == :not_created
-            raise Vagrant::Errors::VMNotCreatedError
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end