vagrant-parallels 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5316a81fe9c64de94bb88a2db7b9efcc015325d4b95bd4ec6302f7441334e0c3
-  data.tar.gz: d493a896f4b9776f2755038d333046c6fa920f7e1fdd45de96dee0ae4cf33ef4
+  metadata.gz: 2b5666de284879e9b3ea20a38dc3a132ad280a89dd6ec516ce21bbf8ff839a5c
+  data.tar.gz: d1828f81d1ebcb19c8d0054372db475082a83b25ad23c7c0dba1fb07e74aa019
 SHA512:
-  metadata.gz: 874be6069e0cf9ec4ee115d75b7979bd68a1c007d04f0552dae2a808d7025c8659926a906ce37814ee19c7c2e04ef7b753d2c5b1d2121f8670092a40b77b5248
-  data.tar.gz: 53435b75213e446b68d679f2600d47e70cc4d5fec8141d9be6e9eba270030cfa9f3d48cf398d5ce07311503de8a053802fb1629408bd49e5f49d25cbf40d0562
+  metadata.gz: 3d1f742e64b4fe8283cf110b4b9636291db21fca1686d92c38cc2376fe6b03cfa7a2e5c54a87ac16dab48052cf66e96f602dd920d860eb2886b83f21d52ff367
+  data.tar.gz: 7b2c507dfc64f46a168b7ee32c26e9db23e74306be8f5ec733166c669a363a45dd2119fca1c953a2f7e938fbeef303e1cc0bb691c51d0043a0344fa6f8a3662e

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 2.4.0 (May 22, 2023)
+## 2.4.2 (Feb 5, 2024)
+
+BUG FIXES:
+  - Revert "use clonefile copy for macvm boxes"
+  [[GH-464](https://github.com/Parallels/vagrant-parallels/pull/464)]
+## 2.4.1 (Oct 16, 2023)
 IMPROVEMENTS:
   - use clonefile copy for macvm boxes
   [[GH-459](https://github.com/Parallels/vagrant-parallels/pull/459)]

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

@@ -78,26 +78,7 @@ 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]
 
@@ -116,41 +97,7 @@ module VagrantPlugins
               yield $1.to_i if block_given?
             end
           end
-        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)
+          read_vms[dst_name]
         end
 
         # Compacts the specified virtual disk image

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

@@ -1,5 +1,3 @@
-require 'shellwords'
-
 module VagrantPlugins
   module Parallels
     module Util
@@ -11,23 +9,6 @@ module VagrantPlugins
           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.1'
+    VERSION = '2.4.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri