lib/rails_config.rb in rails_config-0.4.2 vs lib/rails_config.rb in rails_config-0.5.0.beta1

@@ -1,10 +1,10 @@
 require 'active_support/core_ext/module/attribute_accessors'
 
 require 'rails_config/options'
 require 'rails_config/version'
-require 'rails_config/engine'
+require 'rails_config/engine' if defined?(::Rails)
 require 'rails_config/sources/yaml_source'
 require 'rails_config/vendor/deep_merge' unless defined?(DeepMerge)
 
 module RailsConfig
   # ensures the setup only gets run once
@@ -36,9 +36,21 @@
 
   # Loads and sets the settings constant!
   def self.load_and_set_settings(*files)
     Kernel.send(:remove_const, RailsConfig.const_name) if Kernel.const_defined?(RailsConfig.const_name)
     Kernel.const_set(RailsConfig.const_name, RailsConfig.load_files(files))
+  end
+
+  def self.setting_files(config_root, env)
+    [
+      File.join(config_root, "settings.yml").to_s,
+      File.join(config_root, "settings", "#{env}.yml").to_s,
+      File.join(config_root, "environments", "#{env}.yml").to_s,
+
+      File.join(config_root, "settings.local.yml").to_s,
+      File.join(config_root, "settings", "#{env}.local.yml").to_s,
+      File.join(config_root, "environments", "#{env}.local.yml").to_s
+    ].freeze
   end
 
   def self.reload!
     Kernel.const_get(RailsConfig.const_name).reload!
   end