vagrant-parallels 1.1.0 → 1.2.0.rc1

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

@@ -3,9 +3,6 @@ shared_examples "parallels desktop driver" do |options|
     raise ArgumentError, "Need parallels context to use these shared examples." unless defined? parallels_context
   end
 
-  # Accessor to the delegate object
-  let(:driver) { subject.instance_variable_get("@driver") }
-
   describe "compact" do
     settings = {"Hardware" => {"hdd0" => {"image" => "/path/to/disk0.hdd"},
                                "hdd1" => {"image" => "/path/to/disk1.hdd"}}}
@@ -34,13 +31,13 @@ shared_examples "parallels desktop driver" do |options|
     let(:hostonly_iface) {'vnic12'}
     it "creates host-only NIC with dhcp server configured" do
       vnic_opts = {
-        :network_id => 'vagrant_vnic8',
-        :adapter_ip => '11.11.11.11',
-        :netmask    => '255.255.252.0',
-        :dhcp => {
-          :ip => '11.11.11.11',
-          :lower => '11.11.8.1',
-          :upper => '11.11.11.254'
+        network_id: 'vagrant_vnic8',
+        adapter_ip: '11.11.11.11',
+        netmask:    '255.255.252.0',
+        dhcp:       {
+          ip:    '11.11.11.11',
+          lower: '11.11.8.1',
+          upper: '11.11.11.254'
         }
       }
 
@@ -62,15 +59,16 @@ shared_examples "parallels desktop driver" do |options|
       interface.should include(:ip => vnic_opts[:adapter_ip])
       interface.should include(:netmask => vnic_opts[:netmask])
       interface.should include(:dhcp => vnic_opts[:dhcp])
-      interface.should include(:name => hostonly_iface)
-      interface[:name].should =~ /^(vnic(\d+))$/
+      # TODO: implement nicer tests for all supported PD versions
+      # interface.should include(:name => hostonly_iface)
+      # interface[:name].should =~ /^(vnic(\d+))$/
     end
 
     it "creates host-only NIC without dhcp" do
       vnic_options = {
-        :network_id => 'vagrant_vnic3',
-        :adapter_ip => '22.22.22.22',
-        :netmask    => '255.255.254.0',
+        network_id: 'vagrant_vnic3',
+        adapter_ip: '22.22.22.22',
+        netmask:    '255.255.254.0',
       }
 
       subprocess.should_receive(:execute).
@@ -89,8 +87,9 @@ shared_examples "parallels desktop driver" do |options|
       interface.should include(:ip => vnic_options[:adapter_ip])
       interface.should include(:netmask => vnic_options[:netmask])
       interface.should include(:dhcp => nil)
-      interface.should include(:name => hostonly_iface)
-      interface[:name].should =~ /^(vnic(\d+))$/
+      # TODO: implement nicer tests for all supported PD versions
+      # interface.should include(:name => hostonly_iface)
+      # interface[:name].should =~ /^(vnic(\d+))$/
     end
   end
 
@@ -159,26 +158,6 @@ 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_guest_tools_iso_path" do
     before do
       subprocess.stub(:execute).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,82 +9,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-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
     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,18 @@ 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
 - lib/vagrant-parallels/action/clear_shared_folders.rb
 - lib/vagrant-parallels/action/customize.rb
@@ -105,45 +114,46 @@ files:
 - 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/forward_ports.rb
 - lib/vagrant-parallels/action/handle_guest_tools.rb
 - lib/vagrant-parallels/action/import.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
+- lib/vagrant-parallels/action/prepare_forwarded_port_collision_params.rb
 - lib/vagrant-parallels/action/prepare_nfs_settings.rb
 - lib/vagrant-parallels/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-parallels/action/resume.rb
+- lib/vagrant-parallels/action/sane_defaults.rb
 - lib/vagrant-parallels/action/set_name.rb
-- lib/vagrant-parallels/action/set_power_consumption.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
 - lib/vagrant-parallels/cap/public_address.rb
 - lib/vagrant-parallels/config.rb
 - lib/vagrant-parallels/driver/base.rb
 - lib/vagrant-parallels/driver/meta.rb
+- lib/vagrant-parallels/driver/pd_10.rb
 - lib/vagrant-parallels/driver/pd_8.rb
 - 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/model/forwarded_port.rb
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb
 - 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
 - test/unit/config_test.rb
+- test/unit/driver/pd_10_test.rb
 - test/unit/driver/pd_8_test.rb
 - test/unit/driver/pd_9_test.rb
 - test/unit/locales/locales_test.rb
@@ -151,8 +161,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
@@ -163,17 +171,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.1
 signing_key: 
 specification_version: 4
 summary: Parallels provider for Vagrant.

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

@@ -1,28 +0,0 @@
-module VagrantPlugins
-  module Parallels
-    module Action
-      # This middleware is meant to be used with Call and can check if
-      # a version of Parallels Desktop satisfies the given constraint.
-      class IsDriverVersion
-        # @param [String] requirement Can be a full requirement specification,
-        # like ">= 9.0.24229", or a list of them, like [">= 9","< 10.0.2"].
-        def initialize(app, env, requirement, **opts)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant::plugins::parallels::is_driver_version")
-          @requirement = Gem::Requirement.new(requirement)
-          @invert = !!opts[:invert]
-        end
-
-        def call(env)
-          @logger.debug("Checking if 'prlctl' driver version satisfies '#{@requirement}'")
-          driver_version = Gem::Version.new(env[:machine].provider.driver.version)
-          @logger.debug("-- 'prlctl' driver version: #{driver_version}")
-
-          env[:result] = @requirement.satisfied_by?(driver_version)
-          env[:result] = !env[:result] if @invert
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module VagrantPlugins
-  module Parallels
-    module Action
-      # Important: It works only with Parallels Desktop >= 9 !
-      # Use "IsDriverVersion" middleware to wrap it.
-      class SetPowerConsumption
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant::plugins::parallels::power_consumption")
-          @app = app
-        end
-
-        def call(env)
-          # Optimization of power consumption is defined by "Longer Battery Life" state.
-          vm_settings = env[:machine].provider.driver.read_settings
-
-          old_val = vm_settings.fetch("Longer battery life") == "on" ? true : false
-          new_val = env[:machine].provider_config.optimize_power_consumption
-
-          if old_val == new_val
-            @logger.info("Skipping power consumption method because it is already set")
-            return @app.call(env)
-          end
-
-          mode = new_val ? "Longer battery life" : "Better Performance"
-          env[:ui].info I18n.t("vagrant_parallels.parallels.power_consumption.set_mode",
-                               mode: mode)
-          env[:machine].provider.driver.set_power_consumption_mode(new_val)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end