vagrant-parallels 1.0.8 → 1.0.9.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53efd8fa01ec277af1f83f69aa9dfab622b2fed0
-  data.tar.gz: 67484ac9e531c0e2d9f9684877d1fc7ac323ad78
+  metadata.gz: a8ea354f8e68e8f1aaf7818f93d2dca3443810dd
+  data.tar.gz: 2233c2829d52b81c756887386609777cae1f9b20
 SHA512:
-  metadata.gz: 7d4d5682d7172e1c4906a4105b57b5cf897b4cba4c89f7619ca2f1c4a03d70dee01a2473f5bb40ba19ce61b798d97b03d4b10edb38495a17adea12dd23663fc3
-  data.tar.gz: 1570ee017231dbab9c23ba887c589ef2106a031255150a1f9d8efd7ff3a655bc046707054220f675be5704fd42b70310eda27d98d41896d9c44230cd013dfcd7
+  metadata.gz: f9d87dd9bb9b2d54ca7cf823b401afb7d6e2c613a545c6b5747c32d90f758a913a06886c22f589ddd033499fda31837e510e44c3a3f799d6de3b73907f39e601
+  data.tar.gz: ba152304d98bc5c2f1212783a1f50fffff9ba4f21b6ec9ea2ba2c235c977804614e27c7ac35c449d09a3c69dd9a35d475ef141a136b3e5af39a3b6a8b1f56350

data/lib/vagrant-parallels/action.rb

@@ -49,7 +49,6 @@ module VagrantPlugins
 
             b2.use Call, DestroyConfirm do |env2, b3|
               if env2[:result]
-                b3.use ConfigValidate
                 b3.use CheckAccessible
                 b3.use EnvSet, :force_halt => true
                 b3.use action_halt

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

@@ -9,7 +9,7 @@ module VagrantPlugins
 
         def call(env)
           @env = env
-          if env[:machine].provider.state.id != :stopped
+          if env[:machine].state.id != :stopped
             raise Vagrant::Errors::VMPowerOffToPackage
           end
 

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

@@ -26,7 +26,7 @@ module VagrantPlugins
           # We should to unregister template
           unregister_template
 
-          if env[:machine].provider.state.id != :not_created
+          if env[:machine].state.id != :not_created
             return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
             return if env["vagrant_parallels.error"].is_a?(VagrantPlugins::Parallels::Errors::VagrantParallelsError)
 

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

@@ -318,11 +318,11 @@ module VagrantPlugins
           end
 
           return {
-            :adapter  => config[:adapter],
-            :hostonly => interface[:name],
-            :mac      => config[:mac],
-            :nic_type => config[:nic_type],
-            :type     => :hostonly
+            :adapter     => config[:adapter],
+            :hostonly    => interface[:name],
+            :mac_address => config[:mac],
+            :nic_type    => config[:nic_type],
+            :type        => :hostonly
           }
         end
 

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

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          current_state = env[:machine].provider.state.id
+          current_state = env[:machine].state.id
 
           if current_state == :suspended
             env[:ui].info I18n.t("vagrant.actions.vm.resume.resuming")

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

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          if env[:machine].provider.state.id == :running
+          if env[:machine].state.id == :running
             env[:ui].info I18n.t("vagrant.actions.vm.suspend.suspending")
             env[:machine].provider.driver.suspend
           end

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

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module Parallels
+    module Cap
+      module NicMacAddresses
+        # Reads the network interface card MAC addresses and returns them.
+        #
+        # @return [Hash<String, String>] Adapter => MAC address
+        def self.nic_mac_addresses(machine)
+          machine.provider.driver.read_mac_addresses
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/config.rb

@@ -4,6 +4,7 @@ module VagrantPlugins
       attr_accessor :check_guest_tools
       attr_reader   :customizations
       attr_accessor :destroy_unused_network_interfaces
+      attr_accessor :functional_psf
       attr_accessor :optimize_power_consumption
       attr_accessor :name
       attr_reader   :network_adapters
@@ -16,6 +17,7 @@ module VagrantPlugins
         @check_guest_tools = UNSET_VALUE
         @customizations    = []
         @destroy_unused_network_interfaces = UNSET_VALUE
+        @functional_psf = UNSET_VALUE
         @network_adapters  = {}
         @name              = UNSET_VALUE
         @optimize_power_consumption = UNSET_VALUE
@@ -42,6 +44,14 @@ module VagrantPlugins
         customize("pre-boot", ["set", :id, "--cpus", count.to_i])
       end
 
+      def merge(other)
+        super.tap do |result|
+          c = customizations.dup
+          c += other.customizations
+          result.instance_variable_set(:@customizations, c)
+        end
+      end
+
       def finalize!
         if @check_guest_tools == UNSET_VALUE
           @check_guest_tools = true
@@ -51,6 +61,10 @@ module VagrantPlugins
           @destroy_unused_network_interfaces = true
         end
 
+        if @functional_psf == UNSET_VALUE
+          @functional_psf = true
+        end
+
         if @optimize_power_consumption == UNSET_VALUE
           @optimize_power_consumption = true
         end

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

@@ -149,6 +149,12 @@ module VagrantPlugins
         def read_mac_address
         end
 
+        # Returns the network interface card MAC addresses
+        #
+        # @return [Hash<String, String>] Adapter => MAC address
+        def read_mac_addresses
+        end
+
         # Returns a list of network interfaces of the VM.
         #
         # @return [Hash]
@@ -234,6 +240,10 @@ module VagrantPlugins
         def suspend
         end
 
+        # Unshare folders.
+        def unshare_folders(names)
+        end
+
         # Verifies that the driver is ready to accept work.
         #
         # This should raise a VagrantError if things are not ready.

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

@@ -94,6 +94,7 @@ module VagrantPlugins
                        :read_guest_property,
                        :read_host_only_interfaces,
                        :read_mac_address,
+                       :read_mac_addresses,
                        :read_network_interfaces,
                        :read_shared_interface,
                        :read_shared_folders,

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

@@ -277,6 +277,18 @@ module VagrantPlugins
           read_settings.fetch('Hardware', {}).fetch('net0', {}).fetch('mac', nil)
         end
 
+        def read_mac_addresses
+          macs = {}
+          read_settings.fetch('Hardware', {}).each do |device, params|
+            if device =~ /^net(\d+)$/
+              adapter = $1
+              mac = params.fetch('mac')
+              macs[adapter] = mac
+            end
+          end
+          macs
+        end
+
         def read_network_interfaces
           nics = {}
 
@@ -438,6 +450,12 @@ module VagrantPlugins
           execute("unregister", uuid)
         end
 
+        def unshare_folders(names)
+          names.each do |name|
+            execute("set", @uuid, "--shf-host-del", name)
+          end
+        end
+
         def verify!
           execute('--version', retryable: true)
         end

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

@@ -25,6 +25,10 @@ module VagrantPlugins
             comm.sudo("ln -s \"/Volumes/SharedFolders/#{name}\" \"#{guestpath}\"")
           end
         end
+
+        def self.unmount_parallels_shared_folder(machine, guestpath, options)
+          machine.communicate.sudo("rm #{guestpath}", error_check: false)
+        end
       end
     end
   end

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

@@ -35,6 +35,10 @@ module VagrantPlugins
             end
           end
         end
+
+        def self.unmount_parallels_shared_folder(machine, guestpath, options)
+          machine.communicate.sudo("rm #{guestpath}", error_check: false)
+        end
       end
     end
   end

data/lib/vagrant-parallels/plugin.rb

@@ -35,21 +35,36 @@ module VagrantPlugins
         GuestDarwinCap::MountParallelsSharedFolder
       end
 
+      guest_capability(:darwin, :unmount_parallels_shared_folder) do
+        require_relative "guest_cap/darwin/mount_parallels_shared_folder"
+        GuestDarwinCap::MountParallelsSharedFolder
+      end
+
       guest_capability(:linux, :mount_parallels_shared_folder) do
         require_relative "guest_cap/linux/mount_parallels_shared_folder"
         GuestLinuxCap::MountParallelsSharedFolder
       end
 
-      provider_capability("parallels", "public_address") do
+      guest_capability(:linux, :unmount_virtualbox_shared_folder) do
+        require_relative "guest_cap/linux/mount_virtualbox_shared_folder"
+        GuestLinuxCap::MountParallelsSharedFolder
+      end
+
+      provider_capability(:parallels, :public_address) do
         require_relative "cap/public_address"
         Cap::PublicAddress
       end
 
-      provider_capability("parallels", "host_address") do
+      provider_capability(:parallels, :host_address) do
         require_relative "cap/host_address"
         Cap::HostAddress
       end
 
+      provider_capability(:parallels, :nic_mac_addresses) do
+        require_relative "cap/nic_mac_addresses"
+        Cap::NicMacAddresses
+      end
+
       synced_folder(:parallels) do
         require File.expand_path("../synced_folder", __FILE__)
         SyncedFolder

data/lib/vagrant-parallels/provider.rb

@@ -6,6 +6,19 @@ module VagrantPlugins
     class Provider < Vagrant.plugin("2", :provider)
       attr_reader :driver
 
+      def self.usable?(raise_error=false)
+        # Instantiate the driver, which will determine the Parallels Desktop
+        # version and all that, which checks for Parallels Desktop being present
+        Driver::Meta.new
+        true
+      rescue VagrantPlugins::Parallels::Errors::ParallelsInvalidVersion
+        raise if raise_error
+        return false
+      rescue VagrantPlugins::Parallels::Errors::ParallelsNotDetected
+        raise if raise_error
+        return false
+      end
+
       def initialize(machine)
         @logger = Log4r::Logger.new("vagrant::provider::parallels")
         @machine = machine
@@ -48,9 +61,8 @@ module VagrantPlugins
 
       # Returns the SSH info for accessing the Parallels VM.
       def ssh_info
-        # If the VM is not created then we cannot possibly SSH into it, so
-        # we return nil.
-        return nil if state.id == :not_created
+        # If the VM is not running that we can't possibly SSH into it
+        return nil if state.id != :running
 
         detected_ip = @driver.read_guest_ip
 
@@ -80,6 +92,11 @@ module VagrantPlugins
         short = state_id.to_s.gsub("_", " ")
         long  = I18n.t("vagrant_parallels.commands.status.#{state_id}")
 
+        # If machine is not created, then specify the special ID flag
+        if state_id == :not_created
+          state_id = Vagrant::MachineState::NOT_CREATED_ID
+        end
+
         # Return the state
         Vagrant::MachineState.new(state_id, short, long)
       end

data/lib/vagrant-parallels/synced_folder.rb

@@ -3,21 +3,25 @@ require "vagrant/util/platform"
 module VagrantPlugins
   module Parallels
     class SyncedFolder < Vagrant.plugin("2", :synced_folder)
-      def usable?(machine)
+      def usable?(machine, raise_errors=false)
         # These synced folders only work if the provider is Parallels
-        machine.provider_name == :parallels
+        machine.provider_name == :parallels &&
+          machine.provider_config.functional_psf
       end
 
-      def prepare(machine, folders, _opts)
+      def enable(machine, folders, _opts)
+        # Export the shared folders to the VM
         defs = []
         folders.each do |id, data|
-          hostpath = Vagrant::Util::Platform.cygwin_windows_path(data[:hostpath])
+          hostpath = data[:hostpath]
+          if !data[:hostpath_exact]
+            hostpath = Vagrant::Util::Platform.cygwin_windows_path(hostpath)
+          end
+
 
           defs << {
-              # Escape special symbols (Parallels Shared Folders specific)
-              name: id.split('/').delete_if{|i| i.empty?}.join('_'),
+              name: os_friendly_id(id),
               hostpath: hostpath.to_s,
-              transient: data[:transient],
           }
         end
 
@@ -25,9 +29,7 @@ module VagrantPlugins
         # Anyway, duplicates will be mounted later.
         defs.uniq! { |d| d[:hostpath] }
         driver(machine).share_folders(defs)
-      end
 
-      def enable(machine, folders, _opts)
         # short guestpaths first, so we don't step on ourselves
         folders = folders.sort_by do |id, data|
           if data[:guestpath]
@@ -48,8 +50,6 @@ module VagrantPlugins
           id = shf_config.key(data[:hostpath])
 
           if data[:guestpath] and id
-            id = Pathname.new(id).to_s.split('/').drop_while{|i| i.empty?}.join('_')
-
             # Guest path specified, so mount the folder to specified point
             machine.ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                      guestpath: data[:guestpath],
@@ -74,6 +74,20 @@ module VagrantPlugins
         end
       end
 
+      def disable(machine, folders, _opts)
+        if machine.guest.capability?(:unmount_parallels_shared_folder)
+          folders.each do |id, data|
+            machine.guest.capability(
+              :unmount_parallels_shared_folder,
+              data[:guestpath], data)
+          end
+        end
+
+        # Remove the shared folders from the VM metadata
+        names = folders.map { |id, _data| os_friendly_id(id) }
+        driver(machine).unshare_folders(names)
+      end
+
       def cleanup(machine, opts)
         driver(machine).clear_shared_folders if machine.id && machine.id != ""
       end
@@ -84,6 +98,10 @@ module VagrantPlugins
       def driver(machine)
         machine.provider.driver
       end
+
+      def os_friendly_id(id)
+        id.gsub(/[\/]/,'_').sub(/^_/, '')
+      end
     end
   end
 end

data/lib/vagrant-parallels/version.rb

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

data/test/unit/config_test.rb

@@ -3,13 +3,46 @@ require_relative "base"
 require VagrantPlugins::Parallels.source_root.join('lib/vagrant-parallels/config')
 
 describe VagrantPlugins::Parallels::Config do
+  let(:machine) { double("machine") }
+
+  def assert_invalid
+    errors = subject.validate(machine)
+    if !errors.values.any? { |v| !v.empty? }
+      raise "No errors: #{errors.inspect}"
+    end
+  end
+
+  def assert_valid
+    errors = subject.validate(machine)
+    if !errors.values.all? { |v| v.empty? }
+      raise "Errors: #{errors.inspect}"
+    end
+  end
+
+  def valid_defaults
+    subject.image = "foo"
+  end
+
+  before do
+    vm_config = double("vm_config")
+    vm_config.stub(networks: [])
+    config = double("config")
+    config.stub(vm: vm_config)
+    machine.stub(config: config)
+  end
+
+  its "valid by default" do
+    subject.finalize!
+    assert_valid
+  end
 
   context "defaults" do
     before { subject.finalize! }
 
-    its(:check_guest_tools) { should be_true }
-    its(:name) { should be_nil }
-    its(:optimize_power_consumption) { should be_true }
+    it { expect(subject.check_guest_additions).to be_true }
+    it { expect(subject.name).to be_nil }
+    it { expect(subject.functional_psf).to be_true }
+    it { expect(subject.optimize_power_consumption).to be_true }
 
     it "should have one Shared adapter" do
       expect(subject.network_adapters).to eql({
@@ -18,6 +51,22 @@ describe VagrantPlugins::Parallels::Config do
     end
   end
 
+  describe "#merge" do
+    let(:one) { described_class.new }
+    let(:two) { described_class.new }
+
+    subject { one.merge(two) }
+
+    it "merges the customizations" do
+      one.customize ["foo"]
+      two.customize ["bar"]
+
+      expect(subject.customizations).to eq([
+        ["pre-boot", ["foo"]],
+        ["pre-boot", ["bar"]]])
+    end
+  end
+
   describe "memory=" do
     it "configures memory size (in Mb)" do
       subject.memory=(1024)

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

@@ -181,6 +181,14 @@ shared_examples "parallels desktop driver" do |options|
     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)
+      subject.read_mac_addresses.should include("0")
+      subject.read_mac_addresses["0"].should be_kind_of(String)
+    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)

data/test/unit/synced_folder_test.rb

@@ -1,16 +1,23 @@
 require "vagrant"
 require_relative "base"
 
+require VagrantPlugins::Parallels.source_root.join("lib/vagrant-parallels/config")
 require VagrantPlugins::Parallels.source_root.join('lib/vagrant-parallels/synced_folder')
 
 describe VagrantPlugins::Parallels::SyncedFolder do
   let(:machine) do
     double("machine").tap do |m|
+      m.stub(provider_config: VagrantPlugins::Parallels::Config.new)
+      m.stub(provider_name: :parallels)
     end
   end
 
   subject { described_class.new }
 
+  before do
+    machine.provider_config.finalize!
+  end
+
   describe "usable" do
     it "should be with parallels provider" do
       machine.stub(provider_name: :parallels)
@@ -21,6 +28,11 @@ describe VagrantPlugins::Parallels::SyncedFolder do
       machine.stub(provider_name: :virtualbox)
       subject.should_not be_usable(machine)
     end
+
+    it "should not be usable if not functional psf" do
+      machine.provider_config.functional_psf = false
+      expect(subject).to_not be_usable(machine)
+    end
   end
 
   describe "prepare" do

data/vagrant-parallels.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = ">= 1.3.6"
   spec.rubyforge_project         = "vagrant-parallels"
 
-  spec.add_development_dependency "bundler", "~> 1.5.2"
+  spec.add_development_dependency "bundler", ">= 1.5.2", "< 1.7.0" 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rspec", "~> 2.14.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9.rc1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-08 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
@@ -124,6 +130,7 @@ files:
 - lib/vagrant-parallels/action/suspend.rb
 - lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/cap/host_address.rb
+- lib/vagrant-parallels/cap/nic_mac_addresses.rb
 - lib/vagrant-parallels/cap/public_address.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb
@@ -142,7 +149,6 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
-- rel_1.0.7_commit.txt
 - tasks/bundler.rake
 - tasks/test.rake
 - test/unit/base.rb

data/rel_1.0.7_commit.txt

@@ -1,9 +0,0 @@
-driver: removed unnecessary 'version' method.
-action/import: Regenerate 'SourceVmUuid' while template registration [GH-113]
-driver: added 'regen_src_uuid' argument to the 'register' method
-tests/unit: added tests for 'set_power_consumption_mode' driver method
-Added 'SetPowerConsumption' action. [GH-110]
-gemspec: added 'minitest' dependency as a aorkaround for rspec warning about 'minitest/autorun'
-driver/meta: Don't show unreleased PD 10 version in the error message.
-Convert Parallels Desktop version to semantic-like format (x.y.z)
-errors: 'vm_name_exists' error key added