config_files 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a3001450205f4734271598f6b0cd51ca6aba8808434b734d031d3f7c7851b6
-  data.tar.gz: d62a7f9bf5fc8e4f8a299b7fe9f8eba9f7f547917298a8e0e8b9c7d0944e15f1
+  metadata.gz: 0e601554ecea9bc4ad625f62936f005413b5cc13e76c25776a6abd1455dca6ff
+  data.tar.gz: 91b7f6eeb1e07b2646c3086d4ef008b91ee04d63fee1b7b6ccb9a73c8adfd67a
 SHA512:
-  metadata.gz: 689ac43514f81720d263e6e5f707139b451a32703a5d361937626ce653f3c0494019aeed282d5b3e7e384e6b5a217dbd3f67d1927128a3cd12180148f32aef66
-  data.tar.gz: '08c8db4aff8046683fafdfa71ef7cc4717a09b0165cac63a97a3ec660f6f344d0432c8823d7d662dddad221ea8202f83aef7d189cf06a70adc7729dc0aa86eaa'
+  metadata.gz: d086ca2975a90d9035a7e81eac2a7ddaadfcbd42ca61a3cb33fbde4675b42c226bfd181c48a9dcc6206f6fd6167e26b016af977fee61b2ab02d5bb132c67da53
+  data.tar.gz: 84211ae6ba278ebec36df53a7e0f7275b35430118b135ae6ecc5e73f3ad5ca02833691e4655e38f61f67857c62beb7a041189d3b00a3395e33526f96730c1520

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    config_files (0.1.5)
+      activesupport (>= 2.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.2)
+    rake (13.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  config_files!
+  rake
+
+BUNDLED WITH
+   1.16.1

data/lib/config_files.rb

@@ -7,20 +7,28 @@ require 'active_support/core_ext/object/blank'
 
 require 'meta'
 require 'yaml'
+
+class NoDirectoryEntry < NoMethodError; end
 module ConfigFiles
 
   class << self
     def included(base)
       base.class_eval do
-        extend ClassMethods
+        extend ConfigFilesClassMethods
       end
     end
   end
 
-  module ClassMethods
+  module ConfigFilesClassMethods
     include Meta
     attr_accessor :directories
 
+    def self.extended(base)
+      base.instance_eval do
+        self.directories=default_directories
+      end
+    end
+
     def any_extension
       '*'
     end
@@ -29,8 +37,12 @@ module ConfigFiles
       :etc
     end
 
+    def default_directories
+      { :etc => ['config', 'etc', '/etc'] }
+    end
+
     def config_directories(*arr)
-      self.directories||={ :etc => ['config', 'etc', '/etc'] }
+      self.directories||=default_directories
       arr.each do |directory_list|
         directory_list.each do |key, value|
           self.directories[key]=value.map { |dir| ::File.expand_path(dir) }
@@ -68,7 +80,11 @@ module ConfigFiles
     end
 
     def first_directory(file, key=config_key)
-      self.directories[key]&.detect { |directory| directory_listing(directory, file).presence } || ''
+      begin
+        self.directories[key]&.detect { |directory| directory_listing(directory, file).presence } || ''
+      rescue NoMethodError=>e
+        raise NoDirectoryEntry, "Unable to find #{key} in #{self.directories}"
+      end
     end
 
     def files(file, key=config_key)

data/lib/config_files/version.rb

@@ -1,3 +1,3 @@
 module ConfigFiles
-  VERSION='0.1.5'
+  VERSION='0.1.6'
 end

data/test/config_files_test.rb

@@ -16,6 +16,11 @@ class Dummy2 < Dummy
   end
 end
 
+class Defaults
+  include ConfigFiles
+  static_config_files :dummy
+end
+
 class ConfigFilesTest < MiniTest::Test
   def test_config_key
     assert_equal(:etc, Dummy.config_key)
@@ -44,4 +49,8 @@ class ConfigFilesTest < MiniTest::Test
   def test_yaml_and_config_override
     assert_equal('test', Dummy2.dummy[:config_test])
   end
+
+  def test_defaults_are_picked_up_when_no_directories_used
+    assert_equal('test', Defaults.dummy[:config_test])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_files
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul McKibbin
@@ -48,6 +48,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: ConfigFiles is a configuration file access tool. It parses multiple configuration