capistrano 2.5.10 → 2.5.11

data/VERSION

@@ -1 +1 @@
-2.5.10
+2.5.11

data/bin/capify

@@ -59,8 +59,8 @@ role :db,  "your slave db-server here"
 # these http://github.com/rails/irs_process_scripts
 
 # namespace :deploy do
-#   task :start {}
-#   task :stop {}
+#   task :start do ; end
+#   task :stop do ; end
 #   task :restart, :roles => :app, :except => { :no_release => true } do
 #     run "#{try_sudo} touch #{File.join(current_path,\'tmp\',\'restart.txt\')}"
 #   end

data/lib/capistrano.rb

@@ -1,2 +1,2 @@
 require 'capistrano/configuration'
-require 'capistrano/extensions'
+require 'capistrano/extensions'

data/lib/capistrano/errors.rb

@@ -1,15 +1,19 @@
 module Capistrano
-  class Error < RuntimeError; end
+  
+  Error = Class.new(RuntimeError)
 
-  class CaptureError < Error; end
-  class NoSuchTaskError < Error; end
-  class NoMatchingServersError < Error; end
+  CaptureError            = Class.new(Capistrano::Error)
+  NoSuchTaskError         = Class.new(Capistrano::Error)
+  NoMatchingServersError  = Class.new(Capistrano::Error)
   
   class RemoteError < Error
     attr_accessor :hosts
   end
 
-  class ConnectionError < RemoteError; end
-  class TransferError < RemoteError; end
-  class CommandError < RemoteError; end
+  ConnectionError     = Class.new(Capistrano::RemoteError)
+  TransferError       = Class.new(Capistrano::RemoteError)
+  CommandError        = Class.new(Capistrano::RemoteError)
+  
+  LocalArgumentError  = Class.new(Capistrano::Error)
+  
 end

data/lib/capistrano/recipes/deploy.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'mkmf'
 require 'capistrano/recipes/deploy/scm'
 require 'capistrano/recipes/deploy/strategy'
 
@@ -39,6 +38,7 @@ _cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_e
 
 _cset(:strategy)          { Capistrano::Deploy::Strategy.new(deploy_via, self) }
 
+# If overriding release name, please also select an appropriate setting for :releases below.
 _cset(:release_name)      { set :deploy_timestamped, true; Time.now.utc.strftime("%Y%m%d%H%M%S") }
 
 _cset :version_dir,       "releases"
@@ -51,7 +51,7 @@ _cset(:shared_path)       { File.join(deploy_to, shared_dir) }
 _cset(:current_path)      { File.join(deploy_to, current_dir) }
 _cset(:release_path)      { File.join(releases_path, release_name) }
 
-_cset(:releases)          { capture("ls -xt #{releases_path}").split.reverse }
+_cset(:releases)          { capture("ls -x #{releases_path}").split.reverse }
 _cset(:current_release)   { File.join(releases_path, releases.last) }
 _cset(:previous_release)  { releases.length > 1 ? File.join(releases_path, releases[-2]) : nil }
 
@@ -95,18 +95,14 @@ end
 # returns the command output as a string
 def run_locally(cmd)
   logger.trace "executing locally: #{cmd.inspect}" if logger
-  command_present?(cmd)
-  `#{cmd}`
-end
-
-# tests if the given command is present on the local system
-def command_present?(cmd)
-  executable = cmd.to_s.split(" ").first
-  unless find_executable(executable)
-    logger.important "executable '#{executable}' not present or not in $PATH on the local system!"
+  output_on_stdout = `#{cmd}`
+  if $?.to_i > 0 # $? is command exit code (posix style)
+    raise Capistrano::LocalArgumentError, "Command #{cmd} returned status code #{$?}"
   end
+  output_on_stdout
 end
 
+
 # If a command is given, this will try to execute the given command, as
 # described below. Otherwise, it will return a string for use in embedding in
 # another command, for executing that command as described below.

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

@@ -59,7 +59,10 @@ module Capistrano
         # If the 'revision' argument, on the other hand, is not :head, it is
         # simply returned.
         def query_revision(revision)
-          revision
+          return revision unless :head == revision
+
+          command = scm('revno', repository)
+          result = yield(command)
         end
 
         # Increments the given revision number and returns it.

data/test/deploy/scm/bzr_test.rb

@@ -0,0 +1,51 @@
+require "utils"
+require 'capistrano/recipes/deploy/scm/bzr'
+
+class DeploySCMBzrTest < Test::Unit::TestCase
+  class TestSCM < Capistrano::Deploy::SCM::Bzr
+    default_command "bzr"
+  end
+
+  def setup
+    @config = { :repository => "." }
+
+    def @config.exists?(name); key?(name); end # is this actually needed?
+
+    @source = TestSCM.new(@config)
+  end
+
+  # The bzr scm does not support pseudo-ids. The bzr adapter uses symbol :head
+  # to refer to the recently committed revision.
+  def test_head_revision
+    assert_equal(:head,
+                 @source.head,
+                 "Since bzr doesn't know a real head revision, symbol :head is used instead.")
+  end
+
+  # The bzr scm does support many different ways to specify a revision. Only
+  # symbol :head triggers the bzr command 'revno'.
+  def test_query_revision
+    assert_equal("bzr revno #{@config[:repository]}",
+                 @source.query_revision(:head) { |o| o },
+                 "Query for :head revision should call bzr command 'revno' in repository directory.")
+
+    # Many valid revision specifications, some invalid on the last line
+    revision_samples = [ 5, -7, '2', '-4',
+                         'revid:revid:aaaa@bbbb-123456789',
+                         'submit:',
+                         'ancestor:/path/to/branch',
+                         'date:yesterday',
+                         'branch:/path/to/branch',
+                         'tag:trunk',
+                         'revno:3:/path/to/branch',
+                         'before:revid:aaaa@bbbb-1234567890',
+                         'last:3',
+                         nil, {}, [], true, false, 1.34, ]
+    
+    revision_samples.each do |revivsion_spec|
+      assert_equal(revivsion_spec,
+                   @source.query_revision(revivsion_spec),
+                   "Any revision specification other than symbol :head should simply by returned.")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.10
+  version: 2.5.11
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2009-12-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -175,6 +175,7 @@ files:
 - test/deploy/remote_dependency_test.rb
 - test/deploy/scm/accurev_test.rb
 - test/deploy/scm/base_test.rb
+- test/deploy/scm/bzr_test.rb
 - test/deploy/scm/darcs_test.rb
 - test/deploy/scm/git_test.rb
 - test/deploy/scm/mercurial_test.rb
@@ -244,6 +245,7 @@ test_files:
 - test/deploy/remote_dependency_test.rb
 - test/deploy/scm/accurev_test.rb
 - test/deploy/scm/base_test.rb
+- test/deploy/scm/bzr_test.rb
 - test/deploy/scm/darcs_test.rb
 - test/deploy/scm/git_test.rb
 - test/deploy/scm/mercurial_test.rb