alpha_omega 1.3.42 → 1.3.43

data/VERSION

@@ -1 +1 @@
-1.3.42
+1.3.43

data/lib/alpha_omega/config/deploy_notify.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 Capistrano::Configuration.instance(:must_exist).load do |config|
   namespace :deploy do
     namespace :notify do
@@ -14,10 +16,6 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         end
       end
 
-      task :email do
-        run_locally "echo '#{notify_message}' | mail -s '#{notify_message_abbr}' #{$deploy["notify"]["email"]["recipients"].join(" ")}"
-      end
-
       task :campfire do
         require 'capistrano/campfire'
 
@@ -76,12 +74,32 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         require 'new_relic/recipes'
       end
 
+      task :email do
+        tmp_notify = Tempfile.new('email')
+        tmp_notify.write notify_message
+        tmp_notify.close
+        run_locally "cat '#{tmp_notify.path}' | mail -s '#{notify_message_abbr}' #{$deploy["notify"]["email"]["recipients"].join(" ")}"
+        tmp_notify.unlink
+      end
+
+      def map_sha_tag rev
+        %x(git show-ref | grep '^#{rev} refs/tags/' | cut -d/ -f3).chomp
+      end
+
       def notify_message
-        "#{ENV['_AO_USER']} deployed #{application} to #{dna['app_env']}: #{repository}: #{ENV['FLAGS_tag']} => #{current_revision}"
+        if dna["app_env"] == "production"
+          summary = "#{repository.sub("git@github.com:","https://github.com/")}/compare/#{map_sha_tag cmp_previous_revision}...#{map_sha_tag cmp_active_revision}"
+        else
+          summary = "#{repository.sub("git@github.com:","https://github.com/")}/commit/#{cmp_active_revision}"
+        end
+
+        "#{ENV['_AO_DEPLOYER']} deployed #{application} to #{ENV['_AO_ARGS']} (#{dna['app_env']}): #{ENV['FLAGS_tag']}" +
+        "\n\nSummary:\n\n" + summary + 
+        "\n\nLog:\n\n" + full_log
       end 
 
       def notify_message_abbr
-        "#{ENV['_AO_USER']} deployed #{application} to #{dna['app_env']}: #{ENV['FLAGS_tag']}"
+        "#{ENV['_AO_DEPLOYER']} deployed #{application} to #{ENV['_AO_ARGS']} (#{dna['app_env']}): #{ENV['FLAGS_tag']}"
       end 
     end
   end

data/lib/alpha_omega/deploy.rb

@@ -164,9 +164,11 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
   _cset(:rollback_revision)     { capture("cat #{rollback_release}/REVISION 2>&- || true").strip }
   _cset(:previous_revision)     { capture("cat #{previous_release}/REVISION 2>&- || true").strip }
+  _cset(:cmp_previous_revision) { capture("cat #{previous_release}/REVISION 2>&- || true").strip }
   _cset(:current_revision)      { capture("cat #{current_release}/REVISION 2>&- || true").strip }
   _cset(:next_revision)         { capture("cat #{next_release}/REVISION 2>&- || true").strip }
   _cset(:active_revision)       { capture("cat #{active_release}/REVISION 2>&- || true").strip }
+  _cset(:cmp_active_revision)   { capture("cat #{active_release}/REVISION 2>&- || true").strip }
   _cset(:compare_revision)      { capture("cat #{compare_release}/REVISION 2>&- || true").strip }
   _cset(:migrate_revision)      { capture("cat #{migrate_release}/REVISION 2>&- || true").strip }
   _cset(:deploy_revision)       { capture("cat #{deploy_release}/REVISION 2>&- || true").strip }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 1
   - 3
-  - 42
-  version: 1.3.42
+  - 43
+  version: 1.3.43
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-08-31 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -102,95 +103,96 @@ files:
 - LICENSE
 - VERSION
 - README.mkd
-- libexec/_ao
-- libexec/_bump
-- libexec/_jason
-- libexec/_log4sh
+- libexec/aoh-lock
+- libexec/build
+- libexec/publish-gem
+- libexec/_treadstone
 - libexec/_meat
+- libexec/aoh-restart
+- libexec/aoh-dist
 - libexec/_prime
-- libexec/_shflags
-- libexec/_shunit
+- libexec/local-helper
+- libexec/aoh-migrate
+- libexec/aoh-dna
+- libexec/aoh-stage
+- libexec/bump
+- libexec/_log4sh
+- libexec/_jason
+- libexec/build-gem
+- libexec/edit-gem
+- libexec/aoh-compare
+- libexec/aoh-rollback
+- libexec/aoh-unlock
+- libexec/aoh-remote
+- libexec/aoh-deploy
+- libexec/aoh-debug
+- libexec/aoh-proxy
 - libexec/_sub
-- libexec/_treadstone
-- libexec/_versions
-- libexec/aoh
 - libexec/aoh-activate
+- libexec/aohelper
+- libexec/_shunit
+- libexec/aoh
+- libexec/aoh-task
+- libexec/_shflags
+- libexec/_versions
+- libexec/_bump
+- libexec/stub-prepare
+- libexec/aoh-init
 - libexec/aoh-check
-- libexec/aoh-compare
-- libexec/aoh-debug
-- libexec/aoh-deploy
-- libexec/aoh-dist
-- libexec/aoh-dna
+- libexec/_ao
 - libexec/aoh-hosts
-- libexec/aoh-init
-- libexec/aoh-lock
-- libexec/aoh-migrate
-- libexec/aoh-proxy
-- libexec/aoh-release
-- libexec/aoh-remote
-- libexec/aoh-restart
-- libexec/aoh-rollback
 - libexec/aoh-shell
-- libexec/aoh-stage
-- libexec/aoh-task
-- libexec/aoh-unlock
-- libexec/aohelper
-- libexec/build
-- libexec/build-gem
-- libexec/bump
-- libexec/edit-gem
-- libexec/local-helper
+- libexec/aoh-release
 - libexec/publish
-- libexec/publish-gem
-- libexec/stub-prepare
-- lib/alpha_omega/config/deploy.rb
-- lib/alpha_omega/config/deploy_challenge.rb
-- lib/alpha_omega/config/deploy_localhost.rb
-- lib/alpha_omega/config/deploy_log.rb
-- lib/alpha_omega/config/deploy_notify.rb
-- lib/alpha_omega/config/deploy_perf.rb
-- lib/alpha_omega/config/deploy_ssh.rb
-- lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/local_dependency.rb
-- lib/alpha_omega/deploy/remote_dependency.rb
-- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/deploy/strategy.rb
 - lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
+- lib/alpha_omega/deploy/dependencies.rb
 - lib/alpha_omega/deploy/scm.rb
-- lib/alpha_omega/deploy/strategy/base.rb
+- lib/alpha_omega/deploy/local_dependency.rb
 - lib/alpha_omega/deploy/strategy/checkout.rb
 - lib/alpha_omega/deploy/strategy/remote.rb
-- lib/alpha_omega/deploy/strategy.rb
+- lib/alpha_omega/deploy/strategy/base.rb
 - lib/alpha_omega/deploy/templates/maintenance.rhtml
-- lib/alpha_omega/deploy.rb
-- lib/alpha_omega/utils.rb
 - lib/alpha_omega/version.rb
+- lib/alpha_omega/config/deploy.rb
+- lib/alpha_omega/config/deploy_localhost.rb
+- lib/alpha_omega/config/deploy_notify.rb
+- lib/alpha_omega/config/deploy_log.rb
+- lib/alpha_omega/config/deploy_challenge.rb
+- lib/alpha_omega/config/deploy_perf.rb
+- lib/alpha_omega/config/deploy_ssh.rb
+- lib/alpha_omega/utils.rb
 - lib/development.rb
 - sbin/activate
-- sbin/aoh
-- sbin/aoh-stub
-- sbin/bump
+- sbin/stage
 - sbin/check
-- sbin/compare
-- sbin/debug
+- sbin/stub
 - sbin/deploy
 - sbin/dist
-- sbin/dna
-- sbin/hosts
+- sbin/restart
 - sbin/local-helper
-- sbin/lock
+- sbin/bump
+- sbin/hosts
 - sbin/migrate
-- sbin/proxy
-- sbin/release
-- sbin/remote
 - sbin/remote-helper
-- sbin/restart
 - sbin/rollback
-- sbin/shell
-- sbin/stage
-- sbin/stub
 - sbin/task
+- sbin/release
+- sbin/proxy
+- sbin/compare
+- sbin/aoh
+- sbin/shell
+- sbin/lock
 - sbin/unlock
+- sbin/dna
+- sbin/aoh-stub
+- sbin/remote
+- sbin/debug
 - bin/ao
+has_rdoc: true
 homepage: https://github.com/destructuring/alpha_omega
 licenses: []
 
@@ -220,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes