prepare 2.9.2 beta build

5 files changed, 36 insertions, 17 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 64332ec..02f7e2b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,9 @@
-=== 2.9.2
+=== 2.9.2-beta
 
 * Remove advertised algorithms that were not working (ssh-rsa-cert-* *ed25519 acm*-gcm@openssh.com) [mfazekas]
 * Unkown algorithms now ignored instead of failed [mfazekas]
+* Asks for password with password auth (up to number_of_password_prompts) [mfazekas]
+* Removed warnings [amatsuda]
 
 === 2.9.1 / 13 May 2014
 
diff --git a/README.rdoc b/README.rdoc
index f7fd02e..a2c7525 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -171,6 +171,11 @@ Run a single test file like this:
 
 * JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
 
+=== BUILDING GEM
+
+Since building the gem requires the private key if you want to build a .gem locally please use the NET_SSH_NOKEY=1 envirnoment variable:
+
+     rake -T build NET_SSH_NOKEY=1
 
 === PORT FORWARDING TESTS
 
diff --git a/Rakefile b/Rakefile
index 0ab4c2f..54354fc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -34,10 +34,16 @@ begin
 
     s.license = "MIT"
 
-    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
-    s.cert_chain  = ['gem-public_cert.pem']
+    unless ENV['NET_SSH_NOKEY']
+      signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+      s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+      s.cert_chain  = ['gem-public_cert.pem']
+      unless (Rake.application.top_level_tasks & ['build','install']).empty?
+        raise "No key found at #{signing_key} for signing, use rake <taskname> NET_SSH_NOKEY=1 to build without key" unless File.exist?(signing_key)
+      end
+    end
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
diff --git a/lib/net/ssh/version.rb b/lib/net/ssh/version.rb
index b802f28..3f96132 100644
--- a/lib/net/ssh/version.rb
+++ b/lib/net/ssh/version.rb
@@ -16,15 +16,15 @@ module Net; module SSH
 
     # A convenience method for instantiating a new Version instance with the
     # given +major+, +minor+, and +tiny+ components.
-    def self.[](major, minor, tiny)
-      new(major, minor, tiny)
+    def self.[](major, minor, tiny, pre = nil)
+      new(major, minor, tiny, pre)
     end
 
     attr_reader :major, :minor, :tiny
 
     # Create a new Version object with the given components.
-    def initialize(major, minor, tiny)
-      @major, @minor, @tiny = major, minor, tiny
+    def initialize(major, minor, tiny, pre = nil)
+      @major, @minor, @tiny, @pre = major, minor, tiny, pre
     end
 
     # Compare this version to the given +version+ object.
@@ -35,7 +35,7 @@ module Net; module SSH
     # Converts this version object to a string, where each of the three
     # version components are joined by the '.' character. E.g., 2.0.0.
     def to_s
-      @to_s ||= [@major, @minor, @tiny].join(".")
+      @to_s ||= [@major, @minor, @tiny, @pre].compact.join(".")
     end
 
     # Converts this version to a canonical integer that may be compared
@@ -51,10 +51,14 @@ module Net; module SSH
     MINOR = 9
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 1
+    TINY  = 2
+
+    # The prerelease component of this version of the Net::SSH library 
+    # nil allowed
+    PRE   = "beta"
 
     # The current version of the Net::SSH library as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
+    CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
 
     # The current version of the Net::SSH library as a String
     STRING = CURRENT.to_s
diff --git a/net-ssh.gemspec b/net-ssh.gemspec
index edbbeaa..99ea38d 100644
--- a/net-ssh.gemspec
+++ b/net-ssh.gemspec
@@ -2,15 +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.beta ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.9.1"
+  s.version = "2.9.2.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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"]
   s.cert_chain = ["gem-public_cert.pem"]
-  s.date = "2014-05-13"
+  s.date = "2014-12-02"
   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 = [
@@ -46,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/net/ssh/config.rb",
     "lib/net/ssh/connection/channel.rb",
     "lib/net/ssh/connection/constants.rb",
+    "lib/net/ssh/connection/keepalive.rb",
     "lib/net/ssh/connection/session.rb",
     "lib/net/ssh/connection/term.rb",
     "lib/net/ssh/errors.rb",
@@ -177,14 +180,13 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/net-ssh/net-ssh"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = "net-ssh"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.signing_key = "/mnt/gem/gem-private_key.pem"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<test-unit>, [">= 0"])