process_settings 0.11.0.pre.2 → 0.11.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f65d96e096213f9c86c00d170f46a7c2f316cafa73b1689f1a2e8c4533a04c
-  data.tar.gz: 78ed8448055b794871c8ac1d3a59f4d5535c4c089f09228fab99de0032e29f9f
+  metadata.gz: be2ecaa41e362b6bbdfdb93a2ad08ec6e61bb444b43a757acc2062ce3e666fbc
+  data.tar.gz: 4cdecb04dbde4ba79bd0dd41ae4e2a37591b8aa1c1bc09a6d5b2c23f0d3ec409
 SHA512:
-  metadata.gz: 3bdadd58245649ae32c928a73b58d024969ef267ce79db90ee1caaf3031d79928ca2d207cb19a37f07c480a5c783eefe6f276308bff2acd524b2e30246bbdfd3
-  data.tar.gz: 5076a8f2fd8abfbe4e0e1cb7718d71abad25f95a4d5e3e75ca7ffefa14b84f1d48e11eb36f39f3a35944bdbe39d95fb41a1306faf06d02490fcc7ad044b3253d
+  metadata.gz: 4e23f89dd2cdc890074d3fdb3eac84702a6e791ecfa61bb954fb1ed1addda947f0f21041ce2f485e0808ca6fb75a5d7137663b8777434b22c1596f2def0c2bb1
+  data.tar.gz: 74e411fae551d1a14fb39e7cd1a769b2515a9e25bdf72844ba1d3c1510abd833bf3ae6ecd047bd21112746e9836bfc9d6da60616bba644532c44bfe30de90a32

data/lib/process_settings/file_monitor.rb

@@ -3,6 +3,7 @@
 require 'active_support'
 require 'listen'
 require 'psych'
+require 'active_support/deprecation'
 
 require 'process_settings/abstract_monitor'
 require 'process_settings/targeted_settings'
@@ -12,7 +13,7 @@ module ProcessSettings
   class FileMonitor < AbstractMonitor
     attr_reader :file_path, :untargeted_settings
 
-    def initialize(file_path, logger:)
+    def initialize(file_path, logger:, environment: nil)
       super(logger: logger)
 
       @file_path = File.expand_path(file_path)
@@ -20,56 +21,26 @@ module ProcessSettings
       @untargeted_settings = nil
       @last_untargetted_settings = nil
 
-      start
+      start_internal(enable_listen_thread?(environment))
     end
 
-    # starts listening for changes
-    # Note: This method creates a new thread that will be monitoring for changes
-    #       do to the nature of how the Listen gem works, there is no record of
-    #       existing threads, calling this mutliple times will result in spinning off
-    #       multiple listen threads and will have unknow effects
     def start
-      path = File.dirname(file_path)
-
-      # to eliminate any race condition:
-      # 1. set up file watcher
-      # 2. start it (this should trigger if any changes have been made since (1))
-      # 3. load the file
-
-      @listener = file_change_notifier.to(path) do |modified, added, _removed|
-        if modified.include?(file_path) || added.include?(file_path)
-          logger.info("ProcessSettings::Monitor file #{file_path} changed. Reloading.")
-          load_untargeted_settings
-
-          load_statically_targeted_settings
-        end
-      end
-
-      if enable_listen_thread?
-        @listener.start
-      end
-
-      load_untargeted_settings
-      load_statically_targeted_settings
-    end
-
-    # stops listening for changes
-    def stop
-      @listener&.stop
+      start_internal(enable_listen_thread?)
     end
+    deprecate :start, deprecator: ActiveSupport::Deprecation.new('1.0', 'ProcessSettings') # will become private
 
-    def enable_listen_thread?
+    def enable_listen_thread?(environment)
       !disable_listen_thread?
     end
 
-    def disable_listen_thread?
+    def disable_listen_thread?(environment = nil)
       case ENV['DISABLE_LISTEN_CHANGE_MONITORING']
       when 'true', '1'
         true
       when 'false', '0'
         false
       when nil
-        service_env == 'test'
+        environment || service_env == 'test'
       else
         raise ArgumentError, "DISABLE_LISTEN_CHANGE_MONITORING has unknown value #{ENV['DISABLE_LISTEN_CHANGE_MONITORING'].inspect}"
       end
@@ -77,8 +48,46 @@ module ProcessSettings
 
     private
 
+    # optionally starts listening for changes, then loads current settings
+    # Note: If with_listen_thread is truthy, this method creates a new thread that will be
+    #       monitoring for changes.
+    #       Due to how the Listen gem works, there is no record of
+    #       existing threads; calling this multiple times will result in spinning off
+    #       multiple listen threads and will have unknown effects.
+    def start_internal(with_listen_thread)
+      if with_listen_thread
+        path = File.dirname(file_path)
+
+        # to eliminate any race condition:
+        # 1. set up file watcher
+        # 2. start it (this should trigger if any changes have been made since (1))
+        # 3. load the file
+
+        @listener = file_change_notifier.to(path) do |modified, added, _removed|
+          if modified.include?(file_path) || added.include?(file_path)
+            logger.info("ProcessSettings::Monitor file #{file_path} changed. Reloading.")
+            load_untargeted_settings
+
+            load_statically_targeted_settings
+          end
+        end
+
+        @listener.start
+      end
+
+      load_untargeted_settings
+      load_statically_targeted_settings
+    end
+
+    # stops listening for changes
+    def stop
+      @listener&.stop
+    end
+
     def service_env
-      (defined?(Rails) && Rails.environmnent) || ENV['SERVICE_ENV']
+      if defined?(Rails) && Rails.respond_to?(:env)
+        Rails.env
+      end || ENV['RAILS_ENV'] || ENV['SERVICE_ENV']
     end
 
     # Loads the most recent settings from disk

data/lib/process_settings/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.2
+  version: 0.11.0.pre.7
 platform: ruby
 authors:
 - Invoca