vagrant-scp 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f5e91d3b3bfd069036b1ff7e56680541948fcce
-  data.tar.gz: 9a36c99d99290aea2efd26dd1b1c19181e34aeb1
+  metadata.gz: c94d03251e09000e8ae6cfb6b6ec6d2aa5970d0b
+  data.tar.gz: 61fdd2a2dc70a5ef98c1d6bf83037b8350ed7ae4
 SHA512:
-  metadata.gz: bce9dc351807cdde5e7a6152056a6a8ec217a26a8a51ce969ab64c50c87d3337dd754fbd7eb7764799c3472a3e9f499daff8107f810bcbdbb92c18221507bddd
-  data.tar.gz: ebc0bbf403458bf75f75be81b90f178d819a83a818366416624b9e5fa7497ed43fd186f2ec875bb528fffcfcdea60921af2d62265cbee777a7c617a2b5b4aae1
+  metadata.gz: a69f24db5e46b9fdf324c7224d1940f9d94e08dd55437466633ab5526548c3e411457face8cb8b39115b6b77af9783a4db082666a9fad7405716c8f9372fd532
+  data.tar.gz: ebb14738abc8d484262909e73ebeeef5d102e5a44e80afdb495e0c0c93e1789a4bf280f8aa068d6ea858797c194b9833bf556d48d497546f3d44861f7dbd35ec

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

@@ -1,4 +1,3 @@
-require 'net/scp'
 
 module VagrantPlugins
   module Scp
@@ -17,24 +16,25 @@ module VagrantPlugins
           with_target_vms(host) do |machine|
             @ssh_info = machine.ssh_info
             raise Vagrant::Errors::SSHNotReady if @ssh_info.nil?
-            current_file = nil
-            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],
-                :verbose => 2}
-            ) do |_, name, sent, total|
-              message = "\r#{name}: #{(sent*100.0/total).round(3)}%"
-              message = "\n{message}" unless current_file == name
-              STDOUT.write message
-              current_file = name
+            user_at_host = "#{@ssh_info[:username]}@#{@ssh_info[:host]}"
+            if net_ssh_command == :upload!
+              target = "#{user_at_host}:#{target_files}"
+              source = source_files
+            else
+              target = target_files
+              source = "#{user_at_host}:#{source_files}"
             end
+            command = [
+              "scp",
+              "-r",
+              "-o StrictHostKeyChecking=no",
+              "-o UserKnownHostsFile=/dev/null",
+              "-o port=#{@ssh_info[:port]}",
+              "-i '#{@ssh_info[:private_key_path][0]}'",
+              source,
+              target
+            ].join(' ')
+            system(command)
           end
         end
 

data/lib/vagrant/scp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scp
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Luca Invernizzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler