process_settings 0.11.0.pre.3 → 0.11.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef299e8fb9e1a8fca1ebd84a990a2ec84dea17272583f3f1e34858d26a19d0a1
-  data.tar.gz: ff4d958303e70f14eb292835e7c84d752fc2479d20987ad15d0feb430d5b3ad7
+  metadata.gz: 48d483b1a29cf0442c77c1d5b1e95c13d25167e7314d903dc7389db16baebc5e
+  data.tar.gz: e7b5463577055a1471af3d48f84e7968db665a565a9022beddf309c56407f6cc
 SHA512:
-  metadata.gz: 03125f52588f94606ef8d740c23a3eed4eaf69fc0d7025e3ac34b03c030003ddb87949c4c7a6afbb73e5886bcc34e57948d596a9c0639d4083fc5be8c5f659c7
-  data.tar.gz: b7154fdbf0e3376f1bfaff788779c44839648086ece0b2a4eee8f354d475ce2180e9a2c6d12c4c4ad0e6b82f56572e3a9c21ae473f4e798f14af1fd609e1d189
+  metadata.gz: 1097d637758fe0eef6db447496056c14d4e5854a0d3a632f9d203e915996ce4e4cdf35afd59f06e084d8f875896199c6d765b1feb6d92c003af5c6a1e34a8c22
+  data.tar.gz: b497681fef4ebd4fc41ee7c63bb821966f72136f0d11ba34e87f4bd4475fdc9e190ac45e1fe0372cac05f1a70e6625e9ac482bfe837990fbf2265be82ea10465

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,30 @@ 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
+      start_internal(enable_listen_thread?)
     end
+    deprecate :start, deprecator: ActiveSupport::Deprecation.new('1.0', 'ProcessSettings') # will become private
 
-    # stops listening for changes
-    def stop
-      @listener&.stop
+    def listen_thread_running?
+      !@listener.nil?
     end
 
-    def enable_listen_thread?
-      !disable_listen_thread?
+    def enable_listen_thread?(environment = nil)
+      !disable_listen_thread?(environment)
     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 +52,47 @@ 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
+      @listener = nil
+    end
+
     def service_env
-      (defined?(Rails) && Rails.environment) || 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.3'
+  VERSION = '0.11.0.pre.8'
 end

metadata

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