process_settings 0.11.0.pre.4 → 0.11.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00cb781d3385028324b7dd6f55e12da7550901107adf78ee57abde78987335b4
-  data.tar.gz: b8ae66252379583f2ac9a8da599e54d559fbd92d4d40b12d36faa6539114e511
+  metadata.gz: ada8f710e24244a34005a22536e106cf086863b110d1908f58503df01797dedb
+  data.tar.gz: ae8fa6f78f2d4894a81f4e806b8408790520c38b0a19df723fe4a572eb3ffea4
 SHA512:
-  metadata.gz: c0229a56f9a6e8f6fe20fa0b19cdb82f2df4d82dbd3abd0c7d74cd0b136200e7ac48a261252b60fcd467f6b0c8a8967e8b62e6237f8cf737d871edbc8c0db189
-  data.tar.gz: 528650ea37e3fa716b588d76d5cef31af6e06e6d5fd506b4f7b65f13d51e38fd45a3f65a3c004cff0e294df47ec9397c29870dd26cdba0ea05ec5b80ef21bb3e
+  metadata.gz: 5f58df6d01c42db7ec61b2c2815d3fdbe9cc8552e754edcad4e40a63816bbb6a621290acf2c0c636f87902e8fc10f28fc5330e4fd7250f8755e7d4c22f090304
+  data.tar.gz: 5a9ef3528655fbe57d3d23d9a2714fdc3223f9cc7234237cd20beb0f26891571f444d5a325bc2df1d9bfbff8e117b67ad769c797b2033c838c88064dc1bb567c

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
 
-      if enable_listen_thread?
         @listener.start
       end
 
@@ -75,10 +84,10 @@ module ProcessSettings
       end
     end
 
-    private
-
     def service_env
-      (defined?(Rails) && Rails.env) || ENV['SERVICE_ENV']
+      if defined?(Rails) && Rails.respond_to(:env)
+        Rails.env
+      end || 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.4'
+  VERSION = '0.11.0.pre.5'
 end

metadata

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