crossroads_capistrano 1.4.14 → 1.4.15

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.4.14"
+  s.version     = "1.4.15"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/recipes/revisions.rb

@@ -1,11 +1,12 @@
 namespace :deploy do
   desc "Show currently deployed revision on server."
   task :revisions, :roles => :app do
+    stage_str = exists?(:stage) ? ' ' << stage.to_s : ''
     current, previous, latest = current_revision.to_s[0,7], previous_revision.to_s[0,7], real_revision.to_s[0,7]
     # Following line 'right-aligns' the branch string.
     branch_indent = " "*(i=10-branch.size;i<0 ? 0 : i) << branch.capitalize
     current_is_deployed = current == latest
-    puts "\n  * \033[0;32m== Showing revisions and diffs for [\033[1;32m#{application}#{exists?(:stage) ? ' ' << stage.to_s : ''}\033[0;32m]\033[0m\n\n"
+    puts "\n  * \033[0;32m== Showing revisions and diffs for [\033[1;32m#{application}#{stage_str}\033[0;32m]\033[0m\n\n"
     puts "         \033[1;33m#{branch_indent} Branch: \033[1;37m#{latest}\033[0m"
     puts "         \033[#{current == latest ? 1 : 0};33mDeployed Revision: \033[#{current == latest ? 1 : 0};37m#{current}\033[0m"
     puts "         \033[#{previous == latest ? 1 : 0};33mPrevious Revision: \033[#{previous == latest ? 1 : 0};37m#{previous}\033[0m\n\n"
@@ -16,14 +17,19 @@ namespace :deploy do
                                                ["previous revision", "deployed revision", previous, current]
 
     # Show difference between master and deployed revisions.
-    if (diff = `git log #{base_rev}..#{new_rev} --oneline`) != ""
-      # Colorize refs
-      diff.gsub!(/^([a-f0-9]+) /, "\033[1;37m\\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"<<" "*19).gsub(/([^ ]*)\n {19}/m,"\n"<<" "*19<<"\\1")}.join("\n")
-      puts "  * \033[0;32m== Difference between \033[1;32m#{base_label}\033[0;32m and \033[1;32m#{new_label}\033[0;32m:\033[0m\n\n"
-      puts diff
+    if (diff = `git log #{base_rev}..#{new_rev} --oneline 2>&1`) != ""
+      if diff.include?("unknown revision or path not in the working tree")
+        puts "  * You have deployed code that is not in your local repo.\n" +
+             "    Please run 'git pull', then 'cap#{stage_str} deploy:revisions'"
+      else
+        # Colorize refs
+        diff.gsub!(/^([a-f0-9]+) /, "\033[1;37m\\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"<<" "*19).gsub(/([^ ]*)\n {19}/m,"\n"<<" "*19<<"\\1")}.join("\n")
+        puts "  * \033[0;32m== Difference between \033[1;32m#{base_label}\033[0;32m and \033[1;32m#{new_label}\033[0;32m:\033[0m\n\n"
+        puts diff
+      end
     end
   end
 end

metadata

@@ -1,36 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 14
-  version: 1.4.14
+version: !ruby/object:Gem::Version
+  version: 1.4.15
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-27 00:00:00 +08:00
+date: 2011-05-28 00:00:00.000000000 +08:00
 default_executable: 
 dependencies: []
-
 description: A Crossroads Foundation collection of generic capistrano recipes.
-email: 
+email:
 - it_dept@crossroads.org.hk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.textile
@@ -60,36 +50,26 @@ files:
 has_rdoc: true
 homepage: http://www.crossroads.org.hk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
-