capistrano 2.5.2 → 2.5.3

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 2.5.3 / December 6, 2008
+
+* Make previous_release return nil if there is no previous release [Mathias Meyer]
+
+* Play nice with rubies that don't inspect terminals well (ie. JRuby) by defaulting screen columns to 80 [Bob McWhirter]
+
+* Rollback of deploy:symlink would explode if there was no previous revision to rollback to [Jamis Buck]
+
+* Fix bug in transfer.rb that caused get/put/upload/download to ignore blocks passed to them [arika]
+
+* Fix issue with git SCM that caused "Unable to resolve revision" errors when there was trailing whitespace in git's output [Mark Zuneska, Daniel Berlinger and Evan Closson]
+
+
 == 2.5.2 / November 13, 2008
 
 * Fix issue with git SCM that caused "Unable to resolve revision for 'HEAD'" errors on deploy [Jamis Buck]

data/capistrano.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{capistrano}
-  s.version = "2.5.2"
+  s.version = "2.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-11-13}
+  s.date = %q{2008-12-06}
   s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
   s.email = %q{jamis@jamisbuck.org}
   s.executables = ["cap", "capify"]

data/lib/capistrano/cli/help.rb

@@ -111,7 +111,14 @@ module Capistrano
       end
 
       def output_columns #:nodoc:
-        @output_columns ||= self.class.ui.output_cols > 80 ? 80 : self.class.ui.output_cols
+        if ( @output_columns.nil? ) 
+          if ( self.class.ui.output_cols.nil? || self.class.ui.output_cols > 80 )
+            @output_columns = 80 
+          else
+            @output_columns = self.class.ui.output_cols
+          end
+        end
+        @output_columns 
       end
     end
   end

data/lib/capistrano/recipes/deploy.rb

@@ -52,7 +52,7 @@ _cset(:release_path)      { File.join(releases_path, release_name) }
 
 _cset(:releases)          { capture("ls -xt #{releases_path}").split.reverse }
 _cset(:current_release)   { File.join(releases_path, releases.last) }
-_cset(:previous_release)  { File.join(releases_path, releases[-2]) }
+_cset(:previous_release)  { releases.length > 1 ? File.join(releases_path, releases[-2]) : nil }
 
 _cset(:current_revision)  { capture("cat #{current_path}/REVISION").chomp }
 _cset(:latest_revision)   { capture("cat #{current_release}/REVISION").chomp }
@@ -251,7 +251,14 @@ namespace :deploy do
     except `restart').
   DESC
   task :symlink, :except => { :no_release => true } do
-    on_rollback { run "rm -f #{current_path}; ln -s #{previous_release} #{current_path}; true" }
+    on_rollback do
+      if previous_release
+        run "rm -f #{current_path}; ln -s #{previous_release} #{current_path}; true"
+      else
+        logger.important "no previous release to rollback to, rollback of symlink skipped"
+      end
+    end
+
     run "rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
   end
 
@@ -302,10 +309,10 @@ namespace :deploy do
       ever) need to be called directly.
     DESC
     task :revision, :except => { :no_release => true } do
-      if releases.length < 2
-        abort "could not rollback the code because there is no prior release"
-      else
+      if previous_release
         run "rm #{current_path}; ln -s #{previous_release} #{current_path}"
+      else
+        abort "could not rollback the code because there is no prior release"
       end
     end
 

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -213,14 +213,14 @@ module Capistrano
           command = scm('ls-remote', repository, revision)
           result = yield(command)
           revdata = result.split(/[\t\n]/)
-	  newrev = nil
-	  revdata.each_slice(2) do |refs|
-	    rev, ref = *refs
-	    if ref.sub(/refs\/.*?\//, '') == revision
-	      newrev = rev
-	      break
+          newrev = nil
+          revdata.each_slice(2) do |refs|
+            rev, ref = *refs
+            if ref.sub(/refs\/.*?\//, '').strip == revision
+              newrev = rev
+              break
             end
-	  end
+          end
           raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/
           return newrev
         end

data/lib/capistrano/transfer.rb

@@ -29,7 +29,7 @@ module Capistrano
       @to        = to
       @sessions  = sessions
       @options   = options
-      @callback  = callback
+      @callback  = block
 
       @transport = options.fetch(:via, :sftp)
       @logger    = options.delete(:logger)
@@ -213,4 +213,4 @@ module Capistrano
         end
       end
   end
-end
+end

data/lib/capistrano/version.rb

@@ -6,7 +6,7 @@ module Capistrano
   class Version < Net::SSH::Version
     MAJOR = 2
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/deploy/scm/git_test.rb

@@ -64,6 +64,14 @@ class DeploySCMGitTest < Test::Unit::TestCase
     end
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
   end
+  
+  def test_query_revision_has_whitespace
+    revision = @source.query_revision('HEAD') do |o|
+      assert_equal "git ls-remote . HEAD", o
+      "d11006102c07c94e5d54dd0ee63dca825c93ed61\tHEAD\r"
+    end
+    assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
+  end
 
   def test_query_revision_deprecation_error
     assert_raise(ArgumentError) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-13 00:00:00 -07:00
+date: 2008-12-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency