net-ssh 4.0.0.alpha2 → 4.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b154ee668530e852d2d49b1abd6adabafb36548
-  data.tar.gz: 3575089fbf97251dcf4b5da9f58e4c80756f2c61
+  metadata.gz: 87c438b3e9f663090d5c58e901dbb7fd0ac5d2b1
+  data.tar.gz: b5131b9da9d74e7db8294d621a140d9f3f26d8f3
 SHA512:
-  metadata.gz: 6f36037cc7802c102385c28ce1ae52a59fb8b3604288ad0a5724465ed02536e009ade110fb76ce3cf40a96204556d757a3f53ff005abb535ed9452b607f66306
-  data.tar.gz: 90a90d798b557773ab1cd0398ab6b32128bec55c89feeea5a4cc80a39d2310cdb9f02cbe16cf9fbb7b3924ac9339edba5d96d442aa4f882f9fa81d28106b4ee2
+  metadata.gz: a750f4dee5bd82f5678877da2585fe01784a4c340ee188e9b9f7048b3b3342630149c68d67d7069990e8a818f940bf03e5f7238b902b76b67044a13db05b13ed
+  data.tar.gz: 5c089f3172efd1ca45d4c62101bc623c8e630245dea0c85cb11cc4ce1815f3b618cda431aa89187dec5ddf826a101747dca7114e86585427b4528ae258a2410b

data/.travis.yml

@@ -6,16 +6,16 @@ rvm:
   - 2.2
   - 2.3.0
   - jruby-head
-  - jruby-19mode
-  - rbx-2
-  - rbx-3
+  - rbx-3.20
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-3
+    - rvm: rbx-3.20
 
-install: bundle install
+install:
+  - gem install bundler -v "= 1.11.2"
+  - bundle _1.11.2_ install
 
 script: rake test

data/CHANGES.txt

@@ -1,3 +1,7 @@
+=== 4.0.0.alpha3
+
+* added max_select_wait_time [Eugene Kenny]
+
 === 4.0.0.alpha2
 
 * when transport closes we're cleaning up channels [Miklos Fazekas]

data/README.rdoc

@@ -88,6 +88,8 @@ Lastly, if you want to run the tests or use any of the Rake tasks, you'll need M
 
 * gem install net-ssh (might need sudo privileges)
 
+NOTE: If you are running on jruby on windows you need to install jruby-pageant manually (gemspec doesn't allow for platform specific dependencies).
+
 However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signature[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
 
     # Add the public key as a trusted certificate
@@ -121,9 +123,7 @@ To run integration tests see test/integration/README.txt
 
 === BUILDING GEM
 
-Since building the gem requires the private key if you want to build a .gem locally please use the NET_SSH_BUILDGEM_UNSIGNED=1 envirnoment variable:
-
-     rake build NET_SSH_BUILDGEM_UNSIGNED=1
+     rake build
 
 == LICENSE:
 

data/Rakefile

@@ -12,12 +12,21 @@ require "bundler/gem_tasks"
 
 require "rdoc/task"
 
+
+desc "When releasing make sure NET_SSH_BUILDGEM_SIGNED is set"
+task :check_NET_SSH_BUILDGEM_SIGNED do
+  raise "NET_SSH_BUILDGEM_SIGNED should be set to release" unless ENV['NET_SSH_BUILDGEM_SIGNED']
+end
+
+Rake::Task[:release].enhance [:check_NET_SSH_BUILDGEM_SIGNED]
+Rake::Task[:release].prerequisites.unshift(:check_NET_SSH_BUILDGEM_SIGNED)
+
+
 task :default => ["build"]
 CLEAN.include [ 'pkg', 'rdoc' ]
 name = "net-ssh"
 
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
-require "net/ssh"
+require_relative "lib/net/ssh/version"
 version = Net::SSH::Version::CURRENT
 
 extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
@@ -64,4 +73,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs = ["lib", "test"]
   t.libs << "test/integration" if ENV['NET_SSH_RUN_INTEGRATION_TESTS']
+  test_files = FileList['test/**/test_*.rb']
+  test_files -= FileList['test/integration/**/test_*.rb'] unless ENV['NET_SSH_RUN_INTEGRATION_TESTS']
+  t.test_files =  test_files
 end

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

@@ -462,6 +462,13 @@ module Net; module SSH; module Connection
       end
     end
 
+    # If the #preprocess and #postprocess callbacks for this session need to run
+    # periodically, this method returns the maximum number of seconds which may
+    # pass between callbacks.
+    def max_select_wait_time
+      @keepalive.interval if @keepalive.enabled?
+    end
+
 
     private
 
@@ -622,11 +629,7 @@ module Net; module SSH; module Connection
       end
 
       def io_select_wait(wait)
-        if @keepalive.enabled?
-          [wait, @keepalive.interval].compact.min
-        else
-          wait
-        end
+        [wait, max_select_wait_time].compact.min
       end
 
       MAP = Constants.constants.inject({}) do |memo, name|

data/lib/net/ssh/known_hosts.rb

@@ -7,11 +7,12 @@ module Net; module SSH
 
   # Represents the result of a search in known hosts
   # see search_for
-  class HostKeys < Array
+  class HostKeys
+    include Enumerable
     attr_reader :host
 
     def initialize(host_keys, host, known_hosts, options = {})
-       super(host_keys)
+       @host_keys = host_keys
        @host = host
        @known_hosts = known_hosts
        @options = options
@@ -19,7 +20,15 @@ module Net; module SSH
 
     def add_host_key(key)
        @known_hosts.add(@host, key, @options)
-       push(key)
+       @host_keys.push(key)
+    end
+
+    def each(&block)
+       @host_keys.each(&block)
+    end
+
+    def empty?
+      @host_keys.empty?
     end
   end
 

data/lib/net/ssh/test.rb

@@ -10,10 +10,10 @@ module Net; module SSH
   # typically include this module in your unit test class, and then build a
   # "story" of expected sends and receives:
   #
-  #   require 'test/unit'
+  #   require 'minitest/autorun'
   #   require 'net/ssh/test'
   #
-  #   class MyTest < Test::Unit::TestCase
+  #   class MyTest < Minitest::Test
   #     include Net::SSH::Test
   #
   #     def test_exec_via_channel_works

data/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   = "alpha2"
+    PRE   = "alpha3"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   spec.email         = ["net-ssh@solutious.com"]
 
-  unless ENV['NET_SSH_BUILDGEM_UNSIGNED']
+  if ENV['NET_SSH_BUILDGEM_SIGNED']
     spec.cert_chain = ["net-ssh-public_cert.pem"]
     spec.signing_key = "/mnt/gem/net-ssh-private_key.pem"
   end
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rbnacl", ">= 3.1.2")
   spec.add_runtime_dependency("bcrypt_pbkdf", "= 1.0.0.alpha1") unless RUBY_PLATFORM == "java"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 1.11.2"
   spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha2
+  version: 4.0.0.alpha3
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl-libsodium
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'