process_settings 0.11.0.pre.1 → 0.11.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a90fdb765825b3e33cf5de6ceec5ffba64975aec6ec17062c18f53ca47e350
-  data.tar.gz: 30a111bd424743bbe3303fbd76651c160f2f2baae535dbcf1cc243be3339c6b5
+  metadata.gz: f0e4c0d383c1c9a61fccd6805a66edd6a0113ea9ede561b9e77083c8df75ec75
+  data.tar.gz: 15ebc93883d4154eb37c0aacd85067f3608fbae7fa98103a67e7abf4323f73b0
 SHA512:
-  metadata.gz: 9c185d646afc5c8ae430e2160f794b3dd29599ab711a5defdbcc0fa669ccac0b09baaa0a1fc0ad0b889400039b59f6c95cd3b5278fdb36c026aa8f74221ef79a
-  data.tar.gz: efe2370a36301f6e222037497ee8374d5997499de82dbb2d6a6da20150474598aab99d7cc0035a32cea494bf576ab4ceeaf026b97903dc8ffa782aa6e58923f3
+  metadata.gz: fb39a3820a0ca9bf67ccefae886c58fa73dc47b875239ffe2dbfd59528635b0102cd88b25b7e80ba910035137b7f455ef4116f0f69c5f8c9ca359f896515ab82
+  data.tar.gz: 2f83adc49dbdc1968b75206ede61d900fba4197b2f333787020f4a4278d4a9d4494db88ae30f106205dc51056a78b3415d1ec69c1e13b9a235d445efad7776f5

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'
@@ -20,32 +21,40 @@ module ProcessSettings
       @untargeted_settings = nil
       @last_untargetted_settings = nil
 
-      start
+      start_internal(enable_listen_thread?)
     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
+      start_internal(enable_listen_thread?)
+    end
+    deprecate :start, deprecator: ActiveSupport::Deprecation.new('1.0', 'ProcessSettings') # will become private
 
-      @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
+    private
 
-          load_statically_targeted_settings
+    # 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
-      end
 
-      unless ENV['DISABLE_LISTEN_CHANGE_MONITORING']
         @listener.start
       end
 
@@ -58,7 +67,28 @@ module ProcessSettings
       @listener&.stop
     end
 
-    private
+    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
+
+    def service_env
+      if defined?(Rails) && Rails.respond_to?(:env)
+        Rails.env
+      end || ENV['SERVICE_ENV']
+    end
 
     # Loads the most recent settings from disk
     def load_untargeted_settings

data/lib/process_settings/version.rb

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

metadata

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