net-ssh 3.0.0.rc1 → 3.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b946a2c8c50c7f415772cd795bfb22b32a580a
-  data.tar.gz: 88229af4861f293ed5e20209f60cc65d879cb2d6
+  metadata.gz: 3d164d026393607b9458300322c53263a7ec5177
+  data.tar.gz: 3e413fdc16491481a5409b5f9d372d40c5092382
 SHA512:
-  metadata.gz: 73111c96b59044bc841bcd2e16adaaabb6b0778a25754ddf461eec4bcd3fd26bc57ed3ed19bcf29f6978cb88022eaf9098774891a60f2c5f2234d20372ddf0d5
-  data.tar.gz: 4f62ed4e65be39045f14f8f53608e03f977a674deeb13bcf2ce5a0fe81777dfe90f1f5d31d6b62eb22af38cf06d977708dc0d03ef38232915ac4a0514333de82
+  metadata.gz: 3f502d0b2b3b64c5b99a36ebc05c0b8c4e894264809f10fd60ee46ac30254ef26332fde43ba48975c997f74fb2401f028e301cb9ff6f3fbfe0285a3583d403ca
+  data.tar.gz: 3542a91dfa1c82d56c3f4364582733f3ffe571eb46ef56599b78e677a8fc06e865ab27ca825892b52d8bf39d4f6d53fbc1c8fa2399cd2728da5a4b95506263a3

data.tar.gz.sig

@@ -1,2 +1,2 @@
-q5�*W�R[�-9��V�����2s�bC�G�ג��
-�v�rgz�]�����^������icx���$�����Z4��@�;="������a\��&8�gާ�wH
x
+u���8�
++d���frN�D
�Eb[t�E��z"�F�q/�Vt!y)�e��;/JC�yv�{β�K�2%�i���ᑓ�y�߫2i3[,��wE

data/CHANGES.txt

@@ -1,3 +1,9 @@
+=== 3.0.1.rc1
+
+* Breaking change from 2.* series: exec! without block now returns empty string instread of nil if command has no output [https://github.com/net-ssh/net-ssh/pull/273]
+* Support remote_user as %r in proxy commands [Dominic Scheirlinck]
+* Raise Net::SSH::ConnectionTimeout from connection timeout [Carl Hoerberg]
+
 === 3.0.0.rc1
 
 * SemVer: Major version change because of dropping of ruby 1.9

data/lib/net/ssh.rb

@@ -62,7 +62,7 @@ module Net
     # Net::SSH.start for a description of each option.
     VALID_OPTIONS = [
       :auth_methods, :bind_address, :compression, :compression_level, :config,
-      :encryption, :forward_agent, :hmac, :host_key,
+      :encryption, :forward_agent, :hmac, :host_key, :remote_user,
       :keepalive, :keepalive_interval, :keepalive_maxcount, :kex, :keys, :key_data,
       :languages, :logger, :paranoid, :password, :port, :proxy,
       :rekey_blocks_limit,:rekey_limit, :rekey_packet_limit, :timeout, :verbose,
@@ -169,6 +169,7 @@ module Net
     # * :user => the user name to log in as; this overrides the +user+
     #   parameter, and is primarily only useful when provided via an SSH
     #   configuration file.
+    # * :remote_user => used for substitution into the '%r' part of a ProxyCommand
     # * :user_known_hosts_file => the location of the user known hosts file.
     #   Set to an array to specify multiple user known hosts files.
     #   Defaults to %w(~/.ssh/known_hosts ~/.ssh/known_hosts2).

data/lib/net/ssh/connection/session.rb

@@ -351,19 +351,21 @@ module Net; module SSH; module Connection
     end
 
     # Same as #exec, except this will block until the command finishes. Also,
-    # if a block is not given, this will return all output (stdout and stderr)
+    # if no block is given, this will return all output (stdout and stderr)
     # as a single string.
     #
     #   matches = ssh.exec!("grep something /some/files")
     def exec!(command, &block)
-      block ||= Proc.new do |ch, type, data|
+      block_or_concat = block || Proc.new do |ch, type, data|
         ch[:result] ||= ""
         ch[:result] << data
       end
 
-      channel = exec(command, &block)
+      channel = exec(command, &block_or_concat)
       channel.wait
 
+      channel[:result] ||= "" unless block
+
       return channel[:result]
     end
 

data/lib/net/ssh/transport/session.rb

@@ -85,6 +85,8 @@ module Net; module SSH; module Transport
 
       @algorithms = Algorithms.new(self, options)
       wait { algorithms.initialized? }
+    rescue Errno::ETIMEDOUT
+      raise Net::SSH::ConnectionTimeout
     end
 
     # Returns the host (and possibly IP address) in a format compatible with

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 0
+    TINY  = 1
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.0.0.rc1 ruby lib
+# stub: net-ssh 3.0.1.rc1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.0.0.rc1"
+  s.version = "3.0.1.rc1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2015-09-14"
+  s.date = "2015-09-19"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [
@@ -134,6 +134,7 @@ Gem::Specification.new do |s|
     "test/configs/negative_match",
     "test/configs/nohost",
     "test/configs/numeric_host",
+    "test/configs/proxy_remote_user",
     "test/configs/send_env",
     "test/configs/substitutes",
     "test/configs/wild_cards",

data/test/configs/proxy_remote_user

@@ -0,0 +1,2 @@
+Host behind-proxy
+  ProxyCommand ssh %r@proxy -W %h:%p

data/test/connection/test_session.rb

@@ -473,6 +473,11 @@ module Connection
       assert_equal "some data", session.exec!("ls")
     end
 
+    def test_exec_bang_without_block_should_return_empty_string_for_empty_command_output
+      prep_exec('ls', :stdout, '')
+      assert_equal "", session.exec!('ls')
+    end
+
     private
 
       def prep_exec(command, *data)
@@ -488,10 +493,8 @@ module Connection
 
             t2.return(CHANNEL_SUCCESS, :long, p[:remote_id])
 
-            0.step(data.length-1, 2) do |index|
-              type = data[index]
-              datum = data[index+1]
-
+            data.each_slice(2) do |type, datum|
+              next if datum.empty?
               if type == :stdout
                 t2.return(CHANNEL_DATA, :long, p[:remote_id], :string, datum)
               else

data/test/start/test_options.rb

@@ -45,6 +45,13 @@ module NetSSH
         Net::SSH.start('localhost', 'testuser', options)
       end
     end
+
+    def test_start_should_accept_remote_user_option
+      assert_nothing_raised do
+        options = { :remote_user => 'foo' }
+        Net::SSH.start('localhost', 'testuser', options)
+      end
+    end
   end
 end
 

data/test/test_config.rb

@@ -213,6 +213,12 @@ class TestConfig < Test::Unit::TestCase
     assert_equal [/^GIT_.*$/, /^LANG$/, /^LC_.*$/], net_ssh[:send_env]
   end
 
+  def test_load_with_remote_user
+    config = Net::SSH::Config.load(config(:proxy_remote_user), "behind-proxy")
+    net_ssh = Net::SSH::Config.translate(config)
+    assert net_ssh[:proxy]
+  end
+
   private
 
     def config(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.1.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   MbvRpzgROzyfw1qYi4dnIyMwTtXFFcZ0a2jpxHPkcTYFK6TzvFgDLAP0Y/u9jqUQ
   eZ7/3CdSi/isZHEw
   -----END CERTIFICATE-----
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -185,6 +185,7 @@ files:
 - test/configs/negative_match
 - test/configs/nohost
 - test/configs/numeric_host
+- test/configs/proxy_remote_user
 - test/configs/send_env
 - test/configs/substitutes
 - test/configs/wild_cards