alpha_omega 1.3.43 → 1.3.44

data/VERSION

@@ -1 +1 @@
-1.3.43
+1.3.44

data/lib/alpha_omega/config/deploy_notify.rb

@@ -5,14 +5,14 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
     namespace :notify do
       task :default do
         if $deploy["notify"]
-          email if $deploy["notify"].member? "email"
-
           unless skip_notifications
             airbrake if $deploy["notify"].member? "airbrake"
             newrelic if $deploy["notify"].member? "newrelic"
             campfire if $deploy["notify"].member? "campfire"
             flowdock if $deploy["notify"].member? "flowdock"
           end
+
+          email if $deploy["notify"].member? "email"
         end
       end
 
@@ -86,11 +86,15 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         %x(git show-ref | grep '^#{rev} refs/tags/' | cut -d/ -f3).chomp
       end
 
+      def public_git_url url
+        url.sub("git@github.com:","https://github.com/").sub(/\.git$/,'')
+      end
+
       def notify_message
         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}"
+          summary = "#{public_git_url repository}/compare/#{map_sha_tag cmp_previous_revision}...#{map_sha_tag cmp_current_revision}"
         else
-          summary = "#{repository.sub("git@github.com:","https://github.com/")}/commit/#{cmp_active_revision}"
+          summary = "#{public_git_url repository)}/commit/#{cmp_current_revision}"
         end
 
         "#{ENV['_AO_DEPLOYER']} deployed #{application} to #{ENV['_AO_ARGS']} (#{dna['app_env']}): #{ENV['FLAGS_tag']}" +

data/lib/alpha_omega/deploy.rb

@@ -164,11 +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(:cmp_previous_revision) { capture("cat #{previous_path}/REVISION 2>&- || true").strip }
   _cset(:current_revision)      { capture("cat #{current_release}/REVISION 2>&- || true").strip }
+  _cset(:cmp_current_revision)  { capture("cat #{current_path}/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: 77
+  hash: 67
   prerelease: 
   segments: 
   - 1
   - 3
-  - 43
-  version: 1.3.43
+  - 44
+  version: 1.3.44
 platform: ruby
 authors: 
 - David Nghiem