eventhub-processor2 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada51c14b34969eea52b154ed1aad5d6d5114354aeab4f3f4ef5a43269f6d3ca
-  data.tar.gz: 90c9e9dd2af39915a9f7d7f81e12f260b0a9206ef6fb76c080e7406eb8d2b9d0
+  metadata.gz: c2802cc49773eefcd1c4ac043ad25c07a59576eae96f1a657556741e20da1815
+  data.tar.gz: 84f36939159674c30169766b44e427fdee7a03cbdba0f3d4f356040bb5c2ed41
 SHA512:
-  metadata.gz: 4fc3467735769496ead9fbcd560e8f9085cf79f599738a201042515de769b6b51b00b0c8662f774fd488cfb152c326cf1361e54ad3148517cf9daeb95ec5e9c1
-  data.tar.gz: f5a4bb8365be33644b5140de210cdc372ca9ff61b15b69ad33a5efb3c17e57e5e8870f4f5d8fd9cf4ee5957e5b2758f22587fa3a07c4d845d3cabcdd0f49776f
+  metadata.gz: 71c2532c9d70ea9d913778f12435f36d8d4aa1185b7586e6ad41803aa2f5f4182c720edaa17e32e77889c9e46ab4b4147fbaae78ec7ecfab31729208e4f182ed
+  data.tar.gz: 57e0722d7267a3dd6356422ac7f069390dcfce6fe06f7d40eac1debba3efb44418d1c3a5291806db7d4bf0272e98a54a5dc5a479ab1c621ee8afdf33e3f09241

data/.rspec

@@ -1,2 +1,3 @@
+--format documentation
 --color
 --require spec_helper

data/.ruby-version

@@ -1 +1 @@
-2.7.0
+2.6.6

data/.travis.yml

@@ -9,10 +9,10 @@ os:
 - linux
 
 rvm:
-- 2.7.1
+- 3.0.0
+- 2.7.2
 - 2.6.6
 - 2.5.8
-- 2.4.10
 
 env:
   - secure: R0rBtWClmnJKO+zyAncF6+1qDpZ6JQR+Z6VXzUmWw8MuxUXv732XTNYulY/tTeDW876GofAsOF9QfX/jhF+2ubV8SzM6rKTZS09feATuOWRPtECEaBOPcb0JGYouBNg/Lv4onuXb8KS/9U093sRqiJMfib82iY7QK9bnDPsYoQXtMnI7KBeQNrTV0H4nby3lvbjcpMDhmyg+anOmCP5yepZeS53Qq+C5GHguYivisvhSPmCfONrT303XxFLDo/aOkMDlceeZBDhtcpm5Px3GIwybSI9xRtAnpT73oL1Piazda6mRN7VHoT7YAHKqcJNZDB48HYuTj3Pt3oVVw0v78Cf25caBqXttXflXfB8U3qfVt+94uF0icH34NAnpW9l1B8GXHi6CTr27Hg2ZatWkQCN1rCpcCaW0eM/NoAG6snwTIwr1VvjLWpSW5wwhQgHPyMl+MRlTmCn/UM+eQSwPVhflKpMS1+ah6cbhDrQQF1jDt3dRaLqSnVE4APrafdT90SA3SCG2MGOE+pp+DX528gEsRB34UdX2V67dlwXeRu1eU5vZBR7jZrqwuwTAgSvxEF0eJWC0kgvEfouzuVHhVmmSAcNNHlg2kd0/oyQELyXTsklJghwAupcy4X/GEAyfLW9GAxItjATyV7XyfjmaBmdzHl/5JWeXicoyZ/4+8iE=

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog of EventHub::Processor2
 
+## 1.9.0 / 2021-02-26
+
+* Updated gem dependencies
+* Appply ruby style guides
+* Reduce log noice
+
 ## 1.8.0 / 2020-05-05
 
 * Increase watchdog cycle time to 60s

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/Gemfile.lock

@@ -1,62 +1,77 @@
 PATH
   remote: .
   specs:
-    eventhub-processor2 (1.8.0)
+    eventhub-processor2 (1.9.0)
       bunny (~> 2.15)
-      celluloid (~> 0.17)
+      celluloid (~> 0.18)
       eventhub-components (~> 0.2)
       uuidtools (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (2.3.1)
-    bunny (2.15.0)
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bunny (2.17.0)
       amq-protocol (~> 2.3, >= 2.3.1)
-    celluloid (0.17.4)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.6)
-      timers (>= 4.1.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    celluloid (0.18.0)
+      timers (~> 4)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     eventhub-components (0.2.2)
       logstash-logger (~> 0.26)
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    rake (13.0.1)
-    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.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    simplecov (0.18.5)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.10.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    timers (4.3.0)
-    uuidtools (2.1.5)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    standard (0.13.0)
+      rubocop (= 1.10.0)
+      rubocop-performance (= 1.9.2)
+    standardrb (1.0.0)
+      standard
+    timers (4.3.3)
+    unicode-display_width (2.0.0)
+    uuidtools (2.2.0)
 
 PLATFORMS
   ruby
@@ -66,7 +81,8 @@ DEPENDENCIES
   eventhub-processor2!
   rake (~> 13.0)
   rspec (~> 3.9)
-  simplecov (~> 0.18)
+  simplecov (~> 0.21)
+  standardrb (~> 1.0)
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/Rakefile

@@ -1,6 +1,9 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "standard/rake"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+end
 
-task default: :spec
+task default: [:spec, :standard]

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rabbitmq:3.8.2-management
+FROM rabbitmq:3.8.12-management
 
 LABEL maintainer="thomas.steiner@ikey.ch"
 

data/docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   rabbitmq:
     build: .
     container_name: eventhub.rabbitmq
-    image: eventhub.rabbitmq:3.8.2
+    image: eventhub.rabbitmq:3.8.12
     ports:
       - "5672:5672"
       - "15672:15672"

data/eventhub-processor2.gemspec

@@ -1,37 +1,38 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'eventhub/version'
+require "eventhub/version"
 
-note = 'Next generation gem to build ruby based eventhub processor'
+note = "Next generation gem to build ruby based eventhub processor"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'eventhub-processor2'
-  spec.version       = EventHub::VERSION
-  spec.authors       = ['Steiner, Thomas']
-  spec.email         = ['thomas.steiner@ikey.ch']
+  spec.name = "eventhub-processor2"
+  spec.version = EventHub::VERSION
+  spec.authors = ["Steiner, Thomas"]
+  spec.email = ["thomas.steiner@ikey.ch"]
 
-  spec.summary       = note
-  spec.description   = note
-  spec.homepage      = 'https://github.com/thomis/eventhub-processor2'
-  spec.license       = 'MIT'
+  spec.summary = note
+  spec.description = note
+  spec.homepage = "https://github.com/thomis/eventhub-processor2"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
   # required by celluloid and bunny (-> amq-protocol)
   # spec.required_ruby_version = '~> 2.2.6'
 
-  spec.add_dependency 'celluloid', '~> 0.17'
-  spec.add_dependency 'bunny', '~> 2.15'
-  spec.add_dependency 'eventhub-components', '~> 0.2'
-  spec.add_dependency 'uuidtools', '~> 2.1'
+  spec.add_dependency "celluloid", "~> 0.18"
+  spec.add_dependency "bunny", "~> 2.15"
+  spec.add_dependency "eventhub-components", "~> 0.2"
+  spec.add_dependency "uuidtools", "~> 2.1"
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'simplecov', '~> 0.18'
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "simplecov", "~> 0.21"
+  spec.add_development_dependency "standardrb", "~> 1.0"
 end

data/example/crasher.rb

@@ -1,17 +1,17 @@
-require 'eventhub/components'
-require_relative '../lib/eventhub/sleeper'
+require "eventhub/components"
+require_relative "../lib/eventhub/sleeper"
 
 RESTART_RANGES_IN_SECONDS = (30..600).to_a
-PROCESS_PATTERNS = ['router', 'receiver']
+PROCESS_PATTERNS = ["router", "receiver"]
 
 # Module Crasher
 module Crasher
   def self.logger
     unless @logger
       @logger = ::EventHub::Components::MultiLogger.new
-      @logger.add_device(Logger.new(STDOUT))
+      @logger.add_device(Logger.new($stdout))
       @logger.add_device(
-        EventHub::Components::Logger.logstash('crasher', 'development')
+        EventHub::Components::Logger.logstash("crasher", "development")
       )
     end
     @logger
@@ -26,7 +26,7 @@ module Crasher
 
     def restart
       Crasher.logger.info "Sending Signal HUP to process [#{@id}/#{@name}]"
-      Process.kill('HUP', @id)
+      Process.kill("HUP", @id)
     rescue Errno::ESRCH
     end
 
@@ -35,13 +35,13 @@ module Crasher
       PROCESS_PATTERNS.each do |name|
         data = `ps | grep #{name}.rb`
         data.lines[0..-2].each do |line|
-          a = line.split(' ')
+          a = line.split(" ")
           next if a.size > 5
           processes << MyProcess.new(a[0].to_i, a[-1])
         end
       end
 
-      Crasher.logger.info "Found ids: #{processes.map{ |pr| pr.id}.join(', ')}"
+      Crasher.logger.info "Found ids: #{processes.map { |pr| pr.id }.join(", ")}"
       processes
     end
   end
@@ -61,13 +61,12 @@ module Crasher
     end
   end
 
-
   class Application
     def initialize
       @sleeper = EventHub::Sleeper.new
       @run = true
 
-      Signal.trap('INT') {
+      Signal.trap("INT") {
         @run = false
         @sleeper.stop
       }
@@ -75,8 +74,8 @@ module Crasher
 
     def pick_process
       processes = []
-      processes << Docker.new('processor-rabbitmq')
-      processes << Docker.new('processor-rabbitmq', 0)
+      processes << Docker.new("eventhub.rabbitmq")
+      processes << Docker.new("eventhub.rabbitmq", 0)
       processes << MyProcess.all
       processes.flatten.sample
     end
@@ -89,7 +88,7 @@ module Crasher
         @sleeper.start(to_sleep)
         next unless @run
         process = pick_process
-        process.restart if process
+        process&.restart
       end
       Crasher.logger.info "Crasher has been stopped"
     end

data/example/publisher.rb

@@ -1,9 +1,9 @@
-require 'bunny'
-require 'celluloid/current'
-require 'json'
-require 'securerandom'
-require 'eventhub/components'
-require_relative '../lib/eventhub/sleeper'
+require "bunny"
+require "celluloid"
+require "json"
+require "securerandom"
+require "eventhub/components"
+require_relative "../lib/eventhub/sleeper"
 
 SIGNALS_FOR_TERMINATION = [:INT, :TERM, :QUIT]
 SIGNALS_FOR_RELOAD_CONFIG = [:HUP]
@@ -12,16 +12,16 @@ PAUSE_BETWEEN_WORK = 0.05 # default is 0.05
 
 Celluloid.logger = nil
 Celluloid.exception_handler { |ex| Publisher.logger.error "Exception occured: #{ex}}" }
+Celluloid.boot
 
 # Publisher module
 module Publisher
-
   def self.logger
     unless @logger
       @logger = ::EventHub::Components::MultiLogger.new
-      @logger.add_device(Logger.new(STDOUT))
+      @logger.add_device(Logger.new($stdout))
       @logger.add_device(
-        EventHub::Components::Logger.logstash('publisher', 'development')
+        EventHub::Components::Logger.logstash("publisher", "development")
       )
     end
     @logger
@@ -36,11 +36,11 @@ module Publisher
       @start = Time.now
       @files_sent = 0
 
-      @filename = 'data/store.json'
+      @filename = "data/store.json"
       if File.exist?(@filename)
         cleanup
       else
-        File.write(@filename, '{}')
+        File.write(@filename, "{}")
       end
 
       every(30) { write_statistics }
@@ -48,7 +48,7 @@ module Publisher
 
     def start(name)
       store = read_store
-      store[name] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%L')
+      store[name] = Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")
       write_store(store)
     end
 
@@ -76,19 +76,20 @@ module Publisher
 
     def write_statistics
       now = Time.now
-      rate = @files_sent / (now-@start)
-      time_spent = (now-@start)/60
-      Publisher.logger.info("Started @ #{@start.strftime('%Y-%m-%d %H:%M:%S.%L')}: Files sent within #{'%0.1f' % time_spent} minutes: #{@files_sent}, #{ '%0.1f' % rate} files/second")
+      rate = @files_sent / (now - @start)
+      time_spent = (now - @start) / 60
+      Publisher.logger.info("Started @ #{@start.strftime("%Y-%m-%d %H:%M:%S.%L")}: Files sent within #{"%0.1f" % time_spent} minutes: #{@files_sent}, #{"%0.1f" % rate} files/second")
     end
 
     private
-      def read_store
-        JSON.parse(File.read(@filename))
-      end
 
-      def write_store(store)
-        File.write(@filename, store.to_json)
-      end
+    def read_store
+      JSON.parse(File.read(@filename))
+    end
+
+    def write_store(store)
+      File.write(@filename, store.to_json)
+    end
   end
 
   # Worker
@@ -106,26 +107,26 @@ module Publisher
         sleep PAUSE_BETWEEN_WORK
       end
     ensure
-      @connection.close if @connection
+      @connection&.close
     end
 
     private
 
     def connect
-      @connection = Bunny.new(vhost: 'event_hub',
+      @connection = Bunny.new(vhost: "event_hub",
                               automatic_recovery: false,
-                              logger: Logger.new('/dev/null'))
+                              logger: Logger.new("/dev/null"))
       @connection.start
       @channel = @connection.create_channel
       @channel.confirm_select
-      @exchange = @channel.direct('example.outbound', durable: true)
+      @exchange = @channel.direct("example.outbound", durable: true)
     end
 
     def do_the_work
-      #prepare id and content
+      # prepare id and content
       id = SecureRandom.uuid
       file_name = "data/#{id}.json"
-      data = { body: { id: id } }.to_json
+      data = {body: {id: id}}.to_json
 
       # start transaction...
       Celluloid::Actor[:transaction_store].start(id)
@@ -135,10 +136,10 @@ module Publisher
       @exchange.publish(data, persistent: true)
       success = @channel.wait_for_confirms
       if success
-        Celluloid::Actor[:transaction_store].stop(id) if Celluloid::Actor[:transaction_store]
-        Publisher.logger.info("[#{id}] - Message sent")
+        Celluloid::Actor[:transaction_store]&.stop(id)
+        Publisher&.logger&.info("[#{id}] - Message sent")
       else
-        Publisher.logger.error("[#{id}] -  Published message not confirmed")
+        Publisher&.logger&.error("[#{id}] -  Published message not confirmed")
       end
     end
   end
@@ -153,27 +154,27 @@ module Publisher
     def start_supervisor
       @config = Celluloid::Supervision::Configuration.define(
         [
-          { type: TransactionStore, as: :transaction_store },
-          { type: Worker, as: :worker }
+          {type: TransactionStore, as: :transaction_store},
+          {type: Worker, as: :worker}
         ]
       )
 
       sleeper = @sleeper
       @config.injection!(:before_restart, proc do
-        Publisher.logger.info('Restarting in 15 seconds...')
+        Publisher.logger.info("Restarting in 15 seconds...")
         sleeper.start(15)
       end)
       @config.deploy
     end
 
     def start
-      Publisher.logger.info 'Publisher has been started'
+      Publisher.logger.info "Publisher has been started"
 
       setup_signal_handler
       start_supervisor
       main_event_loop
 
-      Publisher.logger.info 'Publisher has been stopped'
+      Publisher.logger.info "Publisher has been stopped"
     end
 
     private
@@ -181,12 +182,11 @@ module Publisher
     def main_event_loop
       loop do
         command = @command_queue.pop
-        case
-          when SIGNALS_FOR_TERMINATION.include?(command)
-            @sleeper.stop
-            break
-          else
-            sleep 0.5
+        if SIGNALS_FOR_TERMINATION.include?(command)
+          @sleeper.stop
+          break
+        else
+          sleep 0.5
         end
       end