net-scp 1.1.2 → 1.2.0

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+=== 1.2.0 / 11 Apr 2014
+
+* Get the error string during download [jkeiser]
+
 === 1.1.2 / 6 Jul 2013
 
 * Explicit convert to string in shellescape [jwils]

data/Rakefile

@@ -30,8 +30,8 @@ begin
 
     s.license = "MIT"
 
-    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
-    s.cert_chain  = ['gem-public_cert.pem']
+    #s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+    #s.cert_chain  = ['gem-public_cert.pem']
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/net/scp.rb

@@ -128,6 +128,11 @@ module Net
   # * E -- terminator directive. Indicates the end of a directory, and subsequent
   #   files and directories should be received by the parent of the current
   #   directory.
+  # * \0 -- indicates a successful response from the other end.
+  # * \1 -- warning directive. Indicates a warning from the other end.  Text from
+  #   this warning will be reported if the SCP results in an error.
+  # * \2 -- error directive.  Indicates an error from the other end.  Text from
+  #   this error will be reported if the SCP results in an error.
   #
   # If a 'C' directive is received, we switch over to
   # Net::SCP::Download#read_data_state. If an 'E' directive is received, and
@@ -355,8 +360,9 @@ module Net
               channel[:buffer  ] = Net::SSH::Buffer.new
               channel[:state   ] = "#{mode}_start"
               channel[:stack   ] = []
+              channel[:error_string] = ''
 
-              channel.on_close                  { |ch| raise Net::SCP::Error, "SCP did not finish successfully (#{ch[:exit]})" if ch[:exit] != 0 }
+              channel.on_close                  { |ch| send("#{channel[:state]}_state", channel); raise Net::SCP::Error, "SCP did not finish successfully (#{channel[:exit]}): #{channel[:error_string]}" if channel[:exit] != 0 }
               channel.on_data                   { |ch, data| channel[:buffer].append(data) }
               channel.on_extended_data          { |ch, type, data| debug { data.chomp } }
               channel.on_request("exit-status") { |ch, data| channel[:exit] = data.read_long }

data/lib/net/scp/download.rb

@@ -37,7 +37,13 @@ module Net; class SCP
 
       directive = parse_directive(line)
       case directive[:type]
-      when :times then
+      when :OK
+        return
+      when :warning
+        channel[:error_string] << directive[:message]
+      when :error
+        channel[:error_string] << directive[:message]
+      when :times
         channel[:times] = directive
       when :directory
         read_directory(channel, directive)
@@ -87,6 +93,15 @@ module Net; class SCP
     # data.
     def parse_directive(text)
       case type = text[0]
+      when "\x00"
+        # Success
+        { :type => :OK }
+      when "\x01"
+        { :type => :warning,
+          :message => text[1..-1] }
+      when "\x02"
+        { :type => :error,
+          :message => text[1..-1] }
       when ?T
         parts = text[1..-1].split(/ /, 4).map { |i| i.to_i }
         { :type  => :times,

data/lib/net/scp/version.rb

@@ -5,8 +5,8 @@ module Net; class SCP
   # Describes the current version of the Net::SCP library.
   class Version < Net::SSH::Version
     MAJOR = 1
-    MINOR = 1
-    TINY  = 2
+    MINOR = 2
+    TINY  = 0
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/lib/uri/open-scp.rb

@@ -2,13 +2,15 @@ require 'open-uri'
 require 'uri/scp'
 require 'net/scp'
 
+OpenURI::Options[:ssh] = nil
+
 module URI
 
   class SCP
     def buffer_open(buf, proxy, open_options)
       options = open_options.merge(:port => port, :password => password)
       progress = options.delete(:progress_proc)
-      buf << Net::SCP.download!(host, user, path, nil, open_options, &progress)
+      buf << Net::SCP.download!(host, user, path, nil, options, &progress)
       buf.io.rewind
     end
 

data/net-scp.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "net-scp"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
-  s.cert_chain = ["gem-public_cert.pem"]
-  s.date = "2013-07-06"
+  s.date = "2014-04-11"
   s.description = "A pure Ruby implementation of the SCP client protocol"
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [
@@ -43,8 +42,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "net-scp"
-  s.rubygems_version = "1.8.25"
-  s.signing_key = "/mnt/gem/gem-private_key.pem"
+  s.rubygems_version = "1.8.23"
   s.summary = "A pure Ruby implementation of the SCP client protocol"
 
   if s.respond_to? :specification_version then

data/test/test_download.rb

@@ -54,6 +54,33 @@ class TestDownload < Net::SCP::TestCase
     assert_equal "a" * 1234, file.io.string
   end
 
+  def test_download_with_error_should_respond_with_error_text
+    story do |session|
+      channel = session.opens_channel
+      channel.sends_exec "scp -f /path/to/remote.txt"
+
+      channel.sends_ok
+      channel.gets_data "\x01File not found: /path/to/remote.txt\n"
+      channel.sends_ok
+
+      channel.gets_eof
+      channel.gets_exit_status(1)
+      channel.gets_close
+      channel.sends_close
+    end
+
+    error = nil
+    assert_scripted do
+      begin
+        scp.download!("/path/to/remote.txt")
+      rescue
+        error = $!
+      end
+    end
+    assert_equal Net::SCP::Error, error.class
+    assert_equal "SCP did not finish successfully (1): File not found: /path/to/remote.txt\n", error.message
+  end
+
   def test_download_with_progress_callback_should_invoke_callback
     prepare_file("/path/to/local.txt", "a" * 3000 + "b" * 3000 + "c" * 3000 + "d" * 3000)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-scp
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,36 +9,8 @@ authors:
 - Delano Mandelbaum
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVE4d0RRWURWUVFEREFaa1pX
-  eGgKYm04eEdUQVhCZ29Ka2lhSmsvSXNaQUVaRmdsemIyeDFkR2x2ZFhNeEV6
-  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOagpiMjB3SGhjTk1UTXdNakEyTVRFMU56
-  UTFXaGNOTVRRd01qQTJNVEUxTnpRMVdqQkJNUTh3RFFZRFZRUUREQVprClpX
-  eGhibTh4R1RBWEJnb0praWFKay9Jc1pBRVpGZ2x6YjJ4MWRHbHZkWE14RXpB
-  UkJnb0praWFKay9Jc1pBRVoKRmdOamIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFF
-  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEZzFoTXRsMFhzTXVVSwpBS1RnWVd2
-  M2dqajd2dUVzRTJFalQrdnlCZzgvTHBxVlZ3WnppaWFlYkpUOUlaaVErc0NG
-  cWJpYWtqMGI1M3BJCmhnMXlPYUJFbUg2L1cwTDdyd3pxYVJWOXNXMWVKczlK
-  eEZZUUNuZDY3elVuemo4bm5SbE9qRytoaElHK1ZzaWoKbnBzR2J0MjhwZWZ1
-  TlpKak81cTJjbEFsZlNuaUlJSGZJc1U3L1N0RVl1NkZVR09qbndyeVowcjV5
-  SmxyOVJyRQpHcytxMERXOFFuWjlVcEFmdURGUVp1SXFlS1FGRkxFN25NbUNH
-  YUErMEJOMW5MbDNmVkhOYkxIcTdBdms4K1orClp1dXZrZHNjYkhsTy9sKzN4
-  Q05RNW5Vbkh3cTBBREFiTUxPbG1pWVl6cVhvV0xqbWVJNm1lL2Nsa3RKQ2ZO
-  MlIKb1pHM1VRdnZBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
-  ME9CQllFRk1TSk9FdEh6RTRsMGF6dgpNMEpLMGtLTlRvSzFNQXNHQTFVZER3
-  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQXRPZEU3M3F4Ck9I
-  MnlkaTlvVDJoUzVmOUcweTFaNzBUbHdoK1ZHRXh5Znh6VkU5WHdDK2lQcEp4
-  TnJhaUhZZ0YvOS9va3k3WloKUjlxMC90Sm5ldWhBZW5aZGlRa1g3b2k0TzN2
-  OXdSUzZZSG9XQnhNUEZLVlJMTlR6dlZKc2JtZnBDQWxwNS81ZwpwczR3UUZ5
-  NW1pYkVsR1ZsT29iZi9naHFaMjVIUzlKNmtkMC9DL3J5MEFVdFRvZ3NMN1R4
-  R3dUNGtiQ3g2M3ViCjN2eXdFRWhzSlV6ZmQ5N0dDQUJtdFFmUlRsZFgvajdG
-  MXovNXdkOHAraGZkb3gxaWliZHM5WnRmYVpBM0t6S24Ka2NoV045QjZ6Zzly
-  MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
-  NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
-  LS0tLS0K
-date: 2013-07-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -137,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: net-scp
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A pure Ruby implementation of the SCP client protocol

metadata.gz.sig

@@ -1 +0,0 @@
-��2��=�C��r�K��C�6x�+�?[k�3��j�&����Uz�_V�.lm?ЁDgӕhW�'�?O��j�_ƃP�&q�ģ֣ �Z�M�)+��Y|���Ф���O@!��	w/’_[dxq/���|�=�:I���R�ѷ�h�������d�+dZ�4[ݣ���$g&��{�X)�>�ۓ2ҡ���;U��W��QqA��Ƕ!}j��7-�`(��Y�ʢ�ՕnpE~4�����<x�+R��{r6��D���