puma 0.9.1-java → 0.9.2-java

data/Manifest.txt

@@ -23,7 +23,7 @@ ext/puma_http11/puma_http11.c
 lib/puma.rb
 lib/puma/app/status.rb
 lib/puma/cli.rb
-lib/puma/config.rb
+lib/puma/configuration.rb
 lib/puma/const.rb
 lib/puma/control_cli.rb
 lib/puma/events.rb
@@ -35,12 +35,17 @@ 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_rack_handler.rb
 test/test_rack_server.rb

data/lib/puma/app/status.rb

@@ -4,9 +4,21 @@ module Puma
       def initialize(server, cli)
         @server = server
         @cli = cli
+        @auth_token = nil
+      end
+
+      attr_accessor :auth_token
+
+      def authenticate(env)
+        return true unless @auth_token
+        env['QUERY_STRING'].to_s.split(/&;/).include?("token=#{@auth_token}")
       end
 
       def call(env)
+        unless authenticate(env)
+          return [403, {}, ["Invalid auth token"]]
+        end
+
         case env['PATH_INFO']
         when "/stop"
           @server.stop

data/lib/puma/cli.rb

@@ -3,7 +3,7 @@ require 'uri'
 
 require 'puma/server'
 require 'puma/const'
-require 'puma/config'
+require 'puma/configuration'
 
 require 'rack/commonlogger'
 
@@ -11,7 +11,6 @@ module Puma
   # Handles invoke a Puma::Server in a command line style.
   #
   class CLI
-    DefaultRackup = "config.ru"
     IS_JRUBY = defined?(JRUBY_VERSION)
 
     # Create a new CLI object using +argv+ as the command line
@@ -142,6 +141,11 @@ module Puma
           end
         end
 
+        o.on "--control-token TOKEN",
+             "The token to use as authentication for the control server" do |arg|
+          @options[:control_auth_token] = arg
+        end
+
         o.on '-t', '--threads INT', "min:max threads to use (default 0:16)" do |arg|
           min, max = arg.split(":")
           if max
@@ -163,20 +167,6 @@ module Puma
       end
     end
 
-    # Load the specified rackup file, pull an options from
-    # the rackup file, and set @app.
-    #
-    def load_rackup
-      @app, options = Rack::Builder.parse_file @options[:rackup]
-      @options.merge! options
-
-      options.each do |key,val|
-        if key.to_s[0,4] == "bind"
-          @binds << val
-        end
-      end
-    end
-
     # If configured, write the pid of the current process out
     # to a file.
     #
@@ -206,17 +196,14 @@ module Puma
     def parse_options
       @parser.parse! @argv
 
+      if @argv.last
+        @options[:rackup] = @argv.shift
+      end
+
       @config = Puma::Configuration.new @options
       @config.load
 
-      unless @options[:rackup]
-        @options[:rackup] = @argv.shift || DefaultRackup
-      end
-
-      if @options[:control_url] == "auto"
-        path = @temp_status_path = Configuration.temp_path
-        @options[:control_url] = "unix://#{path}"
-      end
+      @temp_status_path = @options[:control_path_temp]
     end
 
     # Parse the options, load the rackup, start the server and wait
@@ -225,24 +212,15 @@ module Puma
     def run
       parse_options
 
-      rackup = @options[:rackup]
-
-      unless File.exists?(rackup)
-        raise "Missing rackup file '#{rackup}'"
-      end
+      app = @config.app
 
-      load_rackup
       write_pid
       write_state
 
-      unless @options[:quiet]
-        @app = Rack::CommonLogger.new(@app, STDOUT)
-      end
-
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      server = Puma::Server.new @app, @events
+      server = Puma::Server.new app, @events
       server.min_threads = min_t
       server.max_threads = max_t
 
@@ -273,6 +251,11 @@ module Puma
         uri = URI.parse str
 
         app = Puma::App::Status.new server, self
+
+        if token = @options[:control_auth_token]
+          app.auth_token = token unless token.empty? or token == :none
+        end
+
         status = Puma::Server.new app, @events
         status.min_threads = 0
         status.max_threads = 1

data/lib/puma/configuration.rb

@@ -0,0 +1,190 @@
+module Puma
+  class Configuration
+    DefaultRackup = "config.ru"
+
+    DefaultTCPHost = "0.0.0.0"
+    DefaultTCPPort = 9292
+
+    def initialize(options)
+      @options = options
+      @options[:binds] ||= []
+    end
+
+    attr_reader :options
+
+    def load
+      if path = @options[:config_file]
+        DSL.new(@options)._load_from path
+      end
+
+      # Rakeup default option support
+      if host = @options[:Host]
+        port = @options[:Port] || DefaultTCPPort
+
+        @options[:binds] << "tcp://#{host}:#{port}"
+      end
+
+      if @options[:binds].empty?
+        @options[:binds] << "tcp://#{DefaultTCPHost}:#{DefaultTCPPort}"
+      end
+
+      if @options[:control_url] == "auto"
+        path = Configuration.temp_path
+        @options[:control_url] = "unix://#{path}"
+        @options[:control_url_temp] = path
+      end
+
+      unless @options[:control_auth_token]
+        setup_random_token
+      end
+    end
+
+    # Load the specified rackup file, pull an options from
+    # the rackup file, and set @app.
+    #
+    def app
+      if app = @options[:app]
+        return app
+      end
+
+      path = @options[:rackup] || DefaultRackup
+
+      unless File.exists?(path)
+        raise "Missing rackup file '#{path}'"
+      end
+
+      app, options = Rack::Builder.parse_file path
+      @options.merge! options
+
+      options.each do |key,val|
+        if key.to_s[0,4] == "bind"
+          @options[:binds] << val
+        end
+      end
+
+      unless @options[:quiet]
+        app = Rack::CommonLogger.new(app, STDOUT)
+      end
+
+      return app
+    end
+
+    def setup_random_token
+      begin
+        require 'openssl'
+      rescue LoadError
+      end
+
+      count = 16
+
+      bytes = nil
+
+      if defined? OpenSSL::Random
+        bytes = OpenSSL::Random.random_bytes(count)
+      elsif File.exists?("/dev/urandom")
+        File.open("/dev/urandom") do |f|
+          bytes = f.read(count)
+        end
+      end
+
+      if bytes
+        token = ""
+        bytes.each_byte { |b| token << b.to_s(16) }
+      else
+        token = (0..count).to_a.map { rand(255).to_s(16) }.join
+      end
+
+      @options[:control_auth_token] = token
+    end
+
+    def self.temp_path
+      require 'tmpdir'
+
+      t = (Time.now.to_f * 1000).to_i
+      "#{Dir.tmpdir}/puma-status-#{t}-#{$$}"
+    end
+
+    # The methods that are available for use inside the config file.
+    #
+    class DSL
+      def initialize(options)
+        @options = options
+      end
+
+      def _load_from(path)
+        instance_eval File.read(path), path, 1
+      end
+
+      # Use +obj+ or +block+ as the Rack app. This allows a config file to
+      # be the app itself.
+      #
+      def app(obj=nil, &block)
+        obj ||= block
+
+        raise "Provide either a #call'able or a block" unless obj
+
+        @options[:app] = obj
+      end
+
+      # Start the Puma control rack app on +url+. This app can be communicated
+      # with to control the main server.
+      #
+      def activate_control_app(url="auto", opts=nil)
+        @options[:control_url] = url
+
+        if opts
+          if tok = opts[:auth_token]
+            @options[:control_auth_token] = tok
+          end
+
+          if opts[:no_token]
+            @options[:control_auth_token] = :none
+          end
+        end
+      end
+
+      # Bind the server to +url+. tcp:// and unix:// are the only accepted
+      # protocols.
+      #
+      def bind(url)
+        @options[:binds] << url
+      end
+
+      # Store the pid of the server in the file at +path+.
+      def pidfile(path)
+        @options[:pidfile] = path
+      end
+
+      # Disable request logging.
+      #
+      def quiet
+        @options[:quiet] = true
+      end
+
+      # Load +path+ as a rackup file.
+      #
+      def rackup(path)
+        @options[:rackup] = path.to_s
+      end
+
+      # Configure +min+ to be the minimum number of threads to use to answer
+      # requests and +max+ the maximum.
+      #
+      def threads(min, max)
+        if min > max
+          raise "The minimum number of threads must be less than the max"
+        end
+
+        @options[:min_threads] = min
+        @options[:max_threads] = max
+      end
+
+      # Use +path+ as the file to store the server info state. This is
+      # used by pumactl to query and control the server.
+      #
+      def state_path(path)
+        @options[:state] = path.to_s
+      end
+    end
+  end
+end

data/lib/puma/const.rb

@@ -71,7 +71,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "0.9.1".freeze
+    PUMA_VERSION = VERSION = "0.9.2".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 

data/lib/puma/control_cli.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 
 require 'puma/const'
-require 'puma/config'
+require 'puma/configuration'
 
 require 'yaml'
 require 'uri'
@@ -11,8 +11,9 @@ require 'socket'
 module Puma
   class ControlCLI
 
-    def initialize(argv)
+    def initialize(argv, stdout=STDOUT)
       @argv = argv
+      @stdout = stdout
     end
 
     def setup_options
@@ -59,57 +60,68 @@ module Puma
       end
     end
 
+    def request(sock, url)
+      token = @config.options[:control_auth_token]
+      if token
+        url = "#{url}?token=#{token}"
+      end
+
+      sock << "GET #{url} HTTP/1.0\r\n\r\n"
+
+      rep = sock.read.split("\r\n")
+
+      m = %r!HTTP/1.\d (\d+)!.match(rep.first)
+      if m[1] == "403"
+        raise "Unauthorized access to server (wrong auth token)"
+      elsif m[1] != "200"
+        raise "Bad response code from server: #{m[1]}"
+      end
+
+      return rep.last
+    end
+
     def command_pid
-      puts "#{@state['pid']}"
+      @stdout.puts "#{@state['pid']}"
     end
 
     def command_stop
       sock = connect
-      sock << "GET /stop HTTP/1.0\r\n\r\n"
-      rep = sock.read
+      body = request sock, "/stop"
 
-      body = rep.split("\r\n").last
       if body != '{ "status": "ok" }'
         raise "Invalid response: '#{body}'"
       else
-        puts "Requested stop from server"
+        @stdout.puts "Requested stop from server"
       end
     end
 
     def command_halt
       sock = connect
-      s << "GET /halt HTTP/1.0\r\n\r\n"
-      rep = s.read
+      body = request sock, "/halt"
 
-      body = rep.split("\r\n").last
       if body != '{ "status": "ok" }'
         raise "Invalid response: '#{body}'"
       else
-        puts "Requested halt from server"
+        @stdout.puts "Requested halt from server"
       end
     end
 
     def command_restart
       sock = connect
-      sock << "GET /restart HTTP/1.0\r\n\r\n"
-      rep = sock.read
+      body = request sock, "/restart"
 
-      body = rep.split("\r\n").last
       if body != '{ "status": "ok" }'
         raise "Invalid response: '#{body}'"
       else
-        puts "Requested restart from server"
+        @stdout.puts "Requested restart from server"
       end
     end
 
     def command_stats
       sock = connect
-      sock << "GET /stats HTTP/1.0\r\n\r\n"
-      rep = sock.read
-
-      body = rep.split("\r\n").last
+      body = request sock, "/stats"
 
-      puts body
+      @stdout.puts body
     end
   end
 end

data/lib/puma/server.rb

@@ -52,6 +52,7 @@ module Puma
       @thread_pool = nil
 
       @persistent_timeout = PERSISTENT_TIMEOUT
+      @persistent_check, @persistent_wakeup = IO.pipe
 
       @proto_env = {
         "rack.version".freeze => Rack::VERSION,
@@ -91,14 +92,18 @@ module Puma
     end
 
     # Tell the server to listen on host +host+, port +port+.
-    # If optimize_for_latency is true (the default) then clients connecting
+    # If +optimize_for_latency+ is true (the default) then clients connecting
     # will be optimized for latency over throughput.
     #
-    def add_tcp_listener(host, port, optimize_for_latency=true)
+    # +backlog+ indicates how many unaccepted connections the kernel should
+    # allow to accumulate before returning connection refused.
+    #
+    def add_tcp_listener(host, port, optimize_for_latency=true, backlog=1024)
       s = TCPServer.new(host, port)
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       end
+      s.listen backlog
       @ios << s
     end
 
@@ -219,9 +224,11 @@ module Puma
                 env = @proto_env.dup
                 nparsed = 0
               else
-                unless IO.select([client], nil, nil, @persistent_timeout)
+                unless ret = IO.select([client, @persistent_check], nil, nil, @persistent_timeout)
                   raise EOFError, "Timed out persistent connection"
                 end
+
+                return if ret.first.include? @persistent_check
               end
             else
               # Parser is not done, queue up more data to read and continue parsing
@@ -514,12 +521,14 @@ module Puma
     # off the request queue before finally exiting.
     #
     def stop(sync=false)
+      @persistent_wakeup.close
       @notify << STOP_COMMAND
 
       @thread.join if @thread && sync
     end
 
     def halt(sync=false)
+      @persistent_wakeup.close
       @notify << HALT_COMMAND
 
       @thread.join if @thread && sync

data/lib/rack/handler/puma.rb

@@ -8,13 +8,13 @@ module Rack
         :Host => '0.0.0.0',
         :Port => 8080,
         :Threads => '0:16',
-        :Quiet => false
+        :Verbose => false
       }
 
       def self.run(app, options = {})
         options  = DEFAULT_OPTIONS.merge(options)
 
-        unless options[:Quiet]
+        if options[:Verbose]
           app = Rack::CommonLogger.new(app, STDOUT)
         end
 

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2011-12-06"
+  s.date = "2011-12-19"
   s.description = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications.  It is designed for running rack apps only.\n\nWhat makes Puma so fast is the careful use of an Ragel extension to provide fast, accurate HTTP 1.1 protocol parsing. This makes the server scream without too many portability issues."
   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/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/config.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/lobster.ru", "test/mime.yaml", "test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/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/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_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.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.12"
   s.summary = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.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_persistent.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
@@ -26,15 +26,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.7.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.10"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.7.0"])
-      s.add_dependency(%q<hoe>, ["~> 2.10"])
+      s.add_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.7.0"])
-    s.add_dependency(%q<hoe>, ["~> 2.10"])
+    s.add_dependency(%q<hoe>, ["~> 2.12"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
   end
 end

data/test/config/app.rb

@@ -0,0 +1,3 @@
+app do |env|
+  [200, {}, ["embedded app"]]
+end

data/test/hello.ru

@@ -0,0 +1 @@
+run lambda { |env| [200, {}, ["Hello World"]] }

data/test/slow.ru

@@ -0,0 +1,4 @@
+run lambda { |env|
+  30000000.times { }
+  [200, {}, ["Hello World"]]
+}

data/test/test_app_status.rb

@@ -24,12 +24,36 @@ class TestAppStatus < Test::Unit::TestCase
   def setup
     @server = FakeServer.new
     @app = Puma::App::Status.new(@server, @server)
+    @app.auth_token = nil
+  end
+
+  def test_bad_token
+    @app.auth_token = "abcdef"
+
+    env = { 'PATH_INFO' => "/whatever" }
+
+    status, _, _ = @app.call env
+
+    assert_equal 403, status
+  end
+
+  def test_good_token
+    @app.auth_token = "abcdef"
+
+    env = {
+      'PATH_INFO' => "/whatever",
+      'QUERY_STRING' => "token=abcdef"
+    }
+
+    status, _, _ = @app.call env
+
+    assert_equal 404, status
   end
 
   def test_unsupported
     env = { 'PATH_INFO' => "/not-real" }
 
-    status, header, body = @app.call env
+    status, _, _ = @app.call env
 
     assert_equal 404, status
   end
@@ -37,7 +61,7 @@ class TestAppStatus < Test::Unit::TestCase
   def test_stop
     env = { 'PATH_INFO' => "/stop" }
 
-    status, header, body = @app.call env
+    status, _ , body = @app.call env
 
     assert_equal :stop, @server.status
     assert_equal 200, status
@@ -47,7 +71,7 @@ class TestAppStatus < Test::Unit::TestCase
   def test_halt
     env = { 'PATH_INFO' => "/halt" }
 
-    status, header, body = @app.call env
+    status, _ , body = @app.call env
 
     assert_equal :halt, @server.status
     assert_equal 200, status
@@ -60,7 +84,7 @@ class TestAppStatus < Test::Unit::TestCase
     @server.backlog = 1
     @server.running = 9
 
-    status, header, body = @app.call env
+    status, _ , body = @app.call env
 
     assert_equal 200, status
     assert_equal ['{ "backlog": 1, "running": 9 }'], body

data/test/test_cli.rb

@@ -34,7 +34,10 @@ class TestCLI < Test::Unit::TestCase
     sin = StringIO.new
     sout = StringIO.new
 
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", "--control", url, "test/lobster.ru"], sin, sout
+    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
+                         "--control", url,
+                         "--control-token", "",
+                         "test/lobster.ru"], sin, sout
     cli.parse_options
 
     t = Thread.new { cli.run }
@@ -57,7 +60,10 @@ class TestCLI < Test::Unit::TestCase
     sin = StringIO.new
     sout = StringIO.new
 
-    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", "--control", url, "test/lobster.ru"], sin, sout
+    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
+                         "--control", url,
+                         "--control-token", "",
+                         "test/lobster.ru"], sin, sout
     cli.parse_options
 
     t = Thread.new { cli.run }

data/test/test_config.rb

@@ -0,0 +1,16 @@
+require 'test/unit'
+
+require 'puma'
+require 'puma/configuration'
+
+class TestConfigFile < Test::Unit::TestCase
+  def test_app_from_app_DSL
+    opts = { :config_file => "test/config/app.rb" }
+    conf = Puma::Configuration.new opts
+    conf.load
+
+    app = conf.app
+
+    assert_equal [200, {}, ["embedded app"]], app.call(nil)
+  end
+end

data/test/test_http11.rb

@@ -37,14 +37,6 @@ class Http11ParserTest < Test::Unit::TestCase
     assert_equal should_be_good.length, nread
     assert parser.finished?
     assert !parser.error?
-
-    nasty_pound_header = "GET / HTTP/1.1\r\nX-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n\tRA==\r\n\t-----END CERTIFICATE-----\r\n\r\n"
-    parser = HttpParser.new
-    req = {}
-    #nread = parser.execute(req, nasty_pound_header, 0)
-    #assert_equal nasty_pound_header.length, nread
-    #assert parser.finished?
-    #assert !parser.error?
   end
   
   def test_parse_error
@@ -54,8 +46,8 @@ class Http11ParserTest < Test::Unit::TestCase
 
     error = false
     begin
-      nread = parser.execute(req, bad_http, 0)
-    rescue => details
+      parser.execute(req, bad_http, 0)
+    rescue
       error = true
     end
 

data/test/test_integration.rb

@@ -0,0 +1,48 @@
+require 'test/unit'
+require 'rubygems'
+require 'socket'
+
+require 'puma/cli'
+require 'puma/control_cli'
+
+class TestIntegration < Test::Unit::TestCase
+  def setup
+    @state_path = "test/test_puma.state"
+    @bind_path = "test/test_server.sock"
+    @control_path = "test/test_control.sock"
+  end
+
+  def teardown
+    File.unlink @state_path rescue nil
+    File.unlink @bind_path  rescue nil
+    File.unlink @control_path rescue nil
+  end
+
+  def test_stop_via_pumactl
+    if defined? JRUBY_VERSION
+      assert true
+      return
+    end
+
+    sin = StringIO.new
+    sout = StringIO.new
+
+    cli = Puma::CLI.new %W!-q -S #{@state_path} -b unix://#{@bind_path} --control unix://#{@control_path} test/hello.ru!, sin, sout
+
+    t = Thread.new do
+      cli.run
+    end
+
+    sleep 1
+
+    s = UNIXSocket.new @bind_path
+    s << "GET / HTTP/1.0\r\n\r\n"
+    assert_equal "Hello World", s.read.split("\r\n").last
+
+    ccli = Puma::ControlCLI.new %W!-S #{@state_path} stop!, sout
+
+    ccli.run
+
+    assert_kind_of Thread, t.join(1), "server didn't stop"
+  end
+end

data/test/test_ws.rb

@@ -90,7 +90,7 @@ class WebServerTest < Test::Unit::TestCase
   def test_file_streamed_request
     body = "a" * (Puma::Const::MAX_BODY * 2)
     long = "GET /test HTTP/1.1\r\nContent-length: #{body.length}\r\n\r\n" + body
-    do_test(long, Puma::Const::CHUNK_SIZE * 2 -400)
+    do_test(long, (Puma::Const::CHUNK_SIZE * 2) - 400)
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 -08:00
+date: 2011-12-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ files:
   - lib/puma.rb
   - lib/puma/app/status.rb
   - lib/puma/cli.rb
-  - lib/puma/config.rb
+  - lib/puma/configuration.rb
   - lib/puma/const.rb
   - lib/puma/control_cli.rb
   - lib/puma/events.rb
@@ -98,12 +98,17 @@ files:
   - 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_rack_handler.rb
   - test/test_rack_server.rb
@@ -145,8 +150,10 @@ summary: Puma is a small library that provides a very fast and concurrent HTTP 1
 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_rack_handler.rb
   - test/test_rack_server.rb

data/lib/puma/config.rb

@@ -1,98 +0,0 @@
-module Puma
-  class Configuration
-    DefaultTCPHost = "0.0.0.0"
-    DefaultTCPPort = 9292
-
-    def initialize(options)
-      @options = options
-      @options[:binds] ||= []
-    end
-
-    attr_reader :options
-
-    def load
-      if path = @options[:config_file]
-        instance_eval File.read(path), path, 1
-      end
-
-      # Rakeup default option support
-      if host = @options[:Host]
-        port = @options[:Port] || DefaultTCPPort
-
-        @options[:binds] << "tcp://#{host}:#{port}"
-      end
-
-      if @options[:binds].empty?
-        @options[:binds] << "tcp://#{DefaultTCPHost}:#{DefaultTCPPort}"
-      end
-    end
-
-    def self.temp_path
-      require 'tmpdir'
-
-      t = (Time.now.to_f * 1000).to_i
-      "#{Dir.tmpdir}/puma-status-#{t}-#{$$}"
-    end
-
-    # Use +obj+ or +block+ as the Rack app. This allows a config file to
-    # be the app itself.
-    #
-    def app(obj=nil, &block)
-      obj ||= block
-
-      raise "Provide either a #call'able or a block" unless obj
-
-      @options[:app] = obj
-    end
-
-    # Start the Puma control rack app on +url+. This app can be communicated
-    # with to control the main server.
-    #
-    def activate_control_app(url="auto")
-      @options[:control_url] = url
-    end
-
-    # Bind the server to +url+. tcp:// and unix:// are the only accepted
-    # protocols.
-    #
-    def bind(url)
-      @options[:binds] << url
-    end
-
-    # Store the pid of the server in the file at +path+.
-    def pidfile(path)
-      @options[:pidfile] = path
-    end
-
-    # Disable request logging.
-    #
-    def quiet
-      @options[:quiet] = true
-    end
-
-    # Load +path+ as a rackup file.
-    #
-    def rackup(path)
-      @options[:rackup] = path.to_s
-    end
-
-    # Configure +min+ to be the minimum number of threads to use to answer
-    # requests and +max+ the maximum.
-    #
-    def threads(min, max)
-      if min > max
-        raise "The minimum number of threads must be less than the max"
-      end
-
-      @options[:min_threads] = min
-      @options[:max_threads] = max
-    end
-
-    # Use +path+ as the file to store the server info state. This is
-    # used by pumactl to query and control the server.
-    #
-    def state_path(path)
-      @options[:state] = path.to_s
-    end
-  end
-end