heroku_env 0.1.0 → 0.2.0

data/README.textile

@@ -19,5 +19,5 @@ without changing herokus or your variables
   FOO: BAR
 </code></pre>
 
-Heroku Env will overwrite herokus environment variables with yours in
-<code>config/heroku_env.yml</code>
+You can generate a default <code>heroku_env.yml</code> file with a rake task:
+<code>rake heroku_env:config:create</code>

data/lib/heroku_env.rb

@@ -1,16 +1,31 @@
 module HerokuEnv
   module Rails
     class Railtie < ::Rails::Railtie
-      config.before_configuration do
-        heroku_config = `heroku config --shell`.split("\n").inject({}) do |config, item|
-          key, value = item.split("=", 2)
-          config[key] = value
-          config
+
+      rake_tasks do
+        namespace :heroku_env do
+          namespace :config do
+            desc "Create heroku_env.yml from heroku config"
+            task :create => :environment do
+              heroku_config = `heroku config --shell`.split("\n").inject({}) do |config, item|
+                key, value = item.split(/\s+\=\>\s+/, 2)
+                config[key] = value
+                config
+              end
+              heroku_env = { :development => heroku_config.clone, :test => heroku_config.clone }
+              puts heroku_env.to_yaml
+            end
+          end
         end
-        custom_config = YAML.load_file(File.join(::Rails.root, "config", "heroku_env.yml"))[::Rails.env] rescue {}
-        config = heroku_config.merge(custom_config)
-        config.each do |key, value|
-          ENV[key] = value if !ENV.has_key?(key) && key != "BUNDLE_WITHOUT"
+      end
+
+      unless ENV.include?('HEROKU_UPID')
+        config.before_configuration do
+          if heroku_config = YAML.load_file(File.join(::Rails.root, "config", "heroku_env.yml"))[::Rails.env] rescue nil || {}
+            heroku_config.each do |key, value|
+              ENV[key] = value if !ENV.has_key?(key) && !["BUNDLE_WITHOUT", "RACK_ENV"].include?(key)
+            end
+          end
         end
       end
 

data/lib/heroku_env/version.rb

@@ -1,3 +1,3 @@
 module HerokuEnv
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: heroku_env
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Spangenberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 Z
+date: 2011-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: heroku