heroku_san 1.0.2 → 1.0.3

data/README.rdoc

@@ -67,7 +67,8 @@ A full list of tasks provided:
 
   rake all                   # Select all Heroku apps for later command
   rake console               # Opens a remote console
-  rake deploy                # Deploys, migrates and restarts latest code.
+  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 after_deploy          # Callback after deploys
   rake before_deploy         # Callback before deploys
   rake capture               # Captures a bundle on Heroku
@@ -75,8 +76,11 @@ A full list of tasks provided:
   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:push           # Pushes the given commit (default: HEAD)
+  rake heroku:push:force     # Force-pushes the given commit (default: HEAD)
   rake heroku:remotes        # Add git remotes for all apps in this project
   rake heroku:rack_env       # Add proper RACK_ENV to each application
+  rake heroku:rake[task]     # Runs a rake task remotely
   rake heroku:share          # Adds a collaborator
   rake heroku:unshare        # Removes a collaborator
   rake migrate               # Migrates and restarts remote servers

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/heroku_san/tasks.rb

@@ -24,7 +24,7 @@ namespace :heroku do
   desc "Creates the Heroku app"
   task :create do
     each_heroku_app do |name, app, repo|
-      system_with_echo "heroku create #{app}"
+      sh "heroku create #{app}"
     end
   end
 
@@ -58,17 +58,17 @@ namespace :heroku do
     $stdout.flush
     email = $stdin.gets
     each_heroku_app do |name, app, repo|
-      system_with_echo "heroku sharing:add --app #{app} #{email}"
+      sh "heroku sharing:add --app #{app} #{email}"
     end
   end
 
-  desc 'Adds a collaborator'
+  desc 'Removes a collaborator'
   task :unshare do
     print "Email address of collaborator to remove: "
     $stdout.flush
     email = $stdin.gets
     each_heroku_app do |name, app, repo|
-      system_with_echo "heroku sharing:remove --app #{app} #{email}"
+      sh "heroku sharing:remove --app #{app} #{email}"
     end
   end
 
@@ -88,7 +88,7 @@ namespace :heroku do
       puts command
       config = Hash[`#{command}`.scan(/^(.+?)\s*=>\s*(.+)$/)]
       if config['RACK_ENV'] != name
-        system_with_echo "heroku config:add --app #{app} RACK_ENV=#{name}"
+        sh "heroku config:add --app #{app} RACK_ENV=#{name}"
       end
     end
   end
@@ -101,26 +101,58 @@ namespace :heroku do
     else
       puts "Copied example config to config/heroku.yml"
       FileUtils.cp(example, HEROKU_CONFIG_FILE)
-      system_with_echo("#{ENV['EDITOR']} #{HEROKU_CONFIG_FILE}")
+      sh("#{ENV['EDITOR']} #{HEROKU_CONFIG_FILE}")
     end
   end
-end
 
-desc "Deploys, migrates and restarts latest code"
-task :deploy => :before_deploy do
-  each_heroku_app do |name, app, repo|
-    branch = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
-    if branch.present?
+  desc 'Runs a rake task remotely'
+  task :rake, :task do |t, args|
+    each_heroku_app do |name, app, repo|
+      sh "heroku rake --app #{app} #{args[:task]}"
+    end
+  end
+
+  desc "Pushes the given commit (default: HEAD)"
+  task :push, :commit do |t, args|
+    each_heroku_app do |name, app, repo|
+      push(args[:commit], repo)
+    end
+  end
+
+  namespace :push do
+    desc "Force-pushes the given commit (default: HEAD)"
+    task :force, :commit do |t, args|
       @git_push_arguments ||= []
-      system_with_echo "git push #{repo} #{@git_push_arguments.join(' ')} #{branch}:master && heroku rake --app #{app} db:migrate && heroku restart --app #{app}"
-    else
-      puts "Unable to determine the current git branch, please checkout the branch you'd like to deploy"
-      exit(1)
+      @git_push_arguments << '--force'
+      Rake::Task[:'heroku:push'].execute(args)
     end
   end
+
+end
+
+desc "Pushes the given commit, migrates and restarts (default: HEAD)"
+task :deploy, :commit, :needs => :before_deploy do |t, args|
+  each_heroku_app do |name, app, repo|
+    push(args[:commit], repo)
+    migrate(app)
+  end
   Rake::Task[:after_deploy].execute
 end
 
+namespace :deploy do
+  desc "Force-pushes the given commit, migrates and restarts (default: HEAD)"
+  task :force, :commit do |t, args|
+    @git_push_arguments ||= []
+    @git_push_arguments << '--force'
+    Rake::Task[:deploy].execute(args)
+  end
+end
+
+# Deprecated.
+task :force_deploy do
+  Rake::Task[:'deploy:force'].invoke
+end
+
 desc "Callback before deploys"
 task :before_deploy do
 end
@@ -129,62 +161,50 @@ desc "Callback after deploys"
 task :after_deploy do
 end
 
-desc "Force deploys, migrates and restarts latest code"
-task :force_deploy do
-  @git_push_arguments ||= []
-  @git_push_arguments << '--force'
-  Rake::Task[:deploy].execute
-end
-
 desc "Captures a bundle on Heroku"
 task :capture do
   each_heroku_app do |name, app, repo|
-    system_with_echo "heroku bundles:capture --app #{app}"
+    sh "heroku bundles:capture --app #{app}"
   end
 end
 
 desc "Opens a remote console"
 task :console do
   each_heroku_app do |name, app, repo|
-    system_with_echo "heroku console --app #{app}"
+    sh "heroku console --app #{app}"
   end
 end
 
 desc "Restarts remote servers"
 task :restart do
   each_heroku_app do |name, app, repo|
-    system_with_echo "heroku restart --app #{app}"
+    sh "heroku restart --app #{app}"
   end
 end
 
 desc "Migrates and restarts remote servers"
 task :migrate do
   each_heroku_app do |name, app, repo|
-    system_with_echo "heroku rake --app #{app} db:migrate && heroku restart --app #{app}"
+    migrate(app)
   end
 end
 
 namespace :db do
   task :pull do
     each_heroku_app do |name, app, repo|
-      system_with_echo "heroku pgdumps:capture --app #{app}"
+      sh "heroku pgdumps:capture --app #{app}"
       dump = `heroku pgdumps --app #{app}`.split("\n").last.split(" ").first
-      system_with_echo "mkdir -p #{Rails.root}/db/dumps"
+      sh "mkdir -p #{Rails.root}/db/dumps"
       file = "#{Rails.root}/db/dumps/#{dump}.sql.gz"
       url = `heroku pgdumps:url --app #{app} #{dump}`.chomp
-      system_with_echo "wget", url, "-O", file
-      system_with_echo "rake db:drop db:create"
-      system_with_echo "gunzip -c #{file} | #{Rails.root}/script/dbconsole"
-      system_with_echo "rake jobs:clear"
+      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
 
-def system_with_echo(*args)
-  puts args.join(' ')
-  system(*args)
-end
-
 def each_heroku_app
   if @heroku_apps.blank? && HEROKU_SETTINGS['apps'].size == 1
     app = HEROKU_SETTINGS['apps'].keys.first
@@ -209,3 +229,19 @@ def each_heroku_app
     exit(1)
   end
 end
+
+def push(commit, repo)
+  commit ||= "HEAD"
+  @git_push_arguments ||= []
+  begin
+    sh "git update-ref refs/heroku_san/deploy #{commit}"
+    sh "git push #{repo} #{@git_push_arguments.join(' ')} refs/heroku_san/deploy:refs/heads/master"
+  ensure
+    sh "git update-ref -d refs/heroku_san/deploy"
+  end
+end
+
+def migrate(app)
+  sh "heroku rake --app #{app} db:migrate"
+  sh "heroku restart --app #{app}"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_san
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Elijah Miller
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -04:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency