net-ssh-multi 1.2.0 → 1.2.1

data/CHANGES.txt

@@ -1,4 +1,10 @@
 
+=== 1.2.1 / 11 Apr 2015
+
+* Fix two problems with :concurrent_connections option (#4) [sersut]
+* Replaced test-unit with minitest [juliandunn]
+
+
 === 1.2.0 / 06 Feb 2013
 
 * Added public cert. All gem releases are now signed. See INSTALL in readme.

data/Rakefile

@@ -26,7 +26,7 @@ begin
     s.add_dependency 'net-ssh', ">=2.6.5"
     s.add_dependency 'net-ssh-gateway', ">=1.2.0"
 
-    s.add_development_dependency 'test-unit'
+    s.add_development_dependency 'minitest'
     s.add_development_dependency 'mocha'
 
     s.license = "MIT"

data/lib/net/ssh/multi/server.rb

@@ -140,8 +140,9 @@ module Net; module SSH; module Multi
 
     # Returns +true+ if the session has been opened, and the session is currently
     # busy (as defined by Net::SSH::Connection::Session#busy?).
+    # Also returns false if the server has failed to connect.
     def busy?(include_invisible=false)
-      session && session.busy?(include_invisible)
+      !failed? && session && session.busy?(include_invisible)
     end
 
     # Closes this server's session. If the session has not yet been opened,
@@ -228,4 +229,4 @@ module Net; module SSH; module Multi
         session.postprocess(listeners & readers, listeners & writers)
       end
   end
-end; end; end
+end; end; end

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

@@ -476,7 +476,12 @@ module Net; module SSH; module Multi
           return connection
         end
 
-        @open_connections += 1
+        # Only increment the open_connections count if the connection
+        # is not being forced. Incase of a force, it will already be
+        # incremented.
+        if !force
+          @open_connections += 1
+        end
       end
 
       begin
@@ -542,6 +547,10 @@ module Net; module SSH; module Multi
       count = concurrent_connections ? (concurrent_connections - open_connections) : @pending_sessions.length
       count.times do
         session = @pending_sessions.pop or break
+        # Increment the open_connections count here to prevent
+        # creation of connection thread again before that is
+        # incremented by the thread.
+        @session_mutex.synchronize { @open_connections += 1 }
         @connect_threads << Thread.new do
           session.replace_with(next_session(session.server, true))
         end

data/lib/net/ssh/multi/version.rb

@@ -10,7 +10,7 @@ module Net; module SSH; module Multi
     MINOR = 2
 
     # The tiny component of the library's version
-    TINY  = 0
+    TINY  = 1
 
     # The library's version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh-multi.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "net-ssh-multi"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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-02-06"
+  s.date = "2015-04-11"
   s.description = "Control multiple Net::SSH connections via a single interface."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "net-ssh-multi"
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.signing_key = "/mnt/gem/gem-private_key.pem"
   s.summary = "Control multiple Net::SSH connections via a single interface."
 
@@ -57,18 +57,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5"])
       s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
       s.add_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
     s.add_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end

data/test/channel_test.rb

@@ -1,7 +1,7 @@
 require 'common'
 require 'net/ssh/multi/channel'
 
-class ChannelTest < Test::Unit::TestCase
+class ChannelTest < Minitest::Test
   def test_each_should_iterate_over_each_component_channel
     channels = [c1 = mock('channel'), c2 = mock('channel'), c3 = mock('channel')]
     channel = Net::SSH::Multi::Channel.new(mock('session'), channels)
@@ -149,4 +149,4 @@ class ChannelTest < Test::Unit::TestCase
         end
       end
     end
-end
+end

data/test/common.rb

@@ -1,2 +1,9 @@
-require 'test/unit'
-require 'mocha'
+require 'minitest/autorun'
+require 'mocha/setup'
+
+if Minitest.const_defined?('Test')
+  # We're on Minitest 5+. Nothing to do here.
+else
+  # Minitest 4 doesn't have Minitest::Test yet.
+  Minitest::Test = MiniTest::Unit::TestCase
+end

data/test/multi_test.rb

@@ -1,7 +1,7 @@
 require 'common'
 require 'net/ssh/multi'
 
-class MultiTest < Test::Unit::TestCase
+class MultiTest < Minitest::Test
   def test_start_with_block_should_yield_session_and_then_close
     Net::SSH::Multi::Session.any_instance.expects(:loop)
     Net::SSH::Multi::Session.any_instance.expects(:close)
@@ -17,4 +17,4 @@ class MultiTest < Test::Unit::TestCase
     Net::SSH::Multi::Session.any_instance.expects(:close).never
     assert_instance_of Net::SSH::Multi::Session, Net::SSH::Multi.start
   end
-end
+end

data/test/server_test.rb

@@ -1,7 +1,7 @@
 require 'common'
 require 'net/ssh/multi/server'
 
-class ServerTest < Test::Unit::TestCase
+class ServerTest < Minitest::Test
   def setup
     @master = stub('multi-session', :default_user => "bob")
   end
@@ -50,7 +50,7 @@ class ServerTest < Test::Unit::TestCase
     s1 = server('user@host1:1234')
     s2 = server('user@host2:1234')
     assert !s1.eql?(s2)
-    assert_not_equal s1.hash, s2.hash
+    refute_equal s1.hash, s2.hash
     assert s1 != s2
   end
 
@@ -58,7 +58,7 @@ class ServerTest < Test::Unit::TestCase
     s1 = server('user@host:1234')
     s2 = server('user@host:1235')
     assert !s1.eql?(s2)
-    assert_not_equal s1.hash, s2.hash
+    refute_equal s1.hash, s2.hash
     assert s1 != s2
   end
 
@@ -66,7 +66,7 @@ class ServerTest < Test::Unit::TestCase
     s1 = server('user1@host:1234')
     s2 = server('user2@host:1234')
     assert !s1.eql?(s2)
-    assert_not_equal s1.hash, s2.hash
+    refute_equal s1.hash, s2.hash
     assert s1 != s2
   end
 
@@ -112,7 +112,7 @@ class ServerTest < Test::Unit::TestCase
   end
 
   def test_close_channels_when_session_is_not_open_should_not_do_anything
-    assert_nothing_raised { server('host').close_channels }
+    server('host').close_channels
   end
 
   def test_close_channels_when_session_is_open_should_iterate_over_open_channels_and_close_them
@@ -127,7 +127,7 @@ class ServerTest < Test::Unit::TestCase
   end
 
   def test_close_when_session_is_not_open_should_not_do_anything
-    assert_nothing_raised { server('host').close }
+    server('host').close
   end
 
   def test_close_when_session_is_open_should_close_session
@@ -253,4 +253,4 @@ class ServerTest < Test::Unit::TestCase
       @master.expects(:next_session).with(server).returns(session)
       return session
     end
-end
+end

data/test/session_actions_test.rb

@@ -2,7 +2,7 @@ require 'common'
 require 'net/ssh/multi/server'
 require 'net/ssh/multi/session_actions'
 
-class SessionActionsTest < Test::Unit::TestCase
+class SessionActionsTest < Minitest::Test
   class SessionActionsContainer
     include Net::SSH::Multi::SessionActions
 
@@ -125,4 +125,4 @@ class SessionActionsTest < Test::Unit::TestCase
     assert_equal 127, c[:exit_status]
   end
 
-end
+end

data/test/session_test.rb

@@ -1,7 +1,7 @@
 require 'common'
 require 'net/ssh/multi/session'
 
-class SessionTest < Test::Unit::TestCase
+class SessionTest < Minitest::Test
   def setup
     @session = Net::SSH::Multi::Session.new
   end
@@ -198,4 +198,4 @@ class SessionTest < Test::Unit::TestCase
     IO.expects(:select).with([:a, :b, :c], [:a, :c], nil, 5).returns([[:b, :c], [:a, :c]])
     @session.process(5)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-multi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
   NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: net-ssh-multi
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Control multiple Net::SSH connections via a single interface.