vagrant-scp-sync 0.5.26 → 0.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f1926cb1f70c6621ac3b31fbf2edbd46589ee4a8c29242c8db7f0908a17496
-  data.tar.gz: d13e86d331ee8963264d3515f43affcc0421dffed7459f8bb12585af82ecd156
+  metadata.gz: b57515d717378b1daf432022a6c9b288503e116b08645bb0ddaa89a14719c295
+  data.tar.gz: 5c26d7d94fd7dbafc95efe661617d27c7b4ddbf345b537af7c20a4ef354a2d7c
 SHA512:
-  metadata.gz: 5b5045fb6e101431eaa8fd3a2f6e129aad58721a96f326aa939c83663c8effb618d7021d664975782169d16c53a5428eb235d6fd08e0ee94df29cb8c53752a14
-  data.tar.gz: 670d25bf4857c3dcc0e2daab2051794ab2b3835b588be8f3cc2232621c37d0142135ef7d770abbeee425125f68389bf24f8d8cdd08f92a8c9a7a414b4550057c
+  metadata.gz: 90334be946bf82fea5f69fa97f3070e75dec9ee07baa8829d86b995c32bc0138077a956fe065cd69dbac04a3b2f94b3cb565d5f327b0b3709a9ea23082168b2c
+  data.tar.gz: 19d2079b97289af6d5366367d58b299fd10a9263603f89e167e34b32652e1cabe58c8c8687c5b5a689f60a5e87697cae56fe662aa90d7f3081fc6a18adf652a8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.5.27](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.26...v0.5.27) (2025-01-15)
+
+
+### Bug Fixes
+
+* FIle paths with quotes break things, this is an attempt to workaround/fix that - making rubocop happy ([525d3f3](https://github.com/STARTcloud/vagrant-scp-sync/commit/525d3f396c503e79d2a0fc700b6e24de55379321))
+
 ## [0.5.26](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.25...v0.5.26) (2025-01-15)
 
 

data/lib/vagrant-scp-sync/action/scp_sync.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
 
     # This will SCP the files
     class ScpSyncHelper
-      def self.scp_single(machine, opts)
+      def self.scp_single(machine, opts, scp_path)
         ssh_info = machine.ssh_info
         raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
 
@@ -97,7 +97,7 @@ module VagrantPlugins
         end
 
         # Build and execute the scp command with sync message
-        synchronize = build_scp_command(ssh_opts, source, target)
+        synchronize = build_scp_command(scp_path, ssh_opts, source, target)
         execute_command(machine, synchronize, true, 'scp_sync_folder', opts)
       end
 
@@ -114,9 +114,8 @@ module VagrantPlugins
         ['ssh', *ssh_opts, "#{ssh_info[:username]}@#{ssh_info[:host]}", "'#{command}'"].join(' ')
       end
 
-      def self.build_scp_command(ssh_opts, source, target)
-        # Just use 'scp' and let the shell find it, like we do with ssh
-        ['scp', '-r', *ssh_opts, source, target].join(' ')
+      def self.build_scp_command(scp_path, ssh_opts, source, target)
+        [scp_path, '-r', *ssh_opts, source, target].join(' ')
       end
 
       def self.execute_command(machine, command, raise_error, message_key, opts)

data/lib/vagrant-scp-sync/command/scp.rb

@@ -2,6 +2,7 @@
 
 require 'pathname'
 require 'vagrant/util/subprocess'
+require 'vagrant/util/which'
 
 module VagrantPlugins
   module ScpSync
@@ -21,14 +22,16 @@ module VagrantPlugins
             if @source.nil? && @target.nil?
               folders = machine.config.vm.synced_folders
               ssh_info = machine.ssh_info
+              scp_path = Vagrant::Util::Which.which('scp')
               machine.ui.warn(I18n.t('vagrant.scp_ssh_password')) if ssh_info[:private_key_path].empty? && ssh_info[:password]
               folders.each_value do |folder_opts|
                 next unless folder_opts[:type] == :scp
 
-                VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts)
+                VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts, scp_path)
               end
             else
               ssh_info = machine.ssh_info
+              scp_path = Vagrant::Util::Which.which('scp')
               direction = net_ssh_command(@source)
               source = format_file_path(machine, @source)
               target = format_file_path(machine, @target)
@@ -46,7 +49,7 @@ module VagrantPlugins
                 hostpath: source
               }
 
-              VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts)
+              VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts, scp_path)
             end
           end
         end

data/lib/vagrant-scp-sync/synced_folder.rb

@@ -31,13 +31,12 @@ module VagrantPlugins
 
       def enable(machine, folders, _opts)
         ssh_info = machine.ssh_info
-        # Still check if scp exists, but don't pass the path
-        return false unless Which.which('scp')
+        scp_path = Which.which('scp')
 
         machine.ui.warn(I18n.t('vagrant.scp_ssh_password')) if ssh_info[:private_key_path].empty? && ssh_info[:password]
 
         folders.each_value do |folder_opts|
-          ScpSyncHelper.scp_single(machine, folder_opts)
+          ScpSyncHelper.scp_single(machine, folder_opts, scp_path)
         end
       end
     end

data/lib/vagrant-scp-sync/version.rb

@@ -2,7 +2,7 @@
 
 module Vagrant
   module ScpSync
-    VERSION = '0.5.26'
+    VERSION = '0.5.27'
     NAME = 'vagrant-scp-sync'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.26
+  version: 0.5.27
 platform: ruby
 authors:
 - Mark Gilbert