capistrano 2.5.1 → 2.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 2.5.2 / November 13, 2008
+
+* Fix issue with git SCM that caused "Unable to resolve revision for 'HEAD'" errors on deploy [Jamis Buck]
+
+
 == 2.5.1 / November 7, 2008
 
 * Add -t (--tools) switch for better task lists for external tools [Jamis Buck]

data/capistrano.gemspec

@@ -1,14 +1,10 @@
-
-# Gem::Specification for Capistrano-2.5.1
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{capistrano}
-  s.version = "2.5.1"
+  s.version = "2.5.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-07}
+  s.date = %q{2008-11-13}
   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"]
@@ -33,12 +29,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<net-ssh>, [">= 2.0.0"])
       s.add_dependency(%q<net-sftp>, [">= 2.0.0"])
       s.add_dependency(%q<net-scp>, [">= 1.0.0"])
       s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
       s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<net-ssh>, [">= 2.0.0"])
@@ -46,43 +44,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-scp>, [">= 1.0.0"])
     s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
     s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end
-
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require "./lib/capistrano/version"
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Capistrano's Rakefile"
-# end
-# 
-# version = Capistrano::Version::STRING.dup
-# if ENV['SNAPSHOT'].to_i == 1
-#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-# end
-# 
-# Echoe.new('capistrano', version) do |p|
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-# 
-#   p.summary = <<-DESC.strip.gsub(/\n\s+/, " ")
-#     Capistrano is a utility and framework for executing commands in parallel
-#     on multiple remote machines, via SSH.
-#   DESC
-# 
-#   p.url              = "http://www.capify.org"
-#   p.need_zip         = true
-#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
-# 
-#   p.dependencies     = ["net-ssh         >=2.0.0",
-#                         "net-sftp        >=2.0.0",
-#                         "net-scp         >=1.0.0",
-#                         "net-ssh-gateway >=1.0.0",
-#                         "highline"]
-# end

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

@@ -210,7 +210,7 @@ module Capistrano
         def query_revision(revision)
           raise ArgumentError, "Deploying remote branches has been deprecated.  Specify the remote branch as a local branch for the git repository you're deploying from (ie: '#{revision.gsub('origin/', '')}' rather than '#{revision}')." if revision =~ /^origin\//
           return revision if revision =~ /^[0-9a-f]{40}$/
-          command = scm('ls-remote -h -t', repository, revision)
+          command = scm('ls-remote', repository, revision)
           result = yield(command)
           revdata = result.split(/[\t\n]/)
 	  newrev = nil

data/lib/capistrano/version.rb

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

data/test/deploy/scm/git_test.rb

@@ -59,7 +59,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
   def test_query_revision
     revision = @source.query_revision('HEAD') do |o|
-      assert_equal "git ls-remote -h -t . HEAD", o
+      assert_equal "git ls-remote . HEAD", o
       "d11006102c07c94e5d54dd0ee63dca825c93ed61\tHEAD"
     end
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -07:00
+date: 2008-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
 email: jamis@jamisbuck.org
 executables: 
@@ -259,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []