vagrant-scp-sync 0.5.24 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8ea86918db593ce6126add66de0626dcacfd459be232571d5bcce2a37a2001b
-  data.tar.gz: 5e89431618de8223b5e1f3aae8d674ecec9fde75e99e67ffce0be7e534119825
+  metadata.gz: 61f1926cb1f70c6621ac3b31fbf2edbd46589ee4a8c29242c8db7f0908a17496
+  data.tar.gz: d13e86d331ee8963264d3515f43affcc0421dffed7459f8bb12585af82ecd156
 SHA512:
-  metadata.gz: 9385b53ed26fda63f126b11df9b00b2498bcde636adc314bf8586d9bf226f816a664cba69592cee9edace2717ad78b16501935d8496d139deb53cfcec002d415
-  data.tar.gz: f28ab6c87f427e35d50e65c2503b46b313e5a10e5a1286bc39f351c3a493432a4471fab7fed4dad704f4c06aff8c983e995e9b4cc724487e6383d5f234bf5e95
+  metadata.gz: 5b5045fb6e101431eaa8fd3a2f6e129aad58721a96f326aa939c83663c8effb618d7021d664975782169d16c53a5428eb235d6fd08e0ee94df29cb8c53752a14
+  data.tar.gz: 670d25bf4857c3dcc0e2daab2051794ab2b3835b588be8f3cc2232621c37d0142135ef7d770abbeee425125f68389bf24f8d8cdd08f92a8c9a7a414b4550057c

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.5.26](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.25...v0.5.26) (2025-01-15)
+
+
+### Bug Fixes
+
+* FIle paths with quotes break things, this is an attempt to workaround/fix that - making rubocop happy ([83bc118](https://github.com/STARTcloud/vagrant-scp-sync/commit/83bc1184d3809da8af81af2e2795f4725615e425))
+
+## [0.5.25](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.24...v0.5.25) (2025-01-15)
+
+
+### Bug Fixes
+
+* FIle paths with quotes break things, this is an attempt to workaround/fix that ([ec704c1](https://github.com/STARTcloud/vagrant-scp-sync/commit/ec704c16d2d49436f842e3e490ea61b9b1f0d322))
+* FIle paths with quotes break things, this is an attempt to workaround/fix that - making rubocop happy ([09797b5](https://github.com/STARTcloud/vagrant-scp-sync/commit/09797b591d3c7e7678cf251cc41835fea3576e8a))
+
 ## [0.5.24](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.23...v0.5.24) (2025-01-14)
 
 

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, scp_path)
+      def self.scp_single(machine, opts)
         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(scp_path, ssh_opts, source, target)
+        synchronize = build_scp_command(ssh_opts, source, target)
         execute_command(machine, synchronize, true, 'scp_sync_folder', opts)
       end
 
@@ -114,8 +114,9 @@ module VagrantPlugins
         ['ssh', *ssh_opts, "#{ssh_info[:username]}@#{ssh_info[:host]}", "'#{command}'"].join(' ')
       end
 
-      def self.build_scp_command(scp_path, ssh_opts, source, target)
-        [scp_path, '-r', *ssh_opts, source, target].join(' ')
+      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(' ')
       end
 
       def self.execute_command(machine, command, raise_error, message_key, opts)

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

@@ -2,7 +2,6 @@
 
 require 'pathname'
 require 'vagrant/util/subprocess'
-require 'vagrant/util/which'
 
 module VagrantPlugins
   module ScpSync
@@ -22,16 +21,14 @@ 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, scp_path)
+                VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts)
               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)
@@ -49,7 +46,7 @@ module VagrantPlugins
                 hostpath: source
               }
 
-              VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts, scp_path)
+              VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts)
             end
           end
         end

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

@@ -31,12 +31,13 @@ module VagrantPlugins
 
       def enable(machine, folders, _opts)
         ssh_info = machine.ssh_info
-        scp_path = Which.which('scp')
+        # Still check if scp exists, but don't pass the path
+        return false unless 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, scp_path)
+          ScpSyncHelper.scp_single(machine, folder_opts)
         end
       end
     end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.26
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n