process_settings 0.10.1 → 0.10.6.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da736f5bcda926a346f3c125fdeb36f936cf9221df5c3c209394c95627c6c47b
-  data.tar.gz: 5b726059cd24532410a70e8417b9e30ebd0685496ae457defce22b1c11d1544b
+  metadata.gz: 9f84a7b291c62e80a70aa63c5cd9fef3da8a479023b97b2b48876440e2ad3f78
+  data.tar.gz: ed14cf885d3c1e8f43aba4efd90b84aae91fba2e7d9aa0c044d3d87d60453ed0
 SHA512:
-  metadata.gz: a8fa6fce27fc8b1fa91196ea95cca1c843b7bf460143b44de0e824e87be530fae61d1ace71c4c3d4c36c08d918d234a1e5b0ea7fa101df962e43af323a0e9bf3
-  data.tar.gz: 931090768b94558c83f4ddfa1ec5f674f69709f3831587238e5f3e8cc8f761cf1fa2c6d9b403d3761f866069dde264841008d2efe9d6a040611d5cb02c5d14b6
+  metadata.gz: db0012a991f04fe39c830010e5d5bb189ab0d4acd7211e04b3c606aa4267297b439ef42837238366a13798bef80a3ba078c192494b2d135b29b5ae80998e16ab
+  data.tar.gz: 571dd8f98045dd11f43dc4d349d0b3b0e094de80deb304a3a52905c6659e8643f6adf9cc31ae4474bdd55b8530d9698fcaaa940e1d4a21c84461686bdd32b8e0

data/bin/diff_process_settings

@@ -7,6 +7,7 @@
 require 'fileutils'
 require 'optparse'
 require 'ostruct'
+require 'tempfile'
 
 PROGRAM_NAME = File.basename($PROGRAM_NAME)
 
@@ -41,19 +42,22 @@ input_files =
       end
     end
 
-system("rm -f tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml")
+tempfile_a = Tempfile.new(['combined_process_settings', '.yml'], 'tmp').path
+tempfile_b = Tempfile.new(['combined_process_settings', '.yml'], 'tmp').path
+
+system("rm -f #{tempfile_a} #{tempfile_b}")
 
 # remove the meta-data from the end
-system("sed '/^- meta:$/,$d' #{input_files[0]} > tmp/combined_process_settings-A.yml")
-system("sed '/^- meta:$/,$d' #{input_files[1]} > tmp/combined_process_settings-B.yml")
+system("sed '/^- meta:$/,$d' #{input_files[0]} > #{tempfile_a}")
+system("sed '/^- meta:$/,$d' #{input_files[1]} > #{tempfile_b}")
 
 if options.silent
-  system("cmp --silent tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml")
+  system("cmp --silent #{tempfile_a} #{tempfile_b}")
 else
-  system("diff -c tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml | sed '1,3d'")
+  system("diff -c #{tempfile_a} #{tempfile_b} | sed '1,3d'")
 end
 exit_code = $?.exitstatus
 
-system("rm -f tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml")
+system("rm -f #{tempfile_a} #{tempfile_b}")
 
 exit(exit_code)

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/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/monitor.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext'
 require 'process_settings/abstract_monitor'
 

data/lib/process_settings/testing/monitor_stub.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 
 require_relative '../monitor'
@@ -9,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.1'
+  VERSION = '0.10.6.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.6.pre.1
 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: