process_settings 0.19.4 → 0.20.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e070efd3c6c720c5c32a039cd1997fceb2f527daefaa7aea4fb4116a542f3400
-  data.tar.gz: c2ed0b9dc4bb85f093df508580f2f98744837120f4bcdcc6e6f415349f24c10a
+  metadata.gz: b1badef60c71146241a061aebd1a5911d0780cd1eb2aa0b776f931eaab3d9b7d
+  data.tar.gz: 6b9b1d1b7fcb775b316fb8440e9e2786e9a597314fd4b25214620d594e862fbe
 SHA512:
-  metadata.gz: 81694c41b4686cb3e533827337e0f344d2372d8396fcc95ed01ea4a160a9fd7baaf8487eb22dffc5859910ead7740fef6badf4ecb0d553192d69b6c78ceacc88
-  data.tar.gz: 693a1121602581e6afd0d951f83d31b3ea8016152655afa3a4cac9b957ad0df187b54adee327c3a59964b939cbea1a74f403ba2ac28ac326f1d638832b7304bd
+  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/helpers/watchdog.rb

@@ -14,7 +14,7 @@ module ProcessSettings
 
     def check
       if version_from_memory != version_from_disk && (Time.now - mtime_from_disk) > MAX_MTIME_DIFFERENCE
-        raise OutOfSync.new("ProcessSettings versions are out of sync!\n Version from Disk: #{version_from_disk}\n Version from Memory: #{version_from_memory}\n mtime of file: #{mtime_from_disk}")
+        raise ProcessSettings::OutOfSync.new("ProcessSettings versions are out of sync!\n Version from Disk: #{version_from_disk}\n Version from Memory: #{version_from_memory}\n mtime of file: #{mtime_from_disk}")
       end
     end
 

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/testing/helpers.rb

@@ -60,18 +60,12 @@ module ProcessSettings
 
         class << self
           def included(including_klass)
-            # Prepend the teardown method in case the test class has already defined one.
-            including_klass.prepend(TeardownProcessSettings)
+            including_klass.define_method(:teardown) do
+              ProcessSettings.instance = initial_instance
+            end
           end
         end
       end
-
-      module TeardownProcessSettings
-        def teardown
-          ProcessSettings.instance = initial_instance
-          super
-        end
-      end
     end
 
     Helpers = RSpec::Helpers  # for backward-compatibility

data/lib/process_settings/version.rb

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

data/lib/process_settings.rb

@@ -2,7 +2,6 @@
 
 require 'active_support'
 require 'active_support/deprecation'
-require 'active_support/core_ext'
 
 module ProcessSettings
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0.pre.1
 platform: ruby
 authors:
 - Invoca
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +62,14 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Targeted process settings that dynamically reload without restarting
@@ -117,11 +123,11 @@ 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.3.26
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Dynamic process settings