crossroads_capistrano 1.2.4 → 1.2.5

data/crossroads_capistrano.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crossroads_capistrano"
-  s.version     = "1.2.4"
+  s.version     = "1.2.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/revisions.rb

@@ -6,14 +6,20 @@ task :revisions, :roles => :app do
   puts "===== [ \033[1;36m#{application.capitalize} - #{stage.capitalize}\033[0m ]"
   puts "=== Deployed Revision: \033[1;32m#{current}\033[0m"
   puts "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
+
+  # If deployed and master are the same, show the difference between the last 2 deployments.
+  base_label, new_label, base_rev, new_rev = latest != current ? \
+                                             ["deployed", "master", current, latest] : \
+                                             ["previous", "deployed", previous, current]
+
   # Show difference between master and deployed revisions.
-  if (diff = `git log #{current}..#{latest} --oneline`) != ""
+  if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
     # Colorize refs
     diff.gsub!(/^([a-f0-9]+) /, "\033[1;32m\\1\033[0m - ")
     diff = "    " << diff.gsub("\n", "\n    ") << "\n"
     # Indent commit messages nicely, max 80 chars per line, line has to end with space.
     diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*14).gsub(/([^ ]*)\n {14}/m,"\n"<<" "*14<<"\\1")}.join("\n")
-    puts "=== Difference between master revision and deployed revision:\n\n"
+    puts "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
     puts diff
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Steve Kenworthy