bump puma/sinatra (#7)

* bump puma/sinatra, and fix test helper so tests will run properly

* fix branch references in ci config (copy/paste error)

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '0 0 * * 1' # At 00:00 on Monday.
 

Gemfile.lock

@@ -1,47 +1,66 @@
 PATH
   remote: .
   specs:
-    puma-acme (0.1.0)
+    puma-acme (0.1.3.pre)
       acme-client (~> 2.0.13)
       pstore (~> 0.1)
-      puma (~> 6.4)
-      sinatra (~> 3.1)
+      puma (~> 6.0)
+      sinatra (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (2.0.15)
+    acme-client (2.0.17)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
-    faraday (2.7.12)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    bigdecimal (3.1.6)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     faraday-retry (2.2.0)
       faraday (~> 2.0)
+    hashdiff (1.1.0)
     http.rb (0.12.0)
     minitest (5.20.0)
     minitest-mock_expectations (1.2.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
+    net-http (0.4.1)
+      uri
     nio4r (2.7.0)
     pstore (0.1.3)
+    public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    rack (2.2.8)
-    rack-protection (3.1.0)
-      rack (~> 2.2, >= 2.2.4)
+    rack (3.0.9.1)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rake (13.1.0)
+    rexml (3.2.6)
     ruby2_keywords (0.0.5)
-    sinatra (3.1.0)
+    sinatra (4.0.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     tilt (2.3.0)
+    uri (0.13.0)
     vcr (6.2.0)
+    webmock (3.23.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   arm64-darwin-23
@@ -54,6 +73,7 @@ DEPENDENCIES
   puma-acme!
   rake (~> 13.0)
   vcr (~> 6.1)
+  webmock (~> 3.19)
 
 BUNDLED WITH
    2.3.26

puma-acme.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'acme-client', '~> 2.0.13'
   s.add_runtime_dependency 'pstore', '~> 0.1'
-  s.add_runtime_dependency 'puma', '~> 5.6'
-  s.add_runtime_dependency 'sinatra', '~> 3.1'
+  s.add_runtime_dependency 'puma', '~> 6.0'
+  s.add_runtime_dependency 'sinatra', '~> 4.0'
 
   s.add_development_dependency 'http.rb', '~> 0.12'
   s.add_development_dependency 'minitest', '~> 5.14'

test/test_helper.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'bundler/setup'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'puma-acme'
 
-require 'http'
+require 'HTTP'
 require 'minitest/autorun'
 require 'minitest/mock_expectations'
 require 'puma/configuration'