gitlab-mail_room 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa8e5569da85c3fa57acd7d2729af8f67429f281f13cc87fdbfdd8d533f3ee9
-  data.tar.gz: 50d4dccc94549ff477922d7318115e1992a87566e6d159d50f046015cf875e10
+  metadata.gz: 0e4c047999e1f2e3d77862ea0e65f146fe92c89de4d0367892649d518de8ad66
+  data.tar.gz: 36000daee0622b345eea3be14143652ce335ea9441ab012a4088d0038b7bef8c
 SHA512:
-  metadata.gz: 2e4d8fe88a968459036de06624cd917b3e68a6f4bf5a5cd1bcbb9e0d466dcff8608cead170a8e813f45bcccc2b5c342d603732b9520314d8792c23e4523d91ff
-  data.tar.gz: 5de2450bbd78041a19c4996ebaa74b2497af0e7362c4e6e5338ccc10a740bc4cc13a508bd3cc7cea55a7eabd7da25365b544d7baa0e33dd134c40b0bd1a0f577
+  metadata.gz: 9693c9ee292e8e45025d251c720d4bda9f80b121aa0524c6c2bad0924b5ec731fcb017f91641c27adf2c7a3321a59345d1f0b80177bbde998ac5b42bc080a13d
+  data.tar.gz: d8c733b9eaef28122e6b2533e1e5fca6a0aba6581b07be93189f498f38ad4845ef624016258c339a2e6cd8ac56e7eb2fbe3c52a9724d5d9363deb58ed1d8d431

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      # Label used to access the service container
+      redis:
+        # Docker Hub image
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - head
+          - '3.2'
+          - '3.1'
+          - '3.0'
+          - '2.7'
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rspec
+
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run Rubocop
+      run: bundle exec rubocop
+

data/.gitlab-ci.yml

@@ -10,7 +10,7 @@ services:
     paths:
       - vendor/ruby
   variables:
-    REDIS_URL: redis://redis:6379
+    REDIS_URL: redis://redis:6379/0
   before_script:
     - apt update && apt install -y libicu-dev
     - ruby -v                                   # Print out ruby version for debugging

data/.rubocop.yml

@@ -3,3 +3,4 @@ inherit_from: .rubocop_todo.yml
 Style/HashSyntax:
   Enabled: true
   EnforcedStyle: ruby19_no_mixed_keys
+  EnforcedShorthandSyntax: either

data/.rubocop_todo.yml

@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-03-15 06:29:40 UTC using RuboCop version 1.26.0.
+# on 2023-03-15 01:41:21 UTC using RuboCop version 1.48.1.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemspec
 Gemspec/OrderedDependencies:
@@ -15,21 +15,21 @@ Gemspec/OrderedDependencies:
     - 'mail_room.gemspec'
 
 # Offense count: 1
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Layout/BlockEndNewline:
   Exclude:
     - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end
 Layout/CaseIndentation:
@@ -37,13 +37,13 @@ Layout/CaseIndentation:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLineAfterMagicComment:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: around, only_before
 Layout/EmptyLinesAroundAccessModifier:
@@ -52,7 +52,7 @@ Layout/EmptyLinesAroundAccessModifier:
     - 'lib/mail_room/delivery/que.rb'
 
 # Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
@@ -62,7 +62,7 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
 Layout/EmptyLinesAroundClassBody:
@@ -70,7 +70,7 @@ Layout/EmptyLinesAroundClassBody:
     - 'lib/mail_room/logger/structured.rb'
 
 # Offense count: 15
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
@@ -80,7 +80,7 @@ Layout/FirstHashElementIndentation:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
@@ -90,7 +90,7 @@ Layout/HashAlignment:
     - 'lib/mail_room/delivery/sidekiq.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
   Exclude:
@@ -98,14 +98,14 @@ Layout/LeadingCommentSpace:
     - 'spec/lib/arbitration/redis_spec.rb'
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Layout/MultilineBlockLayout:
   Exclude:
     - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 3
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
@@ -115,14 +115,14 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceAroundKeyword:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
 # SupportedStylesForExponentOperator: space, no_space
 Layout/SpaceAroundOperators:
@@ -131,7 +131,7 @@ Layout/SpaceAroundOperators:
     - 'spec/lib/arbitration/redis_spec.rb'
 
 # Offense count: 7
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -142,7 +142,7 @@ Layout/SpaceBeforeBlockBraces:
     - 'spec/lib/mailbox_spec.rb'
 
 # Offense count: 51
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -159,7 +159,7 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/lib/mailbox_watcher_spec.rb'
 
 # Offense count: 32
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
@@ -170,7 +170,7 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/lib/mailbox_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, compact, no_space
 Layout/SpaceInsideParens:
@@ -178,7 +178,7 @@ Layout/SpaceInsideParens:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingEmptyLines:
@@ -186,7 +186,7 @@ Layout/TrailingEmptyLines:
     - 'spec/lib/delivery/letter_opener_spec.rb'
 
 # Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
@@ -207,20 +207,20 @@ Lint/RescueException:
     - 'lib/mail_room/cli.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 27
 
 # Offense count: 32
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 198
 
@@ -230,12 +230,12 @@ Metrics/ClassLength:
   Max: 169
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 8
 
 # Offense count: 13
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 22
 
@@ -250,13 +250,13 @@ Naming/AccessorMethodName:
     - 'lib/mail_room/configuration.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Security/YAMLLoad:
   Exclude:
     - 'lib/mail_room/configuration.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
@@ -264,12 +264,12 @@ Style/Alias:
     - 'lib/mail_room/coordinator.rb'
 
 # Offense count: 16
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
+# AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
     - 'spec/lib/arbitration/redis_spec.rb'
@@ -277,7 +277,7 @@ Style/BlockDelimiters:
     - 'spec/lib/delivery/que_spec.rb'
     - 'spec/lib/delivery/sidekiq_spec.rb'
 
-# Offense count: 12
+# Offense count: 14
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -290,14 +290,16 @@ Style/Documentation:
     - 'lib/mail_room/connection.rb'
     - 'lib/mail_room/crash_handler.rb'
     - 'lib/mail_room/delivery.rb'
+    - 'lib/mail_room/imap.rb'
     - 'lib/mail_room/imap/connection.rb'
     - 'lib/mail_room/imap/message.rb'
     - 'lib/mail_room/logger/structured.rb'
     - 'lib/mail_room/message.rb'
+    - 'lib/mail_room/microsoft_graph.rb'
     - 'lib/mail_room/microsoft_graph/connection.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
@@ -306,27 +308,27 @@ Style/EmptyMethod:
     - 'lib/mail_room/delivery/noop.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/Encoding:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/ExpandPathArguments:
   Exclude:
     - 'mail_room.gemspec'
     - 'spec/spec_helper.rb'
 
 # Offense count: 39
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'lib/mail_room/crash_handler.rb'
@@ -335,7 +337,8 @@ Style/GlobalStdStream:
     - 'spec/lib/delivery/logger_spec.rb'
 
 # Offense count: 3
-# Configuration parameters: MinBodyLength.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
     - 'lib/mail_room/configuration.rb'
@@ -343,22 +346,22 @@ Style/GuardClause:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either
+# SupportedShorthandSyntax: always, never, either, consistent
 Style/HashSyntax:
   Exclude:
     - 'spec/lib/microsoft_graph/connection_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 5
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
@@ -369,8 +372,8 @@ Style/MutableConstant:
     - 'spec/spec_helper.rb'
 
 # Offense count: 1
-# This cop supports unsafe auto-correction (--auto-correct-all).
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -378,7 +381,7 @@ Style/NumericPredicate:
     - 'lib/mail_room/imap/connection.rb'
 
 # Offense count: 2
-# This cop supports unsafe auto-correction (--auto-correct-all).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
@@ -387,7 +390,7 @@ Style/PreferredHashMethods:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
@@ -395,13 +398,13 @@ Style/RaiseArgs:
     - 'lib/mail_room/logger/structured.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantPercentQ:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 7
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
   Exclude:
     - 'lib/mail_room/configuration.rb'
@@ -410,7 +413,7 @@ Style/RedundantSelf:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
@@ -418,37 +421,37 @@ Style/RescueStandardError:
     - 'lib/mail_room/configuration.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireEnglish, EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
 Style/SpecialGlobalVars:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 1
-# This cop supports unsafe auto-correction (--auto-correct-all).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 140
-# This cop supports safe auto-correction (--auto-correct).
+# Offense count: 142
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
 # Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
@@ -457,7 +460,7 @@ Style/SymbolArray:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
@@ -466,20 +469,20 @@ Style/TrailingCommaInHashLiteral:
     - 'spec/spec_helper.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/WhileUntilDo:
   Exclude:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/WhileUntilModifier:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 3
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
@@ -487,8 +490,8 @@ Style/WordArray:
   MinSize: 3
 
 # Offense count: 7
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 177

data/README.md

@@ -183,11 +183,11 @@ If you're seeing the error `Please log in via your web browser: https://support.
 ### Microsoft Graph configuration
 
 To use the Microsoft Graph API instead of IMAP to read e-mail, you will
-need to create an application in the Azure Active Directory. See the
-[Microsoft instructions](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) for more details:
+need to create an application in Microsoft Entra ID (formerly known as Azure Active Directory). See the
+[Microsoft instructions](https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app) for more details:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Search for and select `Azure Active Directory`.
+1. Search for and select `Microsoft Entra ID`.
 1. Under `Manage`, select `App registrations` > `New registration`.
 1. Enter a `Name` for your application, such as `MailRoom`. Users of your app might see this name, and you can change it later.
 1. If `Supported account types` is listed, select the appropriate option.
@@ -282,7 +282,7 @@ Delivery options:
   Required, defaults to `redis://localhost:6379`.
 - **sentinels**: A list of sentinels servers used to provide HA to Redis. (see [Sentinel Support](#sentinel-support))
   Optional.
-- **namespace**: The Redis namespace Sidekiq works under. Use the same Redis namespace that's used to configure Sidekiq.
+- **namespace**: [DEPRECATED] The Redis namespace Sidekiq works under. Use the same Redis namespace that's used to configure Sidekiq.
   Optional.
 - **queue**: The Sidekiq queue the job is pushed onto. Make sure Sidekiq actually reads off this queue.
   Required, defaults to `default`.
@@ -426,7 +426,7 @@ When running multiple instances of MailRoom against a single mailbox, to try to
     :arbitration_options:
       # The Redis server to connect with. Defaults to redis://localhost:6379.
       :redis_url: redis://redis.example.com:6379
-      # The Redis namespace to house the Redis keys under. Optional.
+      # [DEPRECATED] The Redis namespace to house the Redis keys under. Optional.
       :namespace: mail_room
   -
     :email: "user2@gmail.com"
@@ -446,7 +446,7 @@ When running multiple instances of MailRoom against a single mailbox, to try to
         -
           :host: 127.0.0.1
           :port: 26379
-      # The Redis namespace to house the Redis keys under. Optional.
+      # [DEPRECATED] The Redis namespace to house the Redis keys under. Optional.
       :namespace: mail_room
 ```
 

data/lib/mail_room/arbitration/redis.rb

@@ -9,6 +9,13 @@ module MailRoom
           namespace = mailbox.arbitration_options[:namespace]
           sentinels = mailbox.arbitration_options[:sentinels]
 
+          if namespace
+            warn <<~MSG
+              Redis namespaces are deprecated. This option will be ignored in future versions.
+              See https://github.com/sidekiq/sidekiq/issues/2586 for more details."
+            MSG
+          end
+
           super(redis_url, namespace, sentinels)
         end
       end

data/lib/mail_room/delivery/postback.rb

@@ -20,10 +20,10 @@ module MailRoom
 
           jwt = initialize_jwt(mailbox.delivery_options)
 
-          username = 
+          username =
             mailbox.delivery_options[:username] ||
             mailbox.delivery_options[:delivery_username]
-          password = 
+          password =
             mailbox.delivery_options[:password] ||
             mailbox.delivery_options[:delivery_password]
 
@@ -73,10 +73,7 @@ module MailRoom
         if @delivery_options.token_auth?
           connection.token_auth @delivery_options.token
         elsif @delivery_options.basic_auth?
-          connection.basic_auth(
-            @delivery_options.username,
-            @delivery_options.password
-          )
+          config_basic_auth(connection)
         end
 
         connection.post do |request|
@@ -103,6 +100,21 @@ module MailRoom
 
         request.headers[@delivery_options.jwt.header] = @delivery_options.jwt.token
       end
+
+      def config_basic_auth(connection)
+        if defined?(connection.basic_auth)
+          connection.basic_auth(
+            @delivery_options.username,
+            @delivery_options.password
+          )
+        else
+          connection.request(
+            :authorization, :basic,
+            @delivery_options.username,
+            @delivery_options.password
+          )
+        end
+      end
     end
   end
 end

data/lib/mail_room/delivery/sidekiq.rb

@@ -18,6 +18,13 @@ module MailRoom
           worker    = mailbox.delivery_options[:worker]
           logger = mailbox.logger
 
+          if namespace
+            warn <<~MSG
+              Redis namespaces are deprecated. This option will be ignored in future versions.
+              See https://github.com/sidekiq/sidekiq/issues/2586 for more details."
+            MSG
+          end
+
           super(redis_url, namespace, sentinels, queue, worker, logger, redis_db)
         end
       end

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/mail_room.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency             "net-imap", ">= 0.2.1"
   gem.add_dependency             "oauth2", [">= 1.4.4", "< 3"]
   gem.add_dependency             "jwt", ">= 2.0"
+  gem.add_dependency             "redis", [">= 4", "< 6"]
+  gem.add_dependency             "redis-namespace", '>= 1.8.2'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.9"
@@ -32,8 +34,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "faraday"
   gem.add_development_dependency "mail"
   gem.add_development_dependency "letter_opener"
-  gem.add_development_dependency "redis", "~> 4"
-  gem.add_development_dependency "redis-namespace"
   gem.add_development_dependency "pg"
   gem.add_development_dependency "charlock_holmes"
   gem.add_development_dependency "webmock"

data/spec/lib/arbitration/redis_spec.rb

@@ -11,12 +11,21 @@ describe MailRoom::Arbitration::Redis do
     )
   }
   let(:options) { described_class::Options.new(mailbox) }
+  let(:redis5) { Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0') }
   subject       { described_class.new(options) }
 
   # Private, but we don't care.
   let(:redis) { subject.send(:client) }
   let(:raw_client) { redis._client }
 
+  let(:server_url) do
+    if redis5
+      raw_client.config.server_url
+    else
+      raw_client.options[:url]
+    end
+  end
+
   describe '#deliver?' do
     context "when called the first time" do
       after do
@@ -80,7 +89,7 @@ describe MailRoom::Arbitration::Redis do
 
   context 'redis client connection params' do
     context 'when only url is present' do
-      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379') }
+      let(:redis_url) { ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') }
       let(:mailbox) {
         build_mailbox(
           arbitration_options: {
@@ -96,7 +105,7 @@ describe MailRoom::Arbitration::Redis do
       it 'client has same specified url' do
         subject.deliver?(123)
 
-        expect(raw_client.options[:url]).to eq redis_url
+        expect(server_url).to eq redis_url
       end
 
       it 'client is a instance of Redis class' do
@@ -135,13 +144,18 @@ describe MailRoom::Arbitration::Redis do
         )
       }
 
-      before { ::Redis::Client::Connector::Sentinel.any_instance.stubs(:resolve).returns(sentinels) }
-
       it 'client has same specified sentinel params' do
-        expect(raw_client.instance_variable_get(:@connector)).to be_a Redis::Client::Connector::Sentinel
-        expect(raw_client.options[:host]).to eq('sentinel-master')
-        expect(raw_client.options[:password]).to eq('mypassword')
-        expect(raw_client.options[:sentinels]).to eq(sentinels)
+        if redis5
+          expect(raw_client.config.password).to eq('mypassword')
+          client_sentinels = raw_client.config.sentinels
+          expect(client_sentinels.length).to eq(sentinels.length)
+          expect(client_sentinels[0].host).to eq('10.0.0.1')
+          expect(client_sentinels[0].port).to eq(26379) # rubocop:disable Style/NumericLiterals
+        else
+          expect(raw_client.options[:host]).to eq('sentinel-master')
+          expect(raw_client.options[:password]).to eq('mypassword')
+          expect(raw_client.options[:sentinels]).to eq(sentinels)
+        end
       end
     end
   end

data/spec/lib/delivery/sidekiq_spec.rb

@@ -6,6 +6,14 @@ describe MailRoom::Delivery::Sidekiq do
   let(:redis) { subject.send(:client) }
   let(:raw_client) { redis._client }
   let(:options) { MailRoom::Delivery::Sidekiq::Options.new(mailbox) }
+  let(:redis5) { Gem::Version.new(Redis::VERSION) >= Gem::Version.new('5.0') }
+  let(:server_url) do
+    if redis5
+      raw_client.config.server_url
+    else
+      raw_client.options[:url]
+    end
+  end
 
   describe '#options' do
     let(:redis_url) { 'redis://localhost' }
@@ -20,8 +28,10 @@ describe MailRoom::Delivery::Sidekiq do
       }
 
       context 'with simple redis url' do
+        let(:expected_url) { redis5 ? "#{redis_url}:6379/0" : redis_url }
+
         it 'client has same specified redis_url' do
-          expect(raw_client.options[:url]).to eq(redis_url)
+          expect(raw_client.server_url).to eq(expected_url)
         end
 
         it 'client is a instance of RedisNamespace class' do
@@ -35,12 +45,14 @@ describe MailRoom::Delivery::Sidekiq do
       end
 
       context 'with redis_db specified in options' do
+        let(:expected_url) { redis5 ? "#{redis_url}:6379/4" : redis_url }
+
         before do
           redis_options[:redis_db] = 4
         end
 
         it 'client has correct redis_url' do
-          expect(raw_client.options[:url]).to eq(redis_url)
+          expect(raw_client.server_url).to eq(expected_url)
         end
 
         it 'connection has correct values' do
@@ -84,15 +96,19 @@ describe MailRoom::Delivery::Sidekiq do
         )
       }
 
-      before { ::Redis::Client::Connector::Sentinel.any_instance.stubs(:resolve).returns(sentinels) }
-
       it 'client has same specified sentinel params' do
-        expect(raw_client.instance_variable_get(:@connector)).to be_a Redis::Client::Connector::Sentinel
-        expect(raw_client.options[:host]).to eq('sentinel-master')
-        expect(raw_client.options[:password]).to eq('mypassword')
-        expect(raw_client.options[:sentinels]).to eq(sentinels)
+        if redis5
+          expect(raw_client.config.password).to eq('mypassword')
+          client_sentinels = raw_client.config.sentinels
+          expect(client_sentinels.length).to eq(sentinels.length)
+          expect(client_sentinels[0].host).to eq('10.0.0.1')
+          expect(client_sentinels[0].port).to eq(26379) # rubocop:disable Style/NumericLiterals
+        else
+          expect(raw_client.options[:host]).to eq('sentinel-master')
+          expect(raw_client.options[:password]).to eq('mypassword')
+          expect(raw_client.options[:sentinels]).to eq(sentinels)
+        end
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Tony Pitale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -58,6 +58,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,34 +218,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +268,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/issue_templates/Default.md"
@@ -269,7 +277,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -348,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - truffleruby
-services:
-  - redis
-script:
-  - bundle exec rspec spec
-
-jobs:
-  - language: ruby
-    rvm: 2.7
-    script:
-      - bundle exec rubocop