vagrant-scp-sync 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6dab1627126fa4175b128368987b80ba059ada1226d05346325bac4c124fe4c
-  data.tar.gz: ecf339d488869952c926f2226bdc0e584c6c4c9139455497a89a65441d544868
+  metadata.gz: c034d409b3c2956435b324465f32bb5e24fa49c540c1fb7679915e72a6c8d1f6
+  data.tar.gz: 732a442ca6213677714a1008f5a732e36fe22c244893de2f0d33ec183d849cc8
 SHA512:
-  metadata.gz: ca832eaa5a34e0f0535ec8ff2e7806cf0ba2f472e5df84e8c6f1973af1f1cbf0a2148e240b516c4f20246e077b670d0bee449c5c5a35d760d9eef83262603cee
-  data.tar.gz: 45ba7fa7c86c90836a8c1b78427e0e1a250ce348c8e1b34a7effcc7d1b0612c69d3a7a140ea0659e0bcd640a8b559672041caa31dd0d496af1faebce190f50e0
+  metadata.gz: 778c512ff8d043a5e4bded18c66b8f35cf3e4f8ad1ceb7d683d99be79d2347cab690a4ab915adae677e448ec6dab1df3531f320232e6b6079f3235a9d8af9bba
+  data.tar.gz: 72e59dc346a18050df0303c6c7ad98637425ad8c54da4914a13b3bb1e63f108ddc1462a1c7a2ddd809fc78bea790c28701b79704ba2dd06d61c65fde997159e4

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.5.12](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.11...v0.5.12) (2024-11-20)
+
+
+### Bug Fixes
+
+* full implentation ([3715346](https://github.com/STARTcloud/vagrant-scp-sync/commit/3715346080fe36ccc08fb401770ef59de13c82ab))
+* linting ([39b82ae](https://github.com/STARTcloud/vagrant-scp-sync/commit/39b82ae671da035f7bbb3eec693b99f950acc1fc))
+* linting ([aa71732](https://github.com/STARTcloud/vagrant-scp-sync/commit/aa717326be49ecd3452e9a793c9bba2146a4efc5))
+* linting ([c6a932b](https://github.com/STARTcloud/vagrant-scp-sync/commit/c6a932b9d476d31ea4bc522bd9356f2a273ca9bd))
+* linting ([390be27](https://github.com/STARTcloud/vagrant-scp-sync/commit/390be27b4f042ae22e035d2829f236f59cccbced))
+* linting ([ce4ba83](https://github.com/STARTcloud/vagrant-scp-sync/commit/ce4ba83954f318062886492f4742950b0b726957))
+* linting ([4befd93](https://github.com/STARTcloud/vagrant-scp-sync/commit/4befd9393ff86006291b293534bdefffac5e413b))
+
 ## [0.5.11](https://github.com/STARTcloud/vagrant-scp-sync/compare/v0.5.10...v0.5.11) (2024-11-20)
 
 

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

@@ -14,7 +14,6 @@ module VagrantPlugins
         source_files = expand_path(opts[:map], machine)
         has_trailing_slash_source = opts[:map].end_with?('/')
         sync_source_files = append_wildcard(source_files, has_trailing_slash_source)
-
         target_files = expand_path(opts[:to], machine)
 
         opts[:owner] ||= ssh_info[:username]

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

@@ -1,52 +1,56 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require 'vagrant/util/subprocess'
+require 'vagrant/util/which'
 
 module VagrantPlugins
   module ScpSync
     module Command
       # This class defines SCPSync
-      class ScpSync < Vagrant.plugin('2', :command)
+      class ScpSyncCommand < Vagrant.plugin('2', :command)
         def self.synopsis
           'Copies data into a box via SCP'
         end
 
         def execute
-          @file1, @file2 = parse_args
-          return if @file2.nil?
+          @source, @target = parse_args
 
           with_target_vms(host) do |machine|
-            @ssh_info = machine.ssh_info
-            raise Vagrant::Errors::SSHNotReady if @ssh_info.nil?
-
-            user_at_host = "#{@ssh_info[:username]}@#{@ssh_info[:host]}"
-            if net_ssh_command == :upload!
-              target = "#{user_at_host}:'#{target_files}'"
-              source = "'#{source_files}'"
+            raise Vagrant::Errors::SSHNotReady if machine.ssh_info.nil?
+
+            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)
+              end
             else
-              target = "'#{target_files}'"
-              source = "#{user_at_host}:'#{source_files}'"
+              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)
+              folder_opts = {
+                type: :scp,
+                map: source,
+                to: target,
+                owner: ssh_info[:username],
+                group: ssh_info[:username],
+                direction: direction,
+                scp__args: ['--delete'],
+                rsync__args: ['--delete'],
+                disabled: false,
+                guestpath: target,
+                hostpath: source
+              }
+
+              VagrantPlugins::ScpSync::ScpSyncHelper.scp_single(machine, folder_opts, scp_path)
             end
-
-            proxy_command = if @ssh_info[:proxy_command]
-                              "-o ProxyCommand='#{@ssh_info[:proxy_command]}'"
-                            else
-                              ''
-                            end
-
-            command = [
-              'scp',
-              '-r',
-              '-o StrictHostKeyChecking=no',
-              '-o UserKnownHostsFile=/dev/null',
-              "-o port=#{@ssh_info[:port]}",
-              '-o LogLevel=ERROR',
-              proxy_command,
-              @ssh_info[:private_key_path].map { |k| "-i '#{k}'" }.join(' '),
-              source,
-              target
-            ].join(' ')
-            system(command)
           end
         end
 
@@ -62,14 +66,16 @@ module VagrantPlugins
             o.separator ''
           end
           argv = parse_options(opts)
-          return argv if argv && argv.length == 2
+          return argv if argv && (argv.empty? || argv.length == 2)
 
-          @env.ui.info(opts.help, prefix: false) if argv
+          @env.ui.info(opts.help, prefix: false)
           [nil, nil]
         end
 
+        require_relative '../action/scp_sync'
+
         def host
-          host = [@file1, @file2].map do |file_spec|
+          host = [@source, @target].map do |file_spec|
             file_spec.match(/^([^:]*):/)[1]
           rescue NoMethodError
             nil
@@ -78,33 +84,23 @@ module VagrantPlugins
           host
         end
 
-        def net_ssh_command
-          @file1.include?(':') ? :download! : :upload!
-        end
-
-        def source_files
-          format_file_path(@file1)
+        def net_ssh_command(source)
+          source.include?(':') ? :download : :upload
         end
 
-        def target_files
-          if target_location_specified?
-            format_file_path(@file2)
-          else
-            Pathname.new(source_files).basename
-          end
+        def expand_path(path, machine)
+          expanded_path = File.expand_path(path, machine.env.root_path)
+          Vagrant::Util::Platform.fs_real_path(expanded_path).to_s
         end
 
-        def format_file_path(filepath)
+        def format_file_path(machine, filepath)
+          ssh_info = machine.ssh_info
           if filepath.include?(':')
-            filepath.split(':').last.gsub('~', "/home/#{@ssh_info[:username]}")
+            filepath.split(':').last.gsub('~', "/home/#{ssh_info[:username]}")
           else
             filepath
           end
         end
-
-        def target_location_specified?
-          !@file2.end_with?(':')
-        end
       end
     end
   end

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

@@ -15,6 +15,11 @@ module VagrantPlugins
         error_key(:scp_sync_error, 'vagrant_scp_sync.errors')
       end
 
+      # This Class denotes Errors for Manual SCP Sync
+      class SyncedFolderScpSyncScpSyncFolderError < VagrantScpSyncError
+        error_key(:scp_sync_folder_error, 'vagrant_scp_sync.errors')
+      end
+
       # This Class denotes Delete Dir Errors for SCP Sync
       class SyncedFolderScpSyncDeleteDirError < VagrantScpSyncError
         error_key(:scp_sync_error_delete_directory, 'vagrant_scp_sync.errors')

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

@@ -17,12 +17,6 @@ module VagrantPlugins
         Copy files to vagrant boxes via scp
       DESC
 
-      command 'scp' do
-        setup_i18n
-        require_relative 'command/scp'
-        Command
-      end
-
       synced_folder('scp', 5) do
         require_relative 'synced_folder'
         SyncedFolder
@@ -69,6 +63,11 @@ module VagrantPlugins
       # from the parent logger.
       setup_logging
       setup_i18n
+
+      command('scp') do
+        require_relative 'command/scp'
+        Command::ScpSyncCommand
+      end
     end
   end
 end

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

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

data/locales/en.yml

@@ -1,9 +1,7 @@
 en:
   vagrant_scp_sync:
     action:
-      scp_sync_folder: |-
-        Syncing Folder: %{source_files} ==> %{target_files}
-
+      scp_sync_folder: "Syncing files: %{source_files} ==> %{target_files}"
     errors:
       not_yet_implemented: |-
         Configuration is not yet implemented
@@ -39,6 +37,13 @@ en:
         Full command causing error:
         %{command}
 
+      scp_sync_folder_error: |-
+        There was an error when attemping to sync folders using scp.
+        Please inspect the error message below for more info.
+        Error: %{stderr}
+        Full command causing error:
+        %{command}
+
       scp_sync_error: |-
         There was an error when attemping to sync folders using scp.
         Please inspect the error message below for more info.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Mark Gilbert