process_settings 0.3.1 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9db3b4fdddeb7af46f7d4624ef1547a3801b19
-  data.tar.gz: eb889d147140be8004a447d102ae42b35aa67b30
+  metadata.gz: da6baa8bdbc61885f6924aba6167ea8a77ea597a
+  data.tar.gz: abdad82d7862752a0fac28ab1c501a41af016857
 SHA512:
-  metadata.gz: 0250e37bfeb4d1958effc06ccaff80e51d00c1e05b1db33c1044fc992006b7bf1210827a64ee8ebb2988878d673434de702c8c115cf4fbebe8a68a2c478ebdd5
-  data.tar.gz: 74cf6478fd1b719cefd5fbf10a46d67b707df96a098471b1f6c50371b01afed18bf9a309d0841cd0b274bf57680bc7de9395514e70681c944284004d81c6fecb
+  metadata.gz: e92e228143718a9cd37eaf0a00a7d721f4b9a6bca7b20b8b87f0cdd29e4b3506f380f1dfc2663dd7da2fefa7acdf15352b43e8588dd4ff2f01cf3332232bc96e
+  data.tar.gz: b4d8e2fb372819ec9e55311b71b94eee7190f71d5e8f4f4773e4dcd1e398b21179d7a24832a22765a25a3ec77abc3ba9d59917c477d3d0f85b618c03a4b9a3e8

data/bin/combine_process_settings

@@ -11,8 +11,6 @@ require_relative '../lib/process_settings/targeted_settings'
 PROGRAM_NAME = File.basename($PROGRAM_NAME)
 SETTINGS_FOLDER = 'settings'
 
-Logger::INFO
-
 def end_marker(version)
   {
     'meta' => {

data/lib/process_settings/monitor.rb

@@ -36,6 +36,8 @@ module ProcessSettings
       @listener.start
 
       load_untargeted_settings
+
+      statically_targeted_settings # so that notify_on_change will be called if any changes
     end
 
     # stops listening for changes

data/lib/process_settings/replace_versioned_file.rb

@@ -4,23 +4,35 @@ require_relative 'targeted_settings'
 
 module ProcessSettings
   # This class will override a file with a higher version file; it accounts for minor version number use
-  class ReplaceVersionedFile
+  module ReplaceVersionedFile
+    class << self
+      def replace_file_on_newer_file_version(source_file_path, destination_file_path)
+        source_file_path.to_s      == '' and raise ArgumentError, "source_file_path not present"
+        destination_file_path.to_s == '' and raise ArgumentError, "destination_file_path not present"
 
-    def replace_file_on_newer_file_version(source_file_name, destination_file_name)
-      if source_version_is_newer?(source_file_name, destination_file_name)
-        FileUtils.mv(source_file_name, destination_file_name)
-      elsif source_file_name != destination_file_name # make sure we're not deleting destination file
-        FileUtils.remove_file(source_file_name) # clean up, remove left over file
+        if source_version_is_newer?(source_file_path, destination_file_path)
+          FileUtils.mv(source_file_path, destination_file_path)
+        elsif source_file_path != destination_file_path # make sure we're not deleting destination file
+          if File.exist?(source_file_path)
+            FileUtils.remove_file(source_file_path) # clean up, remove left over file
+          end
+        end
       end
-    end
 
-    private
+      private
 
-    def source_version_is_newer?(source_file_name, destination_file_name)
-      source_version      = ProcessSettings::TargetedSettings.from_file(source_file_name, only_meta: true).version
-      destination_version = ProcessSettings::TargetedSettings.from_file(destination_file_name, only_meta: true).version
+      def source_version_is_newer?(source_file_path, destination_file_path)
+        if File.exist?(source_file_path)
+          if File.exist?(destination_file_path)
+            source_version      = ProcessSettings::TargetedSettings.from_file(source_file_path, only_meta: true).version
+            destination_version = ProcessSettings::TargetedSettings.from_file(destination_file_path, only_meta: true).version
 
-      Gem::Version.new(source_version) > Gem::Version.new(destination_version)
+            Gem::Version.new(source_version) > Gem::Version.new(destination_version)
+          else
+            true
+          end
+        end
+      end
     end
   end
 end

data/lib/process_settings/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Invoca
@@ -79,6 +79,7 @@ files:
 - lib/process_settings/target_and_settings.rb
 - lib/process_settings/targeted_settings.rb
 - lib/process_settings/util.rb
+- lib/process_settings/version.rb
 homepage: https://rubygems.org/gems/process_settings
 licenses:
 - MIT
@@ -95,9 +96,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: []
 rubyforge_project: 
 rubygems_version: 2.6.13