vagrant-scp 0.5.4 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c94d03251e09000e8ae6cfb6b6ec6d2aa5970d0b
-  data.tar.gz: 61fdd2a2dc70a5ef98c1d6bf83037b8350ed7ae4
+SHA256:
+  metadata.gz: df188ae6f299559786afcf799c99ee23f77010538f96d496ed0871006dedd5ec
+  data.tar.gz: b10ab56b55235b0c99c11b6d3663d8f35cfca5bd0c84d5520a523b339646457f
 SHA512:
-  metadata.gz: a69f24db5e46b9fdf324c7224d1940f9d94e08dd55437466633ab5526548c3e411457face8cb8b39115b6b77af9783a4db082666a9fad7405716c8f9372fd532
-  data.tar.gz: ebb14738abc8d484262909e73ebeeef5d102e5a44e80afdb495e0c0c93e1789a4bf280f8aa068d6ea858797c194b9833bf556d48d497546f3d44861f7dbd35ec
+  metadata.gz: e478cb9254926da3eb9d65f6630408510343ff1f9c4b13301561ad906036d9bba199644628def3284ccf7af8b7aa4cc773a8c920cb0012ad5fe4c7868895931b
+  data.tar.gz: fc96757ab88b04308fa646aa9f8731da3f962a90827cdcd330fe5839b30ac207eab0c05cf939c478bfb9bdccab0dd8117598b36569def7ff2548371336eef405

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant::Scp
 
-Copy files to a Vagrant VM via SCP.
+Copy files to a Vagrant guest via SCP.
 
 ## Installation
 
@@ -10,7 +10,7 @@ You need to install the plugin, like so
 
 ## Usage
 
-If you have just a single Vagrant VM, you can copy files over like this:
+If you have just a single Vagrant guest, you can copy files over like this:
 
     vagrant scp <some_local_file_or_dir> <somewhere_on_the_vm>
 
@@ -18,11 +18,22 @@ If you have multiple VMs, you can specify it.
 
     vagrant scp <some_local_file_or_dir> [vm_name]:<somewhere_on_the_vm>
 
-Copying files out of the VM works in the same fashion
+Copying files out of the guest works in the same fashion
 
     vagrant scp [vm_name]:<somewhere_on_the_vm> <some_local_file_or_dir>
 
-That’s it!
+If source is a directory it will be copied recursively.
+
+
+## Examples
+
+If you have just one guest, you can copy files to it like this:
+
+    vagrant scp file_on_host.txt :file_on_vm.txt
+
+And from the guest like this:
+
+    vagrant scp :file_on_vm.txt file_on_host.txt
 
 ## Vagrant version
-We support Vagrant 1.7+. Note that Ubuntu 14.04 LTS ships version 1.4.3. You can get the deb file with the latest Vagrant [here](https://www.vagrantup.com/downloads.html).
+We require Vagrant v1.7 or newer. If you are running older version (check with `vagrant --version`), install recent version directly from [vendor site](https://www.vagrantup.com/).

data/lib/vagrant/scp/commands/scp.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 
 module VagrantPlugins
   module Scp
@@ -18,18 +19,26 @@ module VagrantPlugins
             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
+              target = "#{user_at_host}:'#{target_files}'"
+              source = "'#{source_files}'"
             else
-              target = target_files
-              source = "#{user_at_host}:#{source_files}"
+              target = "'#{target_files}'"
+              source = "#{user_at_host}:'#{source_files}'"
             end
+
+            if @ssh_info[:proxy_command]
+              proxy_command = "-o ProxyCommand='#{@ssh_info[:proxy_command]}'"
+            else
+              proxy_command = ''
+            end
+
             command = [
               "scp",
               "-r",
               "-o StrictHostKeyChecking=no",
               "-o UserKnownHostsFile=/dev/null",
               "-o port=#{@ssh_info[:port]}",
+              proxy_command,
               "-i '#{@ssh_info[:private_key_path][0]}'",
               source,
               target
@@ -43,7 +52,8 @@ module VagrantPlugins
         def parse_args
           opts = OptionParser.new do |o|
             o.banner =  "Usage: vagrant scp <local_path> [vm_name]:<remote_path> \n"
-            o.banner += "       vagrant scp [vm_name]:<remote_path> <local_path>"
+            o.banner += "       vagrant scp [vm_name]:<remote_path> <local_path> \n"
+            o.banner += "Directories will be copied recursively."
             o.separator ""
             o.separator "Options:"
             o.separator ""
@@ -56,7 +66,7 @@ module VagrantPlugins
 
         def host
           host = [@file_1, @file_2].map{|file_spec| file_spec.match(/^([^:]*):/)[1] rescue nil}.compact.first
-          host = nil if (host.nil? || host == 0 )
+          host = nil if (host.nil? || host == '' || host == 0 )
           host
         end
 
@@ -69,7 +79,11 @@ module VagrantPlugins
         end
 
         def target_files
-          format_file_path(@file_2)
+          if target_location_specified?
+            format_file_path(@file_2)
+          else
+            Pathname.new(source_files).basename
+          end
         end
 
         def format_file_path(filepath)
@@ -80,6 +94,9 @@ module VagrantPlugins
           end
         end
 
+        def target_location_specified?
+          !@file_2.end_with?(':')
+        end
       end
 
     end

data/lib/vagrant/scp/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Scp
-    VERSION = "0.5.4"
+    VERSION = "0.5.9"
   end
 end

data/vagrant-scp.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_runtime_dependency 'log4r', "~> 1.1"
-  spec.add_runtime_dependency 'net-scp', "~> 1.1"
+  spec.add_runtime_dependency 'net-scp', ">= 1.1"
 
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.9
 platform: ruby
 authors:
 - Luca Invernizzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 description: Copy files to a Vagrant VM via SCP.
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Copy files to a Vagrant VM via SCP.