process_settings 0.20.0.pre.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d181fc9c4bdabc2db5115abbc7c99bae9e06a67e590999d403ae001dfb6ab620
-  data.tar.gz: ffe647dc7dc05219275650db9ab3324a8c2b9af9fbaa8812e8f4e5330cae6d39
+  metadata.gz: d76d1e0c9ec3b53bdbb78f166d620003672b0500242d5fa39680d45061243e7f
+  data.tar.gz: ff3e8a9eabafc28721487927f885449ba4cfb9ec8dd5e8d048418f97ca63b7be
 SHA512:
-  metadata.gz: 68209170c9cd7db9bfe54a9c3ebce701b23a244a0c26b96f19150e4b38e63dfc1d3276a5afc9ca3c604155fc6234c6815b7500725062860694816796cdb25d1f
-  data.tar.gz: f2ad2f3fbae440124751d175d8f4083c30b7bd530947ec844049ff91fa190a778ceffad0c2a01250e36919fbaaa22584606e18dcee46bba1e66356394e01a5d4
+  metadata.gz: 3a13084cbef64f92f9543c7dec3da30fc8eab685d7fdaa3a727bc8c6731b636062b65fcac8c2090697f260e944989d97b1a125ee4c1530d7a19229511d0ff044
+  data.tar.gz: 47ffed7b897c9fbdce282a772cbe2f29ab750464c2cc3d8f9b83980ffdc55d97147eacc1b8d17c78c15c74359f8e7a7734832275c2f824a842cea38909d32941

data/README.md

@@ -164,14 +164,6 @@ 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 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}")
+        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}")
       end
     end
 

data/lib/process_settings/monitor.rb

@@ -12,6 +12,10 @@ module ProcessSettings
       attr_reader :logger, :file_path
       attr_writer :instance
 
+      def deprecator
+        @deprecator ||= ActiveSupport::Deprecation.new('1.0', 'ProcessSettings')
+      end
+
       def file_path=(new_file_path)
         clear_instance
 
@@ -33,18 +37,18 @@ module ProcessSettings
         if @instance
           @instance
         else
-          ActiveSupport::Deprecation.warn("`ProcessSettings::Monitor.instance` lazy create is deprecated and will be removed in v1.0. Assign a `FileMonitor` object to `ProcessSettings.instance =` instead.")
+          deprecator.warn("`ProcessSettings::Monitor.instance` lazy create is deprecated and will be removed in v1.0. Assign a `FileMonitor` object to `ProcessSettings.instance =` instead.")
           @instance = default_instance
         end
       end
 
       def default_instance
-        ActiveSupport::Deprecation.warn("`ProcessSettings::Monitor.instance` is deprecated and will be removed in v1.0. Assign a `FileMonitor` object to `ProcessSettings.instance =` instead.")
+        deprecator.warn("`ProcessSettings::Monitor.instance` is deprecated and will be removed in v1.0. Assign a `FileMonitor` object to `ProcessSettings.instance =` instead.")
         @default_instance ||= new_from_settings
       end
 
       def logger=(new_logger)
-        ActiveSupport::Deprecation.warn("ProcessSettings::Monitor.logger is deprecated and will be removed in v1.0.")
+        deprecator.warn("ProcessSettings::Monitor.logger is deprecated and will be removed in v1.0.")
         @logger = new_logger
         Listen.logger = new_logger unless Listen.instance_variable_get(:@logger)
       end

data/lib/process_settings/target.rb

@@ -38,12 +38,6 @@ module ProcessSettings
           with_static_context_hash(target_value, static_context_hash)
         when true, false
           !target_value == !static_context_hash
-        when Regexp
-          if static_context_hash.is_a?(String)
-            static_context_hash.match?(target_value)
-          else
-            static_context_hash == target_value
-          end
         else
           target_value == static_context_hash
         end
@@ -96,12 +90,6 @@ module ProcessSettings
           end
         when true, false
           target_value
-        when Regexp
-          if context_hash.is_a?(String)
-            context_hash.match?(target_value)
-          else
-            context_hash == target_value
-          end
         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.safe_load_file(file_path, permitted_classes: [Regexp])
+        json_doc = Psych.safe_load_file(file_path)
         from_array(json_doc, only_meta: only_meta)
       end
     end

data/lib/process_settings/testing/helpers.rb

@@ -60,12 +60,18 @@ module ProcessSettings
 
         class << self
           def included(including_klass)
-            including_klass.define_method(:teardown) do
-              ProcessSettings.instance = initial_instance
-            end
+            # Prepend the teardown method in case the test class has already defined one.
+            including_klass.prepend(TeardownProcessSettings)
           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/testing/monitor_stub.rb

@@ -13,7 +13,8 @@ module ProcessSettings
     class MonitorStub
       class << self
         def new(*_args)
-          ActiveSupport::Deprecation.warn("ProcessSettings::Testing::MonitorStub is deprecated and will be removed in future versions. Use ProcessSettings::Testing::Monitor instead.", caller)
+          deprecator = ActiveSupport::Deprecation.new('1.0', 'ProcessSettings')
+          deprecator.warn("ProcessSettings::Testing::MonitorStub is deprecated and will be removed in future versions. Use ProcessSettings::Testing::Monitor instead.", caller)
           super
         end
       end

data/lib/process_settings/version.rb

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

data/lib/process_settings.rb

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

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.20.0.pre.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Invoca
-autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-09-19 00:00:00.000000000 Z
@@ -16,20 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -58,18 +51,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   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
@@ -112,7 +133,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/Invoca/process_settings
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,12 +143,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Dynamic process settings
 test_files: []