net-ssh-gateway 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.1 / 1 Feb 2009
+
+* Allow local port to be specified [Will Klancnik]
+
 === 1.0.0 / 1 May 2008
 
 * (no changes since the preview release)

data/lib/net/ssh/gateway.rb

@@ -43,7 +43,7 @@ class Net::SSH::Gateway
     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)
@@ -111,25 +111,28 @@ class Net::SSH::Gateway
   #   port = gateway.open('host', 80)
   #   # ...
   #   gateway.close(port)
-  def open(host, port)
+  #
+  # If +local_port+ is not specified, the next available port will be used.
+  def open(host, port, local_port=nil)
     ensure_open!
 
-    local_port = next_port
+    actual_local_port = local_port || next_port
 
     @session_mutex.synchronize do
-      @session.forward.local(local_port, host, port)
+      @session.forward.local(actual_local_port, host, port)
     end
 
     if block_given?
       begin
-        yield local_port
+        yield actual_local_port
       ensure
-        close(local_port)
+        close(actual_local_port)
       end
     else
-      return local_port
+      return actual_local_port
     end
   rescue Errno::EADDRINUSE
+    raise if local_port # if a local port was explicitly requested, bubble the error up
     retry
   end
 
@@ -186,7 +189,9 @@ class Net::SSH::Gateway
 
       @thread = Thread.new do
         while @active
-          @session_mutex.synchronize { @session.process(0.1) }
+          @session_mutex.synchronize do
+            @session.process(0.1)
+          end
         end
       end
     end
@@ -200,4 +205,4 @@ class Net::SSH::Gateway
         port
       end
     end
-end
+end

data/net-ssh-gateway.gemspec

@@ -1,58 +1,36 @@
-
-# Gem::Specification for Net-ssh-gateway-1.0.0
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{net-ssh-gateway}
-  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{A simple library to assist in establishing tunneled Net::SSH connections}
   s.email = %q{jamis@jamisbuck.org}
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/ssh/gateway.rb", "README.rdoc"]
   s.files = ["CHANGELOG.rdoc", "lib/net/ssh/gateway.rb", "Manifest", "Rakefile", "README.rdoc", "setup.rb", "test/gateway_test.rb", "net-ssh-gateway.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://net-ssh.rubyforge.org/gateway}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-ssh-gateway", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh-gateway}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{A simple library to assist in establishing tunneled Net::SSH connections}
   s.test_files = ["test/gateway_test.rb"]
 
-  s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
-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):
-# 
-# require './lib/net/ssh/gateway'
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Net::SSH::Gateway's Rakefile"
-# end
-# 
-# version = Net::SSH::Gateway::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-gateway', version) do |p|
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-#   p.summary          = "A simple library to assist in establishing tunneled Net::SSH connections"
-#   p.url              = "http://net-ssh.rubyforge.org/gateway"
-# 
-#   p.dependencies     = ["net-ssh >=1.99.1"]
-# 
-#   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.1"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/test/gateway_test.rb

@@ -27,6 +27,12 @@ class GatewayTest < Test::Unit::TestCase
     assert_equal [65000, "app1", 22], gateway_session.forward.active_locals[65000]
   end
 
+  def test_open_with_explicit_local_port_should_use_that_port
+    gateway_session, gateway = new_gateway
+    assert_equal 8181, gateway.open("app1", 22, 8181)
+    assert_equal [8181, "app1", 22], gateway_session.forward.active_locals[8181]
+  end
+
   def test_ssh_should_return_connection_when_no_block_is_given
     gateway_session, gateway = new_gateway
     expect_connect_to("127.0.0.1", "user", :port => 65535).returns(result = mock("session"))
@@ -113,4 +119,4 @@ class GatewayTest < Test::Unit::TestCase
         @looping = false
       end
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh-gateway
 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: 
@@ -21,14 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.99.1
     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: A simple library to assist in establishing tunneled Net::SSH connections
 email: jamis@jamisbuck.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- CHANGELOG.rdoc
+- lib/net/ssh/gateway.rb
+- README.rdoc
 files: 
 - CHANGELOG.rdoc
 - lib/net/ssh/gateway.rb
@@ -41,8 +54,13 @@ files:
 has_rdoc: true
 homepage: http://net-ssh.rubyforge.org/gateway
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Net-ssh-gateway
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -55,12 +73,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: net-ssh-gateway
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A simple library to assist in establishing tunneled Net::SSH connections