vagrant-parallels 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 340fd7bc7a4c4903ee2f67a21435abbd27d0fd3ae531e6e2f45b78d6d40749c6
-  data.tar.gz: ec86770f0a873be4d766e53df5a2ebbae3982924be8ee7974107cdd763a7da55
+  metadata.gz: 5316a81fe9c64de94bb88a2db7b9efcc015325d4b95bd4ec6302f7441334e0c3
+  data.tar.gz: d493a896f4b9776f2755038d333046c6fa920f7e1fdd45de96dee0ae4cf33ef4
 SHA512:
-  metadata.gz: fa1430cfa50873ac14648f6d1c8269812850be959ada747366a669ca7003fbde48460b4e145ef4d193cbfe6ef47cff52bf0db20ea05b2a4fc768e914f9e1cbdc
-  data.tar.gz: '07178f61772a66d419117fa8bbabf953aa4d82b76e47952bba691d6b9ef38ceea92561314df94b3f13dd9712a701a2feb5480b80604785e048650be75ae212b9'
+  metadata.gz: 874be6069e0cf9ec4ee115d75b7979bd68a1c007d04f0552dae2a808d7025c8659926a906ce37814ee19c7c2e04ef7b753d2c5b1d2121f8670092a40b77b5248
+  data.tar.gz: 53435b75213e446b68d679f2600d47e70cc4d5fec8141d9be6e9eba270030cfa9f3d48cf398d5ce07311503de8a053802fb1629408bd49e5f49d25cbf40d0562

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2.4.0 (May 22, 2023)
+IMPROVEMENTS:
+  - use clonefile copy for macvm boxes
+  [[GH-459](https://github.com/Parallels/vagrant-parallels/pull/459)]
+
+BUG FIXES:
+  - Bump activesupport from 6.1.7.3 to 6.1.7.5
+  [[GH-457](https://github.com/Parallels/vagrant-parallels/pull/457)]
+  - Don't try to call methdods on Nil
+  [[GH-456](https://github.com/Parallels/vagrant-parallels/pull/456)]
+  - Add a doc note for releasing a new provider version
+  [[GH-452](https://github.com/Parallels/vagrant-parallels/pull/452)]
+  - website: Remove unused images
+  [[GH-450](https://github.com/Parallels/vagrant-parallels/pull/450)]
+  - adding macos
+  [[GH-447](https://github.com/Parallels/vagrant-parallels/pull/447)]
+
 ## 2.4.0 (May 22, 2023)
 IMPROVEMENTS:
   - Implement shared folder support for `.macvm` VMs

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

@@ -78,7 +78,26 @@ module VagrantPlugins
         # @return [String] UUID of the new VM.
         def clone_vm(src_name, options = {})
           dst_name = "vagrant_temp_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          src_vm = json { execute_prlctl('list', '--json', '-i', src_name) }.first
 
+          if options[:linked] || !Util::Common.is_apfs?(src_vm.fetch('Home'))
+            # If linked clone is an option, or path to src is not on APFS, then do the normal clone.
+            prlctl_clone_vm(src_name, dst_name, options)
+          else
+            # We can use clonefile on APFS to do a fast CoW clone of the VM source and then register
+            copy_clone_vm(src_name, dst_name, options)
+          end
+          read_vms[dst_name]
+        end
+
+        # Uses prlctl to clone an existing registered VM
+        #
+        # @param [String] src_name Name or UUID of the source VM or template.
+        # @param [String] dst_name Name of the destination VM.
+        # @param [<String => String>] options Options to clone virtual machine.
+        def prlctl_clone_vm(src_name, dst_name, options = {})
+          list_args = ['list', '--json', '-i', src_name]
+          src_vm = json { execute_prlctl(*list_args) }.first
           args = ['clone', src_name, '--name', dst_name]
           args.concat(['--dst', options[:dst]]) if options[:dst]
 
@@ -97,7 +116,41 @@ module VagrantPlugins
               yield $1.to_i if block_given?
             end
           end
-          read_vms[dst_name]
+        end
+
+        # Uses cp with clonefile flag to clone an existing registered VM
+        #
+        # @param [String] src_name Name or UUID of the source VM or template.
+        # @param [String] dst_name Name of the destination VM.
+        # @param [<String => String>] options Options to clone virtual machine.
+        def copy_clone_vm(src_name, dst_name, options = {})
+          list_args = ['list', '--json', '-i', src_name]
+          src_vm = json { execute_prlctl(*list_args) }.first
+          basepath = File.dirname(src_vm.fetch('Home')).delete_suffix('/')
+          extension = File.basename(src_vm.fetch('Home')).delete_suffix('/').split('.').last
+          clonepath = File.join(ENV['HOME'], "Parallels", "#{dst_name}.#{extension}")
+          execute('cp', '-c', '-R', '-p', src_vm.fetch('Home'), clonepath)
+
+          # Update config.pvs with dst_name as this is what Parallels uses when registering
+          update_vm_name(File.join(clonepath, 'config.pvs'), dst_name)
+
+          # Register the cloned path as a new VM
+          args = ['register', clonepath]
+          # Regenerate SourceVmUuid of the cloned VM
+          args << '--regenerate-src-uuid' if options[:regenerate_src_uuid]
+
+          # Regenerate SourceVmUuid of the cloned VM
+          execute_prlctl(*args)
+
+          # Don't need the box hanging around in Parallels
+          execute_prlctl('unregister', src_name)
+        end
+
+        def update_vm_name(config_pvs_path, name)
+          xml = Nokogiri::XML(File.read(config_pvs_path))
+          elem = xml.at_xpath('//ParallelsVirtualMachine/Identification/VmName')
+          elem.content = name
+          File.write(config_pvs_path, xml.to_xml)
         end
 
         # Compacts the specified virtual disk image

data/lib/vagrant-parallels/util/common.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module VagrantPlugins
   module Parallels
     module Util
@@ -6,9 +8,26 @@ module VagrantPlugins
         # Determines whether the VM's box contains a macOS guest for an Apple Silicon host.
         # In this case the image file ends with '.macvm' instead of '.pvm'
         def self.is_macvm(machine)
-          return !!Dir.glob(machine.box.directory.join('*.macvm')).first
+          return !machine.box.nil? && !!Dir.glob(machine.box.directory.join('*.macvm')).first
+        end
+
+        # Determines if the box directory is on an APFS filesystem
+        def self.is_apfs?(path, &block)
+            output = {stdout: '', stderr: ''}
+            df_command = %w[df -T apfs]
+            df_command << Shellwords.escape(path)
+            execute(*df_command, &block).exit_code == 0
         end
 
+        private
+
+        def self.execute(*command, &block)
+          command << { notify: [:stdout, :stderr] }
+
+          Vagrant::Util::Busy.busy(lambda {}) do
+            Vagrant::Util::Subprocess.execute(*command, &block)
+          end
+        end
       end
     end
   end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Parallels provider for Vagrant.