waterdrop 2.8.15 → 2.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e65e5de3fde4fee519f6c7313c832e13deffbaf745e7fa934d419db1d4cd050
-  data.tar.gz: de1eeaefdff74ce517e15607d7015886211d831d8a2045d40b782edc1d68fe8b
+  metadata.gz: 37640abb3da7c77152964c699b1fc0426b6ebf57f82aa5e0175498409bf10aff
+  data.tar.gz: 1b30de7a05e720890f94e1aef028886140b9a7faa4c67c80faa4a4abbbeba002
 SHA512:
-  metadata.gz: 9f25c8a5468682bd6bb90ea342557fe1671831598ffa8761af34abbbc58f4cecf682ad682fb2395125e524a571e32802ed16d01139651e3e7584fd3fa671c67a
-  data.tar.gz: 863a9b02697708b8aadf52cd86fcee2b42ea1ca4c9c44ab7a2468e2ca0e1c5c76b391ae6d4e2eea63a77d67dd0ed33fc10d3d097b27f73cb47d174f3b93becd7
+  metadata.gz: f3b79f8f1aba96c578ec367a286a9ec4e3fac0f20d5d07e05e417c6e7a0553117a18586db5546240df69d6b2455badab1e93558d10c842ea28377691a074dc45
+  data.tar.gz: df6c34c35b7a51f5f4c307809e604d4cd142e4bf6b77158f8e31a9b761cffdf59a130d71474afd8b1efa6c183468a13b01b4f4df877d9e23a5dbbb19352b86ce

data/.github/workflows/ci.yml

@@ -17,37 +17,31 @@ jobs:
   specs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
-    env:
-      BUNDLE_FORCE_RUBY_PLATFORM: ${{ matrix.force_ruby_platform }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - '4.0.0-preview2'
+          - '4.0'
           - '3.4'
           - '3.3'
           - '3.2'
-        force_ruby_platform:
-          - true
-          - false
+        polling_mode:
+          - 'thread'
+          - 'fiber'
         include:
           - ruby: '3.4'
+            polling_mode: 'thread'
             coverage: 'true'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Install package dependencies
         run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
 
-      - name: Remove platform-specific ffi entries for Ruby previews
-        if: contains(matrix.ruby, 'preview')
-        run: |
-          sed -i '/^\s*ffi (.*-.*)$/d' Gemfile.lock
-
       - name: Set up Ruby
-        uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
         with:
           ruby-version: ${{matrix.ruby}}
           bundler-cache: true
@@ -75,10 +69,14 @@ jobs:
       - name: Run all tests
         env:
           GITHUB_COVERAGE: ${{matrix.coverage}}
+          FD_POLLING: ${{ matrix.polling_mode == 'fiber' && 'true' || 'false' }}
         run: bundle exec rspec
 
       - name: Run integration tests
-        run: ./bin/integrations
+        env:
+          FD_POLLING: ${{ matrix.polling_mode == 'fiber' && 'true' || 'false' }}
+        # Exclude oauth_token_refresh - requires separate Keycloak + OAuth Kafka infrastructure
+        run: ./bin/integrations --exclude oauth_token_refresh
 
       - name: Check Kafka logs for unexpected warnings
         run: bin/verify_kafka_warnings
@@ -86,53 +84,234 @@ jobs:
       - name: Check test topics naming convention
         run: bin/verify_topics_naming
 
-  coditsu:
+  rubocop:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
+    env:
+      BUNDLE_GEMFILE: Gemfile.lint
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
-      - name: Download Coditsu script
-        run: |
-          curl -sSL https://api.coditsu.io/run/ci -o coditsu_script.sh
-          chmod +x coditsu_script.sh
-      - name: Verify Coditsu script checksum
-        run: |
-          EXPECTED_SHA256="0aecc5aa010f53fca264548a41467a2b0a1208d750ce1da3e98a217304cacbbc"
-          ACTUAL_SHA256=$(sha256sum coditsu_script.sh | awk '{ print $1 }')
-          if [ "$ACTUAL_SHA256" != "$EXPECTED_SHA256" ]; then
-            echo "::error::Checksum verification failed. Expected $EXPECTED_SHA256 but got $ACTUAL_SHA256."
-            exit 1
-          fi
-      - name: Run Coditsu
-        run: ./coditsu_script.sh
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        with:
+          ruby-version: '4.0.1'
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rubocop
 
   yard-lint:
     timeout-minutes: 5
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: Gemfile.lint
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
       - name: Set up Ruby
-        uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
         with:
-          ruby-version: '3.4'
+          ruby-version: '4.0.1'
           bundler-cache: true
       - name: Run yard-lint
         run: bundle exec yard-lint lib/
 
+  lostconf:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+      - name: Set up Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        with:
+          node-version: '20'
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+      - name: Run lostconf
+        run: npx lostconf --fail-on-stale
+
+  oauth-integration:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        polling_mode:
+          - 'thread'
+          - 'fiber'
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        with:
+          ruby-version: '4.0.1'
+          bundler-cache: true
+          bundler: 'latest'
+
+      - name: Start OAuth infrastructure (Keycloak + Kafka with SASL/OAUTHBEARER)
+        run: docker compose -f docker-compose.oauth.yml up -d
+
+      - name: Wait for Keycloak to be ready
+        run: |
+          echo "Waiting for Keycloak to be ready..."
+          for i in {1..60}; do
+            if curl -sf http://localhost:8080/realms/kafka > /dev/null 2>&1; then
+              echo "Keycloak is ready!"
+              break
+            fi
+            echo "Waiting... ($i/60)"
+            sleep 2
+          done
+
+      - name: Wait for Kafka OAuth broker to be ready
+        run: |
+          echo "Waiting for Kafka OAuth broker..."
+          sleep 10
+
+      - name: Install dependencies
+        run: |
+          gem install bundler --no-document
+          bundle config set without 'tools benchmarks docs development'
+          bundle install --jobs 4 --retry 3
+
+      - name: Run OAuth integration test
+        env:
+          FD_POLLING: ${{ matrix.polling_mode == 'fiber' && 'true' || 'false' }}
+        run: ./bin/integrations oauth_token_refresh
+
+      - name: Show Keycloak logs on failure
+        if: failure()
+        run: docker compose -f docker-compose.oauth.yml logs keycloak
+
+      - name: Show Kafka OAuth logs on failure
+        if: failure()
+        run: docker compose -f docker-compose.oauth.yml logs kafka-oauth
+
+  specs-macos:
+    timeout-minutes: 30
+    runs-on: macos-15
+    env:
+      CONFLUENT_VERSION: "8.0.0"
+    strategy:
+      fail-fast: false
+      matrix:
+        polling_mode:
+          - 'thread'
+          - 'fiber'
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: Install Bash 4+
+        run: |
+          brew install bash
+          echo "/opt/homebrew/bin" >> $GITHUB_PATH
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+        with:
+          ruby-version: '4.0.1'
+          bundler-cache: true
+          bundler: 'latest'
+
+      - name: Install and Start Confluent Community Kafka (KRaft)
+        run: |
+          brew install openjdk@17
+          export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
+          export JAVA_HOME="/opt/homebrew/opt/openjdk@17"
+
+          curl -O "https://packages.confluent.io/archive/8.0/confluent-community-${CONFLUENT_VERSION}.tar.gz"
+          tar -xzf "confluent-community-${CONFLUENT_VERSION}.tar.gz"
+
+          export CONFLUENT_HOME="$(pwd)/confluent-${CONFLUENT_VERSION}"
+          export PATH="$CONFLUENT_HOME/bin:$PATH"
+          cd "$CONFLUENT_HOME"
+
+          KRAFT_CONFIG=""
+          for config in "etc/kafka/kraft/server.properties" "config/kraft/server.properties" "etc/kafka/server.properties"; do
+            if [ -f "$config" ]; then
+              KRAFT_CONFIG="$config"
+              echo "Found config: $KRAFT_CONFIG"
+              break
+            fi
+          done
+
+          if [ -z "$KRAFT_CONFIG" ]; then
+            echo "❌ No server config found"
+            exit 1
+          fi
+
+          cat >> "$KRAFT_CONFIG" << 'EOF'
+
+          process.roles=broker,controller
+          node.id=1
+          controller.quorum.voters=1@127.0.0.1:9093
+          listeners=PLAINTEXT://127.0.0.1:9092,CONTROLLER://127.0.0.1:9093
+          advertised.listeners=PLAINTEXT://127.0.0.1:9092
+          controller.listener.names=CONTROLLER
+          inter.broker.listener.name=PLAINTEXT
+          log.dirs=/tmp/kraft-combined-logs
+          authorizer.class.name=org.apache.kafka.metadata.authorizer.StandardAuthorizer
+          super.users=User:ANONYMOUS
+          allow.everyone.if.no.acl.found=true
+          EOF
+
+          CLUSTER_ID=$(bin/kafka-storage random-uuid)
+          bin/kafka-storage format -t "$CLUSTER_ID" -c "$KRAFT_CONFIG"
+          bin/kafka-server-start "$KRAFT_CONFIG" &
+
+          sleep 20
+
+          for i in {1..30}; do
+            if bin/kafka-topics --bootstrap-server 127.0.0.1:9092 --list >/dev/null 2>&1; then
+              echo "✅ Confluent Community ${CONFLUENT_VERSION} (KRaft) is ready!"
+              break
+            fi
+            [ $i -eq 30 ] && { echo "❌ Kafka failed to start"; exit 1; }
+            sleep 2
+          done
+
+      - name: Install latest bundler
+        run: |
+          gem install bundler --no-document
+          gem update --system --no-document
+          bundle config set without 'tools benchmarks docs'
+
+      - name: Bundle install
+        run: |
+          bundle config set without development
+          bundle install --jobs 4 --retry 3
+
+      - name: Run all tests
+        env:
+          FD_POLLING: ${{ matrix.polling_mode == 'fiber' && 'true' || 'false' }}
+        run: bundle exec rspec
+
+      - name: Run integration tests
+        env:
+          FD_POLLING: ${{ matrix.polling_mode == 'fiber' && 'true' || 'false' }}
+        run: ./bin/integrations --exclude oauth_token_refresh
+
   ci-success:
     name: CI Success
     runs-on: ubuntu-latest
     if: always()
     needs:
-      - coditsu
+      - rubocop
       - specs
+      - specs-macos
       - yard-lint
+      - lostconf
+      - oauth-integration
     steps:
       - name: Check all jobs passed
         if: |

data/.github/workflows/push.yml

@@ -19,12 +19,12 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
+        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
         with:
           bundler-cache: false
 
@@ -32,4 +32,4 @@ jobs:
         run: |
           bundle install --jobs 4 --retry 3
 
-      - uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+      - uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2

data/.github/workflows/trigger-wiki-refresh.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'karafka'
     steps:
       - name: Trigger wiki refresh
-        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3.0.0
+        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
         with:
           token: ${{ secrets.WIKI_REPO_TOKEN }}
           repository: karafka/wiki

data/.github/workflows/verify-action-pins.yml

@@ -7,7 +7,7 @@ jobs:
   verify_action_pins:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Check SHA pins
         run: |
           if grep -E -r "uses: .*/.*@(v[0-9]+|main|master)($|[[:space:]]|$)" --include="*.yml" --include="*.yaml" .github/workflows/ | grep -v "#"; then

data/.gitignore

@@ -12,7 +12,6 @@ db/*.sqlite3
 /tmp/*
 *.gem
 *.~
-/.coditsu/local.yml
 .byebug_history
 
 # various artifacts

data/.rubocop.yml

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+plugins:
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-rspec_rails
+  - rubocop-thread_safety
+
+inherit_gem:
+  standard: config/base.yml
+  standard-performance: config/base.yml
+  standard-rspec: config/base.yml
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.2
+  Include:
+    - "**/*.rb"
+    - "**/*.gemspec"
+    - "**/Gemfile"
+    - "**/Rakefile"
+    - Gemfile.lint
+
+# Disabled departments - not a Rails project, no Capybara/FactoryBot
+Capybara:
+  Enabled: false
+
+FactoryBot:
+  Enabled: false
+
+RSpecRails:
+  Enabled: false
+
+# Layout
+Layout/LineLength:
+  Max: 100
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: space
+
+# Lint
+Lint/RescueException:
+  Exclude:
+    - lib/waterdrop/producer/transactions.rb
+
+# RSpec
+RSpec:
+  Exclude:
+    - spec/integrations/**/*
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/IndexedLet:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 20
+
+RSpec/NestedGroups:
+  Max: 4
+
+RSpec/NoExpectationExample:
+  Enabled: false
+
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
+# Style
+Style/SlicingWithRange:
+  Exclude:
+    - bin/integrations
+
+# ThreadSafety
+ThreadSafety/ClassAndModuleAttributes:
+  Enabled: false
+
+ThreadSafety/ClassInstanceVariable:
+  Enabled: false
+
+ThreadSafety/NewThread:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.4.5
+4.0.1