vagrant-parallels 1.3.13 → 1.4.0.rc1

data/locales/en.yml

@@ -51,7 +51,7 @@ en:
         There is no available slots on the Parallels Desktop VM for the configured
         high-level network interfaces. "private_network" and "public_network"
         network configurations consume a single network adapter slot on the
-        Parallels Desktop VM. Parallels Desktop limits the number of slots to 8, and it
+        Parallels Desktop VM. Parallels Desktop limits the number of slots to 16, and it
         appears that every slot is in use. Please lower the number of used
         network adapters.
       parallels_not_detected: |-
@@ -75,6 +75,11 @@ en:
         Could not find a required option of Parallels Desktop virtual machine:
           %{vm_option}
         This is an internal error that should be reported as a bug.
+      snapshot_id_not_detected: |-
+        ID of the newly created shapshod could not be detected. This is an
+        internal error that users should never see. Please report a bug.
+
+        stdout: %{stdout}
       shared_adapter_not_found: |-
         Shared network adapter was not found in your virtual machine configuration.
         It is required to communicate with VM and forward ports. Please check
@@ -163,4 +168,6 @@ en:
           compacting: Compacting exported HDDs...
         forward_ports:
           forwarding_entry: |-
-            %{guest_port} => %{host_port}
+            %{guest_port} => %{host_port}
+        import:
+          importing_linked: Importing base box '%{name}' as a linked clone...

data/tasks/acceptance.rake

@@ -1,7 +1,7 @@
 namespace :acceptance do
   desc "shows components that can be tested separately"
   task :components do
-    exec("bundle exec vagrant-spec components")
+    exec("vagrant-spec components")
   end
 
   desc "runs acceptance tests using vagrant-spec"
@@ -18,7 +18,7 @@ namespace :acceptance do
       package
     ).map{ |s| "provider/parallels/#{s}" }
 
-    command = "bundle exec vagrant-spec test --components=#{components.join(" ")}"
+    command = "vagrant-spec test --components=#{components.join(" ")}"
     puts command
     puts
     exec(command)

data/tasks/test.rake

@@ -5,8 +5,4 @@ namespace :test do
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = "test/unit/**/*_test.rb"
   end
-
-  RSpec::Core::RakeTask.new(:acceptance) do |t|
-    t.pattern = "test/acceptance/**/*_test.rb"
-  end
 end

data/test/acceptance/provider/linked_clone_spec.rb

@@ -0,0 +1,26 @@
+# This tests that VM is up as a linked clone
+shared_examples 'provider/linked_clone' do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+      "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('linked_clone')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'creates machine as linked clone' do
+    status("Test: machine is running after up")
+    result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/foo\n$/)
+  end
+end

data/test/acceptance/skeletons/linked_clone/Vagrantfile

@@ -0,0 +1,7 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.provider "parallels" do |prl|
+    prl.use_linked_clone = true
+  end
+end

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

@@ -115,17 +115,24 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
-  describe "export" do
-    tpl_name = "Some_Template_Name"
-    tpl_uuid = "1234-some-template-uuid-5678"
+  describe "clone_vm" do
+    it "clones VM to the new one" do
+      subprocess.should_receive(:execute).
+        with("prlctl", "clone", tpl_uuid, "--name", vm_name,
+             an_instance_of(Hash)).
+        and_return(subprocess_result(exit_code: 0))
+      subject.clone_vm(tpl_uuid, vm_name).should == uuid
+    end
 
-    it "exports VM to template" do
+    it "clones VM to template" do
       subprocess.should_receive(:execute).
-        with("prlctl", "clone", uuid, "--name", an_instance_of(String),
+        with("prlctl", "clone", uuid, "--name", tpl_name,
              "--template", "--dst", an_instance_of(String),
              an_instance_of(Hash)).
         and_return(subprocess_result(exit_code: 0))
-      subject.export("/path/to/template", tpl_name).should == tpl_uuid
+      subject.clone_vm(uuid, tpl_name,
+                       {dst: "/path/to/template", template: true}).
+        should == tpl_uuid
     end
   end
 
@@ -251,18 +258,6 @@ shared_examples "parallels desktop driver" do |options|
     end
   end
 
-  describe "set_mac_address" do
-    it "sets base MAC address to the Shared network adapter" do
-      subprocess.should_receive(:execute).exactly(2).times.
-        with("prlctl", "set", uuid, '--device-set', 'net0', '--type', 'shared',
-             '--mac', an_instance_of(String), an_instance_of(Hash)).
-        and_return(subprocess_result(exit_code: 0))
-
-      subject.set_mac_address('001C42DD5902')
-      subject.set_mac_address('auto')
-    end
-  end
-
   describe "set_name" do
     it "sets new name for the VM" do
       subprocess.should_receive(:execute).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,6 +146,7 @@ files:
 - lib/vagrant-parallels/driver/base.rb
 - lib/vagrant-parallels/driver/meta.rb
 - lib/vagrant-parallels/driver/pd_10.rb
+- lib/vagrant-parallels/driver/pd_11.rb
 - lib/vagrant-parallels/driver/pd_8.rb
 - lib/vagrant-parallels/driver/pd_9.rb
 - lib/vagrant-parallels/errors.rb
@@ -163,8 +164,10 @@ files:
 - tasks/bundler.rake
 - tasks/test.rake
 - test/acceptance/base.rb
+- test/acceptance/provider/linked_clone_spec.rb
 - test/acceptance/provider/synced_folder_spec.rb
 - test/acceptance/shared/context_parallels.rb
+- test/acceptance/skeletons/linked_clone/Vagrantfile
 - test/acceptance/skeletons/synced_folder/Vagrantfile
 - test/acceptance/skeletons/synced_folder/foo
 - test/unit/base.rb