rimless 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49d6db3a548187e76ca5ee01121a91543c13a2a98ed7afe0a22d299f1869b88
-  data.tar.gz: ca412431753486b42b92c952c30bd24a2104cca1fc9ad2eb7e6672893bbedb93
+  metadata.gz: 4eabd6c0d5bdd171ce8b754bbd37454bd1289f981ba3568bf58ada17e4eb91d7
+  data.tar.gz: be7347e5abb58a8aa18b5ae198e7a36804f13a73905c733d36177a0fbe95fb69
 SHA512:
-  metadata.gz: 664037e7791bed603c7426bf59f26f1164cb6e3344457e3956361e5bac5bfd58efc57272072e0dc2a20205827271e4c8eb5d17c83fe2dd59cde8423932c9ae30
-  data.tar.gz: ae577c63363a7903509ee8d5428c2328c278b4a6dd6c6c9a061d4bbde60eb73b46f45986da0fa0651260435f01dbe201d64713ddf268111929abc2f196f4b1c9
+  metadata.gz: 82374943aa7b559372a7eb60eaabb644df4a872d3a4143273a1f0d56f1da490eec3c802a9e306914756fd71c58f57fe149e8f810eafdbc08d9c4d9776eb8ae2c
+  data.tar.gz: 3af38794436c3fc86e735c88d7fac36690f75a4f702b4cddbcedb2fa55f2f1e66bfd8831e48798f4021b743da2834241324f66bb6415f08cf9ddf975d4866323

data/.github/workflows/documentation.yml

@@ -17,9 +17,9 @@ jobs:
       - name: Install the correct Ruby version
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 2.7
           bundler-cache: true
-          rubygems: '3.3.26'
+          rubygems: '3.4.22'
 
       - name: Prepare the virtual environment
         uses: hausgold/actions/ci@master

data/.github/workflows/release.yml

@@ -20,12 +20,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Ruby 2.5
+      - name: Install Ruby 2.7
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 2.7
           bundler-cache: true
-          rubygems: '3.3.26'
+          rubygems: '3.4.22'
 
       - name: Prepare the virtual environment
         uses: hausgold/actions/ci@master

data/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.7']
+        ruby: ['2.7']
         rails: ['5.2']
     env:
       BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile'
@@ -30,7 +30,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-          rubygems: '3.3.26'
+          rubygems: '3.4.22'
 
       - name: Prepare the virtual environment
         uses: hausgold/actions/ci@master

data/.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   TargetRailsVersion: 5.2
   Exclude:
     - bin/**/*
@@ -65,9 +65,3 @@ RSpec/FilePath:
 # Because we just implemented the ActiveRecord API.
 Rails/SkipsModelValidations:
   Enabled: false
-
-# Because Rubocop does not respect the `TargetRubyVersion: 2.5` for this cop,
-# so it converts to `then` which is not yet available on Ruby 2.5 which causes
-# `NoMethodError` errors. NOTE: Remove when Ruby 2.5 support is dropped.
-Style/ObjectThen:
-  Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 1.6.0
+
+* Dropped support for Ruby <2.7 (#38)
+* Moved the schema file validation into the retry block for parallel execution
+  (#37)
+* Updated the [Kafka Playground](./doc/kafka-playground) to the latest
+  Apache Kafka (3.7) and Schema Registry (7.6) versions (#35)
+
 ### 1.5.1
 
 * Added a retry to write compiled schema files as this may fail on parallel

data/Dockerfile

@@ -1,8 +1,8 @@
-FROM hausgold/ruby:2.5
+FROM hausgold/ruby:2.7
 MAINTAINER Hermann Mayer <hermann.mayer@hausgold.de>
 
 # Update system gem
-RUN gem update --system '3.3.26'
+RUN gem update --system '3.4.22'
 
 # Install system packages and the latest bundler
 RUN apt-get update -yqqq && \
@@ -11,7 +11,7 @@ RUN apt-get update -yqqq && \
     ca-certificates \
     bash-completion inotify-tools && \
   echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && /usr/sbin/locale-gen && \
-  gem install bundler -v '~> 2.3.0' --no-document --no-prerelease
+  gem install bundler -v '~> 2.4.22' --no-document --no-prerelease
 
 # Add new web user
 RUN mkdir /app && \

data/Makefile

@@ -116,7 +116,7 @@ test-style: \
 test-style-ruby:
 	# Run the static code analyzer (rubocop)
 	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a \
-		|| ($(TEST) $$($(RUBY_VERSION)) != '2.5' && true))
+		|| ($(TEST) $$($(RUBY_VERSION)) != '2.7' && true))
 
 clean:
 	# Clean the dependencies

data/config/docker/.bashrc

@@ -15,7 +15,9 @@ sudo sed -i 's/autostart=.*/autostart=false/g' /etc/supervisor/conf.d/*
 sudo supervisord >/dev/null 2>&1 &
 
 # Wait for supervisord
-while ! supervisorctl status >/dev/null 2>&1; do sleep 1; done
+while ! (sudo supervisorctl status | grep avahi) >/dev/null 2>&1; do
+  sleep 1
+done
 
 # Boot the mDNS stack
 echo '# Start the mDNS stack'

data/doc/kafka-playground/Dockerfile

@@ -1,8 +1,8 @@
-FROM hausgold/ruby:2.5
+FROM hausgold/ruby:2.7
 MAINTAINER Hermann Mayer <hermann.mayer@hausgold.de>
 
 # Update system gem
-RUN gem update --system
+RUN gem update --system '3.4.22'
 
 # Add backports repository
 RUN echo 'deb http://archive.debian.org/debian buster-backports main' \
@@ -18,7 +18,7 @@ RUN apt-get update -yqqq && \
     ca-certificates jq curl cmake \
     bash-completion inotify-tools && \
   echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && /usr/sbin/locale-gen && \
-  gem install bundler --no-document --no-prerelease
+  gem install bundler -v '~> 2.4.22' --no-document --no-prerelease
 
 # Install kcat (formerly known as kafkacat)
 RUN curl -sL https://github.com/edenhill/kcat/archive/refs/tags/1.7.0.tar.gz \

data/doc/kafka-playground/Gemfile

@@ -3,6 +3,6 @@
 source 'https://rubygems.org'
 
 # A bundle of opinionated Apache Kafka / Confluent Schema Registry helpers.
-gem 'rimless', '~> 1.2'
+gem 'rimless', '~> 1.5'
 # Thor is a toolkit for building powerful command-line interfaces.
 gem 'thor', '~> 1.1'

data/doc/kafka-playground/Gemfile.lock

@@ -1,27 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     avro (1.9.2)
       multi_json
     avro_turf (0.11.0)
       avro (>= 1.7.7, < 1.10)
       excon (~> 0.45)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
-    crack (0.4.5)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    delivery_boy (1.1.0)
+    delivery_boy (1.2.0)
       king_konf (~> 1.0)
-      ruby-kafka (~> 1.0)
-    digest-crc (0.6.4)
+      ruby-kafka (~> 1.5)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
@@ -64,15 +66,15 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5, >= 1.5.2)
-    envlogic (1.1.3)
+    envlogic (1.1.4)
       dry-inflector (~> 0.1)
-    excon (0.87.0)
-    hashdiff (1.0.1)
-    i18n (1.8.10)
+    excon (0.109.0)
+    hashdiff (1.1.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.5.9)
-    irb (1.3.7)
-      reline (>= 0.2.7)
+    irb (1.4.2)
+      reline (>= 0.3.0)
     karafka (1.4.3)
       dry-configurable (~> 0.8)
       dry-inflector (~> 0.1)
@@ -90,46 +92,50 @@ GEM
       sidekiq (>= 4.2)
     karafka-testing (1.4.1)
       karafka (~> 1.4.0.rc2)
-    king_konf (1.0.0)
-    minitest (5.14.4)
+    king_konf (1.0.1)
+    minitest (5.15.0)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    public_suffix (4.0.7)
+    rack (2.2.9)
+    rack-protection (2.2.4)
       rack
-    rake (13.0.6)
-    redis (4.4.0)
-    reline (0.2.7)
+    rake (13.2.1)
+    redis (4.8.1)
+    reline (0.3.1)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    rimless (1.2.0)
-      activesupport (>= 4.2.0)
+    retries (0.0.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rimless (1.5.1)
+      activesupport (>= 5.2)
       avro_turf (~> 0.11.0)
-      karafka (~> 1.4)
+      karafka (~> 1.4, < 1.4.15)
       karafka-sidekiq-backend (~> 1.4)
       karafka-testing (~> 1.4)
-      sinatra
+      retries (>= 0.0.5)
+      sinatra (~> 2.2)
       sparsify (~> 1.1)
-      waterdrop (~> 1.2)
-      webmock
-    ruby-kafka (1.4.0)
+      waterdrop (~> 1.4)
+      webmock (~> 3.18)
+    ruby-kafka (1.5.0)
       digest-crc
     ruby2_keywords (0.0.5)
-    sidekiq (6.2.2)
-      connection_pool (>= 2.2.2)
+    sidekiq (6.5.12)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
-      redis (>= 4.2.0)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
+      redis (>= 4.5.0, < 5)
+    sinatra (2.2.4)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
     sparsify (1.1.0)
-    thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    strscan (3.1.0)
+    thor (1.2.2)
+    tilt (2.3.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     waterdrop (1.4.2)
       delivery_boy (>= 0.2, < 2.x)
@@ -138,17 +144,17 @@ GEM
       dry-validation (~> 1.2)
       ruby-kafka (>= 0.7.8)
       zeitwerk (~> 2.1)
-    webmock (3.14.0)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  rimless (~> 1.2)
+  rimless (~> 1.5)
   thor (~> 1.1)
 
 BUNDLED WITH

data/doc/kafka-playground/README.md

@@ -76,10 +76,15 @@ the creation of the `/etc/mdns.allow` file.
 After the installation and bootup processes are finished you should have a
 working Apache Kafka setup which includes the following:
 
-* A single node [Apache Kafka](https://kafka.apache.org/) broker via [Zookeeper](https://zookeeper.apache.org/)
-* [Confluent Schema Registry](https://docs.confluent.io/platform/current/schema-registry/index.html), used for [Apache Avro](https://avro.apache.org/docs/current/) schemas
-* [Lenses.io Schema Registry UI](https://github.com/lensesio/schema-registry-ui), you can access it via mDNS at http://schema-registry-ui.playground.local
-* A Ruby 2.5 enabled playground container with configured Rimless support
+* A single node [Apache Kafka](https://kafka.apache.org/) (without Zookeeper,
+  KRaft) broker
+* [Confluent Schema
+  Registry](https://docs.confluent.io/platform/current/schema-registry/index.html),
+  used for [Apache Avro](https://avro.apache.org/docs/current/) schemas
+* [Lenses.io Schema Registry
+  UI](https://github.com/lensesio/schema-registry-ui), you can access it via
+  mDNS at http://schema-registry-ui.playground.local
+* A Ruby 2.7 enabled playground container with configured Rimless support
 
 ## Examples
 

data/doc/kafka-playground/bin/create-topic

@@ -12,6 +12,7 @@ class CreateTopic < Thor
          desc: 'The number of replications'
   option :verbose, aliases: '-v', type: :boolean,
          desc: 'Enable verbose outputs'
+
   def create(name, *configs)
     debug! options
 

data/doc/kafka-playground/bin/delete-topic

@@ -8,6 +8,7 @@ class DeleteTopic < Thor
   desc 'NAME', 'delete an existing Apache Kafka topic'
   option :verbose, aliases: '-v', type: :boolean,
          desc: 'Enable verbose outputs'
+
   def delete(name)
     debug! options
 

data/doc/kafka-playground/bin/produce-event

@@ -12,6 +12,7 @@ class ProduceTopic < Thor
          desc: 'The partition key to use to select the partition'
   option :verbose, aliases: '-v', type: :boolean,
          desc: 'Enable verbose outputs'
+
   def produce(topic, *files)
     debug! options
 

data/doc/kafka-playground/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'active_support'
@@ -30,7 +32,7 @@ KafkaClient = Kafka.new(Rimless.configuration.kafka_brokers, logger: AppLogger)
 # (Avahi, libnss[-mdns]). The default resolver of +Resolv+ does not include the
 # mDNS stack so we have to reconfigure it here for local usage only.
 #
-# See: https://docs.ruby-lang.org/en/2.5.0/Resolv.html
+# See: https://docs.ruby-lang.org/en/2.7.0/Resolv.html
 require 'resolv'
 Resolv::DefaultResolver.replace_resolvers(
   [

data/doc/kafka-playground/docker-compose.yml

@@ -1,35 +1,12 @@
 version: "3"
 services:
-  zookeeper:
-    image: zookeeper:3.7
-    network_mode: bridge
-    ports: ["2181"]
-    ulimits:
-      # Due to systemd/pam RLIMIT_NOFILE settings (max int inside the
-      # container), the Java process seams to allocate huge limits which result
-      # in a +unable to allocate file descriptor table - out of memory+ error.
-      # Lowering this value fixes the issue for now.
-      #
-      # See: http://bit.ly/2U62A80
-      # See: http://bit.ly/2T2Izit
-      nofile:
-        soft: 100000
-        hard: 100000
-
   kafka:
-    image: hausgold/kafka:2.1
+    image: hausgold/kafka:3.7
     network_mode: bridge
     environment:
       MDNS_HOSTNAME: kafka.playground.local
       # See: http://bit.ly/2UDzgqI for Kafka downscaling
       KAFKA_HEAP_OPTS: -Xmx256M -Xms32M
-    links:
-      - zookeeper
-    extra_hosts:
-      # Due to missing nss-mdns support on Alpine Linux
-      # and the requirement to tell our self who we are
-      # for Apache Kafka, we register ourself as hostent.
-      - kafka.playground.local:127.0.0.1
     ulimits:
       # Due to systemd/pam RLIMIT_NOFILE settings (max int inside the
       # container), the Java process seams to allocate huge limits which result
@@ -43,17 +20,16 @@ services:
         hard: 100000
 
   schema-registry:
-    image: hausgold/schema-registry:5.1.2
+    image: hausgold/schema-registry:7.6
     network_mode: bridge
     environment:
       MDNS_HOSTNAME: schema-registry.playground.local
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka.playground.local:9092
       # Set the default Apache Avro schema compatibility
       #
       # See: http://bit.ly/2TcpoY1
       # See: http://bit.ly/2Hfo4wj
       SCHEMA_REGISTRY_AVRO_COMPATIBILITY_LEVEL: full
-    links:
-      - zookeeper
     ulimits:
       # Due to systemd/pam RLIMIT_NOFILE settings (max int inside the
       # container), the Java process seams to allocate huge limits which result

data/lib/rimless/avro_utils.rb

@@ -41,10 +41,9 @@ module Rimless
         FileUtils.mkdir_p(File.dirname(dest))
         # Write the rendered file contents to the destination
         File.write(dest, ERB.new(File.read(src)).result(binding))
+        # Check the written file for correct JSON
+        validate_file(dest)
       end
-
-      # Check the written file for correct JSON
-      validate_file(dest)
     end
 
     # Check the given file for valid JSON.

data/lib/rimless/karafka/avro_deserializer.rb

@@ -19,9 +19,9 @@ module Rimless
         # occurence should be rare.
         Rimless
           .decode(params.raw_payload)
-          .yield_self { |data| Sparsify(data, sparse_array: true) }
-          .yield_self { |data| data.transform_keys { |key| key.delete('\\') } }
-          .yield_self { |data| Unsparsify(data, sparse_array: true) }
+          .then { |data| Sparsify(data, sparse_array: true) }
+          .then { |data| data.transform_keys { |key| key.delete('\\') } }
+          .then { |data| Unsparsify(data, sparse_array: true) }
           .deep_symbolize_keys
       end
     end

data/lib/rimless/rspec.rb

@@ -36,7 +36,7 @@ RSPEC_CONFIGURER.configure do |config|
         num = ENV.fetch('TEST_ENV_NUMBER', nil)
         num = '1' if num.empty?
 
-        conf.compiled_avro_schema_path = \
+        conf.compiled_avro_schema_path =
           conf.compiled_avro_schema_path.join("test-worker-#{num}")
       end
     end

data/lib/rimless/tasks/consumer.rake

@@ -15,7 +15,7 @@ namespace :rimless do
 
     Rimless.consumer.consumer_groups.each do |consumer_group|
       consumer_group.topics.each do |topic|
-        name = topic.name.split('.')[1..-1].join('.')
+        name = topic.name.split('.')[1..].join('.')
 
         puts "#    Topic: #{name}"
         puts "# Consumer: #{topic.consumer}"

data/lib/rimless/tasks/templates/custom_consumer_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe CustomConsumer do
     end
 
     it 'returns the payload properties' do
-      expect(action).to be_eql(['test', nil])
+      expect(action).to eql(['test', nil])
     end
   end
 end

data/lib/rimless/version.rb

@@ -3,7 +3,7 @@
 # The gem version details.
 module Rimless
   # The version of the +rimless+ gem
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 
   class << self
     # Returns the version of gem as a string.

data/log/make.log

@@ -0,0 +1,6 @@
+GNU Make 4.3
+Built for x86_64-pc-linux-gnu
+Copyright (C) 1988-2020 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.

data/rimless.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_runtime_dependency 'activesupport', '>= 5.2'
   spec.add_runtime_dependency 'avro_turf', '~> 0.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rimless
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -242,6 +242,7 @@ files:
 - lib/rimless/tasks/templates/karafka.rb
 - lib/rimless/version.rb
 - log/development.log
+- log/make.log
 - rimless.gemspec
 homepage: 
 licenses:
@@ -260,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="