vagrant-scp 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0d11672c676e513b73498f09f529e11db5cc7e
-  data.tar.gz: 86de802c5e2deaacc769729937bc924bbc52aed1
+  metadata.gz: 9300b6362864078cc341ff6b5dc43b92b4e8c8ea
+  data.tar.gz: 2e0970ff029e60d36aa41a2f6a152f90de951411
 SHA512:
-  metadata.gz: e55abcb4d09613f4574c10d7760d60fc171058d56dba335e5858a128597325dcd926282162a5b47c71cfebb6e0f15afc932bab711f6691938a674fb9f713caad
-  data.tar.gz: f4bcd73647d86920940a91f3366fa436e6608542939da9d102b8858a500bc7b7f16083fa0408c2ff4e5dfd0da944eee65ab25843f42b67bbb281d3821cf0eab4
+  metadata.gz: d64aa17b0df115359d9c6a30867d0dab9ba83e6f91fffbb0f5ae1b395cc276412b3c0353c5ef926d655ec4480d0150614abeaf316afb0284e8109391e7bd7452
+  data.tar.gz: b775d9b17a115fea49828f4692b5fff49983c56d8250cf14c016a5a32f47814020db1fecaa6a85768abd917a9f2dd738c964bc77064f79a03183e690f891ffa1

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.ruby-gemset

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

@@ -1,3 +1,5 @@
+require 'net/scp'
+
 module VagrantPlugins
   module Scp
     module Command
@@ -9,45 +11,28 @@ module VagrantPlugins
         end
 
         def execute
-          # Parse the arguments
-          file_1, file_2 = parse_args()
-          return if file_2.nil?
-          # 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
-          # The default machine name for Vagrant is 'default'
-          host = 'default' if (host.nil? || host == 0 )
+          @file_1, @file_2 = parse_args()
+          return if @file_2.nil?
 
-          # 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
+            @ssh_info = machine.ssh_info
+            raise Vagrant::Errors::SSHNotReady if @ssh_info.nil?
 
-            # Run the SCP
-            command = [
-              "scp",
-              '-r',
-              '-o StrictHostKeyChecking=no',
-              '-o UserKnownHostsFile=/dev/null',
-              "-o port=#{ssh_info[:port]}",
-              "-i '#{ssh_info[:private_key_path][0]}'",
-                source_files,
-                target_files
-            ].join(' ')
-            system(command)
+            Net::SCP.send net_ssh_command,
+                          @ssh_info[:host],
+                          @ssh_info[:username],
+                          source_files,
+                          target_files,
+                          :recursive => true,
+                          :ssh => {:port => @ssh_info[:port], :keys => @ssh_info[:private_key_path]}
           end
         end
 
+        private
+
         def parse_args
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant scp <local_path> [vm_name]:<remote_path> \n"
+            o.banner =  "Usage: vagrant scp <local_path> [vm_name]:<remote_path> \n"
             o.banner += "       vagrant scp [vm_name]:<remote_path> <local_path>"
             o.separator ""
             o.separator "Options:"
@@ -59,6 +44,32 @@ module VagrantPlugins
           return nil, nil
         end
 
+        def host
+          host = [@file_1, @file_2].map{|file_spec| file_spec.match(/^([^:]*):/)[1] rescue nil}.compact.first
+          host = 'default' if (host.nil? || host == 0 )
+          host
+        end
+
+        def net_ssh_command
+          @file_1.include?(':') ? :download! : :upload!
+        end
+
+        def source_files
+          format_file_path(@file_1)
+        end
+
+        def target_files
+          format_file_path(@file_2)
+        end
+
+        def format_file_path(filepath)
+          if @file_1.include?(':')
+            filepath.split(':').last.gsub("~", "/home/#{@ssh_info[:username]}")
+          else
+            filepath
+          end
+        end
+
       end
 
     end

data/lib/vagrant/scp/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Scp
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Luca Invernizzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-09-14 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'
   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
@@ -94,19 +94,18 @@ 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.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Copy files to a Vagrant VM via SCP.
 test_files: []
-has_rdoc: