null+****@clear*****
null+****@clear*****
Tue Feb 14 20:31:59 JST 2012
SHIMADA Koji 2012-02-14 20:31:59 +0900 (Tue, 14 Feb 2012)
New Revision: 504e7e3c799add47b7fc452c85165473fed2e171
Merged b0ee22d: Merge pull request #43 from logaling/extract-config-object
Log:
Remove find_config
Modified files:
lib/logaling/config.rb
Modified: lib/logaling/config.rb (+2 -15)
===================================================================
--- lib/logaling/config.rb 2012-02-14 20:31:24 +0900 (c227bcf)
+++ lib/logaling/config.rb 2012-02-14 20:31:59 +0900 (17d0fc5)
@@ -25,10 +25,8 @@ module Logaling
end
def load_config_and_merge_options(project_config_path, global_config_path, options)
- config_list ||= {}
- find_config(project_config_path, global_config_path).each{|type, path| config_list[type] = load_config(path)}
- global_config = config_list["global_config"] ? config_list["global_config"] : {}
- project_config = config_list["project_config"] ? config_list["project_config"] : {}
+ project_config = project_config_path ? load_config(project_config_path) : load_config(global_config_path)
+ global_config = load_config(global_config_path)
config = merge_options(project_config, global_config)
config = merge_options(options, config)
@@ -50,17 +48,6 @@ module Logaling
config
end
- def find_config(project_config_path, global_config_path)
- config ||= {}
- if project_config_path
- config["project_config"] = project_config_path
- else
- config["project_config"] = global_config_path
- end
- config["global_config"] = global_config_path if global_config_path
- config
- end
-
def load_config(config_path=nil)
config ||= {}
if config_path