govuk_app_config 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc71cc5bd08fd8564de90311775a22d6c9b6a11bfbda2924c8782be3c265ff9
-  data.tar.gz: 6d28205894b18a2b5ceaaed55967d8a55aaf7ab4e375979b1366cf42fbcd98c7
+  metadata.gz: ee3c6597f85f20d601fea02cc8412c6d8440866e0b151d186e10c7d0d7eb52fa
+  data.tar.gz: c1b783944841d1b4a9d6dd4941cb3dbfc68d361215927c78c0931d73a1d851e7
 SHA512:
-  metadata.gz: 87122fbe05b408cb3578e3b983e99451f5fe0898316f31f8e87107d4a09b50f0205ea803620af3a40dc2a0459015fcb67a898359a66aa998b092a9c2d143b2cd
-  data.tar.gz: b4fe9f24dfe1f98efd3d5988f46f147b48bf869eb3e3901634efc4ceb6089d9735588d92a4574d822c68bfe9e8c219a572d69cab971c688a864b2f4e640d2052
+  metadata.gz: 98aa6b485b645c630e0b6d25474096e73be88817aef0e65b7767e3740c2da4feb95d69cd4491fb7762949f232a3f73f7105bfd4b05a2cc73c8cd14076851259d
+  data.tar.gz: db5e291133010b1ddb6c5041a4eaa68fb24bc76920a6f821b1710a66a4e285b97e199cde1371c2d91bdc411708c0a0d0d40d0559e4413c16afa34db4cd4d1af1

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.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))
+
 # 5.0.0
 
 * Forbid base elements in the Content Security Policy

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"
@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 1.3"
-  spec.add_development_dependency "rubocop-govuk", "4.9.0"
+  spec.add_development_dependency "rubocop-govuk", "4.10.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -1,6 +1,9 @@
 module GovukPrometheusExporter
   def self.should_configure
-    if File.basename($PROGRAM_NAME) == "rake" ||
+    # Allow us to force the Prometheus Exporter for persistent Rake tasks...
+    if ENV["GOVUK_PROMETHEUS_EXPORTER"] == "force"
+      true
+    elsif File.basename($PROGRAM_NAME) == "rake" ||
         defined?(Rails) && (Rails.const_defined?("Console") || Rails.env == "test")
       false
     else
@@ -37,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/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "5.0.0".freeze
+  VERSION = "6.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -252,14 +252,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -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.5
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications