heroku_san 2.1.1 → 2.1.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.rdoc

@@ -1,7 +1,8 @@
 = Heroku San
-
 Helpful rake tasks for Heroku.
 
+{<img src="https://secure.travis-ci.org/fastestforward/heroku_san.png?branch=master" alt="Build Status" />}[http://travis-ci.org/fastestforward/heroku_san]
+
 == Install
 
 === Rails 3

data/features/step_definitions/remote_steps.rb

@@ -1,7 +1,6 @@
 World(Aruba::Api)
 
 Given /^I have a new Rails project$/ do
-  # template = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'features', 'data', 'template.rb')
   cmd = "rails new heroku_san_test --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets" #" --template #{template}"
   run_simple unescape(cmd)
 end
@@ -12,9 +11,9 @@ end
 
 When /^I add heroku_san to the Gemfile$/ do
   append_to_file 'Gemfile', <<EOT
-group :development, :test do
-  gem 'heroku_san', :path => '../../../.'
-end
+    group :development, :test do
+      gem 'heroku_san', :path => '../../../.'
+    end
 EOT
 end
 
@@ -26,13 +25,16 @@ end
 
 Then /^rake reports that the heroku: tasks are available$/ do
   run_simple 'rake -T heroku:'
-  assert_partial_output 'rake heroku:apps', all_output
+  output = stdout_from 'rake -T heroku:'
+  assert_partial_output 'rake heroku:apps', output
 end
 
 When /^I create a new config\/heroku\.yml file$/ do
   run_simple 'rake heroku:create_config'
-  assert_matching_output %q{Copied example config to ".*.config.heroku.yml"}, all_output
-  assert_matching_output %q{Please edit ".*.config.heroku.yml" with your application's settings.}, all_output
+  output = stdout_from 'rake heroku:create_config'
+  assert_matching_output %q{Copied example config to ".*.config.heroku.yml"}, output
+  assert_matching_output %q{Please edit ".*.config.heroku.yml" with your application's settings.}, output
+  
   overwrite_file 'config/heroku.yml', <<EOT
 ---
 test_app:
@@ -42,8 +44,9 @@ end
 When /^I create my project on Heroku$/ do
   cmd = 'rake test_app heroku:create'
   run_simple unescape(cmd)
-  assert_matching_output %q{test_app: Created ([\w-]+)}, all_output
   output = stdout_from cmd
+  assert_matching_output %q{test_app: Created ([\w-]+)}, output
+  
   @app = output.match(/test_app: Created ([\w-]+)/)[1]
   overwrite_file 'config/heroku.yml', <<EOT
 ---
@@ -55,9 +58,10 @@ end
 When /^I list the remote configuration$/ do
   cmd = 'rake test_app heroku:config:list'
   run_simple unescape(cmd)
-  assert_partial_output "APP_NAME: #{@app}", all_output
-  assert_partial_output "URL: #{@app}.heroku.com", all_output
   output = stdout_from cmd
+  assert_partial_output "APP_NAME: #{@app}", output
+  assert_partial_output "URL: #{@app}.heroku.com", output
+  
   @url = output.match(/\bURL:\s+(.*.heroku.com)\b/)[1]
   @curl = unescape("curl --silent http://#{@url}")
 end
@@ -77,28 +81,33 @@ test_app:
     DROIDS: marvin
 EOT
   cmd = 'rake test_app heroku:config'
-  run_simple unescape(cmd)
-  assert_partial_output 'DROIDS: marvin', all_output
+  run_simple cmd
+  output = stdout_from cmd
+  assert_partial_output 'DROIDS: marvin', output
 end
 
 When /^I turn maintenance on$/ do
   run_simple 'rake test_app heroku:maintenance_on'
-  assert_partial_output 'test_app: Maintenance mode enabled.', all_output
+  output = stdout_from 'rake test_app heroku:maintenance_on'
+  assert_partial_output 'test_app: Maintenance mode enabled.', output
+  
   run_simple @curl
   output = stdout_from @curl
-  assert_partial_output '<title>Offline for Maintenance</title>', all_output
+  assert_partial_output '<title>Offline for Maintenance</title>', output
 end
 
 When /^I turn maintenance off$/ do
   run_simple 'rake test_app heroku:maintenance_off'
-  assert_partial_output 'test_app: Maintenance mode disabled.', all_output
-  run_simple @curl + "/droids"
-  assert_partial_output %Q{<code>marvin</code>}, all_output
+  output = stdout_from 'rake test_app heroku:maintenance_off'
+  assert_partial_output 'test_app: Maintenance mode disabled.', output
+  assert_app_is_running
 end
 
 When /^I restart my project$/ do
   run_simple 'rake test_app heroku:restart'
-  assert_partial_output 'test_app: Restarted.', all_output
+  output = stdout_from 'rake test_app heroku:restart'
+  assert_partial_output 'test_app: Restarted.', output
+  assert_app_is_running
 end
 
 When /^I deploy my project$/ do
@@ -112,12 +121,22 @@ When /^I deploy my project$/ do
 end
 
 When /^I list all apps on Heroku$/ do
+  sha = in_current_dir do
+    `git rev-parse HEAD`.chomp
+  end
   run_simple 'rake heroku:apps'
-  assert_partial_output "test_app is shorthand for the Heroku app #{@app} located at:", all_output
-  assert_partial_output "git@heroku.com:#{@app}.git", all_output
-  assert_matching_output '@ \w{40} master', all_output
+  output = stdout_from 'rake heroku:apps'
+  assert_partial_output "test_app is shorthand for the Heroku app #{@app} located at:", output
+  assert_partial_output "git@heroku.com:#{@app}.git", output
+  assert_partial_output "@ #{sha} master", output
 end
 
 Then /^heroku_san is green$/ do
   run_simple "heroku apps:destroy #{@app} --confirm #{@app}"
 end
+
+def assert_app_is_running
+  run_simple @curl + "/droids"
+  output = stdout_from @curl + "/droids"
+  assert_partial_output %Q{<code>marvin</code>}, output
+end

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/lib/tasks.rb

@@ -109,7 +109,7 @@ namespace :heroku do
         puts command
         config = Hash[`#{command}`.scan(/^(.+?)\s*=>\s*(.+)$/)]
         if config['RACK_ENV'] != stage.name
-          puts stage.push_config RACK_ENV: stage.name
+          puts stage.push_config 'RACK_ENV' => stage.name
         end
       end
     end

data/spec/heroku_san/stage_spec.rb

@@ -112,8 +112,8 @@ describe HerokuSan::Stage do
     
     context "with a block" do
       it "wraps it in a maitenance mode" do
-        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).ordered
         @heroku_client.should_receive(:maintenance).with('awesomeapp', :on).ordered
+        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).ordered
         @heroku_client.should_receive(:maintenance).with('awesomeapp', :off).ordered
         subject.maintenance do reactor.scram(:now) end
       end
@@ -186,13 +186,13 @@ describe HerokuSan::Stage do
 
   describe "#push_config" do
     it "updates the configuration settings on Heroku" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {FOO: 'bar', DOG: 'emu'}}) 
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {:FOO => 'bar', :DOG => 'emu'}}) 
       @heroku_client.should_receive(:add_config_vars).with('awesomeapp', {:FOO => 'bar', :DOG => 'emu'}).and_return("{}")
       subject.push_config
     end
     it "pushes the options hash" do
       @heroku_client.should_receive(:add_config_vars).with('awesomeapp', {:RACK_ENV => 'magic'}).and_return("{}")
-      subject.push_config(RACK_ENV: 'magic')
+      subject.push_config(:RACK_ENV => 'magic')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156274700 !ruby/object:Gem::Requirement
+  requirement: &2152396440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2156274700
+  version_requirements: *2152396440
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2156273500 !ruby/object:Gem::Requirement
+  requirement: &2152385600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2156273500
+  version_requirements: *2152385600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156272240 !ruby/object:Gem::Requirement
+  requirement: &2152384980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156272240
+  version_requirements: *2152384980
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156270800 !ruby/object:Gem::Requirement
+  requirement: &2152384220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156270800
+  version_requirements: *2152384220
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156269420 !ruby/object:Gem::Requirement
+  requirement: &2152383620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156269420
+  version_requirements: *2152383620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156268140 !ruby/object:Gem::Requirement
+  requirement: &2152382980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156268140
+  version_requirements: *2152382980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156263700 !ruby/object:Gem::Requirement
+  requirement: &2152382280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +90,7 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2156263700
+  version_requirements: *2152382280
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
@@ -100,6 +100,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE