vagrant-scp-sync 0.5.23 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd954a17a047b7a187c76302391b434f191285e975bf8280abf01d0f4a948c8a
-  data.tar.gz: fd5ec7f42859cbd0a47b4f1dbfa4b91bbe8a3cbce9297824c37b86558226def7
+  metadata.gz: 9cb714f9207494b148c9470d8b01f91cd57c8fff99c797827f050b750b59efd9
+  data.tar.gz: d68f414a56e4fd8dd096a14d37588cb8247e9e62779a15f4e57d33f9f53e2095
 SHA512:
-  metadata.gz: 3841a0cb505e8b30cdbcd5fef6478c839548ecbdd60ebaf132b9473e7b43f4b0b79059132d143a185abdfe063555159e006d87bae8bf651a1c483b48173c92d5
-  data.tar.gz: e91f0198672284f053355394d2594a2bd292a718f20a0e066793b872128f17b1c9dcd27d78067f9b7467903097e7a1c0bee45f186a0da7d0b52991b7b051a72b
+  metadata.gz: c1f89779f2a724722bf5c39299c5719854db9b5128e2e204648ddddd206ef20c23e94834989b1e8bf5fa2466a81f0234b1b3b0896bd73d92ccd6648be01e61a2
+  data.tar.gz: ccfd87df8f36614eaf0825ca3af59ee478df4ecd5ae9a853dad16e1a7b54d9ab47e867054dbedbe27e3769f5dae0326c4bae1c16e16cd939e7d6c1bb93262ec7

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* FIle paths with quotes break things, this is an attempt to workaround/fix that ([0c0afc0](https://github.com/STARTcloud/vagrant-scp-sync/commit/0c0afc012bb99fb28de97575c4256bf622e60d16))
+
 ## [0.5.23](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.22...v0.5.23) (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?
 
@@ -51,7 +51,7 @@ module VagrantPlugins
 
           # Determine source path based on trailing slash and directory status
           source = if is_source_directory && has_trailing_slash_source
-                     "'#{source_files}/*'"  # Copy contents of directory with quotes
+                     "'#{source_files}'/*"  # Quote path but leave glob outside quotes
                    else
                      "'#{source_files}'"    # Copy directory itself or single file with quotes
                    end
@@ -77,7 +77,7 @@ module VagrantPlugins
         elsif opts[:direction] == :download
           # For download direction
           source = "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{source_files}'"
-          source = "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{source_files}/*'" if has_trailing_slash_source
+          source = "#{ssh_info[:username]}@#{ssh_info[:host]}:'#{source_files}'/*" if has_trailing_slash_source
 
           # Create local target directory without sudo
           target = "'#{target_files}'"
@@ -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/version.rb

@@ -2,7 +2,7 @@
 
 module Vagrant
   module ScpSync
-    VERSION = '0.5.23'
+    VERSION = '0.5.25'
     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.23
+  version: 0.5.25
 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