lib/veewee/environment.rb in veewee-0.3.0.alpha9 vs lib/veewee/environment.rb in veewee-0.3.0.beta1

- old
+ new

@@ -67,9 +67,17 @@ :validation_dir => File.join(File.expand_path(File.join(File.dirname(__FILE__),"..","..")),"validation"), :tmp_dir => File.join(cwd,"tmp") } options = defaults.merge(options) + veeweefile_config = defaults.keys.inject({}) do |memo,obj| + if config.env.methods.include?(obj) && !config.env.send(obj).nil? + memo.merge({ obj => config.env.send(obj) }) + else + memo + end + end + options = options.merge(veeweefile_config) # We need to set this variable before the first call to the logger object if options.has_key?("debug") ENV['VEEWEE_LOG']="STDOUT" end