govuk_app_config 5.1.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043f58b5ab2db86cab41a12db947c9a22985a0cab93a0a673a313c026f9df172
-  data.tar.gz: 94ad0af53466f3cafcb59e967c69eafae770ed2abb4f75efca92b4f382d13044
+  metadata.gz: 59fb9ea4411ba3ec2be3af84e9888920a6ca07547bfcd199d00b9c921a461639
+  data.tar.gz: aeaea12af9e8ca7612d39c002bd5d5658e5683477f667b5a9419bd1f9529feb2
 SHA512:
-  metadata.gz: 334c9ea1a036cf06dde586d86af5a6d3bfbc89e22ea10e329c4f043341939815cab56eb1a8ede54eab398fc44c1cce08f04736d32a21bff74909b8590fccb55f
-  data.tar.gz: 3fad672d0d868f84ebe91db228f983b00818793b916f3ce503a28428d62fcf2568350978b235b81b6e01cbd0453628885c8d779e8f25e041bd0f773334d8df9d
+  metadata.gz: c46413f09bb129baefa17951e539b8304faaa85c6eae9c7be8fd410677f322c67b65b091b01918555d450518692dd12348b8212cb039dbae6cd429959f8b818b
+  data.tar.gz: 5bafc15ab122c9088039093ed786420dc080bd7f20265157e536e0388133d44707c4146bd8d619a0926f13883ce8c314371f0985e4ce7087d1998e8d413dc59a

data/.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: ['3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.0.1
+
+* Add support for configuring timeouts for puma-based applications
+
+## 6.0.0
+
+* BREAKING: Drop support for Ruby 2.7
+* Register the Prometheus exporter in Sinatra middleware
+
 # 5.1.0
 
 * Add support to force-load the GovukPrometheusExporter by setting `GOVUK_PROMETHEUS_EXPORTER` to `force`. ([#282](https://github.com/alphagov/govuk_app_config/pull/282))

data/govuk_app_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/govuk_app_config"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -40,5 +40,9 @@ module GovukPrometheusExporter
     if defined?(Rails)
       Rails.application.middleware.unshift PrometheusExporter::Middleware
     end
+
+    if defined?(Sinatra)
+      Sinatra.use PrometheusExporter::Middleware
+    end
   end
 end

data/lib/govuk_app_config/govuk_puma.rb

@@ -9,7 +9,11 @@ module GovukPuma
     end
 
     # `worker_timeout` specifies how many seconds Puma will wait before terminating a worker.
-    timeout = ENV.fetch("RAILS_ENV", "development") == "development" ? 3600 : 15
+    timeout = if ENV.fetch("RAILS_ENV", "development") == "development"
+                3600
+              else
+                Integer(ENV.fetch("PUMA_TIMEOUT", 15))
+              end
     config.worker_timeout timeout
 
     # When changing the min/max threads for Puma, also consider changing ActiveRecord to match.

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "5.1.0".freeze
+  VERSION = "6.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -329,14 +329,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications