puma 2.0.0.b1-java → 2.0.0.b2-java

data/History.txt

@@ -1,3 +1,21 @@
+=== 2.0.0.b2 / 2012-11-18
+* 5 minor feature:
+  * Now Puma is bundled with an capistrano recipe. Just require
+     'puma/capistrano' in you deploy.rb
+  * Only inject CommonLogger in development mode
+  * Add -p option to pumactl
+  * Add ability to use pumactl to start a server
+  * Add options to daemonize puma
+
+* 7 bug fixes:
+  * Reset the IOBuffer properly. Fixes #148
+  * Shutdown gracefully on JRuby with Ctrl-C
+  * Various methods to get newrelic to start. Fixes #128
+  * fixing syntax error at capistrano recipe
+  * Force ECONNRESET when read returns nil
+  * Be sure to empty the drain the todo before shutting down. Fixes #155
+  * allow for alternate locations for status app
+
 === 2.0.0.b1 / 2012-09-11
 
 * 1 major feature:

data/Manifest.txt

@@ -1,6 +1,5 @@
 COPYING
 Gemfile
-Gemfile.lock
 History.txt
 LICENSE
 Manifest.txt

data/README.md

@@ -118,10 +118,16 @@ You should place code to close global log files, redis connections, etc in this
 
 If you start puma with `-S some/path` then you can pass that same path to the `pumactl` program to control your server. For instance:
 
-    $ pumactl -S some/path restart
+    $ pumactl -S some/path command
+
+or 
+
+    $ pumactl -C url -T token command
 
 will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the control/status app described above.
 
+Allowed commands: status, restart, halt, stop
+
 ## Managing multiple Pumas / init.d script 
 
 If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for an init.d script.

data/Rakefile

@@ -104,3 +104,14 @@ if IS_JRUBY
 else
   task :test => [:compile]
 end
+
+namespace :test do
+  desc "Run the integration tests"
+  task :integration do
+    sh "cd test/shell; sh run.sh"
+  end
+
+  desc "Run all tests"
+  task :all => [:test, "test:integration"]
+end
+

data/ext/puma_http11/io_buffer.c

@@ -46,14 +46,17 @@ static VALUE buf_append(VALUE self, VALUE str) {
   if(new_size > b->size) {
     size_t n = b->size + (b->size / 2);
     uint8_t* top;
+    uint8_t* old;
 
     new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
 
     top = malloc(new_size);
-    memcpy(top, b->top, used);
+    old = b->top;
+    memcpy(top, old, used);
     b->top = top;
     b->cur = top + used;
     b->size = new_size;
+    free(old);
   }
 
   memcpy(b->cur, RSTRING_PTR(str), str_len);
@@ -84,14 +87,17 @@ static VALUE buf_append2(int argc, VALUE* argv, VALUE self) {
   if(new_size > b->size) {
     size_t n = b->size + (b->size / 2);
     uint8_t* top;
+    uint8_t* old;
 
     new_size = (n > new_size ? n : new_size + BUF_TOLERANCE);
 
     top = malloc(new_size);
-    memcpy(top, b->top, used);
+    old = b->top;
+    memcpy(top, old, used);
     b->top = top;
     b->cur = top + used;
     b->size = new_size;
+    free(old);
   }
 
   for(i = 0; i < argc; i++) {

data/lib/puma/app/status.rb

@@ -21,15 +21,15 @@ module Puma
         end
 
         case env['PATH_INFO']
-        when "/stop"
+        when /\/stop$/
           @server.stop
           return rack_response(200, OK_STATUS)
 
-        when "/halt"
+        when /\/halt$/
           @server.halt
           return rack_response(200, OK_STATUS)
 
-        when "/restart"
+        when /\/restart$/
           if @cli and @cli.restart_on_stop!
             @server.begin_restart
 
@@ -38,7 +38,7 @@ module Puma
             return rack_response(200, '{ "status": "not configured" }')
           end
 
-        when "/stats"
+        when /\/stats$/
           b = @server.backlog
           r = @server.running
           return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)

data/lib/puma/cli.rb

@@ -6,6 +6,7 @@ require 'puma/const'
 require 'puma/configuration'
 require 'puma/binder'
 require 'puma/detect'
+require 'puma/daemon_ext'
 
 require 'rack/commonlogger'
 require 'rack/utils'
@@ -35,6 +36,8 @@ module Puma
 
       @restart = false
 
+      ENV['NEWRELIC_DISPATCHER'] ||= "puma"
+
       setup_options
 
       generate_restart_data
@@ -159,7 +162,9 @@ module Puma
         :quiet => false,
         :debug => false,
         :binds => [],
-        :workers => 0
+        :workers => 0,
+        :daemon => false,
+        :environment => "development"
       }
 
       @parser = OptionParser.new do |o|
@@ -171,6 +176,38 @@ module Puma
           @options[:config_file] = arg
         end
 
+        o.on "--control URL", "The bind url to use for the control server",
+                              "Use 'auto' to use temp unix server" do |arg|
+          if arg
+            @options[:control_url] = arg
+          elsif jruby?
+            unsupported "No default url available on JRuby"
+          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 "-d", "--daemon", "Daemonize the server into the background" do
+          @options[:daemon] = true
+          @options[:quiet] = true
+        end
+
+        o.on "--debug", "Log lowlevel debugging information" do
+          @options[:debug] = true
+        end
+
+        o.on "--dir DIR", "Change to DIR before starting" do |d|
+          @options[:directory] = d.to_s
+        end
+
+        o.on "-e", "--environment ENVIRONMENT",
+             "The environment to run the Rack app on (default development)" do |arg|
+          @options[:environment] = arg
+        end
+
         o.on "-I", "--include PATH", "Specify $LOAD_PATH directories" do |arg|
           $LOAD_PATH.unshift(*arg.split(':'))
         end
@@ -188,28 +225,16 @@ module Puma
           @options[:quiet] = true
         end
 
-        o.on "--debug", "Log lowlevel debugging information" do
-          @options[:debug] = true
+        o.on "--restart-cmd CMD",
+             "The puma command to run during a hot restart",
+             "Default: inferred" do |cmd|
+          @options[:restart_cmd] = cmd
         end
 
         o.on "-S", "--state PATH", "Where to store the state details" do |arg|
           @options[:state] = arg
         end
 
-        o.on "--control URL", "The bind url to use for the control server",
-                              "Use 'auto' to use temp unix server" do |arg|
-          if arg
-            @options[:control_url] = arg
-          elsif jruby?
-            unsupported "No default url available on JRuby"
-          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
@@ -229,16 +254,6 @@ module Puma
           @options[:workers] = arg.to_i
         end
 
-        o.on "--restart-cmd CMD",
-             "The puma command to run during a hot restart",
-             "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>"
@@ -311,6 +326,20 @@ module Puma
       log " - Goodbye!"
     end
 
+    def redirect_io
+      stdout = @options[:redirect_stdout]
+      stderr = @options[:redirect_stderr]
+      append = @options[:redirect_append]
+
+      if stdout
+        STDOUT.reopen stdout, (append ? "a" : "w")
+      end
+
+      if stderr
+        STDOUT.reopen stderr, (append ? "a" : "w")
+      end
+    end
+
     # Parse the options, load the rackup, start the server and wait
     # for it to finish.
     #
@@ -321,6 +350,10 @@ module Puma
         exit 1
       end
 
+      if dir = @options[:directory]
+        Dir.chdir dir
+      end
+
       clustered = @options[:workers] > 0
 
       if clustered
@@ -333,8 +366,6 @@ module Puma
       write_pid
       write_state
 
-      @binder.parse @options[:binds], self
-
       if clustered
         run_cluster
       else
@@ -346,15 +377,17 @@ module Puma
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
+      log "Puma #{Puma::Const::PUMA_VERSION} starting..."
+      log "* Min threads: #{min_t}, max threads: #{max_t}"
+      log "* Environment: #{ENV['RACK_ENV']}"
+
+      @binder.parse @options[:binds], self
+
       server = Puma::Server.new @config.app, @events
       server.binder = @binder
       server.min_threads = min_t
       server.max_threads = max_t
 
-      log "Puma #{Puma::Const::PUMA_VERSION} starting..."
-      log "* Min threads: #{min_t}, max threads: #{max_t}"
-      log "* Environment: #{ENV['RACK_ENV']}"
-
       @server = server
 
       if str = @options[:control_url]
@@ -407,7 +440,20 @@ module Puma
         log "*** Sorry signal SIGTERM not implemented, gracefully stopping feature disabled!"
       end
 
-      log "Use Ctrl-C to stop"
+      if @options[:daemon]
+        Process.daemon(true)
+      else
+        log "Use Ctrl-C to stop"
+      end
+
+      redirect_io
+
+      if jruby?
+        Signal.trap("INT") do
+          graceful_stop server
+          exit
+        end
+      end
 
       begin
         server.run.join
@@ -504,6 +550,8 @@ module Puma
       log "* Min threads: #{@options[:min_threads]}, max threads: #{@options[:max_threads]}"
       log "* Environment: #{ENV['RACK_ENV']}"
 
+      @binder.parse @options[:binds], self
+
       @master_pid = Process.pid
 
       read, write = IO.pipe
@@ -538,9 +586,20 @@ module Puma
       #
       @check_pipe, @suicide_pipe = IO.pipe
 
+      if @options[:daemon]
+        Process.daemon(true)
+      else
+        log "Use Ctrl-C to stop"
+      end
+
+      redirect_io
+
       spawn_workers
 
-      log "* Use Ctrl-C to stop"
+      Signal.trap "SIGINT" do
+        stop = true
+        write.write "!"
+      end
 
       begin
         while !stop

data/lib/puma/configuration.rb

@@ -67,7 +67,7 @@ module Puma
         end
       end
 
-      unless @options[:quiet]
+      if !@options[:quiet] and @options[:environment] == "development"
         logger = @options[:logger] || STDOUT
         app = Rack::CommonLogger.new(app, logger)
       end
@@ -156,6 +156,12 @@ module Puma
         @options[:binds] << url
       end
 
+      # Daemonize the server into the background. Highly suggest that
+      # this be combined with +pidfile+ and +stdout_redirect+.
+      def daemonize(which=true)
+        @options[:daemon] = which
+      end
+
       # Set the environment in which the Rack's app will run.
       def environment(environment)
         @options[:environment] = environment
@@ -187,6 +193,13 @@ module Puma
         @options[:rackup] = path.to_s
       end
 
+      # Redirect STDOUT and STDERR to files specified.
+      def stdout_redirect(stdout=nil, stderr=nil, append=false)
+        @options[:redirect_stdout] = stdout
+        @options[:redirect_stderr] = stderr
+        @options[:redirect_append] = append
+      end
+
       # Configure +min+ to be the minimum number of threads to use to answer
       # requests and +max+ the maximum.
       #
@@ -220,6 +233,11 @@ module Puma
       def workers(count)
         @options[:workers] = count.to_i
       end
+
+      # The directory to operate out of.
+      def directory(dir)
+        @options[:directory] = dir.to_s
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b1".freeze
+    PUMA_VERSION = VERSION = "2.0.0.b2".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -1,127 +1,212 @@
 require 'optparse'
-
 require 'puma/const'
 require 'puma/configuration'
-
 require 'yaml'
 require 'uri'
-
 require 'socket'
-
 module Puma
   class ControlCLI
 
-    def initialize(argv, stdout=STDOUT)
+    COMMANDS = %w{halt restart start stats status stop}
+
+    def is_windows?
+      RUBY_PLATFORM =~ /(win|w)32$/ ? true : false
+    end
+
+    def initialize(argv, stdout=STDOUT, stderr=STDERR)
       @argv = argv
       @stdout = stdout
-    end
+      @stderr = stderr
+      @options = {}
+      
+      opts = OptionParser.new do |o|
+        o.banner = "Usage: pumactl (-p PID | -P pidfile | -S status_file | -C url -T token) (#{COMMANDS.join("|")})"
 
-    def setup_options
-      @parser = OptionParser.new do |o|
         o.on "-S", "--state PATH", "Where the state file to use is" do |arg|
-          @path = arg
+          @options[:status_path] = arg
         end
-      end
-    end
 
-    def connect
-      if str = @config.options[:control_url]
-        uri = URI.parse str
-        case uri.scheme
-        when "tcp"
-          return TCPSocket.new uri.host, uri.port
-        when "unix"
-          path = "#{uri.host}#{uri.path}"
-          return UNIXSocket.new path
-        else
-          raise "Invalid URI: #{str}"
+        o.on "-Q", "--quiet", "Not display messages" do |arg|
+          @options[:quiet_flag] = true
+        end
+
+        o.on "-P", "--pidfile PATH", "Pid file" do |arg|
+          @options[:pid_file] = arg
+        end
+
+        o.on "-p", "--pid PID", "Pid" do |arg|
+          @options[:pid] = arg.to_i
+        end
+
+        o.on "-C", "--control-url URL", "The bind url to use for the control server" do |arg|
+          @options[:control_url] = arg
+        end
+
+        o.on "-T", "--control-token TOKEN", "The token to use as authentication for the control server" do |arg|
+          @options[:control_auth_token] = arg
+        end
+
+        o.on_tail("-H", "--help", "Show this message") do
+          @stdout.puts o
+          exit
         end
+
+        o.on_tail("-V", "--version", "Show version") do
+          puts Const::PUMA_VERSION
+          exit
+        end
+      end
+
+      opts.order!(argv) { |a| opts.terminate a }
+      
+      command = argv.shift
+      @options[:command] = command if command
+
+      # check present of command
+      unless @options[:command]
+        raise "Available commands: #{COMMANDS.join(", ")}"
+      end
+
+      unless COMMANDS.include? @options[:command]
+        raise "Invalid command: #{@options[:command]}" 
       end
 
-      raise "No status address configured"
+    rescue => e
+      @stdout.puts e.message
+      exit 1
+    end
+    
+    def message(msg)
+      @stdout.puts msg unless @options[:quiet_flag]
     end
 
-    def run
-      setup_options
+    def prepare_configuration
+      if @options.has_key? :status_path
+        unless File.exist? @options[:status_path]
+          raise "Status file not found: #{@options[:status_path]}"
+        end
 
-      @parser.parse! @argv
+        status = YAML.load File.read(@options[:status_path])
 
-      @state = YAML.load File.read(@path)
-      @config = @state['config']
+        if status.has_key? "config"
 
-      cmd = @argv.shift
+          conf = status["config"]
 
-      meth = "command_#{cmd}"
+          # get control_url
+          if url = conf.options[:control_url]
+            @options[:control_url] = url
+          end
 
-      if respond_to?(meth)
-        __send__(meth)
-      else
-        raise "Unknown command: #{cmd}"
+          # get control_auth_token
+          if token = conf.options[:control_auth_token]
+            @options[:control_auth_token] = token
+          end
+
+          # get pid
+          @options[:pid] = status["pid"].to_i
+        else
+          raise "Invalid status file: #{@options[:status_path]}"
+        end
+
+      elsif @options.has_key? :pid_file
+        # get pid from pid_file
+        @options[:pid] = File.open(@options[:pid_file]).gets.to_i
       end
     end
 
-    def request(sock, url)
-      token = @config.options[:control_auth_token]
-      if token
-        url = "#{url}?token=#{token}"
-      end
+    def send_request
+      uri = URI.parse @options[:control_url]
+      
+      # create server object by scheme
+      @server = case uri.scheme
+                when "tcp"
+                  TCPSocket.new uri.host, uri.port
+                when "unix"
+                  UNIXSocket.new "#{uri.host}#{uri.path}"
+                else
+                  raise "Invalid scheme: #{uri.scheme}"
+                end
+
+      if @options[:command] == "status"
+        message "Puma is started"
+      else
+        url = "/#{@options[:command]}"
 
-      sock << "GET #{url} HTTP/1.0\r\n\r\n"
+        if @options.has_key?(:control_auth_token)
+          url = url + "?token=#{@options[:control_auth_token]}"
+        end
 
-      rep = sock.read.split("\r\n")
+        @server << "GET #{url} HTTP/1.0\r\n\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
+        response = @server.read.split("\r\n")
 
-      return rep.last
-    end
+        (@http,@code,@message) = response.first.split(" ")
+
+        if @code == "403"
+          raise "Unauthorized access to server (wrong auth token)"
+        elsif @code != "200"
+          raise "Bad response from server: #{@code}"
+        end
 
-    def command_pid
-      @stdout.puts "#{@state['pid']}"
+        message "Command #{@options[:command]} sent success"
+      end
+      
+      @server.close
     end
 
-    def command_stop
-      sock = connect
-      body = request sock, "/stop"
+    def send_signal
+      unless pid = @options[:pid]
+        raise "Neither pid nor control url available"
+      end
 
-      if body != '{ "status": "ok" }'
-        raise "Invalid response: '#{body}'"
-      else
-        @stdout.puts "Requested stop from server"
+      begin
+        Process.getpgid pid
+      rescue SystemCallError
+        raise "No pid '#{pid}' found"
       end
-    end
 
-    def command_halt
-      sock = connect
-      body = request sock, "/halt"
+      case @options[:command]
+      when "restart"
+        Process.kill "SIGUSR2", pid
+
+      when "halt"
+        Process.kill "QUIT", pid
+
+      when "stop"
+        Process.kill "SIGTERM", pid
+
+      when "stats"
+        puts "Stats not available via pid only"
+        return
 
-      if body != '{ "status": "ok" }'
-        raise "Invalid response: '#{body}'"
       else
-        @stdout.puts "Requested halt from server"
+        message "Puma is started"
+        return
       end
+
+      message "Command #{@options[:command]} sent success"
     end
 
-    def command_restart
-      sock = connect
-      body = request sock, "/restart"
+    def run
+      if @options[:command] == "start"
+        require 'puma/cli'
 
-      if body != '{ "status": "ok" }'
-        raise "Invalid response: '#{body}'"
-      else
-        @stdout.puts "Requested restart from server"
+        cli = Puma::CLI.new @argv, @stdout, @stderr
+        cli.run
+        return
       end
-    end
 
-    def command_stats
-      sock = connect
-      body = request sock, "/stats"
+      prepare_configuration
+    
+      if is_windows?
+        send_request
+      else
+        @options.has_key?(:control_url) ? send_request : send_signal
+      end
 
-      @stdout.puts body
+    rescue => e
+      message e.message
+      exit 1
     end
   end
-end
+end  

data/lib/puma/server.rb

@@ -263,6 +263,8 @@ module Puma
         @events.unknown_error self, e, "Read"
 
       ensure
+        buffer.reset
+
         begin
           client.close if close_socket
         rescue IOError, SystemCallError

data/lib/puma/thread_pool.rb

@@ -82,11 +82,6 @@ module Puma
               @waiting += 1
               cond.wait mutex
               @waiting -= 1
-
-              if @shutdown
-                continue = false
-                break
-              end
             end
 
             work = todo.pop if continue

data/lib/rack/handler/puma.rb

@@ -58,3 +58,9 @@ module Rack
     register :puma, Puma
   end
 end
+
+# This is to trick newrelic into enabling the agent automatically.
+module Mongrel
+  class HttpServer
+  end
+end

data/puma.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.0.0.b1"
+  s.version = "2.0.0.b2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-09-12"
+  s.date = "2012-11-18"
   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", "Gemfile.lock", "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/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.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-post.ru", "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_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", "test/testhelp.rb", "tools/trickletest.rb", "test/test_iobuffer.rb"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "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/keystore.jks", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/puma_http11.bundle", "lib/puma/puma_http11.jar", "lib/puma/rack_patch.rb", "lib/puma/reactor.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-post.ru", "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_iobuffer.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", "test/testhelp.rb", "tools/jungle/README.md", "tools/jungle/puma", "tools/jungle/run-puma", "tools/trickletest.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]

data/test/test_app_status.rb

@@ -75,10 +75,14 @@ class TestAppStatus < Test::Unit::TestCase
   def test_stats
     @server.backlog = 1
     @server.running = 9
-
     status, _ , app = lint('/stats')
 
     assert_equal 200, status
     assert_equal ['{ "backlog": 1, "running": 9 }'], app.enum_for.to_a
   end
+
+  def test_alternate_location
+    status, _ , app = lint('__alternatE_location_/stats')
+    assert_equal 200, status
+  end
 end

data/test/test_integration.rb

@@ -85,7 +85,7 @@ class TestIntegration < Test::Unit::TestCase
     assert_kind_of Thread, t.join(1), "server didn't stop"
   end
 
-  def test_restart_closes_keepalive_sockets
+  def notest_restart_closes_keepalive_sockets
     server("-q test/hello.ru")
 
     s = TCPSocket.new "localhost", @tcp_port
@@ -102,7 +102,7 @@ class TestIntegration < Test::Unit::TestCase
 
     assert_raises Errno::ECONNRESET do
       Timeout.timeout(2) do
-        s.read(2)
+        raise Errno::ECONNRESET unless s.read(2)
       end
     end
 
@@ -111,7 +111,7 @@ class TestIntegration < Test::Unit::TestCase
     assert_equal "Hello World", s.read.split("\r\n").last
   end
 
-  def test_restart_closes_keepalive_sockets_workers
+  def notest_restart_closes_keepalive_sockets_workers
     server("-q -w 2 test/hello.ru")
 
     s = TCPSocket.new "localhost", @tcp_port
@@ -128,7 +128,7 @@ class TestIntegration < Test::Unit::TestCase
 
     assert_raises Errno::ECONNRESET do
       Timeout.timeout(2) do
-        s.read(2)
+        raise Errno::ECONNRESET unless s.read(2)
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.b1
+  version: 2.0.0.b2
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-11-19 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
@@ -77,7 +77,6 @@ extra_rdoc_files:
 files: 
   - COPYING
   - Gemfile
-  - Gemfile.lock
   - History.txt
   - LICENSE
   - Manifest.txt

data/Gemfile.lock

@@ -1,27 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bouncy-castle-java (1.5.0146.1)
-    hoe (3.0.7)
-      rake (~> 0.8)
-    jruby-openssl (0.7.7)
-      bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.4)
-    json (1.7.4-java)
-    rack (1.4.1)
-    rake (0.9.2.2)
-    rake-compiler (0.8.1)
-      rake
-    rdoc (3.12)
-      json (~> 1.4)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  hoe
-  jruby-openssl
-  rack
-  rake-compiler
-  rdoc