vagrant-scp-sync 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e117ab4ab00e45911fd5b03030c4d533109adb73eac10cf0de89e813ba6485
-  data.tar.gz: 29f64a74a37a7fe640b22d8b16a481aa08b67a57322e5f6822d9b6e52eac4790
+  metadata.gz: 8c3921e597aab855812426f77e3a91e807643551972b963e04992e04b43172c4
+  data.tar.gz: 1d3fd272ed5e7f3e5b111766a699a62e12ac593e61efcba981a4a4ad98779922
 SHA512:
-  metadata.gz: 2c1f8ad98eed1f467d3d263e918527d5f326a11561be2ed0224a866aae72eb258b4fa90e91ab1831055672ac5030448860fb11913db8b18558988f68697b64d5
-  data.tar.gz: 19080ca8a5a4f742f41882cd4fbee4d58e67dcfae5320c2a35a527e7e883f6c8ebbda2421a5d6a85732e7c10c5f8d22ae3c7e316c8a6f41712ca442720426436
+  metadata.gz: f1cab41bd06b2c0f9469a85b2d3926625c6bf15dd5a7ef7ba105ead7aa1e07e00545138d01af8b91683cbf78d7f13c33097de8f1df14f2fb541fc177fb75fb39
+  data.tar.gz: 5caa59840811a8bdeeabd325c9bb54b231e99568efde4c9cf39ae20f8d54136dcaf6383328cb83b14654129a9a31b43a506e084ec481544cbae92d8c86aa4a1e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.5.15](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.14...v0.5.15) (2024-12-23)
+
+
+### Bug Fixes
+
+* single file sync - lint ([3f77284](https://github.com/STARTcloud/vagrant-scp-sync/commit/3f772846fee7d2a42b7ffa6cfcc4bf4547e09466))
+* single file sync - lint ([029372f](https://github.com/STARTcloud/vagrant-scp-sync/commit/029372fbb906281ee70d0bcae800f71b73f88f73))
+
 ## [0.5.14](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.13...v0.5.14) (2024-12-23)
 
 

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

@@ -22,26 +22,62 @@ module VagrantPlugins
 
         delete = scp_opts.include?('--delete')
 
+        # Handle source and target path behaviors
+        has_trailing_slash_source = opts[:map].end_with?('/')
+        has_trailing_slash_target = opts[:to].end_with?('/')
+        is_source_directory = File.directory?(source_files)
+
         if opts[:direction] == :upload || opts[:direction].nil?
-          source = source_files
-          target = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{target_files}"
-          target_dir = File.dirname(target_files)
-          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 777 #{target_dir}", ssh_info)
-          remove_dir = build_ssh_command(ssh_opts, "sudo rm -rf #{target_files}", ssh_info)
+          # 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)
+
+          # Check if target exists and its type
+          target_exists = execute_command_with_output(machine, target_check).strip == 'EXISTS'
+          target_is_dir = target_exists && execute_command_with_output(machine, target_type_check).strip == 'DIR'
+
+          # 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
+                   else
+                     source_files         # Copy directory itself or single file
+                   end
+
+          # Determine target path based on existence and trailing slash
+          target_base = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{target_files}"
+          target = if target_exists && target_is_dir && !has_trailing_slash_target
+                     # If target exists as directory but no trailing slash, put source inside it
+                     "#{target_base}/#{File.basename(source_files)}"
+                   else
+                     target_base
+                   end
+
+          # Prepare target directory
+          parent_dir = File.dirname(target_files)
+          make_dir = build_ssh_command(ssh_opts, "sudo mkdir -p #{parent_dir}", ssh_info)
+          change_ownership = build_ssh_command(ssh_opts, "sudo chown -R #{opts[:owner]}:#{opts[:group]} #{parent_dir}", ssh_info)
+          change_permissions = build_ssh_command(ssh_opts, "sudo chmod 777 #{parent_dir}", ssh_info)
+          remove_dir = build_ssh_command(ssh_opts, "sudo rm -rf #{target_files}", ssh_info) if delete
+
         elsif opts[:direction] == :download
+          # For download direction
           source = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{source_files}"
+          source = "#{source}/*" if has_trailing_slash_source
+
+          # Create target directory if needed
           target = target_files
-          target_dir = File.dirname(target_files)
-          make_dir = target_dir == '.' ? nil : "mkdir -p #{target_dir}"
+          parent_dir = File.dirname(target)
+          make_dir = "mkdir -p #{parent_dir}"
         end
 
-        synchronize = build_scp_command(scp_path, ssh_opts, source, target)
-        execute_command(machine, remove_dir, delete, nil, opts)
+        # Execute commands
+        execute_command(machine, remove_dir, delete, nil, opts) if delete
         execute_command(machine, make_dir, false, nil, opts)
-        execute_command(machine, change_ownership, false, nil, opts)
-        execute_command(machine, change_permissions, false, nil, opts)
+        execute_command(machine, change_ownership, false, nil, opts) if opts[:direction] == :upload
+        execute_command(machine, change_permissions, false, nil, opts) if opts[:direction] == :upload
+
+        # Build and execute the scp command
+        synchronize = build_scp_command(scp_path, ssh_opts, source, target)
         execute_command(machine, synchronize, true, 'scp_sync_folder', opts)
       end
 
@@ -92,13 +128,22 @@ module VagrantPlugins
         raise_scp_error(message_key, command, result.stderr) if raise_error && !result.exit_code.zero?
       end
 
+      def self.execute_command_with_output(_machine, command)
+        return '' if command.nil?
+
+        result = Vagrant::Util::Subprocess.execute('sh', '-c', command)
+        result.stdout
+      end
+
       def self.raise_scp_error(message_key, command, stderr)
         raise Errors.const_get("SyncedFolderScpSync#{message_key.split('_').map(&:capitalize).join}Error"),
               command: command,
               stderr: stderr
       end
 
-      private_class_method :expand_path, :build_ssh_options, :build_scp_options, :build_ssh_command, :build_scp_command, :execute_command, :raise_scp_error
+      private_class_method :expand_path, :build_ssh_options, :build_scp_options,
+                           :build_ssh_command, :build_scp_command, :execute_command,
+                           :execute_command_with_output, :raise_scp_error
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module Vagrant
   module ScpSync
-    VERSION = '0.5.14'
+    VERSION = '0.5.15'
     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.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Mark Gilbert