heroku_san 2.0.0 → 2.1.0

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Change log (curated)
+
+## v2.1.0
+
+  * Documentation update
+  * Push `REVISION` to Heroku example
+  * Bug fixes
+
+### New tasks
+
+  * rake logs:tail
+  * rake shell
+  * All HerokuSan tasks inside heroku: namespace, with aliases in the global namespace
+
+### New methods
+
+  * `Stage#deploy`
+  * `Stage#maintenance` can now take a block, and ensures that maintenance mode is off afterwards.
+  * `Stage#push_config`
+  
+## v2.0.0
+
+  * Major rewrite into classes `Project` & `Stage`, with helper `Git` module
+  * Tests for _everything_
+  * Examples directory (e.g. `auto-tagger`)
+  * Removed dependencies on Rails
+  * `tasks.rb` is greatly simplified, mostly API calls into the `Stage` class
+  * Support for tagging releases and deploying apps using a tag glob
+  * Support for Heroku stacks (aspen, bamboo & cedar)
+
+## v1.3.0
+
+N/A

data/README.rdoc

@@ -68,37 +68,47 @@ Need to add remotes for each app?
 
 A full list of tasks provided:
 
-  rake after_deploy              # Callback after deploys
-  rake all                       # Select all Heroku apps for later command
-  rake before_deploy             # Callback before deploys
-  rake capture                   # Captures a bundle on Heroku
-  rake console                   # Opens a remote console
-  rake db:pull                   # Pull the Heroku database
-  rake db:push                   # Push local database to Heroku database
-  rake deploy[commit]            # Pushes the given commit, migrates and restarts (default: HEAD)
-  rake deploy:force[commit]      # Force-pushes the given commit, migrates and restarts (default: HEAD)
-  rake heroku:apps               # Lists configured apps
-  rake heroku:apps:local         # Lists configured apps without hitting Heroku
-  rake heroku:config             # Add config:vars to each application
-  rake heroku:config:list        # Lists config variables as set on Heroku
-  rake heroku:config:list:local  # Lists local config variables without setting them
-  rake heroku:create             # Creates the Heroku app
-  rake heroku:create_config      # Creates an example configuration file
-  rake heroku:gems               # Generate the Heroku gems manifest from gem dependencies
-  rake heroku:maintenance        # Enable maintenance mode
-  rake heroku:maintenance_off    # Disable maintenance mode
-  rake heroku:push[commit]       # Pushes the given commit (default: HEAD)
-  rake heroku:push:force[commit] # Force-pushes the given commit (default: HEAD)
-  rake heroku:rack_env           # Add proper RACK_ENV to each application
-  rake heroku:rake[task]         # Runs a rake task remotely
-  rake heroku:remotes            # Add git remotes for all apps in this project
-  rake heroku:share              # Adds a collaborator
-  rake heroku:unshare            # Removes a collaborator
-  rake logs                      # Shows the Heroku logs
-  rake migrate                   # Migrates and restarts remote servers
-  rake restart                   # Restarts remote servers
-
-Frequently used tasks are not namespaced, everything else lives under heroku.
+  rake heroku:apps                  # Lists configured apps
+  rake heroku:apps:local            # Lists configured apps without hitting heroku
+  rake heroku:config                # Add config:vars to each application.
+  rake heroku:config:list           # Lists config variables as set on Heroku
+  rake heroku:config:list:local     # Lists local config variables without setting them
+  rake heroku:config:rack_env       # Add proper RACK_ENV to each application
+  rake heroku:console               # Opens a remote console
+  rake heroku:create                # Creates the Heroku app
+  rake heroku:create_config         # Creates an example configuration file
+  rake heroku:db:migrate            # Migrates and restarts remote servers
+  rake heroku:db:pull               # Pull database from stage to local dev database
+  rake heroku:deploy[commit]        # Pushes the given commit, migrates and restarts (default: HEAD)
+  rake heroku:deploy:after          # Callback after deploys
+  rake heroku:deploy:before         # Callback before deploys
+  rake heroku:deploy:force[commit]  # Force-pushes the given commit, migrates and restarts (default: HEAD)
+  rake heroku:logs                  # Shows the Heroku logs
+  rake heroku:logs:tail             # Tail the Heroku logs (requires logging:expanded)
+  rake heroku:maintenance           # Enable maintenance mode
+  rake heroku:maintenance_off       # Disable maintenance mode
+  rake heroku:maintenance_on        # Enable maintenance mode
+  rake heroku:push[commit]          # Pushes the given commit (default: HEAD)
+  rake heroku:push:force[commit]    # Force-pushes the given commit (default: HEAD)
+  rake heroku:rake[task]            # Runs a rake task remotely
+  rake heroku:remotes               # Add git remotes for all apps in this project
+  rake heroku:restart               # Restarts remote servers
+  rake heroku:share                 # Adds a collaborator (asks for email)
+  rake heroku:unshare               # Removes a collaborator (asks for email)
+  rake heroku:stage:all             # Select all Heroku apps for later command
+
+Frequently used tasks are aliased into the global namespace:
+
+  task :all           => 'heroku:stage:all'
+  task :deploy        => 'heroku:deploy'
+  task 'deploy:force' => 'heroku:deploy:force'
+  task :before_deploy => 'heroku:deploy:before'
+  task :after_deploy  => 'heroku:deploy:after'
+  task :console       => 'heroku:console'
+  task :restart       => 'heroku:restart'
+  task :migrate       => 'heroku:db:migrate'
+  task :logs          => 'heroku:logs:default'
+  task 'logs:tail'    => 'heroku:logs:tail'
 
 == Links
 

data/examples/push_revision.rake

@@ -0,0 +1,8 @@
+# Adding this to your :after_deploy task this will add an environment variable,
+# in this case, "REVISION", to your Heroku environment with the current revision.
+task :after_deploy do
+  each_heroku_app do |stage|
+    revision = stage.revision.split.first
+    stage.push_config('REVISION' => revision) if revision
+  end
+end

data/features/config.feature

@@ -18,6 +18,8 @@ Feature: Command Line
         app: awesomeapp-staging
       demo: 
         app: awesomeapp-demo
+      development:
+        app:
       """
 
     When I run `rake --trace heroku:apps:local`

data/lib/git.rb

@@ -23,17 +23,25 @@ module Git
     end
   end
   
-  def git_tag(glob)
-    return nil if glob.nil?
-    %x{git tag -l '#{glob}'}.split("\n").last
+  def git_parsed_tag(tag)
+    git_rev_parse(git_tag(tag))
   end
   
   def git_rev_parse(ref)
     return nil if ref.nil?
     %x{git rev-parse #{ref}}.split("\n").first
+  end  
+
+  def git_tag(glob)
+    return nil if glob.nil?
+    %x{git tag -l '#{glob}'}.split("\n").last
   end
   
-  def git_parsed_tag(tag)
-    git_rev_parse(git_tag(tag))
+  def git_revision(repo)
+    %x{git ls-remote --heads #{repo} master}.split.first
+  end
+  
+  def git_named_rev(ref)
+    %x{git name-rev #{ref}}.chomp
   end
 end

data/lib/heroku_san.rb

@@ -5,5 +5,6 @@ require 'heroku_san/project'
 
 module HerokuSan
   class NoApps < StandardError; end
+  class MissingApp < StandardError; end
   class Deprecated < StandardError; end
 end

data/lib/heroku_san/stage.rb

@@ -1,6 +1,7 @@
 module HerokuSan
   class Stage
     attr_reader :name
+    include Git
     
     def initialize(stage, options = {})
       @name = stage
@@ -8,7 +9,7 @@ module HerokuSan
     end
     
     def app
-      @options['app']
+      @options['app'] or raise MissingApp, "#{name}: is missing the app: configuration value. I don't know what to access on Heroku."
     end
     
     def repo
@@ -35,14 +36,28 @@ module HerokuSan
       end
     end
     
+    def deploy(sha = nil, force = false)
+      sha ||= git_parsed_tag(tag)
+      git_push(sha, repo, force ? %w[--force] : [])
+    end
+    
     def migrate
       run 'rake', 'db:migrate'
       sh_heroku "restart"
     end
 
-    def maintenance(action)
-      raise ArgumentError, "Action #{action.inspect} must be one of (:on, :off)", caller if ![:on, :off].include?(action)
-      sh_heroku "maintenance:#{action}"
+    def maintenance(action = nil)
+      if block_given?
+        sh_heroku "maintenance:on"
+        begin
+          yield
+        ensure
+          sh_heroku "maintenance:off"
+        end
+      else
+        raise ArgumentError, "Action #{action.inspect} must be one of (:on, :off)", caller if ![:on, :off].include?(action)
+        sh_heroku "maintenance:#{action}"
+      end
     end
     
     def create
@@ -60,18 +75,27 @@ module HerokuSan
     def long_config
       sh_heroku 'config --long'
     end
+    
+    def push_config(options = {})
+      vars = (options == {} ? config : options).map {|var,value| "#{var}=#{Shellwords.escape(value)}"}.join(' ')
+      sh_heroku "config:add #{vars}"
+    end
 
     def restart
       sh_heroku 'restart'
     end
   
-    def logs
-      sh_heroku 'logs'
+    def logs(tail = false)
+      sh_heroku 'logs' + (tail ? ' --tail' : '')
+    end
+    
+    def revision
+      git_named_rev(git_revision(repo))
     end
     
   private
   
-    def sh_heroku command
+    def sh_heroku(command)
       sh "heroku #{command} --app #{app}"
     end
   end

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/tasks.rb

@@ -5,17 +5,18 @@ include Git
 
 @heroku_san.all.each do |stage|
   desc "Select #{stage} Heroku app for later commands"
-  task stage do
+  task "heroku:stage:#{stage}" do
     @heroku_san << stage
   end
-end
-
-desc 'Select all Heroku apps for later command'
-task :all do
-  @heroku_san << @heroku_san.all
+  task stage => "heroku:stage:#{stage}"
 end
 
 namespace :heroku do
+  desc 'Select all Heroku apps for later command'
+  task 'stage:all' do
+    @heroku_san << @heroku_san.all
+  end
+  
   desc "Creates the Heroku app"
   task :create do
     each_heroku_app do |stage|
@@ -23,7 +24,7 @@ namespace :heroku do
     end
   end
 
-  desc "Generate the Heroku gems manifest from gem dependencies"
+  #desc "Generate the Heroku gems manifest from gem dependencies"
   task :gems => 'gems:base' do
     raise HerokuSan::Deprecated
   end
@@ -35,7 +36,7 @@ namespace :heroku do
     end
   end
 
-  desc 'Adds a collaborator'
+  desc 'Adds a collaborator (asks for email)'
   task :share do
     print "Email address of collaborator to add: "
     $stdout.flush
@@ -45,7 +46,7 @@ namespace :heroku do
     end
   end
 
-  desc 'Removes a collaborator'
+  desc 'Removes a collaborator (asks for email)'
   task :unshare do
     print "Email address of collaborator to remove: "
     $stdout.flush
@@ -58,15 +59,10 @@ namespace :heroku do
   desc 'Lists configured apps'
   task :apps => :all do
     each_heroku_app do |stage|
+      rev = stage.revision
       puts  "#{stage.name} is shorthand for the Heroku app #{stage.app} located at:"
       puts  "  #{stage.repo}"
-      print "  @ "
-      rev = `git ls-remote -h #{stage.repo}`.split(' ').first
-      if rev.blank?
-        puts 'not deployed'
-      else
-        puts `git name-rev #{rev}`
-      end
+      puts  "  @ #{rev.blank? ? 'not deployed' : rev}"
       puts
     end
   end
@@ -83,26 +79,10 @@ namespace :heroku do
     end
   end
 
-  desc 'Add proper RACK_ENV to each application'
-  task :rack_env => :all do
-    each_heroku_app do |stage|
-      command = "heroku config --app #{stage.app}"
-      puts command
-      config = Hash[`#{command}`.scan(/^(.+?)\s*=>\s*(.+)$/)]
-      if config['RACK_ENV'] != stage.name
-        sh "heroku config:add --app #{stage.app} RACK_ENV=#{stage.name}"
-      end
-    end
-  end
-
   desc 'Add config:vars to each application.'
   task :config do
     each_heroku_app do |stage|
-      command = "heroku config:add --app #{stage.app}"
-      stage.config.each do |var, value|
-        command += " #{var}=#{value}"
-      end
-      sh(command)
+      stage.push_config
     end
   end
 
@@ -122,6 +102,18 @@ namespace :heroku do
   end
 
   namespace :config do
+    desc 'Add proper RACK_ENV to each application'
+    task :rack_env => :all do
+      each_heroku_app do |stage|
+        command = "heroku config --app #{stage.app}"
+        puts command
+        config = Hash[`#{command}`.scan(/^(.+?)\s*=>\s*(.+)$/)]
+        if config['RACK_ENV'] != stage.name
+          stage.push_config RACK_ENV: stage.name
+        end
+      end
+    end
+
     desc "Lists config variables as set on Heroku"
     task :list do
       each_heroku_app do |stage|
@@ -152,7 +144,7 @@ namespace :heroku do
   desc "Pushes the given commit (default: HEAD)"
   task :push, :commit do |t, args|
     each_heroku_app do |stage|
-      git_push(args[:commit] || git_parsed_tag(stage.tag), stage.repo)
+      stage.deploy(args[:commit])
     end
   end
 
@@ -160,7 +152,7 @@ namespace :heroku do
     desc "Force-pushes the given commit (default: HEAD)"
     task :force, :commit do |t, args|
       each_heroku_app do |stage|
-        git_push(args[:commit] || git_parsed_tag(stage.tag), stage.repo, %w[--force])
+        stage.deploy(args[:commit], :force)
       end
     end
   end
@@ -185,89 +177,122 @@ namespace :heroku do
       stage.maintenance :off
     end
   end
-end
-
-desc "Pushes the given commit, migrates and restarts (default: HEAD)"
-task :deploy, [:commit] => [:before_deploy] do |t, args|
-  each_heroku_app do |stage|
-    git_push(args[:commit] || git_parsed_tag(stage.tag), stage.repo)
-    stage.migrate
-  end
-  Rake::Task[:after_deploy].execute
-end
 
-namespace :deploy do
-  desc "Force-pushes the given commit, migrates and restarts (default: HEAD)"
-  task :force, [:commit] => [:before_deploy] do |t, args|
+  desc "Pushes the given commit, migrates and restarts (default: HEAD)"
+  task :deploy, [:commit] => [:before_deploy] do |t, args|
     each_heroku_app do |stage|
-      git_push(args[:commit] || git_parsed_tag(stage.tag), stage.repo, %w[--force])
+      stage.deploy(args[:commit])
       stage.migrate
     end
     Rake::Task[:after_deploy].execute
   end
-end
 
-task :force_deploy do
-  raise Deprecated
-end
+  namespace :deploy do
+    desc "Force-pushes the given commit, migrates and restarts (default: HEAD)"
+    task :force, [:commit] => [:before_deploy] do |t, args|
+      each_heroku_app do |stage|
+        stage.deploy(args[:commit], :force)
+        stage.migrate
+      end
+      Rake::Task[:after_deploy].execute
+    end
 
-desc "Callback before deploys"
-task :before_deploy do
-end
+    desc "Callback before deploys"
+    task :before do
+    end
 
-desc "Callback after deploys"
-task :after_deploy do
-end
+    desc "Callback after deploys"
+    task :after do
+  end
 
-desc "Captures a bundle on Heroku"
-task :capture do
-  raise Deprecated
-end
+  end
 
-desc "Opens a remote console"
-task :console do
-  each_heroku_app do |stage|
-    stage.run 'console'
+  task :force_deploy do
+    raise HerokuSan::Deprecated
   end
-end
 
-desc "Restarts remote servers"
-task :restart do
-  each_heroku_app do |stage|
-    stage.restart
+  #desc "Captures a bundle on Heroku"
+  task :capture do
+    raise HerokuSan::Deprecated
   end
-end
 
-desc "Migrates and restarts remote servers"
-task :migrate do
-  each_heroku_app do |stage|
-    stage.migrate
+  desc "Opens a remote console"
+  task :console do
+    each_heroku_app do |stage|
+      stage.run 'console'
+    end
   end
-end
 
-desc "Shows the Heroku logs"
-task :logs do
-  each_heroku_app do |stage|
-    stage.logs
+  desc "Restarts remote servers"
+  task :restart do
+    each_heroku_app do |stage|
+      stage.restart
+    end
   end
-end
 
-namespace :db do
-  task :pull do
+  namespace :logs do
+    task :default do
+      each_heroku_app do |stage|
+        stage.logs
+      end
+    end
+
+    desc "Tail the Heroku logs (requires logging:expanded)"
+    task :tail do
+      each_heroku_app do |stage|
+        stage.logs(:tail)
+      end
+    end
+  end
+
+  desc "Shows the Heroku logs"
+  task :logs => 'logs:default'
+
+  namespace :db do
+    desc "Migrates and restarts remote servers"
+    task :migrate do
+      each_heroku_app do |stage|
+        stage.migrate
+      end
+    end
+
+    desc "Pull database from stage to local dev database"
+    task :pull do
+      each_heroku_app do |stage|
+        sh "heroku pgdumps:capture --app #{stage.app}"
+        dump = `heroku pgdumps --app #{stage.app}`.split("\n").last.split(" ").first
+        sh "mkdir -p #{Rails.root}/db/dumps"
+        file = "#{Rails.root}/db/dumps/#{dump}.sql.gz"
+        url = `heroku pgdumps:url --app #{stage.app} #{dump}`.chomp
+        sh "wget", url, "-O", file
+        sh "rake db:drop db:create"
+        sh "gunzip -c #{file} | #{Rails.root}/script/dbconsole"
+        sh "rake jobs:clear"
+      end
+    end
+  end
+  
+  desc "Run a bash shell on Heroku"
+  task :shell do
     each_heroku_app do |stage|
-      sh "heroku pgdumps:capture --app #{stage.app}"
-      dump = `heroku pgdumps --app #{stage.app}`.split("\n").last.split(" ").first
-      sh "mkdir -p #{Rails.root}/db/dumps"
-      file = "#{Rails.root}/db/dumps/#{dump}.sql.gz"
-      url = `heroku pgdumps:url --app #{stage.app} #{dump}`.chomp
-      sh "wget", url, "-O", file
-      sh "rake db:drop db:create"
-      sh "gunzip -c #{file} | #{Rails.root}/script/dbconsole"
-      sh "rake jobs:clear"
+      stage.run 'bash'
     end
   end
 end
 
+task :all => 'heroku:stage:all'
+task :deploy => 'heroku:deploy'
+task 'deploy:force' => 'heroku:deploy:force'
+task :before_deploy => 'heroku:deploy:before'
+task :after_deploy => 'heroku:deploy:after'
+task :console => 'heroku:console'
+task :restart => 'heroku:restart'
+task :migrate => 'heroku:db:migrate'
+task :logs => 'heroku:logs:default'
+task 'logs:tail' => 'heroku:logs:tail'
+task 'heroku:rack_env' => 'heroku:config:rack_env'
+task :shell => 'heroku:shell'
+
 def each_heroku_app(&block)
   @heroku_san.each_app(&block)
   puts

data/spec/git_spec.rb

@@ -52,4 +52,23 @@ describe GitTest do
       subject.git_rev_parse(nil).should == nil
     end
   end
+
+  describe "#git_revision" do
+    it "returns the current revision of the repository (on Heroku)" do
+      subject.should_receive("`").with("git ls-remote --heads staging master") { "sha\n" }
+      subject.git_revision('staging').should == 'sha'
+    end
+    
+    it "returns nil if there is no revision (i.e. not deployed yet)" do
+      subject.should_receive("`").with("git ls-remote --heads staging master") { "\n" }
+      subject.git_revision('staging').should == nil
+    end
+  end
+  
+  describe "#git_named_rev" do
+    it "returns symbolic names for given rev" do
+      subject.should_receive("`").with("git name-rev sha") {"sha production/123456\n"}
+      subject.git_named_rev('sha').should == 'sha production/123456'
+    end
+  end
 end

data/spec/heroku_san/stage_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe HerokuSan::Stage do
+  include Git
   subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7"})}
 
   context "initializes" do
@@ -19,6 +20,16 @@ describe HerokuSan::Stage do
     its(:repo)   { should == 'git@heroku.com:awesomeapp-demo.git' }
   end
   
+  describe "#app" do
+    its(:app) { should == 'awesomeapp'}
+    context "blank app" do
+      subject { HerokuSan::Stage.new('production') }
+      it "should raise an error" do
+        expect { subject.app }.to raise_error(HerokuSan::MissingApp, /production: is missing the app: configuration value\./)
+      end
+    end
+  end
+  
   context "celadon cedar stack has a different API" do
     describe "#stack" do
       it "returns the name of the stack from Heroku" do
@@ -54,6 +65,28 @@ EOT
     end
   end
 
+  describe "#deploy" do
+    it "deploys to heroku" do
+      subject.should_receive(:git_push).with(git_parsed_tag(subject.tag), subject.repo, [])
+      subject.deploy
+    end
+    
+    it "deploys with a custom sha" do
+      subject.should_receive(:git_push).with('deadbeef', subject.repo, [])
+      subject.deploy('deadbeef')
+    end
+    
+    it "deploys with --force" do
+      subject.should_receive(:git_push).with(git_parsed_tag(subject.tag), subject.repo, %w[--force])
+      subject.deploy(nil, :force)
+    end
+    
+    it "deploys with a custom sha & --force" do
+      subject.should_receive(:git_push).with('deadbeef', subject.repo, %w[--force])
+      subject.deploy('deadbeef', :force)
+    end
+  end
+
   describe "#migrate" do
     it "runs rake db:migrate" do
       subject.should_receive(:sh).with("heroku run:rake db:migrate --app awesomeapp")
@@ -62,7 +95,7 @@ EOT
     end
   end
   
-  describe "#maintenance" do      
+  describe "#maintenance" do
     it ":on" do
       subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
       subject.maintenance :on
@@ -78,6 +111,27 @@ EOT
         subject.maintenance :busy
       end.to raise_error ArgumentError, "Action #{:busy.inspect} must be one of (:on, :off)"      
     end
+    
+    context "with a block" do
+      it "wraps it in a maitenance mode" do
+        subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
+        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now)
+        subject.should_receive(:sh).with("heroku maintenance:off --app awesomeapp")
+        subject.maintenance do
+          reactor.scram(:now)
+        end
+      end
+      it "ensures that maintenance mode is turned off" do
+        subject.should_receive(:sh).with("heroku maintenance:on --app awesomeapp")
+        reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).and_raise(RuntimeError)
+        subject.should_receive(:sh).with("heroku maintenance:off --app awesomeapp")
+        expect {
+          subject.maintenance do
+            reactor.scram(:now)
+          end        
+        }.to raise_error
+      end
+    end
   end
 
   describe "#create" do
@@ -133,6 +187,39 @@ EOT
       subject.should_receive(:sh).with("heroku logs --app awesomeapp")
       subject.logs
     end
+    it "tails log files" do
+      subject.should_receive(:sh).with("heroku logs --tail --app awesomeapp")
+      subject.logs(:tail)
+    end
   end
 
+  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.should_receive(:sh).with("heroku config:add FOO=bar DOG=emu --app awesomeapp")
+      subject.push_config
+    end
+    it "properly escapes variables" do
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {FOO: ' bar\emu bat zebra '}})
+      subject.should_receive(:sh).with("heroku config:add FOO=#{Shellwords.escape(' bar\emu bat zebra ')} --app awesomeapp")
+      subject.push_config
+    end
+    it "pushes the options hash" do
+      subject.should_receive(:sh).with("heroku config:add RACK_ENV=magic --app awesomeapp")
+      subject.push_config(RACK_ENV: 'magic')
+    end
+  end
+
+  describe "#revision" do
+    it "returns the named remote revision for the stage" do
+      subject.should_receive(:git_revision).with(subject.repo) {"sha"}
+      subject.should_receive(:git_named_rev).with('sha') {"sha production/123456"}
+      subject.revision.should == 'sha production/123456'
+    end
+    it "returns nil if the stage has never been deployed" do
+      subject.should_receive(:git_revision).with(subject.repo) {nil}
+      subject.should_receive(:git_named_rev).with(nil) {''}
+      subject.revision.should == ''
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151831540 !ruby/object:Gem::Requirement
+  requirement: &2153413220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2151831540
+  version_requirements: *2153413220
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2151830840 !ruby/object:Gem::Requirement
+  requirement: &2153412680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2151830840
+  version_requirements: *2153412680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151830320 !ruby/object:Gem::Requirement
+  requirement: &2153412280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151830320
+  version_requirements: *2153412280
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2151829520 !ruby/object:Gem::Requirement
+  requirement: &2153411640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151829520
+  version_requirements: *2153411640
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2151829020 !ruby/object:Gem::Requirement
+  requirement: &2153411060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151829020
+  version_requirements: *2153411060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151828020 !ruby/object:Gem::Requirement
+  requirement: &2153410400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151828020
+  version_requirements: *2153410400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151826960 !ruby/object:Gem::Requirement
+  requirement: &2153409500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +90,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2151826960
+  version_requirements: *2153409500
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
@@ -101,6 +101,7 @@ files:
 - .gitignore
 - .gitmodules
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -108,6 +109,7 @@ files:
 - autotest/discover.rb
 - cucumber.yml
 - examples/auto_tagger.rake
+- examples/push_revision.rake
 - features/config.feature
 - features/extended-config.feature
 - features/remote.feature