puma 5.6.4 → 6.0.2

data/lib/puma.rb

@@ -3,30 +3,33 @@
 # Standard libraries
 require 'socket'
 require 'tempfile'
-require 'time'
-require 'etc'
 require 'uri'
 require 'stringio'
 
 require 'thread'
 
+# use require, see https://github.com/puma/puma/pull/2381
 require 'puma/puma_http11'
-require 'puma/detect'
-require 'puma/json_serialization'
+
+require_relative 'puma/detect'
+require_relative 'puma/json_serialization'
 
 module Puma
-  autoload :Const, 'puma/const'
-  autoload :Server, 'puma/server'
-  autoload :Launcher, 'puma/launcher'
+  # when Puma is loaded via `Puma::CLI`, all files are loaded via
+  # `require_relative`.  The below are for non-standard loading
+  autoload :Const,     "#{__dir__}/puma/const"
+  autoload :Server,    "#{__dir__}/puma/server"
+  autoload :Launcher,  "#{__dir__}/puma/launcher"
+  autoload :LogWriter, "#{__dir__}/puma/log_writer"
 
   # at present, MiniSSL::Engine is only defined in extension code (puma_http11),
   # not in minissl.rb
   HAS_SSL = const_defined?(:MiniSSL, false) && MiniSSL.const_defined?(:Engine, false)
 
-  HAS_UNIX_SOCKET = Object.const_defined? :UNIXSocket
+  HAS_UNIX_SOCKET = Object.const_defined?(:UNIXSocket) && !IS_WINDOWS
 
   if HAS_SSL
-    require 'puma/minissl'
+    require_relative 'puma/minissl'
   else
     module MiniSSL
       # this class is defined so that it exists when Puma is compiled
@@ -69,9 +72,7 @@ module Puma
     @get_stats.stats
   end
 
-  # Thread name is new in Ruby 2.3
   def self.set_thread_name(name)
-    return unless Thread.current.respond_to?(:name=)
     Thread.current.name = "puma #{name}"
   end
 end

data/lib/rack/handler/puma.rb

@@ -11,10 +11,10 @@ module Rack
       }
 
       def self.config(app, options = {})
-        require 'puma'
-        require 'puma/configuration'
-        require 'puma/events'
-        require 'puma/launcher'
+        require_relative '../../puma'
+        require_relative '../../puma/configuration'
+        require_relative '../../puma/log_writer'
+        require_relative '../../puma/launcher'
 
         default_options = DEFAULT_OPTIONS.dup
 
@@ -63,9 +63,9 @@ module Rack
       def self.run(app, **options)
         conf   = self.config(app, options)
 
-        events = options.delete(:Silent) ? ::Puma::Events.strings : ::Puma::Events.stdio
+        log_writer = options.delete(:Silent) ? ::Puma::LogWriter.strings : ::Puma::LogWriter.stdio
 
-        launcher = ::Puma::Launcher.new(conf, :events => events)
+        launcher = ::Puma::Launcher.new(conf, :log_writer => log_writer)
 
         yield launcher if block_given?
         begin
@@ -93,16 +93,16 @@ module Rack
           config.bind "unix://#{host}"
         elsif host && host =~ /^ssl:\/\//
           uri = URI.parse(host)
-          uri.port ||= port || ::Puma::Configuration::DefaultTCPPort
+          uri.port ||= port || ::Puma::Configuration::DEFAULTS[:tcp_port]
           config.bind uri.to_s
         else
 
           if host
-            port ||= ::Puma::Configuration::DefaultTCPPort
+            port ||= ::Puma::Configuration::DEFAULTS[:tcp_port]
           end
 
           if port
-            host ||= ::Puma::Configuration::DefaultTCPHost
+            host ||= ::Puma::Configuration::DEFAULTS[:tcp_host]
             config.port port, host
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 6.0.2
 platform: ruby
 authors:
 - Evan Phoenix
@@ -62,6 +62,8 @@ files:
 - docs/signals.md
 - docs/stats.md
 - docs/systemd.md
+- docs/testing_benchmarks_local_files.md
+- docs/testing_test_rackup_ci_files.md
 - ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
@@ -96,12 +98,13 @@ files:
 - lib/puma/jruby_restart.rb
 - lib/puma/json_serialization.rb
 - lib/puma/launcher.rb
+- lib/puma/launcher/bundle_pruner.rb
+- lib/puma/log_writer.rb
 - lib/puma/minissl.rb
 - lib/puma/minissl/context_builder.rb
 - lib/puma/null_io.rb
 - lib/puma/plugin.rb
 - lib/puma/plugin/tmp_restart.rb
-- lib/puma/queue_close.rb
 - lib/puma/rack/builder.rb
 - lib/puma/rack/urlmap.rb
 - lib/puma/rack_default.rb
@@ -125,6 +128,7 @@ metadata:
   changelog_uri: https://github.com/puma/puma/blob/master/History.md
   homepage_uri: https://puma.io
   source_code_uri: https://github.com/puma/puma
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -133,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/puma/queue_close.rb

@@ -1,26 +0,0 @@
-class ClosedQueueError < StandardError; end
-module Puma
-
-  # Queue#close was added in Ruby 2.3.
-  # Add a simple implementation for earlier Ruby versions.
-  #
-  module QueueClose
-    def close
-      num_waiting.times {push nil}
-      @closed = true
-    end
-    def closed?
-      @closed ||= false
-    end
-    def push(object)
-      raise ClosedQueueError if closed?
-      super
-    end
-    alias << push
-    def pop(non_block=false)
-      return nil if !non_block && closed? && empty?
-      super
-    end
-  end
-  ::Queue.prepend QueueClose
-end