puma 2.16.0 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761911bec0cc543faf03994736a763dc7d87b6eb
-  data.tar.gz: 20cd1109cf893a9940549520e1f2e6c875532f2e
+  metadata.gz: ec0eeb5886074470b19df49db748d9fad55c57c6
+  data.tar.gz: 74521d8b05a10a149cf6aa0fb4dc4c7e199ab124
 SHA512:
-  metadata.gz: c655e44ef966f2a4d8acd9b3d96b11a13072993edb1049ca65470cc0af3460bcd2e0d3f57f8afcec203cf6d9caad85cc7f1849454374ed65949b4284bd27ea33
-  data.tar.gz: 9b0e3acb94d4b0e3ae1a0f1eb1279dba87d600df67c928b455d8ea3ad47f3f90fb0a6854920776bad809dd46d013441e95385b981472d5f81f88d19ecbf4560e
+  metadata.gz: d64e58108913abf1b2252ba3038553ec28c82cfe96aa8812de7bdc58215881aea90a1048b490cee8699df99c73f3ea2b9d1dd3b472d082fbcc7974003c79e16c
+  data.tar.gz: 35befe3e0a9d01fa14f58841ecbcef2fa84a99ba8b3c564ceacb99101e52d50a855c7ab65c983caf816a09bf5547fb35b4e6f111985bea1cb5940e46a01b4dc8

data/Manifest.txt

@@ -39,6 +39,7 @@ lib/puma/compat.rb
 lib/puma/configuration.rb
 lib/puma/const.rb
 lib/puma/control_cli.rb
+lib/puma/convenient.rb
 lib/puma/daemon_ext.rb
 lib/puma/delegation.rb
 lib/puma/detect.rb
@@ -47,8 +48,11 @@ lib/puma/events.rb
 lib/puma/io_buffer.rb
 lib/puma/java_io_buffer.rb
 lib/puma/jruby_restart.rb
+lib/puma/launcher.rb
 lib/puma/minissl.rb
 lib/puma/null_io.rb
+lib/puma/plugin.rb
+lib/puma/plugin/tmp_restart.rb
 lib/puma/rack/backports/uri/common_18.rb
 lib/puma/rack/backports/uri/common_192.rb
 lib/puma/rack/backports/uri/common_193.rb
@@ -59,6 +63,7 @@ lib/puma/reactor.rb
 lib/puma/runner.rb
 lib/puma/server.rb
 lib/puma/single.rb
+lib/puma/state_file.rb
 lib/puma/tcp_logger.rb
 lib/puma/thread_pool.rb
 lib/puma/util.rb

data/README.md

@@ -1,6 +1,9 @@
 # Puma: A Ruby Web Server Built For Concurrency
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![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) <a href="https://codeclimate.com/github/puma/puma"><img src="https://codeclimate.com/github/puma/puma.png" /></a>
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://secure.travis-ci.org/puma/puma.svg)](http://travis-ci.org/puma/puma)
+[![Dependency Status](https://gemnasium.com/puma/puma.svg)](https://gemnasium.com/puma/puma)
+[![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
 
 ## Description
 

data/ext/puma_http11/http11_parser.java.rl

@@ -7,8 +7,8 @@ public class Http11Parser {
 /** Machine **/
 
 %%{
-  
-  machine http_parser;
+
+  machine puma_parser;
 
   action mark {parser.mark = fpc; }
 
@@ -60,7 +60,7 @@ public class Http11Parser {
     fbreak;
   }
 
-  include http_parser_common "http11_parser_common.rl";
+  include puma_parser_common "http11_parser_common.rl";
 
 }%%
 
@@ -152,10 +152,10 @@ public class Http11Parser {
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }

data/ext/puma_http11/org/jruby/puma/Http11Parser.java

@@ -15,7 +15,7 @@ public class Http11Parser {
 /** Data **/
 
 // line 18 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
-private static byte[] init__http_parser_actions_0()
+private static byte[] init__puma_parser_actions_0()
 {
 	return new byte [] {
 	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
@@ -25,10 +25,10 @@ private static byte[] init__http_parser_actions_0()
 	};
 }
 
-private static final byte _http_parser_actions[] = init__http_parser_actions_0();
+private static final byte _puma_parser_actions[] = init__puma_parser_actions_0();
 
 
-private static short[] init__http_parser_key_offsets_0()
+private static short[] init__puma_parser_key_offsets_0()
 {
 	return new short [] {
 	    0,    0,    8,   17,   27,   29,   30,   31,   32,   33,   34,   36,
@@ -39,10 +39,10 @@ private static short[] init__http_parser_key_offsets_0()
 	};
 }
 
-private static final short _http_parser_key_offsets[] = init__http_parser_key_offsets_0();
+private static final short _puma_parser_key_offsets[] = init__puma_parser_key_offsets_0();
 
 
-private static char[] init__http_parser_trans_keys_0()
+private static char[] init__puma_parser_trans_keys_0()
 {
 	return new char [] {
 	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
@@ -80,10 +80,10 @@ private static char[] init__http_parser_trans_keys_0()
 	};
 }
 
-private static final char _http_parser_trans_keys[] = init__http_parser_trans_keys_0();
+private static final char _puma_parser_trans_keys[] = init__puma_parser_trans_keys_0();
 
 
-private static byte[] init__http_parser_single_lengths_0()
+private static byte[] init__puma_parser_single_lengths_0()
 {
 	return new byte [] {
 	    0,    2,    3,    4,    2,    1,    1,    1,    1,    1,    0,    1,
@@ -94,10 +94,10 @@ private static byte[] init__http_parser_single_lengths_0()
 	};
 }
 
-private static final byte _http_parser_single_lengths[] = init__http_parser_single_lengths_0();
+private static final byte _puma_parser_single_lengths[] = init__puma_parser_single_lengths_0();
 
 
-private static byte[] init__http_parser_range_lengths_0()
+private static byte[] init__puma_parser_range_lengths_0()
 {
 	return new byte [] {
 	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    1,    1,
@@ -108,10 +108,10 @@ private static byte[] init__http_parser_range_lengths_0()
 	};
 }
 
-private static final byte _http_parser_range_lengths[] = init__http_parser_range_lengths_0();
+private static final byte _puma_parser_range_lengths[] = init__puma_parser_range_lengths_0();
 
 
-private static short[] init__http_parser_index_offsets_0()
+private static short[] init__puma_parser_index_offsets_0()
 {
 	return new short [] {
 	    0,    0,    6,   13,   21,   24,   26,   28,   30,   32,   34,   36,
@@ -122,10 +122,10 @@ private static short[] init__http_parser_index_offsets_0()
 	};
 }
 
-private static final short _http_parser_index_offsets[] = init__http_parser_index_offsets_0();
+private static final short _puma_parser_index_offsets[] = init__puma_parser_index_offsets_0();
 
 
-private static byte[] init__http_parser_indicies_0()
+private static byte[] init__puma_parser_indicies_0()
 {
 	return new byte [] {
 	    0,    0,    0,    0,    0,    1,    2,    3,    3,    3,    3,    3,
@@ -158,10 +158,10 @@ private static byte[] init__http_parser_indicies_0()
 	};
 }
 
-private static final byte _http_parser_indicies[] = init__http_parser_indicies_0();
+private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0();
 
 
-private static byte[] init__http_parser_trans_targs_0()
+private static byte[] init__puma_parser_trans_targs_0()
 {
 	return new byte [] {
 	    2,    0,    3,   38,    4,   24,   28,   25,    5,   20,    6,    7,
@@ -174,10 +174,10 @@ private static byte[] init__http_parser_trans_targs_0()
 	};
 }
 
-private static final byte _http_parser_trans_targs[] = init__http_parser_trans_targs_0();
+private static final byte _puma_parser_trans_targs[] = init__puma_parser_trans_targs_0();
 
 
-private static byte[] init__http_parser_trans_actions_0()
+private static byte[] init__puma_parser_trans_actions_0()
 {
 	return new byte [] {
 	    1,    0,   11,    0,    1,    1,    1,    1,   13,   13,    1,    0,
@@ -190,14 +190,14 @@ private static byte[] init__http_parser_trans_actions_0()
 	};
 }
 
-private static final byte _http_parser_trans_actions[] = init__http_parser_trans_actions_0();
+private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans_actions_0();
 
 
-static final int http_parser_start = 1;
-static final int http_parser_first_final = 57;
-static final int http_parser_error = 0;
+static final int puma_parser_start = 1;
+static final int puma_parser_first_final = 57;
+static final int puma_parser_error = 0;
 
-static final int http_parser_en_main = 1;
+static final int puma_parser_en_main = 1;
 
 
 // line 69 "ext/puma_http11/http11_parser.java.rl"
@@ -238,7 +238,7 @@ static final int http_parser_en_main = 1;
           
 // line 240 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
-	cs = http_parser_start;
+	cs = puma_parser_start;
 	}
 
 // line 104 "ext/puma_http11/http11_parser.java.rl"
@@ -290,9 +290,9 @@ static final int http_parser_en_main = 1;
 	}
 case 1:
 	_match: do {
-	_keys = _http_parser_key_offsets[cs];
-	_trans = _http_parser_index_offsets[cs];
-	_klen = _http_parser_single_lengths[cs];
+	_keys = _puma_parser_key_offsets[cs];
+	_trans = _puma_parser_index_offsets[cs];
+	_klen = _puma_parser_single_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -302,9 +302,9 @@ case 1:
 				break;
 
 			_mid = _lower + ((_upper-_lower) >> 1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 1;
-			else if ( data[p] > _http_parser_trans_keys[_mid] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid] )
 				_lower = _mid + 1;
 			else {
 				_trans += (_mid - _keys);
@@ -315,7 +315,7 @@ case 1:
 		_trans += _klen;
 	}
 
-	_klen = _http_parser_range_lengths[cs];
+	_klen = _puma_parser_range_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -325,9 +325,9 @@ case 1:
 				break;
 
 			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 2;
-			else if ( data[p] > _http_parser_trans_keys[_mid+1] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid+1] )
 				_lower = _mid + 2;
 			else {
 				_trans += ((_mid - _keys)>>1);
@@ -338,15 +338,15 @@ case 1:
 	}
 	} while (false);
 
-	_trans = _http_parser_indicies[_trans];
-	cs = _http_parser_trans_targs[_trans];
+	_trans = _puma_parser_indicies[_trans];
+	cs = _puma_parser_trans_targs[_trans];
 
-	if ( _http_parser_trans_actions[_trans] != 0 ) {
-		_acts = _http_parser_trans_actions[_trans];
-		_nacts = (int) _http_parser_actions[_acts++];
+	if ( _puma_parser_trans_actions[_trans] != 0 ) {
+		_acts = _puma_parser_trans_actions[_trans];
+		_nacts = (int) _puma_parser_actions[_acts++];
 		while ( _nacts-- > 0 )
 	{
-			switch ( _http_parser_actions[_acts++] )
+			switch ( _puma_parser_actions[_acts++] )
 			{
 	case 0:
 // line 13 "ext/puma_http11/http11_parser.java.rl"
@@ -479,10 +479,10 @@ case 5:
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }

data/lib/puma.rb

@@ -12,3 +12,4 @@ require 'thread'
 # Ruby Puma
 require 'puma/const'
 require 'puma/server'
+require 'puma/launcher'

data/lib/puma/app/status.rb

@@ -49,7 +49,7 @@ module Puma
           end
 
         when /\/reload-worker-directory$/
-          if !@cli.reload_worker_directory
+          if !@cli.send(:reload_worker_directory)
             return rack_response(404, '{ "error": "reload_worker_directory not available" }')
           else
             return rack_response(200, OK_STATUS)

data/lib/puma/binder.rb

@@ -1,4 +1,5 @@
 require 'puma/const'
+require 'uri'
 
 module Puma
   class Binder
@@ -165,7 +166,7 @@ module Puma
                 @events.error "Please specify the SSL ca via 'ca='"
               end
             end
-            
+
             ctx.ca = params['ca'] if params['ca']
 
             if  params['verify_mode']
@@ -237,10 +238,14 @@ module Puma
       end
       s.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
       s.listen backlog
+      @connected_port = s.addr[1]
+
       @ios << s
       s
     end
 
+    attr_reader :connected_port
+
     def inherit_tcp_listener(host, port, fd)
       if fd.kind_of? TCPServer
         s = fd

data/lib/puma/cli.rb

@@ -1,17 +1,7 @@
 require 'optparse'
 require 'uri'
 
-require 'puma/server'
-require 'puma/const'
-require 'puma/configuration'
-require 'puma/binder'
-require 'puma/detect'
-require 'puma/daemon_ext'
-require 'puma/util'
-require 'puma/single'
-require 'puma/cluster'
-
-require 'puma/commonlogger'
+require 'puma/launcher'
 
 module Puma
   class << self
@@ -25,11 +15,7 @@ module Puma
   # Handles invoke a Puma::Server in a command line style.
   #
   class CLI
-    KEYS_NOT_TO_PERSIST_IN_STATE = [
-      :logger, :lowlevel_error_handler,
-      :before_worker_shutdown, :before_worker_boot, :before_worker_fork,
-      :after_worker_boot, :before_fork, :on_restart
-    ]
+    KEYS_NOT_TO_PERSIST_IN_STATE = Launcher::KEYS_NOT_TO_PERSIST_IN_STATE
 
     # Create a new CLI object using +argv+ as the command line
     # arguments.
@@ -39,544 +25,189 @@ module Puma
     #
     def initialize(argv, events=Events.stdio)
       @debug = false
-      @argv = argv
+      @argv = argv.dup
 
       @events = events
 
-      @status = nil
-      @runner = nil
+      @conf = nil
 
-      @config = nil
+      @stdout = nil
+      @stderr = nil
+      @append = false
 
-      setup_options
-      generate_restart_data
-
-      @binder = Binder.new(@events)
-      @binder.import_from_env
-    end
-
-    # The Binder object containing the sockets bound to.
-    attr_reader :binder
-
-    # The Configuration object used.
-    attr_reader :config
-
-    # The Hash of options used to configure puma.
-    attr_reader :options
-
-    # The Events object used to output information.
-    attr_reader :events
-
-    # Delegate +log+ to +@events+
-    #
-    def log(str)
-      @events.log str
-    end
-
-    # Delegate +error+ to +@events+
-    #
-    def error(str)
-      @events.error str
-    end
-
-    def debug(str)
-      @events.log "- #{str}" if @options[:debug]
-    end
-
-    def clustered?
-      @options[:workers] > 0
-    end
-
-    def prune_bundler?
-      @options[:prune_bundler] && clustered? && !@options[:preload_app]
-    end
-
-    def jruby?
-      IS_JRUBY
-    end
-
-    def windows?
-      RUBY_PLATFORM =~ /mswin32|ming32/
-    end
-
-    def env
-      @options[:environment] || @cli_options[:environment] || ENV['RACK_ENV'] || 'development'
-    end
+      @control_url = nil
+      @control_options = {}
 
-    def write_state
-      write_pid
-
-      path = @options[:state]
-      return unless path
-
-      state = { 'pid' => Process.pid }
-      cfg = @config.dup
-
-      KEYS_NOT_TO_PERSIST_IN_STATE.each { |k| cfg.options.delete(k) }
-      state['config'] = cfg
-
-      require 'yaml'
-      File.open(path, 'w') { |f| f.write state.to_yaml }
-    end
-
-    # If configured, write the pid of the current process out
-    # to a file.
-    #
-    def write_pid
-      path = @options[:pidfile]
-      return unless path
-
-      File.open(path, 'w') { |f| f.puts Process.pid }
-      cur = Process.pid
-      at_exit do
-        delete_pidfile if cur == Process.pid
-      end
-    end
-
-    def delete_pidfile
-      path = @options[:pidfile]
-      File.unlink(path) if path && File.exist?(path)
-    end
-
-    def graceful_stop
-      @runner.stop_blocked
-      log "=== puma shutdown: #{Time.now} ==="
-      log "- Goodbye!"
-    end
-
-    def jruby_daemon_start
-      require 'puma/jruby_restart'
-      JRubyRestart.daemon_start(@restart_dir, restart_args)
-    end
+      setup_options
 
-    def restart!
-      @options[:on_restart].each do |block|
-        block.call self
-      end
+      begin
+        @parser.parse! @argv
 
-      if jruby?
-        close_binder_listeners
-
-        require 'puma/jruby_restart'
-        JRubyRestart.chdir_exec(@restart_dir, restart_args)
-      elsif windows?
-        close_binder_listeners
-
-        argv = restart_args
-        Dir.chdir(@restart_dir)
-        argv += [redirects] if RUBY_VERSION >= '1.9'
-        Kernel.exec(*argv)
-      else
-        redirects = {:close_others => true}
-        @binder.listeners.each_with_index do |(l, io), i|
-          ENV["PUMA_INHERIT_#{i}"] = "#{io.to_i}:#{l}"
-          redirects[io.to_i] = io.to_i
+        if file = @argv.shift
+          @conf.configure do |c|
+            c.rackup file
+          end
         end
-
-        argv = restart_args
-        Dir.chdir(@restart_dir)
-        argv += [redirects] if RUBY_VERSION >= '1.9'
-        Kernel.exec(*argv)
-      end
-    end
-
-    # Parse the options, load the rackup, start the server and wait
-    # for it to finish.
-    #
-    def run
-      begin
-        parse_options
       rescue UnsupportedOption
         exit 1
       end
 
-      dir = @options[:directory]
-      Dir.chdir(dir) if dir
-
-      prune_bundler if prune_bundler?
-
-      set_rack_environment
-
-      if clustered?
-        @events.formatter = Events::PidFormatter.new
-        @options[:logger] = @events
-
-        @runner = Cluster.new(self)
-      else
-        @runner = Single.new(self)
-      end
-
-      setup_signals
-      set_process_title
-
-      @status = :run
-
-      @runner.run
-
-      case @status
-      when :halt
-        log "* Stopping immediately!"
-      when :run, :stop
-        graceful_stop
-      when :restart
-        log "* Restarting..."
-        @runner.before_restart
-        restart!
-      when :exit
-        # nothing
-      end
-    end
-
-    def stop
-      @status = :stop
-      @runner.stop
-    end
-
-    def restart
-      @status = :restart
-      @runner.restart
-    end
-
-    def reload_worker_directory
-      @runner.reload_worker_directory if @runner.respond_to?(:reload_worker_directory)
-    end
+      @conf.configure do |c|
+        if @stdout || @stderr
+          c.stdout_redirect @stdout, @stderr, @append
+        end
 
-    def phased_restart
-      unless @runner.respond_to?(:phased_restart) and @runner.phased_restart
-        log "* phased-restart called but not available, restarting normally."
-        return restart
+        if @control_url
+          c.activate_control_app @control_url, @control_options
+        end
       end
-      true
-    end
 
-    def redirect_io
-      @runner.redirect_io
+      @launcher = Puma::Launcher.new(@conf, :events => @events, :argv => argv)
     end
 
-    def stats
-      @runner.stats
-    end
+    attr_reader :launcher
 
-    def halt
-      @status = :halt
-      @runner.halt
+    # Parse the options, load the rackup, start the server and wait
+    # for it to finish.
+    #
+    def run
+      @launcher.run
     end
 
   private
-    def title
-      buffer = "puma #{Puma::Const::VERSION} (#{@options[:binds].join(',')})"
-      buffer << " [#{@options[:tag]}]" if @options[:tag] && !@options[:tag].empty?
-      buffer
-    end
-
     def unsupported(str)
       @events.error(str)
       raise UnsupportedOption
     end
 
-    def restart_args
-      cmd = @options[:restart_cmd]
-      if cmd
-        cmd.split(' ') + @original_argv
-      else
-        @restart_argv
-      end
-    end
-
-    def set_process_title
-      Process.respond_to?(:setproctitle) ? Process.setproctitle(title) : $0 = title
-    end
-
-    def find_config
-      if @cli_options[:config_file] == '-'
-        @cli_options[:config_file] = nil
-      else
-        @cli_options[:config_file] ||= %W(config/puma/#{env}.rb config/puma.rb).find { |f| File.exist?(f) }
-      end
-    end
-
     # Build the OptionParser object to handle the available options.
     #
 
     def setup_options
-      @cli_options = {}
-      @options = {}
-
-      @parser = OptionParser.new do |o|
-        o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
-          (@cli_options[:binds] ||= []) << arg
-        end
-
-        o.on "-C", "--config PATH", "Load PATH as a config file" do |arg|
-          @cli_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
-            @cli_options[:control_url] = arg
-          elsif jruby?
-            unsupported "No default url available on JRuby"
+      @conf = Configuration.new do |c|
+        @parser = OptionParser.new do |o|
+          o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
+            c.bind arg
           end
-        end
 
-        o.on "--control-token TOKEN",
-             "The token to use as authentication for the control server" do |arg|
-          @cli_options[:control_auth_token] = arg
-        end
-
-        o.on "-d", "--daemon", "Daemonize the server into the background" do
-          @cli_options[:daemon] = true
-          @cli_options[:quiet] = true
-        end
-
-        o.on "--debug", "Log lowlevel debugging information" do
-          @cli_options[:debug] = true
-        end
-
-        o.on "--dir DIR", "Change to DIR before starting" do |d|
-          @cli_options[:directory] = d.to_s
-          @cli_options[:worker_directory] = d.to_s
-        end
-
-        o.on "-e", "--environment ENVIRONMENT",
-             "The environment to run the Rack app on (default development)" do |arg|
-          @cli_options[:environment] = 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 the TCP port to bind to",
-                                  "Use -b for more advanced options" do |arg|
-          binds = (@cli_options[:binds] ||= [])
-          binds << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
-        end
-
-        o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
-          @cli_options[:pidfile] = arg
-        end
-
-        o.on "--preload", "Preload the app. Cluster mode only" do
-          @cli_options[:preload_app] = true
-        end
-
-        o.on "--prune-bundler", "Prune out the bundler env if possible" do
-          @cli_options[:prune_bundler] = true
-        end
-
-        o.on "-q", "--quiet", "Quiet down the output" do
-          @cli_options[:quiet] = true
-        end
-
-        o.on "-R", "--restart-cmd CMD",
-             "The puma command to run during a hot restart",
-             "Default: inferred" do |cmd|
-          @cli_options[:restart_cmd] = cmd
-        end
+          o.on "-C", "--config PATH", "Load PATH as a config file" do |arg|
+            c.load arg
+          end
 
-        o.on "-S", "--state PATH", "Where to store the state details" do |arg|
-          @cli_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
+              @control_url = arg
+            elsif Puma.jruby?
+              unsupported "No default url available on JRuby"
+            end
+          end
 
-        o.on '-t', '--threads INT', "min:max threads to use (default 0:16)" do |arg|
-          min, max = arg.split(":")
-          if max
-            @cli_options[:min_threads] = min
-            @cli_options[:max_threads] = max
-          else
-            @cli_options[:min_threads] = 0
-            @cli_options[:max_threads] = arg
+          o.on "--control-token TOKEN",
+            "The token to use as authentication for the control server" do |arg|
+            @control_options[:auth_token] = arg
           end
-        end
 
-        o.on "--tcp-mode", "Run the app in raw TCP mode instead of HTTP mode" do
-          @cli_options[:mode] = :tcp
-        end
+          o.on "-d", "--daemon", "Daemonize the server into the background" do
+            c.daemonize
+            c.quiet
+          end
 
-        o.on "-V", "--version", "Print the version information" do
-          puts "puma version #{Puma::Const::VERSION}"
-          exit 0
-        end
+          o.on "--debug", "Log lowlevel debugging information" do
+            c.debug
+          end
 
-        o.on "-w", "--workers COUNT",
-                   "Activate cluster mode: How many worker processes to create" do |arg|
-          @cli_options[:workers] = arg.to_i
-        end
+          o.on "--dir DIR", "Change to DIR before starting" do |d|
+            c.directory d
+          end
 
-        o.on "--tag NAME", "Additional text to display in process listing" do |arg|
-          @cli_options[:tag] = arg
-        end
+          o.on "-e", "--environment ENVIRONMENT",
+            "The environment to run the Rack app on (default development)" do |arg|
+            c.environment arg
+          end
 
-        o.on "--redirect-stdout FILE", "Redirect STDOUT to a specific file" do |arg|
-          @cli_options[:redirect_stdout] = arg
-        end
+          o.on "-I", "--include PATH", "Specify $LOAD_PATH directories" do |arg|
+            $LOAD_PATH.unshift(*arg.split(':'))
+          end
 
-        o.on "--redirect-stderr FILE", "Redirect STDERR to a specific file" do |arg|
-          @cli_options[:redirect_stderr] = arg
-        end
+          o.on "-p", "--port PORT", "Define the TCP port to bind to",
+            "Use -b for more advanced options" do |arg|
+            c.bind "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
+          end
 
-        o.on "--[no-]redirect-append", "Append to redirected files" do |val|
-          @cli_options[:redirect_append] = val
-        end
+          o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
+            c.pidfile arg
+          end
 
-        o.banner = "puma <options> <rackup file>"
+          o.on "--preload", "Preload the app. Cluster mode only" do
+            c.preload_app!
+          end
 
-        o.on_tail "-h", "--help", "Show help" do
-          log o
-          exit 0
-        end
-      end
-    end
+          o.on "--prune-bundler", "Prune out the bundler env if possible" do
+            c.prune_bundler
+          end
 
-    def generate_restart_data
-      # Use the same trick as unicorn, namely favor PWD because
-      # it will contain an unresolved symlink, useful for when
-      # the pwd is /data/releases/current.
-      if dir = ENV['PWD']
-        s_env = File.stat(dir)
-        s_pwd = File.stat(Dir.pwd)
-
-        if s_env.ino == s_pwd.ino and (jruby? or s_env.dev == s_pwd.dev)
-          @restart_dir = dir
-          @options[:worker_directory] = dir
-        end
-      end
+          o.on "-q", "--quiet", "Quiet down the output" do
+            c.quiet
+          end
 
-      @restart_dir ||= Dir.pwd
+          o.on "-R", "--restart-cmd CMD",
+            "The puma command to run during a hot restart",
+            "Default: inferred" do |cmd|
+            c.restart_command cmd
+          end
 
-      @original_argv = @argv.dup
+          o.on "-S", "--state PATH", "Where to store the state details" do |arg|
+            c.state_path arg
+          end
 
-      require 'rubygems'
+          o.on '-t', '--threads INT', "min:max threads to use (default 0:16)" do |arg|
+            min, max = arg.split(":")
+            if max
+              c.threads min, max
+            else
+              c.threads 0, max
+            end
+          end
 
-      # if $0 is a file in the current directory, then restart
-      # it the same, otherwise add -S on there because it was
-      # picked up in PATH.
-      #
-      if File.exist?($0)
-        arg0 = [Gem.ruby, $0]
-      else
-        arg0 = [Gem.ruby, "-S", $0]
-      end
+          o.on "--tcp-mode", "Run the app in raw TCP mode instead of HTTP mode" do
+            c.tcp_mode!
+          end
 
-      # Detect and reinject -Ilib from the command line
-      lib = File.expand_path "lib"
-      arg0[1,0] = ["-I", lib] if $:[0] == lib
+          o.on "-V", "--version", "Print the version information" do
+            puts "puma version #{Puma::Const::VERSION}"
+            exit 0
+          end
 
-      if defined? Puma::WILD_ARGS
-        @restart_argv = arg0 + Puma::WILD_ARGS + @original_argv
-      else
-        @restart_argv = arg0 + @original_argv
-      end
-    end
+          o.on "-w", "--workers COUNT",
+            "Activate cluster mode: How many worker processes to create" do |arg|
+            c.workers arg
+          end
 
-    def set_rack_environment
-      @options[:environment] = env
-      ENV['RACK_ENV'] = env
-    end
+          o.on "--tag NAME", "Additional text to display in process listing" do |arg|
+            c.tag arg
+          end
 
-    def setup_signals
-      begin
-        Signal.trap "SIGUSR2" do
-          restart
-        end
-      rescue Exception
-        log "*** SIGUSR2 not implemented, signal based restart unavailable!"
-      end
+          o.on "--redirect-stdout FILE", "Redirect STDOUT to a specific file" do |arg|
+            @stdout = arg.to_s
+          end
 
-      begin
-        Signal.trap "SIGUSR1" do
-          phased_restart
-        end
-      rescue Exception
-        log "*** SIGUSR1 not implemented, signal based restart unavailable!"
-      end
+          o.on "--redirect-stderr FILE", "Redirect STDERR to a specific file" do |arg|
+            @stderr = arg.to_s
+          end
 
-      begin
-        Signal.trap "SIGTERM" do
-          stop
-        end
-      rescue Exception
-        log "*** SIGTERM not implemented, signal based gracefully stopping unavailable!"
-      end
+          o.on "--[no-]redirect-append", "Append to redirected files" do |val|
+            @append = val
+          end
 
-      begin
-        Signal.trap "SIGHUP" do
-          redirect_io
-        end
-      rescue Exception
-        log "*** SIGHUP not implemented, signal based logs reopening unavailable!"
-      end
+          o.banner = "puma <options> <rackup file>"
 
-      if jruby?
-        Signal.trap("INT") do
-          @status = :exit
-          graceful_stop
-          exit
+          o.on_tail "-h", "--help", "Show help" do
+            $stdout.puts o
+            exit 0
+          end
         end
       end
     end
-
-    def close_binder_listeners
-      @binder.listeners.each do |l, io|
-        io.close
-        uri = URI.parse(l)
-        next unless uri.scheme == 'unix'
-        File.unlink("#{uri.host}#{uri.path}")
-      end
-    end
-
-    def parse_options
-      @parser.parse! @argv
-
-      @cli_options[:rackup] = @argv.shift if @argv.last
-
-      find_config
-
-      @config = Puma::Configuration.new @cli_options
-
-      # Advertise the Configuration
-      Puma.cli_config = @config
-
-      @config.load
-
-      @options = @config.options
-
-      if clustered? && (jruby? || windows?)
-        unsupported 'worker mode not supported on JRuby or Windows'
-      end
-
-      if @options[:daemon] && windows?
-        unsupported 'daemon mode not supported on Windows'
-      end
-    end
-
-    def prune_bundler
-      return unless defined?(Bundler)
-      puma = Bundler.rubygems.loaded_specs("puma")
-      dirs = puma.require_paths.map { |x| File.join(puma.full_gem_path, x) }
-      puma_lib_dir = dirs.detect { |x| File.exist? File.join(x, '../bin/puma-wild') }
-
-      unless puma_lib_dir
-        log "! Unable to prune Bundler environment, continuing"
-        return
-      end
-
-      deps = puma.runtime_dependencies.map do |d|
-        spec = Bundler.rubygems.loaded_specs(d.name)
-        "#{d.name}:#{spec.version.to_s}"
-      end
-
-      log '* Pruning Bundler environment'
-      home = ENV['GEM_HOME']
-      Bundler.with_clean_env do
-        ENV['GEM_HOME'] = home
-        ENV['PUMA_BUNDLER_PRUNED'] = '1'
-        wild = File.expand_path(File.join(puma_lib_dir, "../bin/puma-wild"))
-        args = [Gem.ruby, wild, '-I', dirs.join(':'), deps.join(',')] + @original_argv
-        Kernel.exec(*args)
-      end
-    end
   end
 end