process_settings 0.18.0 → 0.20.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab773e1074ed3b357a5938e9366b56e69bdc6e36ace59835fdea8bbbe49516d
-  data.tar.gz: 3fe8bb70b1e59498420c878abb86cf2e1b0289694e4ed941a0a11b1a6abc5bce
+  metadata.gz: b1badef60c71146241a061aebd1a5911d0780cd1eb2aa0b776f931eaab3d9b7d
+  data.tar.gz: 6b9b1d1b7fcb775b316fb8440e9e2786e9a597314fd4b25214620d594e862fbe
 SHA512:
-  metadata.gz: 939389ccdfaf3fb4880251e34abc36f15e11963ef1ce69e102208a04e084df0c870eeb906103f9859d6ce7af1e27938d713e153ab16768ee6bbaf0e6c6bb5262
-  data.tar.gz: bf6190c8812f0fcb73507bfc4b1cda3e2f9370e5c398df8cdbda2a112a23c80479dcf7189d8fb157ae4725b3bcfafe9bef1bb23a63a27eb3351b33d6644e2d04
+  metadata.gz: 92c9644c27ec9d38d1e9aeaf39dbaa8a8b20ea3bfd5c7f84e206db81b1b5bdc344e0effe8cf710b6971535b826b2cd98db9e2c3f58dc6e9cf38f3941e65d41d9
+  data.tar.gz: f29c738cc2f48ae0961e7794968c68b04f450cf1310139ebf76b933c0f25d205e95d7830f84370d833aa89586e659a64c31b39702670d90854327bd525544a18

data/README.md

@@ -164,6 +164,14 @@ target:
 ```
 This will be applied in any process that has (`service_name == "frontend"` OR `service_name == "auth"`) AND `datacenter == "AWS-US-EAST-1"`.
 
+### Regexp Targeting
+To provide a regular expression for targeting, use the ruby regex keyword `!ruby/regexp` followed by your regular expression. For example:
+```
+target:
+  service_name: !ruby/regexp /frontend-\d/
+```
+This will be applied in any process that has `service_name` that has `frontend-` followed with a number. As an example this will match `"frontend-1"`
+
 ### Precedence
 The settings YAML files are always combined in alphabetical order by file path. Later settings take precedence over the earlier ones.
 

data/lib/process_settings/abstract_monitor.rb

@@ -114,7 +114,11 @@ module ProcessSettings
         # find last value from matching targets
         if target_and_settings.target.target_key_matches?(full_context)
           if (value = target_and_settings.settings.json_doc.mine(*path, not_found_value: :not_found)) != :not_found
-            latest_result = value
+            latest_result = if latest_result.is_a?(Hash) && value.is_a?(Hash)
+                              latest_result.deep_merge(value)
+                            else
+                              value
+                            end
           end
         end
         latest_result

data/lib/process_settings/target.rb

@@ -90,6 +90,8 @@ module ProcessSettings
           end
         when true, false
           target_value
+        when Regexp
+          context_hash.match?(target_value)
         else
           target_value == context_hash
         end

data/lib/process_settings/targeted_settings.rb

@@ -73,7 +73,7 @@ module ProcessSettings
       end
 
       def from_file(file_path, only_meta: false)
-        json_doc = Psych.load_file(file_path)
+        json_doc = Psych.safe_load_file(file_path, permitted_classes: [Regexp])
         from_array(json_doc, only_meta: only_meta)
       end
     end

data/lib/process_settings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessSettings
-  VERSION = '0.18.0'
+  VERSION = '0.20.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0.pre.1
 platform: ruby
 authors:
 - Invoca
@@ -123,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: