eventhub-processor2 1.4.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b692a9ccf6bb27c587b52df66c2ccc5485756ff
-  data.tar.gz: 3db7ba2a63141de21449c0c5abc125bb7e85cff6
+SHA256:
+  metadata.gz: c2802cc49773eefcd1c4ac043ad25c07a59576eae96f1a657556741e20da1815
+  data.tar.gz: 84f36939159674c30169766b44e427fdee7a03cbdba0f3d4f356040bb5c2ed41
 SHA512:
-  metadata.gz: 6b91eccfcf2383a7f74073a72da4b6b63977164e085b9f165ee691396b9972157b0c840a6f40075b949c41876fe36a01fe6d2c74a992eb8715048d15ec941abb
-  data.tar.gz: aa65ef67b6dd96aec7e471f46f91b9b08ca12658becf8ff4436f284e9f3413c893ac250e2719a3d6e2f5b955b2a5567b320c0dc01540eab3f846baac921319d0
+  metadata.gz: 71c2532c9d70ea9d913778f12435f36d8d4aa1185b7586e6ad41803aa2f5f4182c720edaa17e32e77889c9e46ab4b4147fbaae78ec7ecfab31729208e4f182ed
+  data.tar.gz: 57e0722d7267a3dd6356422ac7f069390dcfce6fe06f7d40eac1debba3efb44418d1c3a5291806db7d4bf0272e98a54a5dc5a479ab1c621ee8afdf33e3f09241

data/.rspec

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

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/.travis.yml

@@ -9,9 +9,10 @@ os:
 - linux
 
 rvm:
-- 2.5.0
-- 2.4.3
-- 2.3.6
+- 3.0.0
+- 2.7.2
+- 2.6.6
+- 2.5.8
 
 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=
@@ -23,7 +24,7 @@ before_install:
 - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
   > ./cc-test-reporter
 - chmod +x ./cc-test-reporter
-- gem install bundler --version '~> 1.16.0'
+- gem install bundler --version '~> 2.1.2'
 
 before_script:
 - "./cc-test-reporter before-build"

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # 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
+* Upgrade gem and gem dev dependencies
+* Upgrade travis ruby version to test
+
+## 1.7.0 / 2020-02-28
+
+* Upgrade dependencies: bundler 2.1, rake 13.0, rspec 3.9, simplecov 0.18
+* status_message always as string for general exception handling
+* fix rspec tests
+
+## 1.6.0 / 2019-02-20
+
+* Upgrade dependencies: bunny 2.14, bundler 2.0
+
+## 1.5.0 / 2018-12-20
+
+* Upgrade dependencies: rspec 3.8, bunny 2.12, bundler 1.17, simplecov 0.16
+
+## 1.4.1 / 2018-02-27
+
+* Upgrade to eventhub-components 0.2.2
+
 ## 1.4.0 / 2018-02-27
 
 * Upgrade to bunny 2.9.2

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,76 +1,88 @@
 PATH
   remote: .
   specs:
-    eventhub-processor2 (1.4.0)
-      bunny (~> 2.9)
-      celluloid (~> 0.17)
+    eventhub-processor2 (1.9.0)
+      bunny (~> 2.15)
+      celluloid (~> 0.18)
       eventhub-components (~> 0.2)
       uuidtools (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (2.3.0)
-    bunny (2.9.2)
-      amq-protocol (~> 2.3.0)
-    celluloid (0.17.3)
-      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.1.5)
-    eventhub-components (0.2.0)
-      logstash-logger (~> 0.25)
-    hitimes (1.2.6)
-    json (2.1.0)
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bunny (2.17.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
+    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 (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    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.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    timers (4.1.2)
-      hitimes
-    uuidtools (2.1.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_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
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   eventhub-processor2!
-  rake (~> 12.3)
-  rspec (~> 3.7)
-  simplecov (~> 0.15)
+  rake (~> 13.0)
+  rspec (~> 3.9)
+  simplecov (~> 0.21)
+  standardrb (~> 1.0)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,4 +1,4 @@
-[![Dependency Status](https://gemnasium.com/badges/github.com/thomis/eventhub-processor2.svg)](https://gemnasium.com/github.com/thomis/eventhub-processor2)
+[![Gem Version](https://badge.fury.io/rb/eventhub-processor2.svg)](https://badge.fury.io/rb/eventhub-processor2)
 [![Maintainability](https://api.codeclimate.com/v1/badges/9112358562f0614e0e02/maintainability)](https://codeclimate.com/github/thomis/eventhub-processor2/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/9112358562f0614e0e02/test_coverage)](https://codeclimate.com/github/thomis/eventhub-processor2/test_coverage)
 [![Build Status](https://travis-ci.org/thomis/eventhub-processor2.svg?branch=master)](https://travis-ci.org/thomis/eventhub-processor2)

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,6 +1,8 @@
-FROM rabbitmq:3.7.3-management
+FROM rabbitmq:3.8.12-management
+
+LABEL maintainer="thomas.steiner@ikey.ch"
+
 ADD definitions.json /etc/rabbitmq/
 ADD rabbitmq.config /etc/rabbitmq/
 RUN chown rabbitmq:rabbitmq /etc/rabbitmq/rabbitmq.config /etc/rabbitmq/definitions.json
-
-EXPOSE 5672 15672
+RUN rabbitmq-plugins enable rabbitmq_web_stomp

data/docker/README.md

@@ -5,8 +5,8 @@ Please follow these steps to build and run a docker container with a predefined
 
 * Have latest docker community edition installed (https://www.docker.com)
 * cd into the docker folder
-* docker build -t processor-rabbitmq .
-* docker run -d -p 5672:5672 -p 15672:15672 --name processor-rabbitmq processor-rabbitmq
+* docker-compose up --no-start
+* docker-compose start
 
 Is the docker container running fine?
 Go to http://localhost:15672 and login to RabbitMQ Management Console with guest/guest

data/docker/definitions.json

@@ -80,6 +80,15 @@
       "auto_delete": false,
       "internal": false,
       "arguments": {}
+    },
+    {
+      "name": "an_exchange",
+      "vhost": "event_hub",
+      "type": "direct",
+      "durable": true,
+      "auto_delete": false,
+      "internal": false,
+      "arguments": {}
     }
   ],
   "bindings": [
@@ -106,6 +115,14 @@
       "destination_type": "queue",
       "routing_key": "",
       "arguments": {}
+    },
+    {
+      "source": "an_exchange",
+      "vhost": "event_hub",
+      "destination": "example.outbound",
+      "destination_type": "queue",
+      "routing_key": "",
+      "arguments": {}
     }
   ]
 }

data/docker/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.3'
+
+services:
+  rabbitmq:
+    build: .
+    container_name: eventhub.rabbitmq
+    image: eventhub.rabbitmq:3.8.12
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+      - "15674:15674"

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.9'
-  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', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
+  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