heroku_san 4.0.7 → 4.0.8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log (curated)
 
+## v4.0.8
+
+  * Closes #113 & #117
+
 ## v4.0.7
 
   * Closes #114 & #111

data/README.md

@@ -48,10 +48,14 @@ Update your `Rakefile`:
 
 ```ruby
   require "bundler/setup"
-  require "heroku_san"
-  config_file = File.join(File.expand_path(File.dirname(__FILE__)), 'config', 'heroku.yml')
-  HerokuSan.project = HerokuSan::Project.new(config_file, :deploy => HerokuSan::Deploy::Sinatra)
-  load "heroku_san/tasks.rb"
+  begin
+    require "heroku_san"
+    config_file = File.join(File.expand_path(File.dirname(__FILE__)), 'config', 'heroku.yml')
+    HerokuSan.project = HerokuSan::Project.new(config_file, :deploy => HerokuSan::Deploy::Sinatra)
+    load "heroku_san/tasks.rb"
+  rescue LoadError
+    # The gem shouldn't be installed in a production environment
+  end
 ```
 
 ## Configure

data/cucumber.yml

@@ -1,2 +1,3 @@
 default: --tags ~@slow_process --no-source
-remote: --tags @slow_process --no-source
+remote: --tags @slow_process --tags ~@issue --no-source
+issues: --tags @issue --no-source

data/features/issue_113.feature

@@ -0,0 +1,22 @@
+@slow_process @announce-cmd @issue
+Feature: github issues
+  Given there are bugs
+  And everyone wants defect-free software
+  When the bugs are fixed
+  Then these tests should be green
+
+#  https://github.com/fastestforward/heroku_san/issues/113
+#  https://github.com/fastestforward/heroku_san/issues/117
+  Scenario: Deploying to an annotated tag fails with 'error: Trying to write non-commit object'
+    Given I have a new Rails project
+    When I am in the project directory
+    And I commit any changes with "Initial commit"
+    And I add heroku_san to the Gemfile
+    And I run bundle install
+    And I generate a new config file
+    And I create my project on Heroku
+    And I generate a scaffold
+    And I commit any changes with "Added droids"
+    And I tag the commit with "v1.0" annotated by "I am annotated"
+    And I deploy to tag "v1.0"
+    Then issue 113 has been fixed

data/features/remote.feature

@@ -5,7 +5,7 @@ Feature: heroku_san can control a project on Heroku
   this test; otherwise it will probably hang the first
   time it tries to do anything with Heroku itself.
 
-  Scenario: Installing on a project
+  Scenario: Installs a project
     Given I have a new Rails project
     When I am in the project directory
     And I add heroku_san to the Gemfile

data/features/step_definitions/remote_steps.rb

@@ -47,6 +47,10 @@ When /^I commit .* changes with "(.*)"$/ do |message|
   run_clean "git commit -m '#{message}'"
 end
 
+When /^I tag the commit with "([^"]*)" annotated by "([^"]*)"$/ do |tag, annotation|
+  run_clean "git tag -a '#{tag}' -m '#{annotation}' HEAD"
+end
+
 When /^I add heroku_san to the Gemfile$/ do
   append_to_file 'Gemfile', <<EOT.strip_heredoc
     group :development, :test do
@@ -57,9 +61,10 @@ end
 
 def run_clean(cmd)
   Bundler.with_clean_env do
-    ENV['NOEXEC'] = 'skip'
+    ENV['NOEXEC_DISABLE'] = '1'
     run_simple cmd
   end
+  stdout_from cmd
 end
 
 When /^I run bundle install$/ do
@@ -67,8 +72,7 @@ When /^I run bundle install$/ do
 end
 
 Then /^rake reports that the heroku: tasks are available$/ do
-  run_clean 'rake -T heroku:'
-  output = stdout_from 'rake -T heroku:'
+  output = run_clean 'rake -T heroku:'
   assert_partial_output 'rake heroku:apps', output
 end
 
@@ -80,8 +84,7 @@ When /^I generate a new config file$/ do
 end
 
 When /^I create a new config\/heroku\.yml file$/ do
-  run_clean 'rake heroku:create_config'
-  output = stdout_from 'rake heroku:create_config'
+  output = run_clean '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_simple_config_file
@@ -89,8 +92,7 @@ end
 
 When /^I create my project on Heroku$/ do
   cmd = 'rake test_app heroku:create'
-  run_clean unescape(cmd)
-  output = stdout_from cmd
+  output = run_clean unescape(cmd)
   assert_matching_output %q{test_app: Created ([\w-]+)}, output
   
   @app = output.match(/test_app: Created ([\w-]+)/)[1]
@@ -103,7 +105,7 @@ EOT
 end
 
 When /^I curl the app home page$/ do
-  Godot.match("#{@app}.herokuapp.com", 80, %r{<h1><strong>Heroku | Welcome to your new app!</strong></h1>}).should be, "Heroku didn't spin up a new app"
+  vladimir.match(%r{<h1><strong>Heroku | Welcome to your new app!</strong></h1>}).should be, "Heroku didn't spin up a new app"
 end
 
 When /^I configure my project$/ do
@@ -116,29 +118,25 @@ When /^I configure my project$/ do
 
 EOT
   cmd = 'rake test_app heroku:config'
-  run_clean cmd
-  output = stdout_from cmd
+  output = run_clean cmd
   assert_partial_output 'DROIDS: marvin', output
 end
 
 When /^I turn maintenance on$/ do
-  run_clean 'rake test_app heroku:maintenance_on'
-  output = stdout_from 'rake test_app heroku:maintenance_on'
+  output = run_clean 'rake test_app heroku:maintenance_on'
   assert_partial_output 'test_app: Maintenance mode enabled.', output
 
-  Godot.match("#{@app}.herokuapp.com", 80, %r{<title>Offline for Maintenance</title>}).should be, "App is not offline"
+  vladimir.match(%r{<title>Offline for Maintenance</title>}).should be, "App is not offline"
 end
 
 When /^I turn maintenance off$/ do
-  run_clean 'rake test_app heroku:maintenance_off'
-  output = stdout_from 'rake test_app heroku:maintenance_off'
+  output = run_clean '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_clean 'rake test_app heroku:restart'
-  output = stdout_from 'rake test_app heroku:restart'
+  output = run_clean 'rake test_app heroku:restart'
   assert_partial_output 'test_app: Restarted.', output
   assert_app_is_running
 end
@@ -162,12 +160,16 @@ When /^I deploy my project$/ do
   assert_partial_output "http://#{@app}.herokuapp.com deployed to Heroku", all_output
 end
 
+When /^I deploy to tag "([^"]*)"$/ do |tag|
+  run_clean "rake test_app deploy[#{tag}]"
+  assert_partial_output "http://#{@app}.herokuapp.com deployed to Heroku", all_output
+end
+
 When /^I list all apps on Heroku$/ do
   sha = in_current_dir do
     `git rev-parse HEAD`.chomp
   end
-  run_clean 'rake heroku:apps'
-  output = stdout_from 'rake heroku:apps'
+  output = run_clean '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
@@ -183,24 +185,29 @@ When /^I install an addon$/ do
 
 END_CONFIG
 
-  run_clean 'rake test_app heroku:addons'
-  output = stdout_from 'rake test_app heroku:addons'
+  output = run_clean 'rake test_app heroku:addons'
   # The output should show the new one ...
   assert_partial_output "deployhooks:campfire", output
   # ... with a note about needing to configure it.
   assert_partial_output "https://api.heroku.com/myapps/#{@app}/addons/deployhooks:campfire", output
 end
 
-Then /^heroku_san is green$/ do
+Then /^(?:heroku_san|issue \d+) (?:is green|has been fixed)$/ do
   run_clean "heroku apps:destroy #{@app} --confirm #{@app}"
 end
 
 def assert_app_is_running
-  vladimir = Godot.new("#{@app}.herokuapp.com", 80)
-  vladimir.timeout = 30
   vladimir.match(%r{<code>marvin</code>}, 'droids').should be, "http://#{@app}.herokuapp.com/droids are not the droids I'm looking for"
 end
 
+def vladimir
+  @vladimir ||= begin
+    Godot.new("#{@app}.herokuapp.com", 80).tap do |vladimir|
+      vladimir.timeout = 60
+    end
+  end
+end
+
 def overwrite_simple_config_file
   overwrite_file 'config/heroku.yml', <<EOT.strip_heredoc
     ---

data/features/support/env.rb

@@ -12,6 +12,6 @@ Before do
 end
   
 Before('@slow_process') do
-  @aruba_timeout_seconds = 180 
+  @aruba_timeout_seconds = 5 * 60
   # @aruba_io_wait_seconds = 15
 end

data/lib/git.rb

@@ -18,7 +18,7 @@ module Git
     commit ||= "HEAD"
     options ||= []
     begin
-      sh "git update-ref refs/heroku_san/deploy #{commit}"
+      sh "git update-ref refs/heroku_san/deploy #{commit}^{commit}"
       sh "git push #{repo} #{options.join(' ')} refs/heroku_san/deploy:refs/heads/master"
     ensure
       sh "git update-ref -d refs/heroku_san/deploy"

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.0.7"
+  VERSION = "4.0.8"
 end

data/lib/templates/heroku.example.yml

@@ -1,6 +1,6 @@
 #
 # Format:
-# 
+#
 # <stage name>:
 #   app: <Heroku app name>
 #   stack: <Heroku stack, optional>
@@ -9,7 +9,8 @@
 #   config:
 #     - <Heroku config:var name>: <Heroku config:var value>
 #
-production: 
+
+production:
   app: awesomeapp
   stack: bamboo-ree-1.8.7
   tag: production/*
@@ -28,6 +29,6 @@ staging:
     - logging:basic
     - scheduler:standard
 
-demo: 
+demo:
   app: awesomeapp-demo
   config: *default

data/spec/git_spec.rb

@@ -6,21 +6,21 @@ class GitTest; include Git; end
 describe GitTest do
   describe "#git_push" do    
     it "pushes to heroku" do
-      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy HEAD")
+      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy HEAD^{commit}")
       subject.should_receive(:sh).with("git push git@heroku.com:awesomeapp.git  refs/heroku_san/deploy:refs/heads/master")
       subject.should_receive(:sh).with("git update-ref -d refs/heroku_san/deploy")
       subject.git_push(nil, 'git@heroku.com:awesomeapp.git')
     end
     
     it "pushes a specific commit to heroku" do
-      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy kommit")
+      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy kommit^{commit}")
       subject.should_receive(:sh).with("git push git@heroku.com:awesomeapp.git  refs/heroku_san/deploy:refs/heads/master")
       subject.should_receive(:sh).with("git update-ref -d refs/heroku_san/deploy")
       subject.git_push('kommit', 'git@heroku.com:awesomeapp.git')
     end
     
     it "includes options, too" do
-      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy HEAD")
+      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy HEAD^{commit}")
       subject.should_receive(:sh).with("git push git@heroku.com:awesomeapp.git --force -v refs/heroku_san/deploy:refs/heads/master")
       subject.should_receive(:sh).with("git update-ref -d refs/heroku_san/deploy")
       subject.git_push(nil, 'git@heroku.com:awesomeapp.git', %w[--force -v])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -194,6 +194,7 @@ files:
 - examples/push_revision.rake
 - features/config.feature
 - features/extended-config.feature
+- features/issue_113.feature
 - features/remote.feature
 - features/step_definitions/remote_steps.rb
 - features/support/env.rb
@@ -212,7 +213,6 @@ files:
 - lib/railtie.rb
 - lib/tasks/heroku.rake
 - lib/templates/heroku.example.yml
-- spec/bugs/issue_105_spec.rb
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
@@ -222,6 +222,7 @@ files:
 - spec/heroku_san/deploy/rails_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
+- spec/issues/issue_105_spec.rb
 - spec/spec_helper.rb
 - spec/support/heroku.rb
 homepage: http://github.com/fastestforward/heroku_san
@@ -239,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3672813808786714588
+      hash: 3786976856768330652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,10 +257,10 @@ summary: ! 'A bunch of useful Rake tasks for managing your Heroku apps. NOTE: Th
 test_files:
 - features/config.feature
 - features/extended-config.feature
+- features/issue_113.feature
 - features/remote.feature
 - features/step_definitions/remote_steps.rb
 - features/support/env.rb
-- spec/bugs/issue_105_spec.rb
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
@@ -269,5 +270,6 @@ test_files:
 - spec/heroku_san/deploy/rails_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
+- spec/issues/issue_105_spec.rb
 - spec/spec_helper.rb
 - spec/support/heroku.rb