net-ssh-multi 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 1.0.1 / 1 Feb 2009
+
+* Remove redundant call to block_given? in Session#group [paddor]
+
+* Add Channel#on_open_failed callback hook [Jamis Buck]
+
+
 === 1.0.0 / 1 May 2008
 
 * (no changes since the last preview release)

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

@@ -199,6 +199,20 @@ module Net; module SSH; module Multi
       self
     end
 
+    # Registers a callback on all component channels, to be invoked when the
+    # remote server is unable to open the channel. The callback will be
+    # invoked with three arguments: the channel object that couldn't be
+    # opened, a description of the error (as a string), and an integer code
+    # representing the error.
+    #
+    #   channel.on_open_failed do |ch, description, code|
+    #     # ...
+    #   end
+    def on_open_failed(&block)
+      channels.each { |channel| channel.on_open_failed(&block) }
+      self
+    end
+
     # Registers a callback on all component channels, to be invoked when the
     # remote server sends a channel request of the given +type+. The callback
     # will be invoked with two arguments: the specific channel object receiving

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

@@ -219,7 +219,7 @@ module Net; module SSH; module Multi
         begin
           saved_groups = open_groups.dup
           open_groups.concat(args.map { |a| a.to_sym }).uniq!
-          yield self if block_given?
+          yield self
         ensure
           open_groups.replace(saved_groups)
         end
@@ -481,7 +481,12 @@ module Net; module SSH; module Multi
 
       begin
         server.new_session
-      rescue Exception => e
+
+      # I don't understand why this should be necessary--StandardError is a
+      # subclass of Exception, after all--but without explicitly rescuing
+      # StandardError, things like Errno::* and SocketError don't get caught
+      # here!
+      rescue Exception, StandardError => e
         server.fail!
         @session_mutex.synchronize { @open_connections -= 1 }
 
@@ -543,4 +548,4 @@ module Net; module SSH; module Multi
       end
     end
   end
-end; end; end
+end; end; end

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

@@ -10,7 +10,7 @@ module Net; module SSH; module Multi
     MINOR = 0
 
     # 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

@@ -1,59 +1,39 @@
-
-# Gem::Specification for Net-ssh-multi-1.0.0
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{net-ssh-multi}
-  s.version = "1.0.0"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "1.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-05-01}
+  s.date = %q{2009-02-01}
   s.description = %q{Control multiple Net::SSH connections via a single interface}
   s.email = %q{jamis@jamisbuck.org}
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/ssh/multi/channel.rb", "lib/net/ssh/multi/channel_proxy.rb", "lib/net/ssh/multi/dynamic_server.rb", "lib/net/ssh/multi/pending_connection.rb", "lib/net/ssh/multi/server.rb", "lib/net/ssh/multi/server_list.rb", "lib/net/ssh/multi/session.rb", "lib/net/ssh/multi/session_actions.rb", "lib/net/ssh/multi/subsession.rb", "lib/net/ssh/multi/version.rb", "lib/net/ssh/multi.rb", "README.rdoc"]
   s.files = ["CHANGELOG.rdoc", "lib/net/ssh/multi/channel.rb", "lib/net/ssh/multi/channel_proxy.rb", "lib/net/ssh/multi/dynamic_server.rb", "lib/net/ssh/multi/pending_connection.rb", "lib/net/ssh/multi/server.rb", "lib/net/ssh/multi/server_list.rb", "lib/net/ssh/multi/session.rb", "lib/net/ssh/multi/session_actions.rb", "lib/net/ssh/multi/subsession.rb", "lib/net/ssh/multi/version.rb", "lib/net/ssh/multi.rb", "Manifest", "Rakefile", "README.rdoc", "setup.rb", "test/channel_test.rb", "test/common.rb", "test/multi_test.rb", "test/server_test.rb", "test/session_actions_test.rb", "test/session_test.rb", "test/test_all.rb", "net-ssh-multi.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://net-ssh.rubyforge.org/multi}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-ssh-multi", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh-multi}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{Control multiple Net::SSH connections via a single interface}
   s.test_files = ["test/test_all.rb"]
 
-  s.add_dependency(%q<net-ssh>, [">= 1.99.2"])
-  s.add_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
-end
-
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Net::SSH::Multi's Rakefile"
-# end
-# 
-# require './lib/net/ssh/multi/version'
-# 
-# version = Net::SSH::Multi::Version::STRING.dup
-# if ENV['SNAPSHOT'].to_i == 1
-#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-# end
-# 
-# Echoe.new('net-ssh-multi', version) do |p|
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-#   p.summary          = "Control multiple Net::SSH connections via a single interface"
-#   p.url              = "http://net-ssh.rubyforge.org/multi"
-# 
-#   p.dependencies     = ["net-ssh >=1.99.2", "net-ssh-gateway >=0.99.0"]
-# 
-#   p.need_zip         = true
-#   p.include_rakefile = true
-# 
-#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
-# end
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<net-ssh>, [">= 1.99.2"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 1.99.2"])
+      s.add_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 1.99.2"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 0.99.0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh-multi
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-01 00:00:00 -06:00
+date: 2009-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,14 +32,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.99.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Control multiple Net::SSH connections via a single interface
 email: jamis@jamisbuck.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- CHANGELOG.rdoc
+- lib/net/ssh/multi/channel.rb
+- lib/net/ssh/multi/channel_proxy.rb
+- lib/net/ssh/multi/dynamic_server.rb
+- lib/net/ssh/multi/pending_connection.rb
+- lib/net/ssh/multi/server.rb
+- lib/net/ssh/multi/server_list.rb
+- lib/net/ssh/multi/session.rb
+- lib/net/ssh/multi/session_actions.rb
+- lib/net/ssh/multi/subsession.rb
+- lib/net/ssh/multi/version.rb
+- lib/net/ssh/multi.rb
+- README.rdoc
 files: 
 - CHANGELOG.rdoc
 - lib/net/ssh/multi/channel.rb
@@ -66,8 +90,13 @@ files:
 has_rdoc: true
 homepage: http://net-ssh.rubyforge.org/multi
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Net-ssh-multi
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -80,12 +109,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: net-ssh-multi
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Control multiple Net::SSH connections via a single interface