puma 2.16.0 → 3.0.0.rc1

data/lib/puma/plugin/tmp_restart.rb

@@ -0,0 +1,23 @@
+require 'puma/plugin'
+
+Puma::Plugin.create do
+  def start(launcher)
+    path = File.join("tmp", "restart.txt")
+
+    File.write path, ""
+
+    orig = File.stat(path).mtime
+
+    in_background do
+      while true
+        sleep 2
+
+        if File.stat(path).mtime > orig
+          launcher.restart
+          break
+        end
+      end
+    end
+  end
+end
+

data/lib/puma/runner.rb

@@ -1,7 +1,8 @@
 module Puma
   class Runner
-    def initialize(cli)
-      @cli = cli
+    def initialize(cli, events)
+      @launcher = cli
+      @events = events
       @options = cli.options
       @app = nil
       @control = nil
@@ -16,15 +17,19 @@ module Puma
     end
 
     def log(str)
-      @cli.log str
+      @events.log str
+    end
+
+    def before_restart
+      @control.stop(true) if @control
     end
 
     def error(str)
-      @cli.error str
+      @events.error str
     end
 
-    def before_restart
-      @control.stop(true) if @control
+    def debug(str)
+      @events.log "- #{str}" if @options[:debug]
     end
 
     def start_control
@@ -35,13 +40,13 @@ module Puma
 
       uri = URI.parse str
 
-      app = Puma::App::Status.new @cli
+      app = Puma::App::Status.new @launcher
 
       if token = @options[:control_auth_token]
         app.auth_token = token unless token.empty? or token == :none
       end
 
-      control = Puma::Server.new app, @cli.events
+      control = Puma::Server.new app, @launcher.events
       control.min_threads = 0
       control.max_threads = 1
 
@@ -104,34 +109,34 @@ module Puma
     end
 
     def load_and_bind
-      unless @cli.config.app_configured?
+      unless @launcher.config.app_configured?
         error "No application configured, nothing to run"
         exit 1
       end
 
       # Load the app before we daemonize.
       begin
-        @app = @cli.config.app
+        @app = @launcher.config.app
       rescue Exception => e
         log "! Unable to load application: #{e.class}: #{e.message}"
         raise e
       end
 
-      @cli.binder.parse @options[:binds], self
+      @launcher.binder.parse @options[:binds], self
     end
 
     def app
-      @app ||= @cli.config.app
+      @app ||= @launcher.config.app
     end
 
     def start_server
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      server = Puma::Server.new app, @cli.events, @options
+      server = Puma::Server.new app, @launcher.events, @options
       server.min_threads = min_t
       server.max_threads = max_t
-      server.inherit_binder @cli.binder
+      server.inherit_binder @launcher.binder
 
       if @options[:mode] == :tcp
         server.tcp_mode!

data/lib/puma/server.rb

@@ -85,6 +85,7 @@ module Puma
     forward :add_tcp_listener,  :@binder
     forward :add_ssl_listener,  :@binder
     forward :add_unix_listener, :@binder
+    forward :connected_port,    :@binder
 
     def inherit_binder(bind)
       @binder = bind

data/lib/puma/single.rb

@@ -27,7 +27,12 @@ module Puma
     end
 
     def jruby_daemon?
-      daemon? and @cli.jruby?
+      daemon? and Puma.jruby?
+    end
+
+    def jruby_daemon_start
+      require 'puma/jruby_restart'
+      JRubyRestart.daemon_start(@restart_dir, restart_args)
     end
 
     def run
@@ -66,7 +71,7 @@ module Puma
             exit 1
           end
 
-          pid = @cli.jruby_daemon_start
+          pid = jruby_daemon_start
           sleep
         end
       else
@@ -79,7 +84,7 @@ module Puma
         load_and_bind
       end
 
-      @cli.write_state
+      @launcher.write_state
 
       start_control
 
@@ -90,7 +95,7 @@ module Puma
         redirect_io
       end
 
-      @cli.events.fire_on_booted!
+      @launcher.events.fire_on_booted!
 
       begin
         server.run.join

data/lib/puma/state_file.rb

@@ -0,0 +1,27 @@
+module Puma
+  class StateFile
+    def initialize
+      @options = {}
+    end
+
+    def save(path)
+      File.write path, YAML.dump(@options)
+    end
+
+    def load(path)
+      @options = YAML.load File.read(path)
+    end
+
+    FIELDS = %w!control_url control_auth_token pid!
+
+    FIELDS.each do |f|
+      define_method f do
+        @options[f]
+      end
+
+      define_method "#{f}=" do |v|
+        @options[f] = v
+      end
+    end
+  end
+end

data/lib/rack/handler/puma.rb

@@ -5,48 +5,47 @@ module Rack
   module Handler
     module Puma
       DEFAULT_OPTIONS = {
-        :Host => '0.0.0.0',
-        :Port => 8080,
-        :Threads => '0:16',
         :Verbose => false,
-        :Silent => false
+        :Silent  => false
       }
 
       def self.run(app, options = {})
         options  = DEFAULT_OPTIONS.merge(options)
 
-        if options[:Verbose]
-          app = Rack::CommonLogger.new(app, STDOUT)
-        end
+        conf = ::Puma::Configuration.new do |c|
+          if options.delete(:Verbose)
+            app = Rack::CommonLogger.new(app, STDOUT)
+          end
 
-        if options[:environment]
-          ENV['RACK_ENV'] = options[:environment].to_s
-        end
+          if options[:environment]
+            c.environment options[:environment]
+          end
+
+          if options[:Threads]
+            min, max = options.delete(:Threads).split(':', 2)
+            c.threads min, max
+          end
 
-        events_hander = options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
-        server   = ::Puma::Server.new(app, events_hander)
-        min, max = options[:Threads].split(':', 2)
+          host = options[:Host] || ::Puma::Configuration::DefaultTCPHost
+          port = options[:Port] || ::Puma::Configuration::DefaultTCPPort
 
-        log = events_hander.stdout
+          c.port port, host
 
-        log.puts "Puma #{::Puma::Const::PUMA_VERSION} starting..."
-        log.puts "* Min threads: #{min}, max threads: #{max}"
-        log.puts "* Environment: #{ENV['RACK_ENV']}"
-        log.puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
+          c.app app
+        end
+
+        events = options.delete(:Silent) ? ::Puma::Events.strings : ::Puma::Events.stdio
 
-        server.add_tcp_listener options[:Host], options[:Port]
-        server.min_threads = min
-        server.max_threads = max
-        yield server if block_given?
+        launcher = ::Puma::Launcher.new(conf, :events => events)
 
+        yield launcher if block_given?
         begin
-          server.run.join
+          launcher.run
         rescue Interrupt
-          log.puts "* Gracefully stopping, waiting for requests to finish"
-          server.stop(true)
-          log.puts "* Goodbye!"
+          puts "* Gracefully stopping, waiting for requests to finish"
+          launcher.stop
+          puts "* Goodbye!"
         end
-
       end
 
       def self.valid_options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -136,6 +136,7 @@ files:
 - 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
@@ -144,8 +145,11 @@ files:
 - 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
@@ -156,6 +160,7 @@ files:
 - 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
@@ -186,9 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1