Merge pull request #3397 from hennevogel/update/ruby-3.3.2

Update Ruby version to 3.3.2

.github/workflows/next-rails.yml

@@ -26,7 +26,7 @@ jobs:
           echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.3.2
           bundler-cache: true
       - name: Prepare spec
         run: |

.github/workflows/spec.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.3.2
           bundler-cache: true
       - run: bundle exec rubocop
       - run: bundle exec haml-lint app/views
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.4
+          ruby-version: 3.3.2
           bundler-cache: true
       - name: Prepare spec
         run: |

.rubocop.yml

@@ -1,5 +1,6 @@
 require:
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-rails
   - rubocop-capybara
   - rubocop-performance

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-03-26 11:13:17 UTC using RuboCop version 1.62.1.
+# on 2024-06-06 14:55:31 UTC using RuboCop version 1.63.5.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -504,12 +504,6 @@ Lint/NonAtomicFileOperation:
   Exclude:
     - 'spec/support/save_feature_failures.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopDisableDirective:
-  Exclude:
-    - 'spec/support/save_feature_failures.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -982,38 +976,6 @@ RSpec/OverwritingSetup:
   Exclude:
     - 'spec/controllers/admin/booths_controller_spec.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/Rails/AvoidSetupHook:
-  Exclude:
-    - 'spec/features/versions_spec.rb'
-    - 'spec/helpers/events_helper_spec.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpec/Rails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/admin/event_schedules_controller_spec.rb'
-
-# Offense count: 11
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpec/Rails/InferredSpecType:
-  Exclude:
-    - 'spec/controllers/admin/comments_controller_spec.rb'
-    - 'spec/controllers/admin/programs_controller_spec.rb'
-    - 'spec/controllers/application_controller_spec.rb'
-    - 'spec/controllers/conference_registration_controller_spec.rb'
-    - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/helpers/conference_helper_spec.rb'
-    - 'spec/helpers/date_time_helper_spec.rb'
-    - 'spec/helpers/events_helper_spec.rb'
-    - 'spec/helpers/format_helper_spec.rb'
-    - 'spec/helpers/users_helper_spec.rb'
-    - 'spec/routing/routing_spec.rb'
-
 # Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/ReceiveMessages:
@@ -1107,6 +1069,38 @@ RSpec/VoidExpect:
   Exclude:
     - 'spec/models/conference_spec.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+RSpecRails/AvoidSetupHook:
+  Exclude:
+    - 'spec/features/versions_spec.rb'
+    - 'spec/helpers/events_helper_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ResponseMethods.
+# ResponseMethods: response, last_response
+RSpecRails/HaveHttpStatus:
+  Exclude:
+    - 'spec/controllers/admin/event_schedules_controller_spec.rb'
+
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpecRails/InferredSpecType:
+  Exclude:
+    - 'spec/controllers/admin/comments_controller_spec.rb'
+    - 'spec/controllers/admin/programs_controller_spec.rb'
+    - 'spec/controllers/application_controller_spec.rb'
+    - 'spec/controllers/conference_registration_controller_spec.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/helpers/conference_helper_spec.rb'
+    - 'spec/helpers/date_time_helper_spec.rb'
+    - 'spec/helpers/events_helper_spec.rb'
+    - 'spec/helpers/format_helper_spec.rb'
+    - 'spec/helpers/users_helper_spec.rb'
+    - 'spec/routing/routing_spec.rb'
+
 # Offense count: 24
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: ExpectedOrder, Include.
@@ -1530,6 +1524,16 @@ Style/AccessorGrouping:
   Exclude:
     - 'app/models/payment.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'app/models/user.rb'
+
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ArrayIntersect:
@@ -2040,7 +2044,7 @@ Style/TrailingCommaInHashLiteral:
     - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
     - 'spec/models/conference_spec.rb'
 
-# Offense count: 4
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
@@ -2048,7 +2052,7 @@ Style/WordArray:
   EnforcedStyle: percent
   MinSize: 6
 
-# Offense count: 524
+# Offense count: 525
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

.ruby-version

@@ -1 +1 @@
-3.1.4
+3.3.2

Dockerfile

@@ -17,6 +17,10 @@ USER osem
 WORKDIR /osem/
 
 # Install our bundle
-RUN bundle install --jobs=3 --retry=3
+RUN bundle config set --local path 'vendor/bundle'; \
+    bundle install --jobs=4 --retry=3
+
+# Install our process manager
+RUN gem install foreman
 
 CMD ["foreman", "start"]

Gemfile

@@ -6,7 +6,7 @@ end
 
 source 'https://rubygems.org'
 
-ruby ENV.fetch('OSEM_RUBY_VERSION', '3.1.4')
+ruby '3.3.2'
 
 # as web framework
 if next?

Gemfile.lock

@@ -717,7 +717,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 3.1.4
+   ruby 3.3.2
 
 BUNDLED WITH
-   2.3.26
+   2.5.9

dotenv.example

@@ -32,9 +32,6 @@
 # OSEM_MEMCACHED_USERNAME='root'
 # OSEM_MEMCACHED_PASSWORD='1234'
 
-# Set this if you want to deviate from our 'standard' ruby version
-# OSEM_RUBY_VERSION=3.1.2
-
 # What time is it?
 # OSEM_TIME_ZONE="UTC"