gonfic 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e15052de540978cafed0765ee7799009e3090aabea1aa603520c4f663ce5d2
-  data.tar.gz: 628692d67ffafb2e96b2442817f2549b804a3d2d01370f0b12019d54bfb7bcd7
+  metadata.gz: 7b8810655c20a36c4ae9220d82652bd740f7a9b108f62fa6c34400c39d8af4d0
+  data.tar.gz: 4202e4993d903c3fe560730ff88e798728617f2db71d92bc9f5de1127ca30888
 SHA512:
-  metadata.gz: 40db1c5163d6e7654def37a1769b3ca1de9d8fb669e324cb4b1f0d35f192bf9cc5682a85d18eab82f5ad49c9ec62d60036f8496238946a2c7f4793cacd4de728
-  data.tar.gz: 67a77a4d33896fbced469633dcd5fa82e513abf97fe8349c8d7713c940b5d32dbd96fd4a9d8f0c608971f489d06beef4e84dd33671b1f1fcdb9967ef7b0f298e
+  metadata.gz: 4dd9ed806e8982e2be4103930ab51291b3c93c4163f044b5ebbdd63edc72b6bf369d4b2be8c597c5da66a8d83bce4e116171f1021c4238284e54cc6a3f36092b
+  data.tar.gz: 6828d7979ccc5589531c81d2f4f063fcf5d8511749f97445d58c6a8aff6ce2befa75a808d67f6f1e8db89d843a837cee237a5feb40a981146e9567b9a1473432

data/lib/gonfic/version.rb

@@ -1,3 +1,3 @@
 module Gonfic
-	VERSION = '0.6.0'.freeze
+	VERSION = '0.6.2'.freeze
 end

data/lib/gonfic.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 require_relative 'gonfic/version'
 require_relative 'gonfic/config'
 require_relative 'gonfic/env_extractor'
@@ -12,16 +14,25 @@ module Gonfic
 		filename: nil, file_loader: YAML_FILE_LOADER, directories: Directories.home_then_here,
 		env_variable_prefix: EnvExtractor.env_prefix_from_filename(filename)
 	)
-		config = Config.new(defaults)
-		if filename
-			directories.each do |directory|
-				config.merge!(load_configuration_file(File.join(directory, filename), file_loader))
-			end
-		end
-		if env_variable_prefix
-			config.merge!(EnvExtractor.extract_variables_from_env(prefix: env_variable_prefix, defaults: defaults))
+		configs =
+			configs_from_defaults(defaults: defaults) +
+			configs_from_files(filename: filename, file_loader: file_loader, directories: directories) +
+			configs_from_env(env_variable_prefix: env_variable_prefix, defaults: defaults)
+
+		configs.reduce(:merge!)
+	end
+
+	def self.configs_from_defaults(defaults:)
+		[Config.new(defaults)]
+	end
+
+	def self.configs_from_files(filename:, file_loader:, directories:)
+		return [] unless filename
+
+		directories.map do |directory|
+			filepath = File.expand_path(File.join(directory, filename))
+			load_configuration_file(filepath, file_loader)
 		end
-		config
 	end
 
 	def self.load_configuration_file(filename, file_loader)
@@ -32,4 +43,10 @@ module Gonfic
 		Hashie.logger.error(e)
 		{}
 	end
+
+	def self.configs_from_env(env_variable_prefix:, defaults:)
+		return [] unless env_variable_prefix
+
+		[EnvExtractor.extract_variables_from_env(prefix: env_variable_prefix, defaults: defaults)]
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gonfic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Emil Chludziński
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie