@@ -1,7 +1,10 @@ -*SVN* +*unreleased* + +* Add an explicit dependency on Net::SSH and Net::SFTP versions less than 1.99.0 so that cap1 can coexist with net-ssh v2 [Jamis Buck] * Don't send no-auth-cache if no auth credentials are given [Jonathan Younger] + *1.4.1* (February 24, 2007) * Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [Jonathan Younger] CHANGELOG @@ -20,8 +20,8 @@ Gem::Specification.new do |s| s.add_dependency 'rake', ">= 0.7.0" - s.add_dependency 'net-ssh', ">= #{Capistrano::Version::SSH_REQUIRED.join(".")}" - s.add_dependency 'net-sftp', ">= #{Capistrano::Version::SFTP_REQUIRED.join(".")}" + s.add_dependency 'net-ssh', ">= #{Capistrano::Version::MINIMUM_SSH_REQUIRED.join(".")}", "< #{Capistrano::Version::MAXIMUM_SSH_REQUIRED.join('.')}" + s.add_dependency 'net-sftp', ">= #{Capistrano::Version::MINIMUM_SFTP_REQUIRED.join(".")}", "< #{Capistrano::Version::MINIMUM_SSH_REQUIRED.join('.')}" s.author = "Jamis Buck" s.email = "jamis@37signals.com" capistrano.gemspec @@ -1,3 +1,9 @@ +begin + require 'rubygems' + gem 'net-ssh', '< 1.99.0' +rescue LoadError, NameError +end + require 'net/ssh' module Capistrano @@ -5,8 +11,8 @@ module Capistrano require 'capistrano/version' require 'net/ssh/version' ssh_version = [Net::SSH::Version::MAJOR, Net::SSH::Version::MINOR, Net::SSH::Version::TINY] - if !Version.check(Version::SSH_REQUIRED, ssh_version) - raise "You have Net::SSH #{ssh_version.join(".")}, but you need at least #{Version::SSH_REQUIRED.join(".")}" + if !Version.check(ssh_version, Version::MINIMUM_SSH_REQUIRED, Version::MAXIMUM_SSH_REQUIRED) + raise "You have Net::SSH #{ssh_version.join(".")}, but you need a version between #{Version::MINIMUM_SSH_REQUIRED.join(".")}...#{Version::MAXIMUM_SSH_REQUIRED.join(".")}" end end lib/capistrano/ssh.rb @@ -1,11 +1,18 @@ begin require 'capistrano/version' + + begin + require 'rubygems' + gem 'net-sftp', '< 1.99.0' + rescue LoadError, NameError + end + require 'net/sftp' require 'net/sftp/version' + sftp_version = [Net::SFTP::Version::MAJOR, Net::SFTP::Version::MINOR, Net::SFTP::Version::TINY] - required_version = [1,1,0] - if !Capistrano::Version.check(required_version, sftp_version) - warn "You have Net::SFTP #{sftp_version.join(".")}, but you need at least #{required_version.join(".")}. Net::SFTP will not be used." + if !Capistrano::Version.check(sftp_version, Capistrano::Version::MINIMUM_SFTP_REQUIRED, Capistrano::Version::MAXIMUM_SFTP_REQUIRED) + warn "You have Net::SFTP #{sftp_version.join(".")}, but you need between #{Capistrano::Version::MINIMUM_SFTP_REQUIRED.join('.')}...#{Capistrano::Version::MAXIMUM_SFTP_REQUIRED.join('.')}. Net::SFTP will not be used." Capistrano::SFTP = false else Capistrano::SFTP = true lib/capistrano/transfer.rb @@ -1,30 +1,26 @@ module Capistrano module Version #:nodoc: - # A method for comparing versions of required modules. It expects two - # arrays as parameters, and returns true if the first is no more than the - # second. - def self.check(expected, actual) #:nodoc: - good = false - if actual[0] > expected[0] - good = true - elsif actual[0] == expected[0] - if actual[1] > expected[1] - good = true - elsif actual[1] == expected[1] && actual[2] >= expected[2] - good = true - end - end - - good + # A method for comparing versions of required modules. It expects + # arrays as parameters, and returns true if the first is no less than the + # second, and strictly less than the third. + def self.check(actual, minimum, maximum) #:nodoc: + actual = actual[0] * 1_000_000 + actual[1] * 1_000 + actual[2] + minimum = minimum[0] * 1_000_000 + minimum[1] * 1_000 + minimum[2] + maximum = maximum[0] * 1_000_000 + maximum[1] * 1_000 + maximum[2] + + return actual >= minimum && actual < maximum end MAJOR = 1 MINOR = 4 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join(".") - SSH_REQUIRED = [1,0,10] - SFTP_REQUIRED = [1,1,0] + MINIMUM_SSH_REQUIRED = [1,0,10] + MAXIMUM_SSH_REQUIRED = [1,99,0] + + MINIMUM_SFTP_REQUIRED = [1,1,0] + MAXIMUM_SFTP_REQUIRED = [1,99,0] end end lib/capistrano/version.rb 54cee940d2834f406d960d30193b8e442f55126a Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/c746803b22c1117a76f79013b38fc0da15f1b2b4 c746803b22c1117a76f79013b38fc0da15f1b2b4 2008-04-28T09:46:13-07:00 2008-04-28T09:46:13-07:00 Add an explicit dependency on net-ssh and net-sftp < 1.99.0 1a5b8f22a8ac15d23859e5fa025cb8c01a70746e Jamis Buck jamis@37signals.com