fedux_org-stdlib 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5236b00e36418b04fedb9fdabc64f7dff9c0ae
-  data.tar.gz: d9883b7a10db200d561bde6567a79c281427785a
+  metadata.gz: f506723ed12d859cf1a77d2691967d7cf2ac3320
+  data.tar.gz: 3863d6a9ddcef3d63f17193fa42f1cfbe66e0656
 SHA512:
-  metadata.gz: f0975a290e2fb2a14534a3d32a56de64039aa733b1e3dd58b248f44acfcd2502930c8e54929384bed248123beeb4a166fd7ec9417825999bba59854a40b38d21
-  data.tar.gz: 0e2acdd1cca4c126b12e199bc8f3d8d930f137eb504f2e1225271ae5cd7a486c5a0093461d47a5dc2f1cdf410a74c67dcc418bf98c6190780d696619e686b00a
+  metadata.gz: c2861db382e28f365b9fc89a962efe35156389f462e83366536a82b24f22fe0164b7b84129c439f5ffe55c8f39e70338b90d35b20298286216a44988dd2f4f80
+  data.tar.gz: ba38b5cec4597945b9e6a40b1161d23c7acd03bd9ee19abb4c5cd79fe36579587af2da78a07515285e809a0ded8224352fab6d09cd643e354fced56fde1693e7

data/Gemfile.lock

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

data/lib/fedux_org_stdlib/app_config.rb

@@ -180,42 +180,35 @@ module FeduxOrgStdlib
     #   The config instance. If the resulting data structure created by the
     #   config_engine does not respond to `:[]` an empty config object will be
     #   created.
+
+    attr_reader :file, :logger, :config_engine, :check_unknown_options, :working_directory
+
     def initialize(
-      file: _available_config_file,
+      file: nil,
       config_engine: Psych,
       logger: FeduxOrgStdlib::Logging::Logger.new,
-      check_unknown_options: true
+      check_unknown_options: true,
+      working_directory: Dir.getwd
     )
-      @logger = logger
-
-      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 = {}
-
-        return
-      end
-
-      begin
-        yaml = config_engine.safe_load(File.read(file), [Symbol])
-      rescue StandardError => e
-        raise Exceptions::ConfigFileNotReadable, JSON.dump(message: e.message, file: file)
-      end
-
-      if yaml.blank?
-        @__config = {}
-      elsif yaml.is_a? Hash
-        yaml = yaml.deep_symbolize_keys
-
-        yaml_withknown_options = yaml.deep_symbolize_keys.slice(*known_options)
-        unknown_options = yaml.keys - yaml_withknown_options.keys
+      @logger                = logger
+      @file                  = file
+      @config_engine         = config_engine
+      @check_unknown_options = check_unknown_options
+      @working_directory     = working_directory
+
+      detect_file unless @file
+      load_config
+    end
 
-        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
+    # Reload from already found config file
+    def reload
+      load_config
+    end
 
-        @__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 = {}
-      end
+    # Redected configuration file and reload config afterwards
+    def redetect
+      detect_file
+      load_config
     end
 
     # Show known options for configuration
@@ -268,6 +261,42 @@ module FeduxOrgStdlib
 
     private
 
+    def detect_file
+      @file = _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 = {}
+
+        return
+      end
+
+      begin
+        yaml = config_engine.safe_load(File.read(file), [Symbol])
+      rescue StandardError => e
+        raise Exceptions::ConfigFileNotReadable, JSON.dump(message: e.message, file: file)
+      end
+
+      if yaml.blank?
+        @__config = {}
+      elsif yaml.is_a? Hash
+        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
+
+        @__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 = {}
+      end
+    end
+
+
     # The name of the config file
     #
     # @return [String]
@@ -334,7 +363,7 @@ module FeduxOrgStdlib
         ::File.expand_path(::File.join('~', format('.%s', _config_file))),
         ::File.expand_path(::File.join('~', format('.%src', _config_name))),
         ::File.expand_path(::File.join('/etc', _application_name, _config_file)),
-        #          ::File.expand_path("../../../../files/#{config_file}", __FILE__),
+        ::File.expand_path(::File.join(working_directory, _config_file))
       ]
     end
 

data/lib/fedux_org_stdlib/version.rb

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

data/spec/app_config_spec.rb

@@ -395,6 +395,81 @@ RSpec.describe AppConfig do
     end
   end
 
+  context '#reload' do
+    it 're-reads it' do
+      config_klass = Class.new(AppConfig) do
+        option :opt1, 'test1'
+
+        def _class_name
+          'TestConfig'
+        end
+
+        def _module_name
+          'MyApplication'
+        end
+      end
+
+      write_file 'tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: test2
+      EOS
+
+      config = in_current_dir do
+        config_klass.new
+      end
+
+      expect(config.opt1).to eq 'test2'
+
+      write_file 'tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: test3
+      EOS
+
+      config.reload
+
+      expect(config.opt1).to eq 'test3'
+    end
+  end
+
+  context '#redetect' do
+    it 'looks for config file again and re-reads it' do
+      config_klass = Class.new(AppConfig) do
+        option :opt1, 'test1'
+
+        def _class_name
+          'TestConfig'
+        end
+
+        def _module_name
+          'MyApplication'
+        end
+      end
+
+      with_env 'HOME' => absolute_path('.') do
+        write_file 'tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: test2
+        EOS
+
+        config = in_current_dir do
+          config_klass.new
+        end
+
+        expect(config.opt1).to eq 'test2'
+
+        write_file '~/.config/my_application/tests.yaml', <<-EOS.strip_heredoc
+        ---
+        opt1: test3
+        EOS
+
+        config.redetect
+
+        expect(config.opt1).to eq 'test3'
+      end
+    end
+
+  end
+
   context '#known_options' do
     it 'outputs a list of known options' do
       with_env 'HOME' => absolute_path('.') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport