rack-mux 0.1.1 → 0.1.2

data/lib/rack/mux.rb

@@ -2,7 +2,7 @@ require 'rack'
 
 module Rack
   class Mux
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
     HEADER  = 'X-Mux-Uri'
 
     def initialize(app, options = {})
@@ -20,7 +20,7 @@ module Rack
 
     def rackup
       Thread.new(server_options) do |options|
-        Server.start(server_options)
+        Server.start(options)
       end
 
       wait_for_server
@@ -39,24 +39,26 @@ module Rack
     end
 
     def find_port
-      port = rand(64510) + 1025
-
-      begin
-        TCPSocket.new(@host, port)
-        retry
-      rescue Errno::ECONNREFUSED
-        return port
+      loop do
+        port = rand(64510) + 1025
+        begin
+          TCPSocket.new(@host, port)
+        rescue Errno::ECONNREFUSED
+          return port
+        end
       end
     end
 
     def wait_for_server
       Timeout::timeout(30) do
-        begin
-          return TCPSocket.new(@host, @port)
-        rescue Errno::ECONNREFUSED
-          retry
-        rescue => e
-          raise Error, e.message
+        loop do
+          begin
+            return TCPSocket.new(@host, @port)
+          rescue Errno::ECONNREFUSED
+            sleep 1
+          rescue => e
+            raise Error, e.message
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'timeout'
 require 'rack/mux'
 require 'rack/client'
 require 'json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mux
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ben Burkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 -07:00
+date: 2011-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Multiplex multiple rack servers to the same app.