puma 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81d09730460553a429075838b26bb574a4b9610
-  data.tar.gz: a3336117cdff61b925b86effef73382d5e765862
+  metadata.gz: d5d26b911b93d92a109a1e64fd3229c7689395f9
+  data.tar.gz: a24b5aa41459ed2eefeff450681154b1013d4056
 SHA512:
-  metadata.gz: 7a9b8d7cf54f2c97932e16ff76c19be931f936b246305912f1a2b939405af0a41192d7f5ee7ee462640e629a28476c591d44e702401d7a11128a8b3669af4151
-  data.tar.gz: dca5d59920db309d50c341cb19ab4f24d8d3f3781488e9c78a3a240b0d6f7908ad61854eb60965ffbeda10048285375ce9432b3c6d4444db1dd0cf5ca9799eaf
+  metadata.gz: e5a2a20376869642154cbfaf94549ac99a53a55ccf13346025b1c2ae73a36a9c512336ffb8ff11331051512ebbb069debeb456ff7b0b086796233d7bfe0f4cf0
+  data.tar.gz: 93c54f37b5729dadc20e903ea908ff254908b08515a100be0d624c10aff481f29cb9bb7afa011ac560e1c5ac845d547cb69d9fa992129afaf8ea9c3d86bc97d4

data/Gemfile

@@ -1,5 +1,7 @@
 source "https://rubygems.org"
 
+gemspec
+
 gem "hoe"
 gem "hoe-git"
 gem "hoe-ignore"

data/History.md

@@ -1,3 +1,9 @@
+## 3.9.1 / 2017-06-03
+
+* 2 bugfixes:
+  * Fixed compatibility with older Bundler versions (#1314)
+  * Some internal test/development cleanup (#1311, #1313)
+
 ## 3.9.0 / 2017-06-01
 
 * 2 features:

data/Rakefile

@@ -8,6 +8,7 @@ IS_JRUBY = defined?(RUBY_ENGINE) ? RUBY_ENGINE == "jruby" : false
 Hoe.plugin :git
 Hoe.plugin :ignore
 
+# Keep in sync with puma.gemspec
 HOE = Hoe.spec "puma" do
   self.readme_file    = "README.md"
   self.urls = %w!http://puma.io https://github.com/puma/puma!
@@ -17,13 +18,9 @@ HOE = Hoe.spec "puma" do
 
   spec_extras[:extensions]  = ["ext/puma_http11/extconf.rb"]
   spec_extras[:executables] = ['puma', 'pumactl']
-  spec_extras[:homepage] = self.urls.first
+  spec_extras[:homepage] = urls.first
 
   require_ruby_version ">= 1.9.3"
-
-  dependency "rack", [">= 1.1", "< 3.0"], :development
-
-  extra_dev_deps << ["rake-compiler", "~> 0.8"]
 end
 
 task :prerelease => [:clobber, :check_manifest, :test]
@@ -143,6 +140,16 @@ else
   task :test => [:compile]
 end
 
+task :test => [:ensure_no_puma_gem]
+task :ensure_no_puma_gem do
+  Bundler.with_clean_env do
+    out = `gem list puma`.strip
+    if !$?.success? || out != ""
+      abort "No other puma version should be install to avoid false positives or lading it by accident but found #{out}"
+    end
+  end
+end
+
 namespace :test do
   desc "Run the integration tests"
   task :integration do

data/lib/puma/const.rb

@@ -95,7 +95,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.9.0".freeze
+    PUMA_VERSION = VERSION = "3.9.1".freeze
     CODE_NAME = "Private Caller".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
 

data/lib/puma/launcher.rb

@@ -163,7 +163,7 @@ module Puma
 
     # Run the server. This blocks until the server is stopped
     def run
-      previous_env = (defined?(Bundler) ? Bundler.clean_env : ENV.to_h)
+      previous_env = (defined?(Bundler) ? Bundler::ORIGINAL_ENV : ENV.to_h)
 
       @config.clamp
 
@@ -340,8 +340,6 @@ module Puma
 
       @restart_dir ||= Dir.pwd
 
-      require 'rubygems'
-
       # 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.
@@ -352,9 +350,10 @@ module Puma
         arg0 = [Gem.ruby, "-S", $0]
       end
 
-      # Detect and reinject -Ilib from the command line
+      # Detect and reinject -Ilib from the command line, used for testing without bundler
+      # cruby has an expanded path, jruby has just "lib"
       lib = File.expand_path "lib"
-      arg0[1,0] = ["-I", lib] if $:[0] == lib
+      arg0[1,0] = ["-I", lib] if [lib, "lib"].include?($LOAD_PATH[0])
 
       if defined? Puma::WILD_ARGS
         @restart_argv = arg0 + Puma::WILD_ARGS + @original_argv

data/puma.gemspec

@@ -1,52 +1,20 @@
 # -*- encoding: utf-8 -*-
 
-# This is only used when puma is a git dep from Bundler, so it's a little
-# weird.
+# This is only used when puma is a git dep from Bundler, keep in sync with Rakefile
 
-d = File.read(File.expand_path("../lib/puma/const.rb", __FILE__))
-if d =~ /VERSION = "(\d+\.\d+\.\d+)"/
-  version = $1
-else
-  version = "0.0.1"
-end
+version = File.read(File.expand_path("../lib/puma/const.rb", __FILE__))[/VERSION = "(\d+\.\d+\.\d+)"/, 1] || raise
 
 Gem::Specification.new do |s|
   s.name = "puma"
   s.version = version
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = `git log --pretty="%ai" -n 1`.split(" ").first
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. It's great for highly concurrent Ruby implementations such as Rubinius and JRuby as well as as providing process worker support to support CRuby well."
+  s.summary = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications"
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.files = `git ls-files`.split($/)
   s.homepage = "http://puma.io"
   s.license = "BSD-3-Clause"
-  s.rdoc_options = ["--main", "README.md"]
-  s.require_paths = ["lib"]
   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"
-  s.test_files = s.files.grep(/^test/)
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
-    else
-      s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.6"])
-    end
-  else
-    s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.6"])
-  end
 end

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for