karafka 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67c595b8ce4b5ff1589517547f94c8e1ba4caf51361074949b7bae1c5368bf6
-  data.tar.gz: 17c507ddf4d2b4cd62eea3df3a1dec0cef5a257054f7d0321e1c71dcba0d400e
+  metadata.gz: 0fae4fb99cb42515602d9f27a6d7a5bd7485e4e0b40868a6856766ebe7b50083
+  data.tar.gz: b82635f328ba711f836da733dd0ec5ed415446d3209918a20f7b6f42ff1e1ac2
 SHA512:
-  metadata.gz: 818d4d75303eda22f8e923e7ade1c445f0c2e99aebdb7e56511b5fdf38ea39c047f61c0983bc8d38641676be2c2fcc901df9d2bc0d812c3454664dd73ab27b2e
-  data.tar.gz: 5c10aced279e74af09d42dd3367a1593abf11267cb09099d0d92a3b4e540f19fa3c06bd9e0f61f7025c3fc0774cde9f4902fb929ca9e24aa308f9d72e6a61def
+  metadata.gz: f90e7c6757cd517649c0021f759db091c050899c8a7846d022fa58e117db61cb5a3f6ee640b452f43017e0b504b0ba6a3b075886b266438daf1098d0fa2bc48d
+  data.tar.gz: 7ab841ff7269992e90a17a88159baa9be67ab35866f8d174a434bd6efbecceb1521bbf142b6c9ebb37cabbea8a125e49b60fde3844b2a0e6ce3b62ef941b6a75

data/.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: ci
 
 on:
+  pull_request:
   push:
   schedule:
     - cron:  '0 1 * * *'

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Karafka framework changelog
 
+## 1.4.3 (2021-03-24)
+- Fixes for Ruby 3.0 compatibility
+
 ## 1.4.2 (2021-02-16)
 - Rescue Errno::EROFS in ensure_dir_exists (unasuke)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka (1.4.2)
+    karafka (1.4.3)
       dry-configurable (~> 0.8)
       dry-inflector (~> 0.1)
       dry-monitor (~> 0.3)
@@ -81,11 +81,11 @@ GEM
       activesupport (>= 5.0.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.8)
+    io-console (0.5.9)
     irb (1.3.4)
       reline (>= 0.1.5)
     king_konf (1.0.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     rake (13.0.3)
     reline (0.2.4)
       io-console (~> 0.5)
@@ -113,7 +113,7 @@ GEM
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    waterdrop (1.4.0)
+    waterdrop (1.4.1)
       delivery_boy (>= 0.2, < 2.x)
       dry-configurable (~> 0.8)
       dry-monitor (~> 0.3)
@@ -123,8 +123,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
-  x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   byebug
@@ -134,4 +133,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.2.11
+   2.2.15

data/README.md

@@ -1,10 +1,12 @@
 ![karafka logo](https://raw.githubusercontent.com/karafka/misc/master/logo/karafka_logotype_transparent2.png)
 
-[![Build Status](https://travis-ci.org/karafka/karafka.svg?branch=master)](https://travis-ci.org/karafka/karafka)
+[![Build Status](https://github.com/karafka/karafka/actions/workflows/ci.yml/badge.svg)](https://github.com/karafka/karafka/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/karafka.svg)](http://badge.fury.io/rb/karafka)
+[![Join the chat at https://gitter.im/karafka/karafka](https://badges.gitter.im/karafka/karafka.svg)](https://gitter.im/karafka/karafka)
 
-**Note**: Documentation presented here refers to Karafka `1.4`.
-
-If you are looking for the documentation for Karafka `1.3.x`, it can be found [here](https://github.com/karafka/wiki/tree/1.3).
+**Note**: We're finishing the new Karafka `2.0` but for now, please use `1.4`. All the documentation presented here refers to `1.4`
+..
+Documentation presented here refers to Karafka `1.4`.
 
 ## About Karafka
 
@@ -72,7 +74,7 @@ Karafka framework and Karafka team are __not__ related to Kafka streaming servic
 ## References
 
 * [Karafka framework](https://github.com/karafka/karafka)
-* [Karafka Travis CI](https://travis-ci.org/karafka/karafka)
+* [Karafka GitHub Actions](https://github.com/karafka/karafka/actions)
 * [Karafka Coditsu](https://app.coditsu.io/karafka/repositories/karafka)
 
 ## Note on contributions

data/lib/karafka/cli/install.rb

@@ -34,7 +34,7 @@ module Karafka
           Bundler.read_file(
             Bundler.default_lockfile
           )
-        ).dependencies.key?('rails')
+        ).dependencies.key?('railties')
       end
 
       # Install all required things for Karafka application in current directory

data/lib/karafka/cli/server.rb

@@ -31,14 +31,6 @@ module Karafka
         # part of the topics
         Karafka::Server.consumer_groups = cli.options[:consumer_groups]
 
-        # Remove pidfile on stop, just before the server instance is going to be GCed
-        # We want to delay the moment in which the pidfile is removed as much as we can,
-        # so instead of removing it after the server stops running, we rely on the gc moment
-        # when this object gets removed (it is a bit later), so it is closer to the actual
-        # system process end. We do that, so monitoring and deployment tools that rely on a pid
-        # won't alarm or start new system process up until the current one is finished
-        ObjectSpace.define_finalizer(self, proc { send(:clean) })
-
         Karafka::Server.run
       end
 
@@ -60,6 +52,14 @@ module Karafka
           cli.options[:pid],
           'w'
         ) { |file| file.write(::Process.pid) }
+
+        # Remove pidfile on stop, just before the server instance is going to be GCed
+        # We want to delay the moment in which the pidfile is removed as much as we can,
+        # so instead of removing it after the server stops running, we rely on the gc moment
+        # when this object gets removed (it is a bit later), so it is closer to the actual
+        # system process end. We do that, so monitoring and deployment tools that rely on a pid
+        # won't alarm or start new system process up until the current one is finished
+        ObjectSpace.define_finalizer(self, proc { send(:clean) })
       end
 
       # Removes a pidfile (if exist)

data/lib/karafka/connection/api_adapter.rb

@@ -48,30 +48,28 @@ module Karafka
 
         # Builds all the configuration settings for kafka#consumer method
         # @param consumer_group [Karafka::Routing::ConsumerGroup] consumer group details
-        # @return [Array<Hash>] array with all the consumer arguments including hash with all
+        # @return [Hash] all the consumer keyword arguments including hash with all
         #   the settings required by Kafka#consumer
         def consumer(consumer_group)
           settings = { group_id: consumer_group.id }
           settings = fetch_for(:consumer, consumer_group, settings)
-          [sanitize(settings)]
+          sanitize(settings)
         end
 
         # Builds all the configuration settings for kafka consumer consume_each_batch and
         #   consume_each_message methods
         # @param consumer_group [Karafka::Routing::ConsumerGroup] consumer group details
-        # @return [Array<Hash>] Array with all the arguments required by consuming method
-        #   including hash with all the settings required by
+        # @return [Hash] hash with all the arguments required by consuming method
+        #   including all the settings required by
         #   Kafka::Consumer#consume_each_message and Kafka::Consumer#consume_each_batch method
         def consumption(consumer_group)
-          [
-            sanitize(
-              fetch_for(
-                :consumption,
-                consumer_group,
-                automatically_mark_as_processed: consumer_group.automatically_mark_as_consumed
-              )
+          sanitize(
+            fetch_for(
+              :consumption,
+              consumer_group,
+              automatically_mark_as_processed: consumer_group.automatically_mark_as_consumed
             )
-          ]
+          )
         end
 
         # Builds all the configuration settings for kafka consumer#subscribe method

data/lib/karafka/connection/builder.rb

@@ -10,7 +10,12 @@ module Karafka
         #   to have a new Kafka client
         # @return [::Kafka::Client] returns a Kafka client
         def call(consumer_group)
-          Kafka.new(*ApiAdapter.client(consumer_group))
+          settings = ApiAdapter.client(consumer_group)
+
+          Kafka.new(
+            settings[0],
+            **settings[1]
+          )
         end
       end
     end

data/lib/karafka/connection/client.rb

@@ -33,9 +33,9 @@ module Karafka
         settings = ApiAdapter.consumption(consumer_group)
 
         if consumer_group.batch_fetching
-          kafka_consumer.each_batch(*settings) { |batch| yield(batch, :batch) }
+          kafka_consumer.each_batch(**settings) { |batch| yield(batch, :batch) }
         else
-          kafka_consumer.each_message(*settings) { |message| yield(message, :message) }
+          kafka_consumer.each_message(**settings) { |message| yield(message, :message) }
         end
       # @note We catch only the processing errors as any other are considered critical (exceptions)
       #   and should require a client restart with a backoff
@@ -98,10 +98,12 @@ module Karafka
         # @note We don't cache the connection internally because we cache kafka_consumer that uses
         #   kafka client object instance
         @kafka_consumer ||= Builder.call(consumer_group).consumer(
-          *ApiAdapter.consumer(consumer_group)
+          **ApiAdapter.consumer(consumer_group)
         ).tap do |consumer|
           consumer_group.topics.each do |topic|
-            consumer.subscribe(*ApiAdapter.subscribe(topic))
+            settings = ApiAdapter.subscribe(topic)
+
+            consumer.subscribe(settings[0], **settings[1])
           end
         end
       rescue Kafka::ConnectionError

data/lib/karafka/server.rb

@@ -58,7 +58,7 @@ module Karafka
       def stop_supervised
         Karafka::App.stop!
 
-        # Temporary patch until https://github.com/dry-rb/dry-configurable/issues/93 is fixed
+        # See https://github.com/dry-rb/dry-configurable/issues/93
         timeout = Thread.new { Karafka::App.config.shutdown_timeout }.join.value
 
         # We check from time to time (for the timeout period) if all the threads finished

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -36,7 +36,7 @@ cert_chain:
   2DND//YJUikn1zwbz1kT70XmHd97B4Eytpln7K+M1u2g1pHVEPW4owD/ammXNpUy
   nt70FcDD4yxJQ+0YNiHd0N8IcVBM1TMIVctMNQ==
   -----END CERTIFICATE-----
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable