puma 3.6.2 → 3.7.0

data/lib/puma/util.rb

@@ -1,10 +1,6 @@
 major, minor, patch = RUBY_VERSION.split('.').map { |v| v.to_i }
 
-if major == 1 && minor < 9
-  require 'puma/rack/backports/uri/common_18'
-elsif major == 1 && minor == 9 && patch == 2 && RUBY_PATCHLEVEL <= 328 && RUBY_ENGINE != 'jruby'
-  require 'puma/rack/backports/uri/common_192'
-elsif major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
+if major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
   require 'puma/rack/backports/uri/common_193'
 else
   require 'uri/common'

data/lib/rack/handler/puma.rb

@@ -1,5 +1,4 @@
 require 'rack/handler'
-require 'puma'
 
 module Rack
   module Handler
@@ -10,7 +9,11 @@ module Rack
       }
 
       def self.run(app, options = {})
-        options  = DEFAULT_OPTIONS.merge(options)
+        require 'puma/configuration'
+        require 'puma/events'
+        require 'puma/launcher'
+
+        options = DEFAULT_OPTIONS.merge(options)
 
         conf = ::Puma::Configuration.new(options) do |c|
           c.quiet
@@ -32,6 +35,10 @@ module Rack
 
           if host && (host[0,1] == '.' || host[0,1] == '/')
             c.bind "unix://#{host}"
+          elsif host && host =~ /^ssl:\/\//
+            uri = URI.parse(host)
+            uri.port ||= options[:Port] || ::Puma::Configuration::DefaultTCPPort
+            c.bind uri.to_s
           else
             host ||= ::Puma::Configuration::DefaultTCPHost
             port = options[:Port] || ::Puma::Configuration::DefaultTCPPort

data/puma.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.license = "BSD-3-Clause"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.25"
   s.summary = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications"

data/tools/jungle/init.d/README.md

@@ -22,16 +22,21 @@ Init script to manage multiple Puma servers on the same box using start-stop-dae
 
 Puma apps are held in /etc/puma.conf by default. It's mainly a CSV file and every line represents one app. Here's the syntax:
 
-    app-path,user,config-file-path,log-file-path
+    app-path,user,config-file-path,log-file-path,environment-variables
 
 You can add an instance by editing the file or running the following command:
 
     sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/log/puma.log
 
-The config and log paths are optional parameters and default to:
+The config and log paths, as well as the environment variables, are optional parameters and default to:
 
 * config: /path/to/app/*config/puma.rb*
 * log: /path/to/app/*log/puma.log*
+* environment: (empty)
+
+Multiple environment variables need to be separated by a semicolon, e.g.
+
+    FOO=1;BAR=2
 
 To remove an app, simply delete the line from the config file or run:
 

data/tools/jungle/init.d/puma

@@ -414,7 +414,7 @@ case "$1" in
     echo "  Add a Puma: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
     echo "    config and log are optionals."
     echo "  Remove a Puma: $SCRIPTNAME remove /path/to/app"
-    echo "  On a Puma: $SCRIPTNAME {start|stop|status|restart} PUMA-NAME" >&2
+    echo "  On a Puma: $SCRIPTNAME {start|stop|status|restart|phased-restart} PUMA-NAME" >&2
     exit 3
   ;;
 esac

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -33,7 +33,7 @@ dependencies:
         version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ extensions:
 - ext/puma_http11/extconf.rb
 extra_rdoc_files:
 - DEPLOYMENT.md
-- History.txt
+- History.md
 - Manifest.txt
 - README.md
 - docs/nginx.md
@@ -97,7 +97,7 @@ extra_rdoc_files:
 files:
 - DEPLOYMENT.md
 - Gemfile
-- History.txt
+- History.md
 - LICENSE
 - Manifest.txt
 - README.md
@@ -148,8 +148,6 @@ files:
 - 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
 - lib/puma/rack/builder.rb
 - lib/puma/rack/urlmap.rb
@@ -186,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/puma/rack/backports/uri/common_18.rb

@@ -1,59 +0,0 @@
-# :stopdoc:
-
-# Stolen from ruby core's uri/common.rb, with modifications to support 1.8.x
-#
-# https://github.com/ruby/ruby/blob/trunk/lib/uri/common.rb
-#
-#
-
-module URI
-  begin
-    TBLENCWWWCOMP_ = {} # :nodoc:
-    256.times do |i|
-      TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
-    end
-    TBLENCWWWCOMP_[' '] = '+'
-    TBLENCWWWCOMP_.freeze
-    TBLDECWWWCOMP_ = {} # :nodoc:
-    256.times do |i|
-      h, l = i>>4, i&15
-      TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-      TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
-    end
-    TBLDECWWWCOMP_['+'] = ' '
-    TBLDECWWWCOMP_.freeze
-  rescue Exception
-  end
-
-  # Encode given +s+ to URL-encoded form data.
-  #
-  # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
-  # (ASCII space) to + and converts others to %XX.
-  #
-  # This is an implementation of
-  # http://www.w3.org/TR/html5/forms.html#url-encoded-form-data
-  #
-  # See URI.decode_www_form_component, URI.encode_www_form
-  def self.encode_www_form_component(s)
-    str = s.to_s
-    if RUBY_VERSION < "1.9" && $KCODE =~ /u/i
-      str.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-        '%' + $1.unpack('H2' * Rack::Utils.bytesize($1)).join('%').upcase
-      end.tr(' ', '+')
-    else
-      str.gsub(/[^*\-.0-9A-Z_a-z]/) {|m| TBLENCWWWCOMP_[m]}
-    end
-  end
-
-  # Decode given +str+ of URL-encoded form data.
-  #
-  # This decodes + to SP.
-  #
-  # See URI.encode_www_form_component, URI.decode_www_form
-  def self.decode_www_form_component(str, enc=nil)
-    raise ArgumentError, "invalid %-encoding (#{str})" unless /\A(?:%[0-9a-fA-F]{2}|[^%])*\z/ =~ str
-    str.gsub(/\+|%[0-9a-fA-F]{2}/) {|m| TBLDECWWWCOMP_[m]}
-  end
-end

data/lib/puma/rack/backports/uri/common_192.rb

@@ -1,55 +0,0 @@
-# :stopdoc:
-
-# Stolen from ruby core's uri/common.rb @32618ba to fix DoS issues in 1.9.2
-#
-# https://github.com/ruby/ruby/blob/32618ba7438a2247042bba9b5d85b5d49070f5e5/lib/uri/common.rb
-#
-# Issue:
-# http://redmine.ruby-lang.org/issues/5149
-#
-# Relevant Fixes:
-# https://github.com/ruby/ruby/commit/b5f91deee04aa6ccbe07c23c8222b937c22a799b
-# https://github.com/ruby/ruby/commit/93177c1e5c3906abf14472ae0b905d8b5c72ce1b
-#
-# This should probably be removed once there is a Ruby 1.9.2 patch level that
-# includes this fix.
-
-require 'uri/common'
-
-module URI
-  begin
-    TBLDECWWWCOMP_ = {} unless const_defined?(:TBLDECWWWCOMP_)  #:nodoc:
-    if TBLDECWWWCOMP_.empty?
-      256.times do |i|
-        h, l = i>>4, i&15
-        TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
-        TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
-        TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
-        TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
-      end
-      TBLDECWWWCOMP_['+'] = ' '
-      TBLDECWWWCOMP_.freeze
-    end
-  rescue Exception
-  end
-
-  def self.decode_www_form(str, enc=Encoding::UTF_8)
-    return [] if str.empty?
-    unless /\A#{WFKV_}=#{WFKV_}(?:[;&]#{WFKV_}=#{WFKV_})*\z/o =~ str
-      raise ArgumentError, "invalid data of application/x-www-form-urlencoded (#{str})"
-    end
-    ary = []
-    $&.scan(/([^=;&]+)=([^;&]*)/) do
-      ary << [decode_www_form_component($1, enc), decode_www_form_component($2, enc)]
-    end
-    ary
-  end
-
-  def self.decode_www_form_component(str, enc=Encoding::UTF_8)
-    raise ArgumentError, "invalid %-encoding (#{str})" unless /\A[^%]*(?:%\h\h[^%]*)*\z/ =~ str
-    str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)
-  end
-
-  remove_const :WFKV_ if const_defined?(:WFKV_)
-  WFKV_ = '(?:[^%#=;&]*(?:%\h\h[^%#=;&]*)*)' # :nodoc:
-end