Merge pull request #99 from FRRouting/master

Release 2.3.9

.github/workflows/ruby.yml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.3.1
 
       - name: rubocop
         uses: reviewdog/action-rubocop@v2.6.0
@@ -59,11 +59,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Ruby 3.0.2
+      - name: Set up Ruby 3.3.1
         id: ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.2
+          ruby-version: 3.3.1
           bundler-cache: true
 
       - name: Install required package

.rubocop.yml

@@ -10,6 +10,7 @@ AllCops:
   Exclude:
     - 'githubapi/**/*'
     - 'db/schema.rb'
+    - 'bin/console'
 Metrics/MethodLength:
   Max: 20
 

.simplecov

@@ -11,8 +11,9 @@
 SimpleCov.start do
   enable_coverage :branch
   primary_coverage :branch
-  add_filter %r{^/spec/}
+  add_filter %r{^/(spec|config)/}
   add_filter 'database_loader.rb'
+  add_filter 'workers/slack_username2_id.rb'
   add_group 'Models', 'lib/models'
   add_group 'GitHub Functions', 'lib/github'
   add_group 'Bamboo CI Functions', 'lib/bamboo_ci'

Gemfile

@@ -10,29 +10,31 @@
 
 source 'https://rubygems.org'
 
-ruby '3.0.2'
+ruby '3.3.1'
 
 # Token
-gem 'jwt', '2.2.2'
+gem 'jwt'
 
-gem 'octokit', '<= 4.17.0'
+gem 'octokit', '~> 9.1'
 
 # Web Framework
-gem 'sinatra', '2.0.8.1'
+gem 'sinatra'
 
-gem 'rack', '2.1.4'
+gem 'rack', '3.1.7'
+
+gem 'rackup'
 
 # ActiveRecord
-gem 'otr-activerecord', '2.0.3'
+gem 'otr-activerecord', '~> 2.3'
 
 # PostgreSQL adapter
-gem 'pg', '1.2.3'
+gem 'pg', '~> 1.5', '>= 1.5.3'
 
 gem 'netrc'
 
-gem 'puma', '5.5.2'
+gem 'puma'
 
-gem 'rake', '13.0.6'
+gem 'rake'
 
 # Delayed Job
 gem 'delayed_job_active_record'
@@ -49,3 +51,9 @@ group :test do
   gem 'simplecov', require: false
   gem 'webmock', require: 'webmock/rspec'
 end
+
+gem 'multipart-post', '~> 2.4'
+
+gem 'faraday-retry', '~> 2.2'
+
+gem 'faraday-multipart', '~> 1.0'

Gemfile.lock

@@ -1,115 +1,122 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
+      timeout (>= 0.4.0)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.1.1)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    delayed_job (4.1.11)
+    delayed_job (4.1.12)
       activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
+    delayed_job_active_record (4.1.10)
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    factory_bot (6.2.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    faker (3.2.1)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    hashdiff (1.0.1)
+    faraday-net_http (3.3.0)
+      net-http
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
+    hashdiff (1.1.1)
     hashie (5.0.0)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    jwt (2.2.2)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
     language_server-protocol (3.17.0.3)
-    minitest (5.19.0)
-    multipart-post (2.3.0)
-    mustermann (1.1.2)
+    logger (1.6.1)
+    minitest (5.25.1)
+    multipart-post (2.4.1)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
+    net-http (0.4.1)
+      uri
     netrc (0.11.0)
-    nio4r (2.5.9)
-    octokit (4.16.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    otr-activerecord (2.0.3)
-      activerecord (>= 4.0, < 7.1)
+    nio4r (2.7.3)
+    octokit (9.1.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    otr-activerecord (2.4.0)
+      activerecord (>= 6.0, < 7.3)
       hashie-forbidden_attributes (~> 0.1)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    pg (1.2.3)
-    public_suffix (5.0.3)
-    puma (5.5.2)
+    pg (1.5.7)
+    public_suffix (6.0.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.1)
-    rack (2.1.4)
-    rack-protection (2.0.8.1)
-      rack
+    racc (1.8.1)
+    rack (3.1.7)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.7)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.56.1)
       base64 (~> 0.1.1)
       json (~> 2.3)
@@ -122,62 +129,72 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
+    securerandom (0.3.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+    sinatra (4.0.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    tilt (2.2.0)
+    tilt (2.4.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    webmock (3.19.0)
+    unicode-display_width (2.5.0)
+    uri (0.13.1)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.8.1)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   database_cleaner
   delayed_job_active_record
   factory_bot
   faker
-  jwt (= 2.2.2)
+  faraday-multipart (~> 1.0)
+  faraday-retry (~> 2.2)
+  jwt
+  multipart-post (~> 2.4)
   netrc
-  octokit (<= 4.17.0)
-  otr-activerecord (= 2.0.3)
-  pg (= 1.2.3)
-  puma (= 5.5.2)
-  rack (= 2.1.4)
+  octokit (~> 9.1)
+  otr-activerecord (~> 2.3)
+  pg (~> 1.5, >= 1.5.3)
+  puma
+  rack (= 3.1.7)
   rack-test
-  rake (= 13.0.6)
+  rackup
+  rake
   rspec
   rubocop (= 1.56.1)
   rubocop-performance
   simplecov
-  sinatra (= 2.0.8.1)
+  sinatra
   webmock
 
 RUBY VERSION
-   ruby 3.0.2p107
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.4.7
+   2.5.9