process_settings 0.10.4 → 0.11.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7210e6038a6c4b1b401ce316ecac6b94c01eff7d4ff620a6bc37d048be39ae82
-  data.tar.gz: d2fa6a054c3d78c1cecc8dea04e4776c868ce20183da9906fe2414e7e98c746c
+  metadata.gz: ef299e8fb9e1a8fca1ebd84a990a2ec84dea17272583f3f1e34858d26a19d0a1
+  data.tar.gz: ff4d958303e70f14eb292835e7c84d752fc2479d20987ad15d0feb430d5b3ad7
 SHA512:
-  metadata.gz: 634936b6180cd1c1d146d7cc458ae8e3ed6597a4ab25b7ad71301099334da69a3ece6d4ebdfe2451d3c54696c2b8a2caeafb3847854afa6a6355a74a19c40117
-  data.tar.gz: 9132c9edd9f14a5140b437ac148f5c0351f519223cab7466c59b45d0554353d993af5d9a22d1e797fabe0bacf08c32a54c22b48653e27abb77dd34301197be4b
+  metadata.gz: 03125f52588f94606ef8d740c23a3eed4eaf69fc0d7025e3ac34b03c030003ddb87949c4c7a6afbb73e5886bcc34e57948d596a9c0639d4083fc5be8c5f659c7
+  data.tar.gz: b7154fdbf0e3376f1bfaff788779c44839648086ece0b2a4eee8f354d475ce2180e9a2c6d12c4c4ad0e6b82f56572e3a9c21ae473f4e798f14af1fd609e1d189

data/README.md

@@ -21,25 +21,25 @@ gem 'process_settings', '~> 0.4'
 ```
 
 ## Usage
-The `ProcessSettings::Monitor` and related classes can be freely created and used at any time.
-But typical usage is through the `ProcessSettings::Monitor.instance`.
+The `ProcessSettings::FileMonitor` and related classes can be freely created and used at any time.
+But typical usage is through the `ProcessSettings.instance`.
 That should be configured at process startup before use.
 ### Configuration
-Before using `ProcessSettings::Monitor.instance`, you must first configure the path to the combined process settings file on disk,
+Before using `ProcessSettings.instance`, you must first configure the path to the combined process settings file on disk,
 and provide a logger.
 ```ruby
 require 'process_settings'
 
-ProcessSettings::Monitor.file_path = "/etc/process_settings/combined_process_settings.yml"
-ProcessSettings::Monitor.logger = logger
+ProcessSettings.instance = ProcessSettings::FileMonitor.new("/etc/process_settings/combined_process_settings.yml",
+                                                            logger: logger)
 ```
-### Monitor Initialization
-The `ProcessSettings::Monitor` is a hybrid singleton. The class attribute `instance` returns
-the current instance. If not already set, this is lazy-created based on the above configuration.
+### Instance Initialization
+The `ProcessSettings` is a hybrid singleton. The class attribute `instance` returns
+the current instance as set at configuration time. Deprecated: If not already set, this is lazy-created based on the above configuration.
 
 The monitor should be initialized with static (unchanging) context for your process:
 ```
-ProcessSettings::Monitor.static_context = {
+ProcessSettings.instance.static_context = {
   "service_name" => "frontend",
   "datacenter" => "AWS-US-EAST-1"
 }
@@ -76,7 +76,7 @@ log_level = ProcessSettings['frontend', 'log_level']
 => "info"
 ```
 #### ProcessSettings[] interface
-The `ProcessSettings[]` method delegates to `ProcessSettings::Monitor#[]` on the `instance`.
+The `ProcessSettings[]` method delegates to `ProcessSettings.instance#[]` on the `instance`.
 
 `[]` interface:
 
@@ -114,22 +114,22 @@ http_version = ProcessSettings['frontend', 'http_version', required: false] || 2
 
 ### Dynamic Settings
 
-The `ProcessSettings::Monitor` loads settings changes dynamically whenever the file changes,
+The `ProcessSettings::FileMonitor` loads settings changes dynamically whenever the file changes,
 by using the [listen](https://github.com/guard/listen) gem which in turn uses the `INotify` module of the Linux kernel, or `FSEvents` on MacOS. There is no need to restart the process or send it a signal to tell it to reload changes.
 
 There are two ways to get access the latest settings from inside the process:
 
 #### Read Latest Setting Through `ProcessSettings[]`
 
-The simplest approach--as shown above--is to read the latest settings at any time through `ProcessSettings[]` (which delegates to `ProcessSettings::Monitor.instance`):
+The simplest approach--as shown above--is to read the latest settings at any time through `ProcessSettings[]` (which delegates to `ProcessSettings.instance`):
 ```
 http_version = ProcessSettings['frontend', 'http_version']
 ```
 
 #### Register an `on_change` Callback
-Alternatively, if you need to execute some code when there is a change, register a callback with `ProcessSettings::Monitor#on_change`:
+Alternatively, if you need to execute some code when there is a change, register a callback with `ProcessSettings.instance#on_change`:
 ```
-ProcessSettings::Monitor.instance.on_change do
+ProcessSettings.instance.on_change do
   logger.level = ProcessSettings['frontend', 'log_level']
 end
 ```
@@ -166,7 +166,7 @@ The settings YAML files are always combined in alphabetical order by file path.
 ### Testing
 For testing, it is often necessary to set a specific override hash for the process_settings values to use in
 that use case.  The `ProcessSettings::Testing::Helpers` module is provided for this purpose.  It can be used to
-override a specific hash of process settings, while leving the rest in tact, and resetting back to the defaults
+override a specific hash of process settings, while leaving the rest intact, and resetting back to the defaults
 after the test case is over.  Here are some examples using various testing frameworks:
 
 #### RSpec
@@ -179,10 +179,7 @@ RSpec.configure do |config|
 
   include ProcessSettings::Testing::Helpers
 
-  after do
-   reset_process_settings
-  end
-
+  # Note: the include above will automatically register a global after block that will reset process_settings to their initial values.
   # ...
 end
 ```
@@ -205,14 +202,14 @@ end
 require 'process_settings/testing/helpers'
 
 context SomeClass do
+  include ProcessSettings::Testing::Helpers
+
+  # Note: the include above will automatically register a teardown block that will reset process_settings to their initial values.
+
   setup do
     stub_process_settings(honeypot: { answer_odds: 100 })
   end
 
-  teardown do
-    reset_process_settings
-  end
-
   # ...
 end
 ```

data/lib/process_settings.rb

@@ -22,14 +22,14 @@ module ProcessSettings
         raise ArgumentError, "Invalid monitor of type #{monitor.class.name} provided. Must be of type ProcessSettings::AbstractMonitor"
       end
 
-      @instance = monitor
+      Monitor.instance = monitor
     end
 
     # Getter method for retrieving the current monitor instance being used by ProcessSettings
     #
     # @return [ProcessSettings::AbstractMonitor]
     def instance
-      @instance ||= lazy_create_instance
+      Monitor.instance
     end
 
     # This is the main entry point for looking up settings in the process.
@@ -56,12 +56,5 @@ module ProcessSettings
     def [](*path, dynamic_context: {}, required: true)
       instance[*path, dynamic_context: dynamic_context, required: required]
     end
-
-    private
-
-    def lazy_create_instance
-      ActiveSupport::Deprecation.warn("lazy creation of Monitor instance is deprecated and will be removed from ProcessSettings 1.0")
-      Monitor.instance
-    end
   end
 end

data/lib/process_settings/abstract_monitor.rb

@@ -15,7 +15,7 @@ module ProcessSettings
     attr_reader :static_context, :statically_targeted_settings
 
     def initialize(logger:)
-      @logger = logger
+      @logger = logger or raise ArgumentError, "logger must be not be nil"
       @on_change_callbacks = []
       @when_updated_blocks = Set.new
       @static_context = {}

data/lib/process_settings/file_monitor.rb

@@ -45,7 +45,7 @@ module ProcessSettings
         end
       end
 
-      unless ENV['DISABLE_LISTEN_CHANGE_MONITORING']
+      if enable_listen_thread?
         @listener.start
       end
 
@@ -58,8 +58,29 @@ module ProcessSettings
       @listener&.stop
     end
 
+    def enable_listen_thread?
+      !disable_listen_thread?
+    end
+
+    def disable_listen_thread?
+      case ENV['DISABLE_LISTEN_CHANGE_MONITORING']
+      when 'true', '1'
+        true
+      when 'false', '0'
+        false
+      when nil
+        service_env == 'test'
+      else
+        raise ArgumentError, "DISABLE_LISTEN_CHANGE_MONITORING has unknown value #{ENV['DISABLE_LISTEN_CHANGE_MONITORING'].inspect}"
+      end
+    end
+
     private
 
+    def service_env
+      (defined?(Rails) && Rails.environment) || ENV['SERVICE_ENV']
+    end
+
     # Loads the most recent settings from disk
     def load_untargeted_settings
       new_untargeted_settings = load_file(file_path)

data/lib/process_settings/monitor.rb

@@ -13,7 +13,6 @@ module ProcessSettings
       attr_writer :instance
 
       def file_path=(new_file_path)
-        ActiveSupport::Deprecation.warn("ProcessSettings::Monitor.file_path= is deprecated and will be removed in v1.0.")
         clear_instance
 
         @file_path = new_file_path
@@ -31,11 +30,16 @@ module ProcessSettings
       end
 
       def instance
-        ActiveSupport::Deprecation.warn("ProcessSettings::Monitor.instance is deprecated and will be removed in v1.0. Use ProcessSettings.instance instead.")
-        @instance ||= default_instance
+        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.")
+          @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.")
         @default_instance ||= new_from_settings
       end
 

data/lib/process_settings/target.rb

@@ -98,7 +98,7 @@ module ProcessSettings
 
     class << self
       def true_target
-        @true_target || new(TRUE_JSON_DOC)
+        @true_target ||= new(TRUE_JSON_DOC)
       end
     end
   end

data/lib/process_settings/testing/helpers.rb

@@ -9,7 +9,20 @@ require 'process_settings/testing/monitor'
 module ProcessSettings
   module Testing
     module Helpers
-
+      class << self
+        def included(including_klass)
+          after_method =
+            if including_klass.respond_to?(:teardown)
+              :teardown
+            else
+              :after
+            end
+
+          including_klass.send(after_method) do
+            ProcessSettings.instance = initial_instance
+          end
+        end
+      end
       # Adds the given settings_hash as an override at the end of the process_settings array, with default targeting (true).
       # Therefore this will override these settings while leaving others alone.
       #
@@ -34,8 +47,6 @@ module ProcessSettings
         )
       end
 
-      private
-
       def initial_instance
         @initial_instance ||= ProcessSettings.instance
       end

data/lib/process_settings/testing/monitor_stub.rb

@@ -11,8 +11,14 @@ module ProcessSettings
   module Testing
     # This class implements the Monitor#targeted_value interface but is stubbed to use a simple hash in tests
     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)
+          super
+        end
+      end
+
       def initialize(settings_hash)
-        ActiveSupport::Deprecation.warn("ProcessSettings::Testing::MonitorStub is deprecated and will be removed in future versions. Use ProcessSettings::Testing::Monitor instead.", caller)
         @settings_hash = HashWithHashPath[settings_hash]
       end
 

data/lib/process_settings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessSettings
-  VERSION = '0.10.4'
+  VERSION = '0.11.0.pre.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0.pre.3
 platform: ruby
 authors:
 - Invoca
@@ -108,9 +108,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: