puma 2.13.3 → 2.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acbb1042d04d79823317ca4fa3d5b2d3ab861e22
-  data.tar.gz: d5b4df24f2250b28596d618d74840ab74b19069f
+  metadata.gz: c6d1f76be9cff6f4869f548f8a79ffd38f7aca1e
+  data.tar.gz: 9b9f96f22bddf25bda4781383ae1a27de6c14d79
 SHA512:
-  metadata.gz: 276e89c0792300cf7c3bfdb0c2df7ce52babbd5d4b8e5fca722cf3fc6f653c4ec52e880d7b46b1494b6474f4982c5de865f6acd6498ff0bfde94bc8651b1b168
-  data.tar.gz: 995a25cdf59737d196398623b7afc480bf22b066f9df0988a77803d52d8ca00d2749f4ea78cd64dcc1fee161da18c4b848f5596e91752ea803fe16854edfb56c
+  metadata.gz: 1cbeaf17fc7745c596966329be4d8b49b0b350764102cf59a11f7d921309c2372803183da84ee55acbd1e2682193b0bef6c933b73ccfaf75a04b0200adc71851
+  data.tar.gz: e0e9447ad29dd98c3bef95080ec873ba28238b0a54dc1c2ec2639dbdae7029f59bd302cfabb893d2649126b3bb34a6616402b927a49ada0967bd58f1c6a248ae

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.13.4 / 2015-08-16
+
+* 1 bug fix:
+  * Use the environment possible set by the config early and from
+    the config file later (if set).
+
 === 2.13.3 / 2015-08-15
 
 Seriously, I need to revamp config with tests.

data/lib/puma/cli.rb

@@ -96,7 +96,7 @@ module Puma
     end
 
     def env
-      @cli_options[:environment] || ENV['RACK_ENV'] || 'development'
+      @options[:environment] || @cli_options[:environment] || ENV['RACK_ENV'] || 'development'
     end
 
     def write_state
@@ -301,6 +301,7 @@ module Puma
 
     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|

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.13.3".freeze
+    PUMA_VERSION = VERSION = "2.13.4".freeze
     CODE_NAME = "A Midsummer Code's Dream".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4
 platform: ruby
 authors:
 - Evan Phoenix