hanami-events-cloud_pubsub 3.0.2 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d3b5fbc39d5156f61b017e935a4695ad39bb6e10ed435554d1f376fda584f9
-  data.tar.gz: 35416fe9cca3d8eefa03fd998bbe2030163aa59d4cfe88c4eba465d867355bf5
+  metadata.gz: c9761e02377d807f35d3c4e005d4948237bf89204ba7d7dc619d46e91d7bca38
+  data.tar.gz: fade5b3c8657111ab4e485ad5b03bb584b69d4557cd2416d5e0c358bcf5dc3f4
 SHA512:
-  metadata.gz: 36a700e7622f60bdef194ed6f7041967cded5e7fbd16b83b2b0d1f10f574a1774bcf6e40c63fd29b12b8a0ee078d14fac48a0149420a89481f7b779674a063aa
-  data.tar.gz: '0619ed7a378a522575aa9eeb096f51058e69f3027cc9c7d3d0ad312315366bec1e2f380698ae7747fdbb92a87d77ca6c4f27bb625da9088885cf32db3e7875d1'
+  metadata.gz: c89ad6a21c559f77c671b10cd7da95bbd7fbf09a5b0489615e46338677cac4cab129faa2b8e8d69faf6f762cda00d9b0bbf261dd82998634ebc7702e55c4ddb3
+  data.tar.gz: 0c785630df1938f248a4c5fc2f5ad5470ea8f75e872dada244dcc0229bedebbf8214ee98cbe28c5b745ba8037ce8d40ea48bafea028dc2e30329e01e6f7d623c

data/.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+---
+name: CI
+on: [push, pull_request]
+env:
+  CC_TEST_REPORTER_ID: "7ab310950456b913cd7e947f6671e3e9c16822f33bd8c572dadcc14593fe4fb5"
+  COVERAGE: "true"
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Set ENV for codeclimate (pull_request)
+        run: |
+          git fetch --no-tags --prune --depth=1 origin +refs/heads/$GITHUB_HEAD_REF:refs/remotes/origin/$GITHUB_HEAD_REF
+          echo "GIT_BRANCH=$GITHUB_HEAD_REF" >> $GITHUB_ENV
+          echo "GIT_COMMIT_SHA=$(git rev-parse origin/$GITHUB_HEAD_REF)" >> $GITHUB_ENV
+        if: github.event_name == 'pull_request'
+
+      - name: Set ENV for codeclimate (push)
+        run: |
+          echo "GIT_BRANCH=$GITHUB_REF" >> $GITHUB_ENV
+          echo "GIT_COMMIT_SHA=$GITHUB_SHA" >> $GITHUB_ENV
+        if: github.event_name == 'push'
+
+      - name: Prepare for test
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+
+      - name: Run tests
+        run: bundle exec rake
+
+      - name: Report coverage
+        run: ./cc-test-reporter after-build -t simplecov --exit-code $?

data/.gitignore

@@ -11,3 +11,4 @@
 # rspec failure tracking
 .rspec_status
 coverage
+Gemfile.lock

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-09-25 19:54:44 UTC using RuboCop version 0.89.0.
+# on 2020-12-08 03:28:27 UTC using RuboCop version 0.89.0.
 # 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
@@ -15,13 +15,23 @@ Lint/RedundantCopDisableDirective:
 # Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 21
+  Max: 25
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 11
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 11
+
 # Offense count: 1
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:

data/Gemfile

@@ -7,9 +7,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in hanami-events-cloud_pubsub.gemspec
 gemspec
 
+RUBY_MAJOR = RUBY_VERSION[0].to_i
+
 gem 'hanami-events', github: 'hanami/events'
 gem 'pry'
 gem 'rubocop'
 gem 'simplecov', require: false
-
 gem 'request_id', '~> 0.4.3'
+gem 'webrick' if RUBY_MAJOR > 2

data/hanami-events-cloud_pubsub.gemspec

@@ -26,12 +26,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dry-configurable', '>= 0.8'
   spec.add_dependency 'gapic-common', '>= 0.3.4'
-  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 2.1'
+  spec.add_dependency 'google-cloud-pubsub', '>= 0.38.1', '< 2.4'
   spec.add_dependency 'hanami-cli', '~> 0.2'
   spec.add_dependency 'hanami-events', '~> 0.2.0'
   spec.add_dependency 'rack'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'prometheus-client'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/hanami/events/cloud_pubsub.rb

@@ -52,7 +52,7 @@ module Hanami
       }, reader: true
       setting :error_handlers, [
         ->(err, msg) do
-          logger.error "Message(#{msg.message_id}) failed with exception #{err.inspect}"
+          logger.error "Message(#{msg}) failed with exception #{err.inspect}"
         end
       ], reader: true
 

data/lib/hanami/events/cloud_pubsub/cli.rb

@@ -50,6 +50,7 @@ module Hanami
             end
 
             def setup_env(opts)
+              Process.setproctitle('hanami-events-cloud_pubsub')
               ENV['PUBSUB_EMULATOR_HOST'] ||= 'localhost:8085' if opts[:emulator]
             end
 

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -59,7 +59,8 @@ module Hanami
         end
 
         def shutdown
-          subscriber.stop.wait!
+          stop
+          wait
           self
         end
 
@@ -68,8 +69,8 @@ module Hanami
           self
         end
 
-        def wait
-          subscriber.wait!
+        def wait(timeout = 60)
+          subscriber.wait!(timeout)
           self
         end
 
@@ -87,7 +88,7 @@ module Hanami
           middleware.invoke(message) { handler.call(message) }
           message.ack!
         rescue StandardError => e
-          run_error_handlers(e, message)
+          run_error_handlers(e, message.message_id.to_s)
           message.nack! if CloudPubsub.config.auto_retry.enabled
           raise
         end
@@ -133,16 +134,25 @@ module Hanami
         end
 
         def apply_retry_options(sub)
-          return {} unless CloudPubsub.config.auto_retry.enabled
+          retry_policy = build_retry_policy
+          attempts = CloudPubsub.config.auto_retry.max_attempts
 
-          sub.retry_policy = Google::Cloud::PubSub::RetryPolicy.new(
+          sub.retry_policy = retry_policy if sub.retry_policy&.to_grpc != retry_policy&.to_grpc
+          sub.dead_letter_topic = dead_letter_topic if sub.dead_letter_topic&.name != dead_letter_topic&.name
+          sub.dead_letter_max_delivery_attempts = attempts if sub.dead_letter_topic&.name != dead_letter_topic&.name
+
+          sub
+        rescue StandardError => e
+          run_error_handlers(e, nil)
+        end
+
+        def build_retry_policy
+          return unless CloudPubsub.config.auto_retry.enabled
+
+          Google::Cloud::PubSub::RetryPolicy.new(
             minimum_backoff: CloudPubsub.config.auto_retry.minimum_backoff,
             maximum_backoff: CloudPubsub.config.auto_retry.maximum_backoff
           )
-          sub.dead_letter_topic = dead_letter_topic
-          sub.dead_letter_max_delivery_attempts = CloudPubsub.config.auto_retry.max_attempts
-
-          sub
         end
       end
       # rubocop:enable Metrics/ClassLength:

data/lib/hanami/events/cloud_pubsub/runner.rb

@@ -9,7 +9,7 @@ module Hanami
       class Runner
         attr_reader :logger, :adapter
 
-        def initialize(adapter:, logger:, sleep_time: 2)
+        def initialize(adapter:, logger:, sleep_time: 30)
           @logger = logger
           @adapter = adapter
           @sleep_time = sleep_time
@@ -40,9 +40,8 @@ module Hanami
         def gracefully_shutdown
           stop
           logger.info "Gracefully shutting down CloudPubsub runner: #{self}"
-          sleep_for_a_bit
+          adapter.listeners.each { |l| l.wait(@sleep_time) }
           adapter.flush_messages
-          adapter.listeners.each(&:wait)
           handle_on_shutdown
 
           self
@@ -102,10 +101,6 @@ module Hanami
           MSG
         end
 
-        def sleep_for_a_bit
-          sleep @sleep_time
-        end
-
         def handle_on_shutdown
           return if CloudPubsub.on_shutdown_handlers.empty?
 

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '3.0.2'
+      VERSION = '3.0.7'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.7
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -47,7 +47,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
@@ -164,15 +164,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".tool-versions"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/.travis.yml

@@ -1,32 +0,0 @@
----
-sudo: required
-cache: bundler
-services:
-  - docker
-language: ruby
-env:
-  global:
-    - CC_TEST_REPORTER_ID=7ab310950456b913cd7e947f6671e3e9c16822f33bd8c572dadcc14593fe4fb5
-    - COVERAGE=true
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem install bundler -v 1.16.1
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-after_failure:
-  - cat log/test.log
-deploy:
-  provider: rubygems
-  api_key:
-    secure: q/B3zDEld8yzf1plU1vlnUIhqk7hhdrqdF8uRnSvikweM9MSeGk1x6lcZ4mxnwCVPuQEP49iI4sNtFHiJnP/Dv6f48A6ltpVlyST1vghhXlaIi9+r9pCJqB+vAOii7poq9lWyKWj15MMB5xE52Alz7WzUccOL55gmJ4q+Lia6+z04m+VdOuEY1Lyn38O9jtZJBBfnbjar+qKoHXCNSKuJfXrFBi+2LKvaxJFWS8NBvhnDILNkcooh01rp6/dtNuUMFTLd1i+zMMBYc1PyGP0+fNZE9MXUViy3soDfgXlPDyiwtTzASLCu6HXQg8g9SwBxMnkRQRxAKYzoAPoECcr9NxMR1riH6xaA2wkwW/rKcBP5JPfbRymRgSui4uhYSq7WJR5KNxpH2JYK+rW/EL9SB+7BT67g3ZNL6YGpL3R7/S5RLdHk+lJIY8uFRtzhYgchSa0tkBAm/qbll5d4B9wq7O1/McNwUQJKFs7CsVXL/arZUFgQVGdkQDOIeCITzeFy4iP3JASewOk+yCUyCbBCya2AicU7BOjYpghD0QNmyaunTPhCySdBe4mS3QkAspHGg10H5dggNS0IqHYmUTlmHiYg9Pf9TF85krQih/s3hr/+i13u+y8iBwA7n/mXTt5IQ+NQgXNSC0uJvSjHU2Rzr9yKZ1lLEXMB0y+S9OVeZA=
-  gem: hanami-events-cloud_pubsub
-  on:
-    tags: true
-    repo: adHawk/hanami-events-cloud_pubsub

data/Gemfile.lock

@@ -1,161 +0,0 @@
-GIT
-  remote: https://github.com/hanami/events
-  revision: 59a36d22b75ea045fa8994f4f660a02c0901f8b2
-  specs:
-    hanami-events (0.2.1)
-      dry-container (~> 0.6)
-
-PATH
-  remote: .
-  specs:
-    hanami-events-cloud_pubsub (3.0.2)
-      dry-configurable (>= 0.8)
-      gapic-common (>= 0.3.4)
-      google-cloud-pubsub (>= 0.38.1, < 2.1)
-      hanami-cli (~> 0.2)
-      hanami-events (~> 0.2.0)
-      rack
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    dry-configurable (0.11.6)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    gapic-common (0.3.4)
-      google-protobuf (~> 3.12, >= 3.12.2)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.25)
-    google-cloud-core (1.5.0)
-      google-cloud-env (~> 1.0)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-pubsub (2.0.0)
-      concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.5)
-      google-cloud-pubsub-v1 (~> 0.0)
-    google-cloud-pubsub-v1 (0.1.2)
-      gapic-common (~> 0.3)
-      google-cloud-errors (~> 1.0)
-      grpc-google-iam-v1 (>= 0.6.10, < 2.0)
-    google-protobuf (3.13.0)
-    googleapis-common-protos (1.3.10)
-      google-protobuf (~> 3.11)
-      googleapis-common-protos-types (>= 1.0.5, < 2.0)
-      grpc (~> 1.27)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
-    googleauth (0.13.1)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    grpc (1.32.0)
-      google-protobuf (~> 3.13)
-      googleapis-common-protos-types (~> 1.0)
-    grpc-google-iam-v1 (0.6.10)
-      google-protobuf (~> 3.11)
-      googleapis-common-protos (>= 1.3.10, < 2.0)
-      grpc (~> 1.27)
-    hanami-cli (0.3.1)
-      concurrent-ruby (~> 1.0)
-      hanami-utils (~> 1.3)
-    hanami-utils (1.3.6)
-      concurrent-ruby (~> 1.0)
-      transproc (~> 1.0)
-    jwt (2.2.2)
-    memoist (0.16.2)
-    method_source (1.0.0)
-    multi_json (1.15.0)
-    multipart-post (2.1.1)
-    os (1.1.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    prometheus-client (2.1.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
-    request_id (0.4.3)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.89.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    transproc (1.1.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  hanami-events!
-  hanami-events-cloud_pubsub!
-  prometheus-client
-  pry
-  rake (~> 13.0)
-  request_id (~> 0.4.3)
-  rspec (~> 3.0)
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.17.3