Merge pull request #210 from mfazekas/allow-number_of_password_promptsv2.9.2.rc2remove-curve25519-sha256-libssh

2.9.2 rc2 - number_of_password_prompts: 0 now can be passed via capistra...

5 files changed, 16 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 3295e7e..a5dad58 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+=== 2.9.2-rc2
+
+* number_of_password_prompts is now accepted as ssh option, by setting it 0 net-ssh will not ask for password for password auth as with previous versions [mfazekas]
+
 === 2.9.2-rc1
 
 * Documentation fixes and refactoring to keepalive [detiber, mfazekas]
diff --git a/lib/net/ssh.rb b/lib/net/ssh.rb
index 9dfbcd0..bf966a0 100644
--- a/lib/net/ssh.rb
+++ b/lib/net/ssh.rb
@@ -68,7 +68,7 @@ module Net
       :rekey_blocks_limit,:rekey_limit, :rekey_packet_limit, :timeout, :verbose,
       :global_known_hosts_file, :user_known_hosts_file, :host_key_alias,
       :host_name, :user, :properties, :passphrase, :keys_only, :max_pkt_size,
-      :max_win_size, :send_env, :use_agent
+      :max_win_size, :send_env, :use_agent, :number_of_password_prompts
     ]
 
     # The standard means of starting a new SSH connection. When used with a
diff --git a/lib/net/ssh/version.rb b/lib/net/ssh/version.rb
index b12b212..7a9df7d 100644
--- a/lib/net/ssh/version.rb
+++ b/lib/net/ssh/version.rb
@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
diff --git a/net-ssh.gemspec b/net-ssh.gemspec
index 9f0129c..8d932cf 100644
--- a/net-ssh.gemspec
+++ b/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 2.9.2.rc1 ruby lib
+# stub: net-ssh 2.9.2.rc2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.9.2.rc1"
+  s.version = "2.9.2.rc2"
 
   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 = "2014-12-24"
+  s.date = "2015-01-03"
   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 = [
diff --git a/test/start/test_options.rb b/test/start/test_options.rb
index b71e891..6f58635 100644
--- a/test/start/test_options.rb
+++ b/test/start/test_options.rb
@@ -31,6 +31,13 @@ module NetSSH
         Net::SSH.start('localhost', 'testuser', options)
       end
     end
+
+    def test_star_should_accept_number_of_password_prompts_option
+      assert_nothing_raised do
+        options = { :number_of_password_prompts => 2 }
+        Net::SSH.start('localhost', 'testuser', options)
+      end
+    end
   end
 end