vagrant-scp-sync 0.5.26 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f1926cb1f70c6621ac3b31fbf2edbd46589ee4a8c29242c8db7f0908a17496
-  data.tar.gz: d13e86d331ee8963264d3515f43affcc0421dffed7459f8bb12585af82ecd156
+  metadata.gz: bf6209e986838ed0df71e3def682be412a7c9bc67272bcd82761533dd4dc9a17
+  data.tar.gz: b09da588cf177e7b102414f5c1984ad3f5082d8dbc54af7717efb5cfb10444f5
 SHA512:
-  metadata.gz: 5b5045fb6e101431eaa8fd3a2f6e129aad58721a96f326aa939c83663c8effb618d7021d664975782169d16c53a5428eb235d6fd08e0ee94df29cb8c53752a14
-  data.tar.gz: 670d25bf4857c3dcc0e2daab2051794ab2b3835b588be8f3cc2232621c37d0142135ef7d770abbeee425125f68389bf24f8d8cdd08f92a8c9a7a414b4550057c
+  metadata.gz: bbdc62a90063f5c4592826cb26c98848d88de8adfbce15249d329c07a5d62211b3091a6a5adf807faba350f042463f3c31a4b0023febabef7fb7eacf6a87ea4c
+  data.tar.gz: 8521432666f398a5fedea53cd5c8043ea16b0ca8c63890dd8fa6d077c334efb209db02fbf70a00d3f18258b00fe8f9b2515c7626ceb0f671fdee8ada9683fa75

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.5.28](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.27...v0.5.28) (2025-01-15)
+
+
+### Bug Fixes
+
+* FIle paths with quotes break things, this is an attempt to workaround/fix that - making rubocop happy ([08d661f](https://github.com/STARTcloud/vagrant-scp-sync/commit/08d661f6a63e894d9f012d4969e99053c259dde1))
+* FIle paths with quotes break things, this is an attempt to workaround/fix that - making rubocop happy ([9a305a1](https://github.com/STARTcloud/vagrant-scp-sync/commit/9a305a16fe0bf43cf61c16260ad2e04c79663deb))
+
+## [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?
 
@@ -42,8 +42,9 @@ module VagrantPlugins
 
         if opts[:direction] == :upload || opts[:direction].nil?
           # For upload direction
-          target_check = build_ssh_command(ssh_opts, "test -e '#{target_files}' && echo 'EXISTS' || echo 'NOT_EXISTS'", ssh_info)
-          target_type_check = build_ssh_command(ssh_opts, "test -d '#{target_files}' && echo 'DIR' || echo 'FILE'", ssh_info)
+          target_path = opts[:to]
+          target_check = build_ssh_command(ssh_opts, "test -e '#{target_path}' && echo 'EXISTS' || echo 'NOT_EXISTS'", ssh_info)
+          target_type_check = build_ssh_command(ssh_opts, "test -d '#{target_path}' && echo 'DIR' || echo 'FILE'", ssh_info)
 
           # Check if target exists and its type
           target_exists = execute_command_with_output(machine, target_check).strip == 'EXISTS'
@@ -57,22 +58,22 @@ module VagrantPlugins
                    end
 
           # Determine target path based on existence and trailing slash
-          target_base = "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{target_files}'"
+          target_base = "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{target_path}'"
           target = if target_exists && target_is_dir && !has_trailing_slash_target
                      # If target exists as directory but no trailing slash, put source inside it
-                     "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{target_files}/#{File.basename(source_files)}'"
+                     "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{target_path}/#{File.basename(source_files)}'"
                    else
                      target_base
                    end
 
           # Prepare remote target directory with proper permissions
-          target_dir = target_files
-          target_dir = File.dirname(target_files) unless target_is_dir || has_trailing_slash_target
+          target_dir = target_path
+          target_dir = File.dirname(target_path) unless target_is_dir || has_trailing_slash_target
 
           make_dir = build_ssh_command(ssh_opts, "sudo mkdir -p '#{target_dir}'", ssh_info)
           change_ownership = build_ssh_command(ssh_opts, "sudo chown -R #{opts[:owner]}:#{opts[:group]} '#{target_dir}'", ssh_info)
           change_permissions = build_ssh_command(ssh_opts, "sudo chmod -R 777 '#{target_dir}'", ssh_info)
-          remove_dir = build_ssh_command(ssh_opts, "sudo rm -rf '#{target_files}'", ssh_info) if delete
+          remove_dir = build_ssh_command(ssh_opts, "sudo rm -rf '#{target_path}'", ssh_info) if delete
 
         elsif opts[:direction] == :download
           # For download direction
@@ -97,7 +98,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 +115,10 @@ 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)
+        # Quote the scp path if it contains spaces
+        scp_path = "'#{scp_path}'" if scp_path.include?(' ')
+        [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.28'
     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.28
 platform: ruby
 authors:
 - Mark Gilbert