figaro 0.2.0 → 0.3.0

data/.travis.yml

@@ -9,3 +9,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+env:
+  secure: "SBq3viHypfDJrrU0dRw6U+tNZFVb3NjMHWN1HROgZ+ecF0ycRKDxHZQCHWg2\nV0FwRDb/pd6eZgk12Yxp0PyE2rxtiU/LulQkp0EvpcGXjuQHudWXTZ2c/RiY\n7FVwvy6SYB6D/3pDmVEtTRu/BQjgE9fMlLaaZms64+t5MtRFSCU="

data/README.md

@@ -48,7 +48,7 @@ Pusher.secret = ENV["PUSHER_SECRET"]
 
 Heroku's beautifully simple application configuration was the [inspiration](http://laserlemon.com/blog/2011/03/08/heroku-friendly-application-configuration/) for Figaro.
 
-To configure your application `ENV` on Heroku, you can do the following from the command line using the `heroku` gem and your production configuration information.
+Typically, to configure your application `ENV` on Heroku, you would do the following from the command line using the `heroku` gem:
 
 ```bash
 heroku config:add PUSHER_APP_ID=8926
@@ -58,6 +58,18 @@ heroku config:add STRIPE_API_KEY=jHXKPPE0dUW84xJNYzn6CdWM2JfrCbPE
 heroku config:add STRIPE_PUBLIC_KEY=pk_HHtUKJwlN7USCT6nE5jiXgoduiNl3
 ```
 
+But Figaro provides a rake task to do just that! Just run:
+
+```bash
+rake figaro:heroku
+```
+
+Optionally, you can pass in the name of the Heroku app:
+
+```bash
+rake figaro:heroku[my-awesome-app]
+```
+
 ## What if I'm not using Heroku?
 
 No problem. Just add `config/application.yml` to your production app on the server.

data/features/rails.feature

@@ -11,7 +11,7 @@ Feature: Rails
       """
 
   Scenario: Has no application.yml
-    When I run "bundle exec rake hello"
+    When I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has application.yml without requested key
@@ -19,14 +19,14 @@ Feature: Rails
       """
       GOODBYE: Ruby Tuesday
       """
-    And I run "bundle exec rake hello"
+    And I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has blank application.yml
     When I create "config/application.yml" with:
       """
       """
-    And I run "bundle exec rake hello"
+    And I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has commented application.yml
@@ -34,7 +34,7 @@ Feature: Rails
       """
       # Comment
       """
-    And I run "bundle exec rake hello"
+    And I run "rake hello"
     Then the output should be "Hello!"
 
   Scenario: Has application.yml with requested key
@@ -42,16 +42,42 @@ Feature: Rails
       """
       HELLO: world
       """
-    And I run "bundle exec rake hello"
+    And I run "rake hello"
     Then the output should be "Hello, world!"
 
   Scenario: Generator creates and ignores application.yml file
-    When I run "bundle exec rails generate figaro:install"
+    When I run "rails generate figaro:install"
     Then "config/application.yml" should exist
     And ".gitignore" should contain "/config/application.yml"
 
   Scenario: Generator only creates application.yml if not using Git
     Given I run "rm .gitignore"
-    When I run "bundle exec rails generate figaro:install"
+    When I run "rails generate figaro:install"
     Then "config/application.yml" should exist
     But ".gitignore" should not exist
+
+  Scenario: Rake task attempts to configure Heroku
+    Given the "heroku" command is:
+      """
+      #!/usr/bin/env ruby
+      puts "Attempted: heroku #{ARGV.join(" ")}"
+      """
+    And I create "config/application.yml" with:
+      """
+      FOO: bar
+      """
+    When I run "rake figaro:heroku"
+    Then the output should be "Attempted: heroku config:add FOO=bar"
+
+  Scenario: Rake task attempts to configure a specific Heroku app
+    Given the "heroku" command is:
+      """
+      #!/usr/bin/env ruby
+      puts "Attempted: heroku #{ARGV.join(" ")}"
+      """
+    And I create "config/application.yml" with:
+      """
+      FOO: bar
+      """
+    When I run "rake figaro:heroku[my-app]"
+    Then the output should be "Attempted: heroku config:add FOO=bar --app my-app"

data/features/step_definitions/common_steps.rb

@@ -1,3 +1,7 @@
+Given /^the "([^"]+)" command is:$/ do |command, content|
+  write_command(command, content)
+end
+
 When /^I create "([^"]+)" with:$/ do |path, content|
   write_file(path, content)
 end

data/features/support/aruba.rb

@@ -7,6 +7,6 @@ Before do
   @aruba_timeout_seconds = 60
 end
 
-After "~@no-clobber" do
+After do
   FileUtils.rm_rf(current_dir)
 end

data/features/support/commands.rb

@@ -0,0 +1,30 @@
+module CommandHelpers
+  PATH = ROOT.join("tmp/commands")
+
+  def write_command(command, content)
+    path = PATH.join(command)
+    File.open(path, "w"){|f| f << content }
+    FileUtils.chmod(0755, path)
+  end
+
+  def patch_path
+    FileUtils.mkdir_p(PATH)
+    @original_paths = ENV["PATH"] ? ENV["PATH"].split(File::PATH_SEPARATOR) : []
+    ENV["PATH"] = ([PATH] + @original_paths).join(File::PATH_SEPARATOR)
+  end
+
+  def restore_path
+    ENV["PATH"] = @original_paths.join(File::PATH_SEPARATOR)
+    FileUtils.rm_r(PATH)
+  end
+end
+
+World(CommandHelpers)
+
+Before do
+  patch_path
+end
+
+After do
+  restore_path
+end

data/features/support/env.rb

@@ -1 +1,5 @@
-ROOT = File.expand_path("../../..", __FILE__)
+require "pathname"
+
+ROOT = Pathname.new(File.expand_path("../../..", __FILE__))
+
+puts "Travis ENV test: #{ENV["TRAVIS_ENV_TEST"].inspect}"

data/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.2.0"
+  gem.version = "0.3.0"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", ">= 0.8.7"
 
   gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(/^spec\//)
+  gem.test_files    = gem.files.grep(/^features\//)
   gem.require_paths = ["lib"]
 end

data/lib/figaro.rb

@@ -1 +1,17 @@
 require "figaro/railtie"
+
+module Figaro
+  extend self
+
+  def env
+    yaml && YAML.load(yaml) || {}
+  end
+
+  def yaml
+    File.exist?(path) ? File.read(path) : nil
+  end
+
+  def path
+    Rails.root.join("config/application.yml")
+  end
+end

data/lib/figaro/railtie.rb

@@ -4,8 +4,11 @@ require "yaml"
 module Figaro
   class Railtie < ::Rails::Railtie
     config.before_configuration do
-      path = Rails.root.join("config/application.yml")
-      ENV.update(YAML.load(File.read(path)) || {}) if File.exist?(path)
+      ENV.update(Figaro.env)
+    end
+
+    rake_tasks do
+      load "figaro/tasks.rb"
     end
   end
 end

data/lib/figaro/tasks.rb

@@ -0,0 +1,9 @@
+namespace :figaro do
+  desc "Configure Heroku according to application.yml"
+  task :heroku, [:app] => :environment do |_, args|
+    vars = Figaro.env.map{|k,v| "#{k}=#{v}" }.join(" ")
+    command = "heroku config:add #{vars}"
+    command << " --app #{args[:app]}" if args[:app]
+    system(command)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,6 +111,7 @@ files:
 - features/step_definitions/common_steps.rb
 - features/step_definitions/rails_steps.rb
 - features/support/aruba.rb
+- features/support/commands.rb
 - features/support/env.rb
 - figaro.gemspec
 - gemfiles/rails30.gemfile
@@ -118,6 +119,7 @@ files:
 - gemfiles/rails32.gemfile
 - lib/figaro.rb
 - lib/figaro/railtie.rb
+- lib/figaro/tasks.rb
 - lib/generators/figaro/install/install_generator.rb
 - lib/generators/figaro/install/templates/application.yml
 homepage: https://github.com/laserlemon/figaro
@@ -144,4 +146,11 @@ rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple Rails app configuration
-test_files: []
+test_files:
+- features/rails.feature
+- features/step_definitions/bundler_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/support/aruba.rb
+- features/support/commands.rb
+- features/support/env.rb