vagrant-scp-sync 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e117ab4ab00e45911fd5b03030c4d533109adb73eac10cf0de89e813ba6485
-  data.tar.gz: 29f64a74a37a7fe640b22d8b16a481aa08b67a57322e5f6822d9b6e52eac4790
+  metadata.gz: 39eb1408a8d8e620bac881ec74ac17bab6834e2d0a5506278aa88922c0481585
+  data.tar.gz: 3239d37962771cc1a7e330a633617fce7f6fb96bbb4a522569389d10f9595beb
 SHA512:
-  metadata.gz: 2c1f8ad98eed1f467d3d263e918527d5f326a11561be2ed0224a866aae72eb258b4fa90e91ab1831055672ac5030448860fb11913db8b18558988f68697b64d5
-  data.tar.gz: 19080ca8a5a4f742f41882cd4fbee4d58e67dcfae5320c2a35a527e7e883f6c8ebbda2421a5d6a85732e7c10c5f8d22ae3c7e316c8a6f41712ca442720426436
+  metadata.gz: 1b0cf61de8a0475b78eb94db00cf064be8e135924ec6760c8e7b21330900fe6451c450854c2257051bf2d9db588b8976cfa56013c6196a01392d2f7e76de97bc
+  data.tar.gz: 2a295ad03d2082d32fbc5ac8dfea8753f44431c79315faaad0394f82f7d5b57856000ec59c817e8f02b5043da6bd61f0ceb4c3e41a92711f3c5989abffc86d5a

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.5.16](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.15...v0.5.16) (2024-12-23)
+
+
+### Bug Fixes
+
+* single file sync - lint ([d953d76](https://github.com/STARTcloud/vagrant-scp-sync/commit/d953d761e37668f77d2b8d2c4417a3351bd260e8))
+* single file sync - lint ([9d179eb](https://github.com/STARTcloud/vagrant-scp-sync/commit/9d179eb36d01b85c75aade4a04a59eae8280264b))
+* single file sync - lint ([dad006f](https://github.com/STARTcloud/vagrant-scp-sync/commit/dad006fa9da87ac57a79a95124a741f9183a67f0))
+
+## [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

@@ -2,6 +2,7 @@
 
 require 'vagrant/util/platform'
 require 'vagrant/util/subprocess'
+require 'vagrant-scp-sync/ssh_options'
 
 module VagrantPlugins
   module ScpSync
@@ -17,32 +18,75 @@ module VagrantPlugins
         opts[:owner] ||= ssh_info[:username]
         opts[:group] ||= ssh_info[:username]
 
-        ssh_opts = build_ssh_options(ssh_info)
+        ssh_opts = SshOptions.build(ssh_info)
         scp_opts = build_scp_options(opts)
 
         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)
+          # 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 remote target directory with proper permissions
+          target_dir = target_files
+          target_dir = File.dirname(target_files) 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 777 #{target_dir}", ssh_info)
-          remove_dir = build_ssh_command(ssh_opts, "sudo rm -rf #{target_files}", 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
+
         elsif opts[:direction] == :download
+          # For download direction
           source = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{source_files}"
+          source = "#{source}/*" if has_trailing_slash_source
+
+          # Create local target directory without sudo
           target = target_files
-          target_dir = File.dirname(target_files)
-          make_dir = target_dir == '.' ? nil : "mkdir -p #{target_dir}"
+          target_dir = target_files
+          target_dir = File.dirname(target_files) unless File.directory?(target_files) || has_trailing_slash_target
+          make_dir = "mkdir -p #{target_dir}"
+        end
+
+        # Execute commands with proper error messages
+        execute_command(machine, remove_dir, true, 'scp_sync_error_delete_directory', opts) if delete
+        execute_command(machine, make_dir, true, 'scp_sync_error_make_directory', opts)
+
+        # For upload, ensure remote directory permissions
+        if opts[:direction] == :upload || opts[:direction].nil?
+          execute_command(machine, change_ownership, true, 'scp_sync_error_change_ownership_directory', opts)
+          execute_command(machine, change_permissions, true, 'scp_sync_error_change_permissions_directory', opts)
         end
 
+        # Build and execute the scp command
         synchronize = build_scp_command(scp_path, ssh_opts, source, target)
-        execute_command(machine, remove_dir, delete, nil, opts)
-        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, synchronize, true, 'scp_sync_folder', opts)
+        execute_command(machine, synchronize, true, 'scp_sync_folder_error', opts)
       end
 
       def self.expand_path(path, machine)
@@ -50,17 +94,6 @@ module VagrantPlugins
         Vagrant::Util::Platform.fs_real_path(expanded_path).to_s
       end
 
-      def self.build_ssh_options(ssh_info)
-        opts = %w[
-          -o StrictHostKeyChecking=no
-          -o UserKnownHostsFile=/dev/null
-          -o LogLevel=ERROR
-        ]
-        opts << "-o port=#{ssh_info[:port]}"
-        opts << ssh_info[:private_key_path].map { |k| "-i #{k}" }.join(' ')
-        opts
-      end
-
       def self.build_scp_options(opts)
         opts[:scp__args] ? Array(opts[:scp__args]).dup : ['--verbose']
       end
@@ -92,13 +125,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_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/ssh_options.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module VagrantPlugins
+  module ScpSync
+    # Helper class for building SSH options
+    class SshOptions
+      def self.build(ssh_info)
+        opts = %w[
+          -o StrictHostKeyChecking=no
+          -o UserKnownHostsFile=/dev/null
+          -o LogLevel=ERROR
+        ]
+        opts << "-o port=#{ssh_info[:port]}"
+        opts << ssh_info[:private_key_path].map { |k| "-i #{k}" }.join(' ')
+        opts
+      end
+    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.16'
     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.16
 platform: ruby
 authors:
 - Mark Gilbert
@@ -143,6 +143,7 @@ files:
 - lib/vagrant-scp-sync/command/scp.rb
 - lib/vagrant-scp-sync/errors.rb
 - lib/vagrant-scp-sync/plugin.rb
+- lib/vagrant-scp-sync/ssh_options.rb
 - lib/vagrant-scp-sync/synced_folder.rb
 - lib/vagrant-scp-sync/version.rb
 - locales/en.yml