puma-heroku 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 216d3ac5271277c9fd8fdbd5609a1821bf1ca092310bfbeda0c93ceed20747ef
-  data.tar.gz: 1f87bd9dadc93c0f27dce7c2a235d9c2d4eeca405739ed0952401e3eda43440e
+  metadata.gz: 90acb969a0d0ec50ff8f967a5d85b87bca07dd3655dceaa5b0af47bcbe2a8ae5
+  data.tar.gz: 8459f0321d2d69ef0fb6fbf4f2086db8a0d1017f7e528deb68ba136116231233
 SHA512:
-  metadata.gz: eba79fb8ca09ddc005480a21a277308b31368f54fada4459c247fe5dbe6140e6610efa4fe8aa13753be8e2c8ddc4ff1ed7f635e53581b88c48f8bdaf52e0cebf
-  data.tar.gz: 5500a25ba768c628cd85b6548d9003e6f2dda68174f9761779b2170a0eff0e77d36c0a27dad8a6eb80c9ddb51160b02fe417eed56ab1441be80c2ee8c31d720f
+  metadata.gz: 7dde6ec506ef93f7c7d4f4157ab91fb626bade5aa16c5b2db51c57d73176a5eff7cb03f3d7f2ab552959837aad6ffaab6f9cbb915295d0eab5536eeed2f62608
+  data.tar.gz: 0cc8c575780d8634a41bb3346d09aea2607544e3b23730c1d4f43aeb7861a033412cb29e18dc52c1777b15793bdbaae6a8b25303410fc70dc3fcdce00e434f84

data/README.md

@@ -1,40 +1,20 @@
 # puma-heroku
 
-A Puma plugin with best-practices configuration and handy configuration
-variables for Heroku deployments.
+This gem is being sunset. Puma 5.0+ now configures Puma in most of the ways that this plugin did.
 
-You can read Heroku's documentation on the topic [here](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server). Most of the ideas there apply to all ruby apps running on Puma. Important Note: In that article, Heroku uses a different (rails-specific) environment variable for configuring threads. This plugin uses the generic `MAX_THREADS`, but will use `RAILS_MAX_THREADS` if available.
+## Removing this gem from your Gemfile 
 
-## Installation
+1. Upgrade to Puma 5.0.
+2. Add `c.port ENV['PORT'] || 3000` to your Puma config file, or `-p ${PORT:-3000}` to your `puma` invocation in your Procfile.
+3. Remove this gem.
 
-Add this line to your application's Gemfile:
+## More Notes on Upgrading from 1.0
 
-```ruby
-gem 'puma-heroku'
-```
+In 1.x, this plugin set `workers` to `1` if WEB_CONCURRENCY is not set. However, this isn't optimal, as it creates a master and worker process, when instead we could just use single mode (`workers 0`) and save memory. 2.x of this plugin uses the Puma 5 default, which is `workers 0` if `WEB_CONCURRENCY` is not set.
 
-And then execute:
+If you are using Rails 4.0 or less, you will have to [add your own `on_worker_boot` block.](https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot), it has been removed.
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install puma-heroku
-    
-Then add to your puma config.rb:
-
-    # config/puma.rb
-    plugin 'heroku'
-
-
-## Usage
-
-Read about how to configure puma to use this plugin here: https://github.com/puma/puma#plugins
-
-There are two variables this plugin reads from the environment which control its behavior.
-
-* `WEB_CONCURRENCY` — How many workers to run. This will be ignored on JRuby and Windows, where only 1 worker will be run.
-* `MAX_THREADS` — The number of threads to run per worker. Note that this also sets the minimum number of threads to the same value, which is a recommended approach, especially in a single-app environment such as Heroku. If you are using Rails, you may want to use `RAILS_MAX_THREADS` instead, which is also supported.
+As of Puma 5.0/this plugin 2.x, all this gem does is set the port to `ENV["PORT"]`. In Puma 6.0, Puma will listen to `ENV["PORT"]` by default, and this plugin will receive no further updates (because all of its changes will be merged into the Puma default config).
 
 ## License
 

data/lib/puma/plugin/heroku.rb

@@ -1,23 +1,7 @@
 Puma::Plugin.create do
   def config(c)
-    workers_count = Integer(ENV['WEB_CONCURRENCY'] || 1)
-    threads_count = Integer(ENV['RAILS_MAX_THREADS'] || ENV['MAX_THREADS'] || 5)
-    c.threads threads_count, threads_count
-
     c.port        ENV['PORT']     || 3000
-    c.environment ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-
-    if workers_supported? && workers_count > 1
-      c.preload_app!
-      c.workers workers_count
-
-      # Not necessary in Rails 5.2+, see https://github.com/rails/rails/pull/29807
-      if defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) && Gem::Version.new(Rails.version) < Gem::Version.new('5.2.0')
-        c.before_fork { ActiveRecord::Base.connection_pool.disconnect! }
-        c.on_worker_boot { ActiveRecord::Base.establish_connection }
-      end
-    end
   end
 
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/puma-heroku.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Puma integration for Heroku}
   spec.description   = %q{A Puma plugin that contains the default Heroku config}
-  spec.homepage      = "https://github.com/evanphx/puma-heroku"
+  spec.homepage      = "https://github.com/puma/puma-heroku"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "puma", ">= 3.0", "< 5.0"
+  spec.add_runtime_dependency "puma", ">= 5.0", "< 6.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-heroku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Evan Phoenix
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,11 +72,11 @@ files:
 - Rakefile
 - lib/puma/plugin/heroku.rb
 - puma-heroku.gemspec
-homepage: https://github.com/evanphx/puma-heroku
+homepage: https://github.com/puma/puma-heroku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Puma integration for Heroku
 test_files: []