null+****@clear*****
null+****@clear*****
Wed Feb 8 14:24:16 JST 2012
SHIMADA Koji 2012-02-08 14:24:16 +0900 (Wed, 08 Feb 2012)
New Revision: 0b2a26eea42290bc719c1bd3b28fa80f016c96d2
Merged 94f43d2: Merge pull request #38 from logaling/reduce-duplication
Log:
Remove check_required_option from #load_config_and_merge_options
call #load and merge options once on initialize.
and call #check_required_option as an independent.
Modified files:
lib/logaling/command/application.rb
Modified: lib/logaling/command/application.rb (+1 -3)
===================================================================
--- lib/logaling/command/application.rb 2012-02-08 14:11:50 +0900 (94f62e7)
+++ lib/logaling/command/application.rb 2012-02-08 14:24:16 +0900 (f69948d)
@@ -272,7 +272,7 @@ module Logaling::Command
end
end
- def load_config_and_merge_options(required={})
+ def load_config_and_merge_options
config_list ||= {}
find_config.each{|type, path| config_list[type] = load_config(path)}
global_config = config_list["global_config"] ? config_list["global_config"] : {}
@@ -281,8 +281,6 @@ module Logaling::Command
config = merge_options(project_config, global_config)
config = merge_options(options, config)
- check_required_option(config, required)
-
config
end