figaro 0.4.0 → 0.4.1

data/.travis.yml

@@ -9,3 +9,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+before_script:
+  - unset RAILS_ENV
+  - unset RACK_ENV

data/README.md

@@ -44,7 +44,7 @@ Pusher.key    = ENV["PUSHER_KEY"]
 Pusher.secret = ENV["PUSHER_SECRET"]
 ```
 
-If your app requires Rails-environment-specific configuration, you can also namespace your configuration under a key for `Rails.environment`. For instance:
+If your app requires Rails-environment-specific configuration, you can also namespace your configuration under a key for `Rails.env`.
 
 ```yaml
 HELLO: world

data/Rakefile

@@ -1,9 +1,11 @@
 #!/usr/bin/env rake
 
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 require "cucumber/rake/task"
 require "appraisal"
 
+RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:cucumber)
 
-task :default => :cucumber
+task :default => [:spec, :cucumber]

data/features/rails.feature

@@ -45,17 +45,7 @@ Feature: Rails
     When I run "rake hello"
     Then the output should be "Hello, world!"
 
-  Scenario: Has application.yml with a RAILS_ENV
-    Given I create "config/application.yml" with:
-      """
-      HELLO: world
-      development:
-        HELLO: developers
-      """
-    When I run "rake hello RAILS_ENV=development"
-    Then the output should be "Hello, developers!"
-
-  Scenario: Has application.yml without a RAILS_ENV, but has env variables set
+  Scenario: Has application.yml with RAILS_ENV defaulting to "development"
     Given I create "config/application.yml" with:
       """
       HELLO: world
@@ -63,9 +53,9 @@ Feature: Rails
         HELLO: developers
       """
     When I run "rake hello"
-    Then the output should be "Hello, world!"
+    Then the output should be "Hello, developers!"
 
-  Scenario: Has application.yml with a RAILS_ENV, with multiple envs configured.
+  Scenario: Has application.yml with RAILS_ENV set
     Given I create "config/application.yml" with:
       """
       HELLO: world
@@ -74,6 +64,8 @@ Feature: Rails
       production:
         HELLO: users
       """
+    When I run "rake hello RAILS_ENV=test"
+    Then the output should be "Hello, world!"
     When I run "rake hello RAILS_ENV=development"
     Then the output should be "Hello, developers!"
     When I run "rake hello RAILS_ENV=production"
@@ -90,28 +82,6 @@ Feature: Rails
     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"
+  Scenario: Includes Heroku Rake task
+    When I run "rake --tasks figaro:heroku"
+    Then the output should be "rake figaro:heroku[app]  # Configure Heroku according to application.yml"

data/features/step_definitions/common_steps.rb

@@ -1,7 +1,3 @@
-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/figaro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "0.4.0"
+  gem.version = "0.4.1"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "aruba", "~> 0.4"
   gem.add_development_dependency "cucumber", "~> 1.0"
   gem.add_development_dependency "rake", ">= 0.8.7"
+  gem.add_development_dependency "rspec", "~> 2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(/^features\//)

data/lib/figaro.rb

@@ -20,7 +20,7 @@ module Figaro
   end
 
   def environment
-    ENV["RAILS_ENV"] || ENV["RACK_ENV"]
+    Rails.env
   end
 
   private

data/lib/figaro/railtie.rb

@@ -8,7 +8,7 @@ module Figaro
     end
 
     rake_tasks do
-      load "figaro/tasks.rb"
+      load "figaro/tasks.rake"
     end
   end
 end

data/lib/figaro/{tasks.rb → tasks.rake}

@@ -1,9 +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(" ")
+    vars = Figaro.env.map{|k,v| "#{k}=#{v}" }.sort.join(" ")
     command = "heroku config:add #{vars}"
     command << " --app #{args[:app]}" if args[:app]
-    system(command)
+    Kernel.system(command)
   end
 end

data/spec/figaro/tasks_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "Figaro Rake tasks", :rake => true do
+  describe "figaro:heroku" do
+    it "configures Heroku" do
+      Figaro.stub(:env => {"HELLO" => "world", "FOO" => "bar"})
+      Kernel.should_receive(:system).once.with("heroku config:add FOO=bar HELLO=world")
+      task.invoke
+    end
+
+    it "configures a specific Heroku app" do
+      Figaro.stub(:env => {"HELLO" => "world", "FOO" => "bar"})
+      Kernel.should_receive(:system).once.with("heroku config:add FOO=bar HELLO=world --app my-app")
+      task.invoke("my-app")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require "figaro"
+require "pathname"
+
+ROOT = Pathname.new(File.expand_path("../..", __FILE__))
+
+Dir[ROOT.join("spec/support/**/*.rb")].each{|f| require f }

data/spec/support/rake.rb

@@ -0,0 +1,11 @@
+require "rake"
+
+shared_context "rake", :rake => true do
+  let(:rake){ Rake.application = Rake::Application.new }
+  let(:task){ rake[self.class.description] }
+
+  before do
+    rake.rake_require("lib/figaro/tasks", [ROOT.to_s], [])
+    Rake::Task.define_task(:environment)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Simple, Heroku-friendly Rails app configuration using ENV and a single
   YAML file
 email:
@@ -111,7 +127,6 @@ 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
@@ -119,9 +134,12 @@ files:
 - gemfiles/rails32.gemfile
 - lib/figaro.rb
 - lib/figaro/railtie.rb
-- lib/figaro/tasks.rb
+- lib/figaro/tasks.rake
 - lib/generators/figaro/install/install_generator.rb
 - lib/generators/figaro/install/templates/application.yml
+- spec/figaro/tasks_spec.rb
+- spec/spec_helper.rb
+- spec/support/rake.rb
 homepage: https://github.com/laserlemon/figaro
 licenses: []
 post_install_message: 
@@ -152,5 +170,4 @@ test_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

data/features/support/commands.rb

@@ -1,30 +0,0 @@
-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