puma 1.4.0 → 1.5.0

data/.travis.yml

@@ -1,3 +1,8 @@
+language: ruby
+
+jdk:
+  - oraclejdk7
+
 rvm:
   - 1.8.7
   - 1.9.3

data/History.txt

@@ -1,3 +1,27 @@
+=== 1.5.0 / 2012-07-19
+
+* 7 contributers to this release:
+  * Christian Mayer
+  * Darío Javier Cravero
+  * Dirkjan Bussink
+  * Gianluca Padovani
+  * Santiago Pastorino
+  * Thibault Jouan
+  * tomykaira
+
+* 6 bug fixes:
+  * Define RSTRING_NOT_MODIFIED for Rubinius
+  * Convert status to integer. Fixes #123
+  * Delete pidfile when stopping the server
+  * Allow compilation with -Werror=format-security option
+  * Fix wrong HTTP version for a HTTP/1.0 request
+  * Use String#bytesize instead of String#length
+
+* 3 minor features:
+  * Added support for setting RACK_ENV via the CLI, config file, and rack app
+  * Allow Server#run to run sync. Fixes #111
+  * Puma can now run on windows
+
 === 1.4.0 / 2012-06-04
 
 * 1 bug fix:

data/README.md

@@ -45,7 +45,7 @@ First, make sure Puma is in your Gemfile:
 
 Then start your server with the `rails` command:
 
-    $ rails s puma
+    $ rails s Puma
 
 ### Rackup
 

data/Rakefile

@@ -30,7 +30,7 @@ HOE.spec.files -= [".gemtest"]
 
 # puma.gemspec
 
-file "#{HOE.spec.name}.gemspec" => ['Rakefile'] do |t|
+file "#{HOE.spec.name}.gemspec" => ['Rakefile', "lib/puma/const.rb"] do |t|
   puts "Generating #{t.name}"
   File.open(t.name, 'wb') { |f| f.write HOE.spec.to_ruby }
 end

data/ext/puma_http11/ext_help.h

@@ -1,9 +1,9 @@
 #ifndef ext_help_h
 #define ext_help_h
 
-#define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "NULL found for " # T " when shouldn't be.");
+#define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "%s", "NULL found for " # T " when shouldn't be.");
 #define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name);
-#define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T);
+#define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "%s", "Wrong argument type for " # V " required " # T);
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
 #ifdef DEBUG

data/ext/puma_http11/puma_http11.c

@@ -2,6 +2,9 @@
  * Copyright (c) 2005 Zed A. Shaw
  * You can redistribute it and/or modify it under the same terms as Ruby.
  */
+
+#define RSTRING_NOT_MODIFIED 1
+
 #include "ruby.h"
 #include "ext_help.h"
 #include <assert.h>
@@ -38,7 +41,7 @@ static VALUE global_request_path;
 #define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N  " is longer than the " # length " allowed length."
 
 /** Validates the max length of given input and throws an HttpParserError exception if over. */
-#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, MAX_##N##_LENGTH_ERR); }
+#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, "%s", MAX_##N##_LENGTH_ERR); }
 
 /** Defines global strings in the init method. */
 #define DEF_GLOBAL(N, val)   global_##N = rb_str_new2(val); rb_global_variable(&global_##N)
@@ -377,7 +380,7 @@ VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
 
   if(from >= dlen) {
     rb_free_chars(dptr);
-    rb_raise(eHttpParserError, "Requested start is after data buffer end.");
+    rb_raise(eHttpParserError, "%s", "Requested start is after data buffer end.");
   } else {
     http->request = req_hash;
     http_parser_execute(http, dptr, dlen, from);
@@ -386,7 +389,7 @@ VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
     VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
 
     if(http_parser_has_error(http)) {
-      rb_raise(eHttpParserError, "Invalid HTTP format, parsing fails.");
+      rb_raise(eHttpParserError, "%s", "Invalid HTTP format, parsing fails.");
     } else {
       return INT2FIX(http_parser_nread(http));
     }

data/lib/puma/app/status.rb

@@ -41,7 +41,7 @@ module Puma
         when "/stats"
           b = @server.backlog
           r = @server.running
-            return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)
+          return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)
         end
 
         rack_response 404, "Unsupported action", 'text/plain'

data/lib/puma/cli.rb

@@ -31,7 +31,6 @@ module Puma
       @status = nil
 
       @restart = false
-      @temp_status_path = nil
 
       @listeners = []
 
@@ -53,17 +52,10 @@ module Puma
       remove.each do |k|
         ENV.delete k
       end
-
-      ENV['RACK_ENV'] ||= "development"
     end
 
     def restart_on_stop!
-      if @restart_argv
-        @restart = true
-        return true
-      else
-        return false
-      end
+      @restart = true
     end
 
     def generate_restart_data
@@ -137,17 +129,16 @@ module Puma
       end
     end
 
-    # Write +str+ to +@stdout+
+    # Delegate +log+ to +@events+
     #
     def log(str)
-      @stdout.puts str
+      @events.log str
     end
 
-    # Write +str+ to +@stderr+
+    # Delegate +error+ to +@events+
     #
     def error(str)
-      @stderr.puts "ERROR: #{str}"
-      exit 1
+      @events.error str
     end
 
     # Build the OptionParser object to handle the available options.
@@ -220,6 +211,11 @@ module Puma
              "Default: inferred" do |cmd|
           @options[:restart_cmd] = cmd
         end
+
+        o.on "-e", "--environment ENVIRONMENT",
+             "The environment to run the Rack app on (default development)" do |arg|
+          @options[:environment] = arg
+        end
       end
 
       @parser.banner = "puma <options> <rackup file>"
@@ -241,6 +237,21 @@ module Puma
       end
     end
 
+    def set_rack_environment 
+      # Try the user option first, then the environment variable,
+      # finally default to development
+
+      ENV['RACK_ENV'] = @options[:environment] ||
+                        ENV['RACK_ENV'] ||
+                        'development'
+    end
+
+    def delete_pidfile
+      if path = @options[:pidfile]
+        File.unlink path
+      end
+    end
+
     def write_state
       require 'yaml'
 
@@ -268,13 +279,12 @@ module Puma
 
       @config = Puma::Configuration.new @options
       @config.load
-
-      @temp_status_path = @options[:control_path_temp]
     end
 
     def graceful_stop(server)
       log " - Gracefully stopping, waiting for requests to finish"
       server.stop(true)
+      delete_pidfile
       log " - Goodbye!"
     end
 
@@ -284,6 +294,8 @@ module Puma
     def run
       parse_options
 
+      set_rack_environment
+
       app = @config.app
 
       write_pid
@@ -298,6 +310,7 @@ module Puma
 
       log "Puma #{Puma::Const::PUMA_VERSION} starting..."
       log "* Min threads: #{min_t}, max threads: #{max_t}"
+      log "* Environment: #{ENV['RACK_ENV']}"
 
       @options[:binds].each do |str|
         uri = URI.parse str
@@ -419,14 +432,22 @@ module Puma
         @status = status
       end
 
-      Signal.trap "SIGUSR2" do
-        @restart = true
-        server.begin_restart
+      begin
+        Signal.trap "SIGUSR2" do
+          @restart = true
+          server.begin_restart
+        end
+      rescue Exception
+        log "*** Sorry signal SIGUSR2 not implemented, restart feature disabled!"
       end
 
-      Signal.trap "SIGTERM" do
-        log " - Gracefully stopping, waiting for requests to finish"
-        server.stop false
+      begin
+        Signal.trap "SIGTERM" do
+          log " - Gracefully stopping, waiting for requests to finish"
+          server.stop false
+        end
+      rescue Exception
+        log "*** Sorry signal SIGTERM not implemented, gracefully stopping feature disabled!"
       end
 
       log "Use Ctrl-C to stop"
@@ -437,8 +458,6 @@ module Puma
         graceful_stop server
       end
 
-      File.unlink @temp_status_path if @temp_status_path
-
       if @restart
         log "* Restarting..."
         @status.stop true if @status
@@ -448,6 +467,7 @@ module Puma
 
     def stop
       @server.stop(true) if @server
+      delete_pidfile
     end
   end
 end

data/lib/puma/configuration.rb

@@ -208,6 +208,11 @@ module Puma
       def state_path(path)
         @options[:state] = path.to_s
       end
+
+      # Set the environment in which the Rack's app will run.
+      def environment(environment)
+        @options[:environment] = environment
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -25,7 +25,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.4.0".freeze
+    PUMA_VERSION = VERSION = "1.5.0".freeze
 
     # The default number of seconds for another request within a persistent
     # session.

data/lib/puma/events.rb

@@ -20,6 +20,19 @@ module Puma
 
     attr_reader :stdout, :stderr
 
+    # Write +str+ to +@stdout+
+    #
+    def log(str)
+      @stdout.puts str
+    end
+
+    # Write +str+ to +@stderr+
+    #
+    def error(str)
+      @stderr.puts "ERROR: #{str}"
+      exit 1
+    end
+
     # An HTTP parse error has occured.
     # +server+ is the Server object, +env+ the request, and +error+ a
     # parsing exception.

data/lib/puma/server.rb

@@ -185,10 +185,13 @@ module Puma
       @thread_pool and @thread_pool.spawned
     end
 
-    # Runs the server.  It returns the thread used so you can join it.
-    # The thread is always available via #thread to be join'd
+    # Runs the server.
     #
-    def run
+    # If +background+ is true (the default) then a thread is spun
+    # up in the background to handle requests. Otherwise requests
+    # are handled synchronously.
+    #
+    def run(background=true)
       BasicSocket.do_not_reverse_lookup = true
 
       @status = :run
@@ -201,40 +204,45 @@ module Puma
         @thread_pool.auto_trim!(@auto_trim_time)
       end
 
-      @thread = Thread.new do
-        begin
-          check = @check
-          sockets = @ios
-          pool = @thread_pool
-
-          while @status == :run
-            begin
-              ios = IO.select sockets
-              ios.first.each do |sock|
-                if sock == check
-                  break if handle_check
-                else
-                  pool << [sock.accept, @envs.fetch(sock, @proto_env)]
-                end
+      if background
+        @thread = Thread.new { handle_servers }
+        return @thread
+      else
+        handle_servers
+      end
+    end
+
+    def handle_servers
+      begin
+        check = @check
+        sockets = @ios
+        pool = @thread_pool
+
+        while @status == :run
+          begin
+            ios = IO.select sockets
+            ios.first.each do |sock|
+              if sock == check
+                break if handle_check
+              else
+                pool << [sock.accept, @envs.fetch(sock, @proto_env)]
               end
-            rescue Errno::ECONNABORTED
-              # client closed the socket even before accept
-              client.close rescue nil
-            rescue Object => e
-              @events.unknown_error self, e, "Listen loop"
             end
+          rescue Errno::ECONNABORTED
+            # client closed the socket even before accept
+            client.close rescue nil
+          rescue Object => e
+            @events.unknown_error self, e, "Listen loop"
           end
+        end
 
-          graceful_shutdown if @status == :stop
-        ensure
-          unless @status == :restart
-            @ios.each { |i| i.close }
-            @unix_paths.each { |i| File.unlink i }
-          end
+        graceful_shutdown if @status == :stop
+      ensure
+        unless @status == :restart
+          @ios.each { |i| i.close }
+          @unix_paths.each { |i| File.unlink i }
         end
       end
-
-      return @thread
     end
 
     # :nodoc:
@@ -279,7 +287,7 @@ module Puma
           # a problem with the read operation on the client socket. 
           # Effect is to stop processing when the socket can't fill the buffer
           # for further parsing.
-          while nparsed < data.length
+          while nparsed < data.bytesize
             nparsed = parser.execute(env, data, nparsed)
 
             if parser.finished?
@@ -313,7 +321,7 @@ module Puma
               return if !chunk or chunk.length == 0  # read failed, stop processing
 
               data << chunk
-              if data.length >= MAX_HEADER
+              if data.bytesize >= MAX_HEADER
                 raise HttpParserError,
                   "HEADER is longer than allowed, aborting client early."
               end
@@ -418,6 +426,7 @@ module Puma
       begin
         begin
           status, headers, res_body = @app.call(env)
+          status = status.to_i
 
           if status == -1
             unless headers.empty? and res_body == []
@@ -471,7 +480,7 @@ module Puma
           if status == 200
             client.write HTTP_10_200
           else
-            client.write "HTTP/1.1 "
+            client.write "HTTP/1.0 "
             client.write status.to_s
             client.write " "
             client.write HTTP_STATUS_CODES[status]

data/lib/puma/thread_pool.rb

@@ -53,15 +53,17 @@ module Puma
       @spawned += 1
 
       th = Thread.new do
-        todo = @todo
+        todo  = @todo
         block = @block
+        mutex = @mutex
+        cond  = @cond
 
         while true
           work = nil
 
           continue = true
 
-          @mutex.synchronize do
+          mutex.synchronize do
             while todo.empty?
               if @trim_requested > 0
                 @trim_requested -= 1
@@ -75,7 +77,7 @@ module Puma
               end
 
               @waiting += 1
-              @cond.wait @mutex
+              cond.wait mutex
               @waiting -= 1
 
               if @shutdown
@@ -92,7 +94,7 @@ module Puma
           block.call work
         end
 
-        @mutex.synchronize do
+        mutex.synchronize do
           @spawned -= 1
           @workers.delete th
         end

data/lib/rack/handler/puma.rb

@@ -18,11 +18,16 @@ module Rack
           app = Rack::CommonLogger.new(app, STDOUT)
         end
 
+        if options[:environment]
+          ENV['RACK_ENV'] = options[:environment].to_s
+        end
+
         server   = ::Puma::Server.new(app)
         min, max = options[:Threads].split(':', 2)
 
         puts "Puma #{::Puma::Const::PUMA_VERSION} starting..."
         puts "* Min threads: #{min}, max threads: #{max}"
+        puts "* Environment: #{ENV['RACK_ENV']}"
         puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
 
         server.add_tcp_listener options[:Host], options[:Port]

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.3.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-05-16"
+  s.date = "2012-07-19"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]

data/test/test_app_status.rb

@@ -28,79 +28,57 @@ class TestAppStatus < Test::Unit::TestCase
     @app.auth_token = nil
   end
 
-  def lint(env)
+  def lint(uri)
     app = Rack::Lint.new @app
-    mock_env = Rack::MockRequest.env_for env['PATH_INFO']
+    mock_env = Rack::MockRequest.env_for uri
     app.call mock_env
   end
 
   def test_bad_token
     @app.auth_token = "abcdef"
 
-    env = { 'PATH_INFO' => "/whatever" }
-
-    status, _, _ = @app.call env
+    status, _, _ = lint('/whatever')
 
     assert_equal 403, status
-    lint(env)
   end
 
   def test_good_token
     @app.auth_token = "abcdef"
 
-    env = {
-      'PATH_INFO' => "/whatever",
-      'QUERY_STRING' => "token=abcdef"
-    }
-
-    status, _, _ = @app.call env
+    status, _, _ = lint('/whatever?token=abcdef')
 
     assert_equal 404, status
-    lint(env)
   end
 
   def test_unsupported
-    env = { 'PATH_INFO' => "/not-real" }
-
-    status, _, _ = @app.call env
+    status, _, _ = lint('/not-real')
 
     assert_equal 404, status
-    lint(env)
   end
 
   def test_stop
-    env = { 'PATH_INFO' => "/stop" }
-
-    status, _ , body = @app.call env
+    status, _ , app = lint('/stop')
 
     assert_equal :stop, @server.status
     assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], body
-    lint(env)
+    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
   end
 
   def test_halt
-    env = { 'PATH_INFO' => "/halt" }
-
-    status, _ , body = @app.call env
+    status, _ , app = lint('/halt')
 
     assert_equal :halt, @server.status
     assert_equal 200, status
-    assert_equal ['{ "status": "ok" }'], body
-    lint(env)
+    assert_equal ['{ "status": "ok" }'], app.enum_for.to_a
   end
 
   def test_stats
-    env = { 'PATH_INFO' => "/stats" }
-
     @server.backlog = 1
     @server.running = 9
 
-    status, _ , body = @app.call env
+    status, _ , app = lint('/stats')
 
     assert_equal 200, status
-    assert_equal ['{ "backlog": 1, "running": 9 }'], body
-    lint(env)
+    assert_equal ['{ "backlog": 1, "running": 9 }'], app.enum_for.to_a
   end
-
 end

data/test/test_cli.rb

@@ -5,6 +5,7 @@ require 'tempfile'
 
 class TestCLI < Test::Unit::TestCase
   def setup
+    @environment = 'production'
     @tmp_file = Tempfile.new("puma-test")
     @tmp_path = @tmp_file.path
     @tmp_file.close!
@@ -26,6 +27,40 @@ class TestCLI < Test::Unit::TestCase
     cli.write_pid
 
     assert_equal File.read(@tmp_path).strip.to_i, Process.pid
+
+    cli.stop
+    assert !File.exist?(@tmp_path), "Pid file shouldn't exist anymore"
+  end
+
+  def test_control_for_tcp
+    url = "tcp://127.0.0.1:9877/"
+    sin = StringIO.new
+    sout = StringIO.new
+    cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
+                         "--control", url,
+                         "--control-token", "",
+                         "test/lobster.ru"], sin, sout
+    cli.parse_options
+
+    thread_exception = nil
+    t = Thread.new do
+      begin
+        cli.run
+      rescue Exception => e
+        thread_exception = e
+      end
+    end 
+
+    sleep 1
+
+    s = TCPSocket.new "127.0.0.1", 9877
+    s << "GET /stats HTTP/1.0\r\n\r\n"
+    body = s.read
+    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
+
+    cli.stop
+    t.join
+    assert_equal nil, thread_exception
   end
 
   unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
@@ -125,4 +160,12 @@ class TestCLI < Test::Unit::TestCase
     assert_equal 'baz/qux', $LOAD_PATH[0]
     $LOAD_PATH.shift
   end
+
+  def test_environment
+    cli = Puma::CLI.new ["--environment", @environment]
+    cli.parse_options
+    cli.set_rack_environment
+
+    assert_equal ENV['RACK_ENV'], @environment 
+  end
 end

data/test/test_rack_server.rb

@@ -66,7 +66,7 @@ class TestRackServer < Test::Unit::TestCase
 
     @server.run
 
-    hit(['http://localhost:9998/test'])
+    hit(['http://127.0.0.1:9998/test'])
 
     stop
 
@@ -83,7 +83,7 @@ class TestRackServer < Test::Unit::TestCase
 
     big = "x" * (1024 * 16)
 
-    Net::HTTP.post_form URI.parse('http://localhost:9998/test'),
+    Net::HTTP.post_form URI.parse('http://127.0.0.1:9998/test'),
                  { "big" => big }
 
     stop
@@ -98,7 +98,7 @@ class TestRackServer < Test::Unit::TestCase
     @server.app = lambda { |env| input = env; @simple.call(env) }
     @server.run
 
-    hit(['http://localhost:9998/test/a/b/c'])
+    hit(['http://127.0.0.1:9998/test/a/b/c'])
 
     stop
 
@@ -115,7 +115,7 @@ class TestRackServer < Test::Unit::TestCase
 
     @server.run
 
-    hit(['http://localhost:9998/test'])
+    hit(['http://127.0.0.1:9998/test'])
 
     stop
 
@@ -131,7 +131,7 @@ class TestRackServer < Test::Unit::TestCase
 
     @server.run
 
-    hit(['http://localhost:9998/test'])
+    hit(['http://127.0.0.1:9998/test'])
 
     stop
 

data/test/test_ws.rb

@@ -25,19 +25,15 @@ class WebServerTest < Test::Unit::TestCase
     @server = Server.new @tester, Events.strings
     @server.add_tcp_listener "127.0.0.1", 9998
 
-    redirect_test_io do
-      @server.run 
-    end
+    @server.run
   end
 
   def teardown
-    redirect_test_io do
-      @server.stop(true)
-    end
+    @server.stop(true)
   end
 
   def test_simple_server
-    hit(['http://localhost:9998/test'])
+    hit(['http://127.0.0.1:9998/test'])
     assert @tester.ran_test, "Handler didn't really run"
   end
 
@@ -73,17 +69,13 @@ class WebServerTest < Test::Unit::TestCase
   end
 
   def test_bad_client
-    redirect_test_io do
-      do_test("GET /test HTTP/BAD", 3)
-    end
+    do_test("GET /test HTTP/BAD", 3)
   end
 
   def test_header_is_too_long
-    redirect_test_io do
-      long = "GET /test HTTP/1.1\r\n" + ("X-Big: stuff\r\n" * 15000) + "\r\n"
-      assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do
-        do_test(long, long.length/2, 10)
-      end
+    long = "GET /test HTTP/1.1\r\n" + ("X-Big: stuff\r\n" * 15000) + "\r\n"
+    assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do
+      do_test(long, long.length/2, 10)
     end
   end
 

data/test/testhelp.rb

@@ -16,10 +16,6 @@ require 'stringio'
 
 require 'puma'
 
-def redirect_test_io
-  yield
-end
-
 # Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
 # HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
 def hit(uris)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puma
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puma
-rubygems_version: 1.8.22
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications