vagrant-scp 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0663135f112cc32d2207ab2f9180965e55c8a737
-  data.tar.gz: e099da6b9267f0b865d2d54d3ab0de34bc58bd84
+  metadata.gz: 056e0192ea635266592a0eeb2fc8ebc830bad160
+  data.tar.gz: 4ba0bc5fc9f408745ebfdeec75072196e73260f9
 SHA512:
-  metadata.gz: 4e289d8493bbb6fa19c0c4619e9bfe42d7b0b7dcd9369b52db08cebbf8743da14950256603769029edd9b4c5c76a7616cff7db275b5d6675c499a3a761266149
-  data.tar.gz: 196a67e7e99e54039b73c68214e89bbba2a84fdbd7808b44c67644c6070a2bf1a5ad71c974e26110f19675d0f0bb2b075d3ab2eaa56c3dd963e4c0139f2cf735
+  metadata.gz: 9d548c352f4bad8b97f9edb56a013b6dba0fa9b8cef8c3634f3d9081aab5f7965791a2172e93af22270cf7df7be22226f05c02d4623b3cc9b8a6db2e66f67795
+  data.tar.gz: 670e2056b2eca67c16a7ac58834571b70505d0b2d5e1c1e791da0af88cd2b9b98aae5b96648c3ee52b5e4bf21968ea24db07cb2fd16012b36ca82e4d5524560a

data/README.md

@@ -14,8 +14,12 @@ If you have just a single Vagrant VM, you can copy files over like this:
 
     vagrant scp <some_local_file_or_dir> <somewhere_on_the_vm>
 
-If you have multiple VMs, you need a third parameter
+If you have multiple VMs, you can specify it.
 
-    vagrant scp <some_local_file_or_dir> <somewhere_on_the_vm> <vm_name>
+    vagrant scp <some_local_file_or_dir> <vm_name:somewhere_on_the_vm>
+
+Copying files out of the VM works in the same fashion
+
+    vagrant scp <vm_name:somewhere_on_the_vm> <some_local_file_or_dir>
 
 That’s it!

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

@@ -10,13 +10,23 @@ module VagrantPlugins
 
         def execute
           # Parse the arguments
-          source_files, target_dir, host = parse_args()
-          return if target_dir.nil?
+          file_1, file_2 = parse_args()
+          # Extract host info
+          #
+          # We want to get the name of the vm, from a [host_1]:file_1 [host_2]:file_2 description
+          host = [file_1, file_2].map{|file_spec| file_spec.match(/^([^:]*):/)[1] rescue nil}.compact.first
 
           # Get the info about the target VM
           with_target_vms(host) do |machine|
             ssh_info = machine.ssh_info
             raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
+            if file_1.include? ':'
+              source_files = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{file_1.split(':').last}"
+              target_files = file_2
+            else
+              source_files = file_1
+              target_files = "#{ssh_info[:username]}@#{ssh_info[:host]}:#{file_2.split(':').last}"
+            end
 
             # Run the SCP
             command = [
@@ -27,7 +37,7 @@ module VagrantPlugins
               "-o port=#{ssh_info[:port]}",
               "-i '#{ssh_info[:private_key_path][0]}'",
                 source_files,
-                "#{ssh_info[:username]}@#{ssh_info[:host]}:#{target_dir}"
+                target_files
             ].join(' ')
             system(command)
           end
@@ -41,7 +51,7 @@ module VagrantPlugins
             o.separator ""
           end
           argv = parse_options(opts)
-          @env.ui.info(opts.help, prefix: false) if ! [2,3].include? argv.length
+          @env.ui.info(opts.help, prefix: false) unless argv.length == 2
           return argv
         end
 

data/lib/vagrant/scp/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Scp
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Luca Invernizzi
@@ -14,56 +14,56 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   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'
 - !ruby/object:Gem::Dependency
   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.
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Copy files to a Vagrant VM via SCP.