process_settings 0.10.0 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7639f6a88f14fbfc52dabbac2b771712cb7fda441683eabc23bdabdd2c9d5492
-  data.tar.gz: 5f8f41ad06f23db45c31a6c91246252a2a18b9055f1317dcf7e32f84cb6be6eb
+  metadata.gz: 22513a938b872f9e3366d445d4c121aafd965c32bec9b937f9b2abe41ff73722
+  data.tar.gz: 4e352a2f5a80c19fd171810612b411762372aec422464f684cbcfe71d5d27602
 SHA512:
-  metadata.gz: df98267ef1e0c5da02c62a37ac953e12dd4f187aa822306fccce6c2654b6963641dc682d3fbd457455461d8237be7a4eb319f16f0393d399802773ce5ce16fc2
-  data.tar.gz: 67419019b84fca98837ef37f09d85554052f4ef1b9a2f59185017fb9f141834d28d86228dd7b1f461a00f079234541c02c12f955e760bc7686f55a4ce90b553e
+  metadata.gz: ac2cf3d580dd5c27c4bed2a10a59024d886bcfecd2cae4a2b39ddc3e34b78a82f41e01323bc0732144c4bd2823c1e379c2bd218ebf34cf4dc2b1a992d9bf9b20
+  data.tar.gz: 97b556d773340f019947a3c623faea53086274a8ff03b62b61583c757e3d7228acb0d1b800ad21076831648238dcca008f7a0cf939ade944d33fc3832b78828d

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

@@ -31,11 +31,11 @@ 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
       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/settings.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'abstract_monitor'
 require_relative 'hash_with_hash_path'
 
 module ProcessSettings

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'

data/lib/process_settings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessSettings
-  VERSION = '0.10.0'
+  VERSION = '0.10.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.5
 platform: ruby
 authors:
 - Invoca