markbates-configatron 2.4.1.20090826153428 → 2.4.2.20090909140253

data/README

@@ -53,7 +53,7 @@ You can configure configatron from a hash as well:
 
 Notice how they're all namespaced for your as well. The same holds true for YAML files:
 
-  configuration.configure_from_yaml('/path/to/file.yml')
+  configatron.configure_from_yaml('/path/to/file.yml')
 
 ===Namespaces
 

data/lib/configatron.rb

@@ -1,5 +1,6 @@
 base = File.join(File.dirname(__FILE__), 'configatron')
 require 'yamler'
+require 'fileutils'
 require File.join(base, 'configatron')
 require File.join(base, 'store')
 require File.join(base, 'errors')

data/lib/configatron/rails.rb

@@ -16,14 +16,23 @@ class Configatron
     #   <RAILS_ROOT>/config/configatron/<RAILS_ENV>/defaults.rb
     #   <RAILS_ROOT>/config/configatron/<RAILS_ENV>/bar.rb
     #   <RAILS_ROOT>/config/configatron/<RAILS_ENV>/foo.rb
-    def self.init(root = RAILS_ROOT)
+    def self.init(root = nil, env = nil)
+      base_dir = root
+      if root.nil?
+        root = defined?(RAILS_ROOT) ? RAILS_ROOT : FileUtils.pwd
+        base_dir = File.expand_path(File.join(root, 'config', 'configatron'))
+      end
+      
+      if env.nil?
+        env = defined?(RAILS_ENV) ? RAILS_ENV : 'development'
+      end
+      
       config_files = []
 
-      base_dir = File.expand_path(File.join(root, 'config', 'configatron'))
       config_files << File.join(base_dir, 'defaults.rb')
-      config_files << File.join(base_dir, "#{RAILS_ENV}.rb")
+      config_files << File.join(base_dir, "#{env}.rb")
 
-      env_dir = File.join(base_dir, RAILS_ENV)
+      env_dir = File.join(base_dir, env)
       config_files << File.join(env_dir, 'defaults.rb')
 
       Dir.glob(File.join(env_dir, '*.rb')).sort.each do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-configatron
 version: !ruby/object:Gem::Version 
-  version: 2.4.1.20090826153428
+  version: 2.4.2.20090909140253
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency