eventhub-processor2 1.15.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f4547c597edae29cf4ddc6030441b4562fc55a804c782ddb7bc9c34311f02d
-  data.tar.gz: 13ad75f665e628c48668dfa3ce1a36ac672ff092d15eb77a876d5c2bfc339b84
+  metadata.gz: 78506dd98d394a48e12d31f9e3548bda5ef44674e4e964bf783a3b0374ee100d
+  data.tar.gz: 24f228ec36df83139a4b44d8ac80e51dc60639422f74ebe3713a5eddc7c05c74
 SHA512:
-  metadata.gz: 2a851976fe229400a7e4559b654dbcce531bce4572d8a9aaea5eb59e1fd8f7ed572d990b60f9dba85c13e734e6e8e79ab82a62113342d89a2a7177bf0653c897
-  data.tar.gz: 908681fe866d3cd9e33058fbc77d896eb7a99e706e95ffcb28ece82a7a60bc1ccf119480a73c9059d6d9c6f9ef9650c4512a6a159a09b7c79f37a6bd0eccf127
+  metadata.gz: 9b631a080f4e71f3739f2c8ebdc75ea50173493518f623ec0e394bdf42a10c524fadc123c6ad0e4a42b71d5b7cae625d0c58850f47ccbdb7e78eb411870aaa90
+  data.tar.gz: c3809dc7e46f87ce03e3ca44c2fb3caec3213d70b85d1e565bdf945f3a5b32b752c85281524a21197e30eb55bb7bd7fe6bfce423f0c0e564da65c30c7d3daefc

data/.github/dependabot.yml

@@ -7,3 +7,11 @@ updates:
       day: "saturday"
       time: "04:00"
       timezone: "Europe/Zurich"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+      time: "04:00"
+      timezone: "Europe/Zurich"

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
       - "*"
 
   schedule:
-  - cron: 0 2 * * *
+  - cron: 0 2 * * 1,3,5,6
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog of EventHub::Processor2
 
+## 1.17.0 / 2022-12-21
+
+* Ability to load and merge more config file based on a name or a pattern
+* Update dependencies
+
+## 1.16.0 / 2022-12-18
+
+* Updated gem dependencies
+* Improve access on undefined @logger instance
+
 ## 1.15.0 / 2022-10-28
 
 * Updated gem dependencies

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eventhub-processor2 (1.15.0)
-      bunny (~> 2.19)
+    eventhub-processor2 (1.17.0)
+      bunny (~> 2.20)
       celluloid (~> 0.18)
       eventhub-components (~> 0.2)
       uuidtools (~> 2.1)
@@ -12,7 +12,7 @@ GEM
   specs:
     amq-protocol (2.3.2)
     ast (2.4.2)
-    bunny (2.19.0)
+    bunny (2.20.1)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     celluloid (0.18.0)
@@ -21,17 +21,18 @@ GEM
     docile (1.4.0)
     eventhub-components (0.3.1)
       logstash-logger (~> 0.26)
-    json (2.6.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.2)
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.5)
-    regexp_parser (2.6.0)
+    rbtree (0.4.6)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -39,26 +40,26 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.35.1)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.14.3)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -72,9 +73,10 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    standard (1.16.1)
-      rubocop (= 1.35.1)
-      rubocop-performance (= 1.14.3)
+    standard (1.20.0)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.40.0)
+      rubocop-performance (= 1.15.1)
     timers (4.3.5)
     unicode-display_width (2.3.0)
     uuidtools (2.2.0)
@@ -91,7 +93,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.11)
   simplecov (~> 0.21)
-  standard (~> 1.16)
+  standard (~> 1.20)
 
 BUNDLED WITH
-   2.3.19
+   2.3.26

data/README.md

@@ -19,6 +19,7 @@ Processor2 is using Bunny http://rubybunny.info a feature complete RabbitMQ Clie
 
 Currently supported and tested ruby versions are:
 
+- 3.2
 - 3.1
 - 3.0
 - 2.7
@@ -180,6 +181,46 @@ Processor2 symbolizes keys and sub-keys from configuration files automatically.
   database['name']['subname']   # => "value"
 ```
 
+Version 1.17 and newer allows you to load and merge more configuration files programmatically. It is expected that load! is called once (implicit during class initialization) and then load_more! zero, one, or multiple times. All additional files loaded with load_more! are hash deep merged into one configuration structure. Exceptions while loading of files will be catched and shown as warnings.
+```ruby
+  # specify a file
+  EventHub::Configuration.load_more!(pattern: "config/another_config.json")
+
+  # specify glob patterns to load multiple files
+  EventHub::Configuration.load_more!(pattern: "config/processes/**/*.json")
+  EventHub::Configuration.load_more!(pattern: "config/templates/**/*.json")
+```
+If you have conflicting hashes, the previous settings will be overwritten.
+
+1st file loaded
+```json
+  {
+    "test": {
+      "a": "a_value",
+      "b": "b_value"
+    }
+  }
+```
+2nd file loaded
+```json
+  {
+    "test": {
+      "b": "another_value"
+    }
+  }
+```
+
+Final configuration result
+```json
+  {
+    "test": {
+      "a": "a_value",
+      "b": "another_value"
+    }
+  }
+
+```
+
 ## Development
 
 ```

data/eventhub-processor2.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "celluloid", "~> 0.18"
-  spec.add_dependency "bunny", "~> 2.19"
+  spec.add_dependency "bunny", "~> 2.20"
   spec.add_dependency "eventhub-components", "~> 0.2"
   spec.add_dependency "uuidtools", "~> 2.1"
 
@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "simplecov", "~> 0.21"
-  spec.add_development_dependency "standard", "~> 1.16"
+  spec.add_development_dependency "standard", "~> 1.20"
 end

data/lib/eventhub/configuration.rb

@@ -79,12 +79,30 @@ module EventHub
       deep_merge!(@config_data, new_data)
     end
 
+    # load and merge more configuration files
+    def load_more!(args = {})
+      return unless args[:pattern]
+
+      Dir.glob(args[:pattern]).each do |name|
+        next if File.directory?(name)
+
+        begin
+          EventHub.logger.info("About to load file [#{name}]...")
+          new_data = JSON.parse(File.read(name), symbolize_names: true)
+          new_data = new_data[@environment.to_sym]
+          deep_merge!(@config_data, new_data)
+        rescue => e
+          EventHub.logger.warn("Exception while loading file [#{name}]: #{e}")
+        end
+      end
+    end
+
     # Deep merging of hashes
     # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
     def deep_merge!(target, data)
       return if data.nil?
       merger = proc do |_, v1, v2|
-        v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : v2
+        (v1.is_a?(Hash) && v2.is_a?(Hash)) ? v1.merge(v2, &merger) : v2
       end
       target.merge! data, &merger
     end

data/lib/eventhub/logger.rb

@@ -1,7 +1,7 @@
 # EventHub module
 module EventHub
   def self.logger
-    unless @logger
+    unless defined?(@logger)
       @logger = ::EventHub::Components::MultiLogger.new
       @logger.add_device(Logger.new($stdout))
       @logger.add_device(

data/lib/eventhub/version.rb

@@ -1,3 +1,3 @@
 module EventHub
-  VERSION = "1.15.0".freeze
+  VERSION = "1.17.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-processor2
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Steiner, Thomas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
 - !ruby/object:Gem::Dependency
   name: eventhub-components
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.20'
 description: Next generation gem to build ruby based eventhub processor
 email:
 - thomas.steiner@ikey.ch
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Next generation gem to build ruby based eventhub processor