fedux_org-stdlib 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ef74f7ac7384488eb75228e902abeb2e21dfee
-  data.tar.gz: ff9585596de37c99b38737c540c254c44ef4bc78
+  metadata.gz: 95421cf63a2b9cfc2aadba02729ec31edb4f9c23
+  data.tar.gz: 88d4e3448de789088dd0091a665c362c4ee8215b
 SHA512:
-  metadata.gz: def728359046ad26adc4eacccd56600845d01ad4b1563297192506a063be05f2f1787d99ea1606b67fdb08ab1fe14704dfd01c53c765ca2dc031b06215cec838
-  data.tar.gz: 4adf3fb8af2604cc0dd2f296447e4f665eab7bb960430d0c7d57da3e0adbf3e4bf3064e95a1a4944a41e49b9b6b9be4d3800c205ecea073087fb70968f1bd150
+  metadata.gz: 152515d3efef6302211cedec9d75450aaca7ff5ed7dda382f309d526796a8c496b1f9003bd33c5cb151bd04d9b8713c7dd348724862a11d21a1d69547c2efafc
+  data.tar.gz: b252e98113cd114a7cf8a0a61e3e604a958e9eaeddb162970bfaacb47003a6a4a560b6a1821202d63339667ede7d6b308419144d875f0e5addc1af22832b0f27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.9.3)
+    fedux_org-stdlib (0.9.4)
       activesupport
 
 PATH

data/lib/fedux_org_stdlib/app_config.rb

@@ -181,10 +181,11 @@ module FeduxOrgStdlib
     #   config_engine does not respond to `:[]` an empty config object will be
     #   created.
 
-    attr_reader :file, :logger, :config_engine, :check_unknown_options, :working_directory, :safe
+    attr_reader :files, :logger, :config_engine, :check_unknown_options, :working_directory, :safe, :merge_files
 
     def initialize(
       file: nil,
+      merge_files: false,
       config_engine: Psych,
       logger: FeduxOrgStdlib::Logging::Logger.new,
       check_unknown_options: true,
@@ -192,13 +193,14 @@ module FeduxOrgStdlib
       safe: true
     )
       @logger                = logger
-      @file                  = file
+      @files                 = Array(file)
+      @merge_files           = merge_files
       @config_engine         = config_engine
       @check_unknown_options = check_unknown_options
       @working_directory     = working_directory
       @safe                  = safe
 
-      detect_file unless @file
+      detect_files if @files.blank?
       load_config
     end
 
@@ -209,7 +211,7 @@ module FeduxOrgStdlib
 
     # Redected configuration file and reload config afterwards
     def redetect
-      detect_file
+      detect_files
       load_config
     end
 
@@ -284,42 +286,51 @@ module FeduxOrgStdlib
 
     private
 
-    def detect_file
-      @file = _available_config_file
+    def detect_files
+      @files = _available_config_file
     end
 
     def load_config
-      unless file
-        logger.debug "No configuration file found at #{_allowed_config_file_paths.to_list}, therefor I'm going to use an empty config object instead."
-        @__config = {}
+      @__config = {}
 
+      if files.blank?
+        logger.debug "No configuration files found at #{_allowed_config_file_paths.to_list}, therefor I'm going to use an empty config object instead."
         return
       end
 
-      begin
-        yaml = if safe
-                 config_engine.safe_load(File.read(file), [Symbol, Regexp])
-               else
-                 config_engine.load(File.read(file))
-               end
-      rescue StandardError => e
-        raise Exceptions::ConfigFileNotReadable, JSON.dump(message: e.message, file: file)
-      end
 
-      if yaml.blank?
-        @__config = {}
-      elsif yaml.is_a? Hash
+      files = if merge_files
+                self.files
+              else
+                Array(self.files.first)
+              end
+
+      files.each do |f|
+        begin
+          yaml = if safe
+                   config_engine.safe_load(File.read(f), [Symbol, Regexp])
+                 else
+                   config_engine.load(File.read(f))
+                 end
+        rescue StandardError => e
+          raise Exceptions::ConfigFileNotReadable, JSON.dump(message: e.message, file: f)
+        end
+
+        next if yaml.blank?
+
+        unless yaml.is_a? Hash
+          logger.warn "There seems to be a problem transforming config file \"#{f}\" to a hash, therefor I will use an empty config object."
+          next
+        end
+
         yaml = yaml.deep_symbolize_keys
 
         yaml_withknown_options = yaml.deep_symbolize_keys.slice(*known_options)
         unknown_options = yaml.keys - yaml_withknown_options.keys
 
-        logger.warn "Unknown config options #{(unknown_options).to_list} in config file #{file} detected. Please define them in your config class or remove the entries in your config file or disable check via `check_unknown_options: false` to get rid of this warning." unless unknown_options.blank? && check_unknown_options == true
+        logger.warn "Unknown config options #{(unknown_options).to_list} in config file #{f} detected. Please define them in your config class or remove the entries in your config file or disable check via `check_unknown_options: false` to get rid of this warning." unless unknown_options.blank? && check_unknown_options == true
 
-        @__config = Hash(yaml_withknown_options)
-      else
-        logger.warn "There seems to be a problem transforming config file \"#{file}\" to a hash, therefor I will use an empty config object."
-        @__config = {}
+        @__config.reverse_merge! Hash(yaml_withknown_options)
       end
     end
 
@@ -402,17 +413,17 @@ module FeduxOrgStdlib
     end
 
     def _available_config_file
-      _allowed_config_file_paths.find { |f| ::File.exist? f }
+      _allowed_config_file_paths.select { |f| ::File.exist? f }
     end
 
     def self._reserved_key_words
       (methods | instance_methods | private_methods | private_instance_methods) - (Class.methods | Class.private_methods) | [:to_s]
     end
 
-    def method_missing(*args, &block)
-      $stderr.puts "Please check if you have defined an option for #{args.first}."
+    #def method_missing(*args, &block)
+    #  $stderr.puts "Please check if you have defined an option for #{args.first}."
 
-      super
-    end
+    #  super
+    #end
   end
 end

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/spec/app_config_spec.rb

@@ -86,6 +86,66 @@ RSpec.describe AppConfig do
       expect(config.defaults.opt1).to eq 'foobar'
       expect(config.opt1).to eq 'hello world'
     end
+
+    it 'uses the first file found' do
+      config_klass = Class.new(AppConfig) do
+        option_reader :opt1, 'foobar'
+        option_reader :opt2, 'foobar'
+
+        def _class_name
+          'TestConfig'
+        end
+
+        def _module_name
+          'MyApplication'
+        end
+      end
+
+      write_file '~/.config/my_application/tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: hello world config
+      EOS
+
+      write_file '~/.tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: hello world home
+        opt2: hello world home
+      EOS
+
+      config = config_klass.new(merge_files: false)
+      expect(config.opt1).to eq 'hello world config'
+      expect(config.opt2).to eq 'foobar'
+    end
+
+    it 'merges files on request' do
+      config_klass = Class.new(AppConfig) do
+        option_reader :opt1, 'foobar'
+        option_reader :opt2, 'foobar'
+
+        def _class_name
+          'TestConfig'
+        end
+
+        def _module_name
+          'MyApplication'
+        end
+      end
+
+      write_file '~/.config/my_application/tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: hello world config
+      EOS
+
+      write_file '~/.tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: hello world home
+        opt2: hello world home
+      EOS
+
+      config = config_klass.new(merge_files: true)
+      expect(config.opt1).to eq 'hello world config'
+      expect(config.opt2).to eq 'hello world home'
+    end
   end
 
   context '#lock' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Max Meyer