X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/57c4438b7559def36e74725346210fd7278b3a48..5f495b43d18bfa7a9bcaf918aa4db15261bea46a:/config/preinitializer.rb diff --git a/config/preinitializer.rb b/config/preinitializer.rb index ec05a6070..de8367e9f 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -1,21 +1,19 @@ -require 'yaml' +require "yaml" if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? env = "test" else - env = ENV['RAILS_ENV'] || 'development' + env = ENV["RAILS_ENV"] || "development" end config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__)) -ENV.each do |key,value| +ENV.each do |key, value| if key.match(/^OSM_(.*)$/) Object.const_set(Regexp.last_match(1).upcase, value) end end -config[env].each do |key,value| - unless Object.const_defined?(key.upcase) - Object.const_set(key.upcase, value) - end +config[env].each do |key, value| + Object.const_set(key.upcase, value) unless Object.const_defined?(key.upcase) end