puma 1.2.2 → 1.3.0

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - rbx
+  - jruby

data/History.txt

@@ -1,3 +1,18 @@
+=== 1.3.0 / 2012-05-08
+
+* 2 minor features:
+  * Return valid Rack responses (passes Lint) from status server
+  * Add -I option to specify $LOAD_PATH directories
+
+* 4 bug fixes:
+  * Don't join the server thread inside the signal handle. Fixes #94
+  * Make NullIO#read mimic IO#read
+  * Only stop the status server if it's started. Fixes #84
+  * Set RACK_ENV early in cli also. Fixes #78
+
+* 1 new contributer:
+  * Jesse Cooke
+
 === 1.2.2 / 2012-04-28
 
 * 4 bug fixes:

data/Manifest.txt

@@ -1,3 +1,4 @@
+.travis.yml
 COPYING
 Gemfile
 History.txt
@@ -56,6 +57,7 @@ test/test_config.rb
 test/test_http10.rb
 test/test_http11.rb
 test/test_integration.rb
+test/test_null_io.rb
 test/test_persistent.rb
 test/test_puma_server.rb
 test/test_rack_handler.rb

data/Rakefile

@@ -9,12 +9,13 @@ Hoe.plugin :git
 HOE = Hoe.spec "puma" do
   self.rubyforge_name = 'puma'
   self.readme_file    = "README.md"
-  self.urls = %w!http://puma.io http://github.com/puma/puma!
+  self.urls = %w!http://puma.io https://github.com/puma/puma!
 
   developer 'Evan Phoenix', 'evan@phx.io'
 
   spec_extras[:extensions]  = ["ext/puma_http11/extconf.rb"]
   spec_extras[:executables] = ['puma', 'pumactl']
+  spec_extras[:homepage] = self.urls.first
 
   require_ruby_version ">= 1.8.7"
 

data/lib/puma/app/status.rb

@@ -6,6 +6,7 @@ module Puma
         @cli = cli
         @auth_token = nil
       end
+      OK_STATUS = '{ "status": "ok" }'.freeze
 
       attr_accessor :auth_token
 
@@ -16,34 +17,39 @@ module Puma
 
       def call(env)
         unless authenticate(env)
-          return [403, {}, ["Invalid auth token"]]
+          return rack_response(403, 'Invalid auth token', 'text/plain')
         end
 
         case env['PATH_INFO']
         when "/stop"
           @server.stop
-          return [200, {}, ['{ "status": "ok" }']]
+          return rack_response(200, OK_STATUS)
 
         when "/halt"
           @server.halt
-          return [200, {}, ['{ "status": "ok" }']]
+          return rack_response(200, OK_STATUS)
 
         when "/restart"
           if @cli and @cli.restart_on_stop!
             @server.begin_restart
 
-            return [200, {}, ['{ "status": "ok" }']]
+            return rack_response(200, OK_STATUS)
           else
-            return [200, {}, ['{ "status": "not configured" }']]
+            return rack_response(200, '{ "status": "not configured" }')
           end
 
         when "/stats"
           b = @server.backlog
           r = @server.running
-          return [200, {}, ["{ \"backlog\": #{b}, \"running\": #{r} }"]]
+            return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)
         end
 
-        [404, {}, ["Unsupported action"]]
+        rack_response 404, "Unsupported action", 'text/plain'
+      end
+
+      private
+      def rack_response(status, body, content_type='application/json')
+        [status, { 'Content-Type' => content_type, 'Content-Length' => body.length.to_s }, [body]]
       end
     end
   end

data/lib/puma/cli.rb

@@ -53,6 +53,8 @@ module Puma
       remove.each do |k|
         ENV.delete k
       end
+
+      ENV['RACK_ENV'] ||= "development"
     end
 
     def restart_on_stop!
@@ -167,6 +169,10 @@ module Puma
           @options[:config_file] = arg
         end
 
+        o.on "-I", "--include PATH", "Specify $LOAD_PATH directories" do |arg|
+          $LOAD_PATH.unshift(*arg.split(':'))
+        end
+
         o.on "-p", "--port PORT", "Define what port TCP port to bind to",
                                   "Use -b for more advanced options" do |arg|
           @options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
@@ -419,7 +425,8 @@ module Puma
       end
 
       Signal.trap "SIGTERM" do
-        graceful_stop server
+        log " - Gracefully stopping, waiting for requests to finish"
+        server.stop false
       end
 
       log "Use Ctrl-C to stop"
@@ -434,7 +441,7 @@ module Puma
 
       if @restart
         log "* Restarting..."
-        @status.stop true
+        @status.stop true if @status
         restart!
       end
     end

data/lib/puma/const.rb

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

data/lib/puma/null_io.rb

@@ -4,7 +4,6 @@ module Puma
   # Used as the value for rack.input when the request has no body.
   #
   class NullIO
-
     # Always returns nil
     #
     def gets
@@ -16,10 +15,10 @@ module Puma
     def each
     end
 
-    # Always returns nil
+    # Mimics IO#read with no data
     #
-    def read(count)
-      nil
+    def read(count=nil,buffer=nil)
+      (count && count > 0) ? nil : ""
     end
 
     # Does nothing

data/puma.gemspec

@@ -2,25 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-04-28"
+  s.date = "2012-05-08"
   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"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
-  s.homepage = "[![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma)"
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", "test/test_null_io.rb"]
+  s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.22"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -29,17 +29,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.16"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 2.14"])
+      s.add_dependency(%q<hoe>, ["~> 2.16"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 2.14"])
+    s.add_dependency(%q<hoe>, ["~> 2.16"])
   end
 end

data/test/test_app_status.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rack'
 require 'puma/app/status'
 
 class TestAppStatus < Test::Unit::TestCase
@@ -27,6 +28,12 @@ class TestAppStatus < Test::Unit::TestCase
     @app.auth_token = nil
   end
 
+  def lint(env)
+    app = Rack::Lint.new @app
+    mock_env = Rack::MockRequest.env_for env['PATH_INFO']
+    app.call mock_env
+  end
+
   def test_bad_token
     @app.auth_token = "abcdef"
 
@@ -35,6 +42,7 @@ class TestAppStatus < Test::Unit::TestCase
     status, _, _ = @app.call env
 
     assert_equal 403, status
+    lint(env)
   end
 
   def test_good_token
@@ -48,6 +56,7 @@ class TestAppStatus < Test::Unit::TestCase
     status, _, _ = @app.call env
 
     assert_equal 404, status
+    lint(env)
   end
 
   def test_unsupported
@@ -56,6 +65,7 @@ class TestAppStatus < Test::Unit::TestCase
     status, _, _ = @app.call env
 
     assert_equal 404, status
+    lint(env)
   end
 
   def test_stop
@@ -66,6 +76,7 @@ class TestAppStatus < Test::Unit::TestCase
     assert_equal :stop, @server.status
     assert_equal 200, status
     assert_equal ['{ "status": "ok" }'], body
+    lint(env)
   end
 
   def test_halt
@@ -76,6 +87,7 @@ class TestAppStatus < Test::Unit::TestCase
     assert_equal :halt, @server.status
     assert_equal 200, status
     assert_equal ['{ "status": "ok" }'], body
+    lint(env)
   end
 
   def test_stats
@@ -88,6 +100,7 @@ class TestAppStatus < Test::Unit::TestCase
 
     assert_equal 200, status
     assert_equal ['{ "backlog": 1, "running": 9 }'], body
+    lint(env)
   end
 
 end

data/test/test_cli.rb

@@ -109,4 +109,20 @@ class TestCLI < Test::Unit::TestCase
     assert_equal Process.pid, data["pid"]
     assert_equal url, data["config"].options[:control_url]
   end
+
+  def test_load_path
+    cli = Puma::CLI.new ["--include", 'foo/bar']
+    cli.parse_options
+
+    assert_equal 'foo/bar', $LOAD_PATH[0]
+    $LOAD_PATH.shift
+
+    cli = Puma::CLI.new ["--include", 'foo/bar:baz/qux']
+    cli.parse_options
+
+    assert_equal 'foo/bar', $LOAD_PATH[0]
+    $LOAD_PATH.shift
+    assert_equal 'baz/qux', $LOAD_PATH[0]
+    $LOAD_PATH.shift
+  end
 end

data/test/test_null_io.rb

@@ -0,0 +1,31 @@
+require 'puma/null_io'
+require 'test/unit'
+
+class TestNullIO < Test::Unit::TestCase
+  attr_accessor :nio
+  def setup
+    self.nio = Puma::NullIO.new
+  end
+
+  def test_read_with_no_arguments
+    assert_equal "", nio.read
+  end
+
+  def test_read_with_nil_length
+    assert_equal "", nio.read(nil)
+  end
+
+  def test_read_with_zero_length
+    assert_equal "", nio.read(0)
+  end
+
+  def test_read_with_positive_integer_length
+    assert_nil nio.read(1)
+  end
+
+  def test_read_with_length_and_buffer
+    buf = ""
+    assert_nil nio.read(1,buf)
+    assert_equal "", buf
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-28 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -33,34 +33,34 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 63
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 19
         segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
-        - 3
-        - 0
-        version: "3.0"
+        - 2
+        - 16
+        version: "2.16"
   type: :development
   version_requirements: *id004
 description: |-
@@ -97,6 +97,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 files: 
+- .travis.yml
 - COPYING
 - Gemfile
 - History.txt
@@ -155,6 +156,7 @@ files:
 - test/test_http10.rb
 - test/test_http11.rb
 - test/test_integration.rb
+- test/test_null_io.rb
 - test/test_persistent.rb
 - test/test_puma_server.rb
 - test/test_rack_handler.rb
@@ -196,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puma
-rubygems_version: 1.8.18
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications
@@ -207,6 +209,7 @@ test_files:
 - test/test_http10.rb
 - test/test_http11.rb
 - test/test_integration.rb
+- test/test_null_io.rb
 - test/test_persistent.rb
 - test/test_puma_server.rb
 - test/test_rack_handler.rb