capistrano 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,6 +1,13 @@
+*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]
+* Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [Jonathan Younger]
 
 * Deprecated upper-cased variables [Jamis Buck]
 

data/lib/capistrano/scm/subversion.rb

@@ -80,7 +80,8 @@ module Capistrano
         def authorization
           username = configuration[:svn_username] ? "--username #{configuration[:svn_username]}" : ""
           password = configuration[:svn_password] ? "--password #{configuration[:svn_password]}" : ""
-          "--no-auth-cache #{username} #{password}"
+          no_auth_cache = configuration[:svn_username] || configuration[:svn_password] ? "--no-auth-cache" : ""
+          "#{no_auth_cache} #{username} #{password}"
         end
 
         def svn_log(path)

data/lib/capistrano/ssh.rb

@@ -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
 

data/lib/capistrano/transfer.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

data/lib/capistrano/version.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

data/test/scm/subversion_test.rb

@@ -134,4 +134,12 @@ MSG
     assert_nil @actor.channels.last.sent_data
     assert_match %r{/path/to/svn\b.*\bco\b.* --username turtledove}, @actor.command
   end
+  
+  def test_svn_no_auth_cache
+    @actor.story = []
+    @config[:svn_username] = "turtledove"
+    assert_nothing_raised { @scm.checkout(@actor) }
+    assert_nil @actor.channels.last.sent_data
+    assert_match %r{/path/to/svn\b.*\bco\b.* --no-auth-cache --username turtledove}, @actor.command
+  end
 end

metadata

@@ -1,37 +1,61 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
-date: 2007-02-24 00:00:00 -07:00
-summary: Capistrano is a framework and utility for executing commands in parallel on multiple remote machines, via SSH. The primary goal is to simplify and automate the deployment of web applications.
-require_paths: 
-- lib
-email: jamis@37signals.com
-homepage: http://www.rubyonrails.org
-rubyforge_project: 
-description: 
-autorequire: capistrano
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.4.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jamis Buck
+autorequire: capistrano
+bindir: bin
+cert_chain: []
+
+date: 2008-04-29 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.10
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.99.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.99.0
+    version: 
+description: 
+email: jamis@37signals.com
+executables: 
+- cap
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - bin/cap
 - lib/capistrano
-- lib/capistrano.rb
 - lib/capistrano/actor.rb
 - lib/capistrano/cli.rb
 - lib/capistrano/command.rb
@@ -39,24 +63,19 @@ files:
 - lib/capistrano/extensions.rb
 - lib/capistrano/gateway.rb
 - lib/capistrano/generators
-- lib/capistrano/logger.rb
-- lib/capistrano/recipes
-- lib/capistrano/scm
-- lib/capistrano/shell.rb
-- lib/capistrano/ssh.rb
-- lib/capistrano/transfer.rb
-- lib/capistrano/utils.rb
-- lib/capistrano/version.rb
 - lib/capistrano/generators/rails
 - lib/capistrano/generators/rails/deployment
-- lib/capistrano/generators/rails/loader.rb
 - lib/capistrano/generators/rails/deployment/deployment_generator.rb
 - lib/capistrano/generators/rails/deployment/templates
 - lib/capistrano/generators/rails/deployment/templates/capistrano.rake
 - lib/capistrano/generators/rails/deployment/templates/deploy.rb
+- lib/capistrano/generators/rails/loader.rb
+- lib/capistrano/logger.rb
+- lib/capistrano/recipes
 - lib/capistrano/recipes/standard.rb
 - lib/capistrano/recipes/templates
 - lib/capistrano/recipes/templates/maintenance.rhtml
+- lib/capistrano/scm
 - lib/capistrano/scm/base.rb
 - lib/capistrano/scm/baz.rb
 - lib/capistrano/scm/bzr.rb
@@ -65,59 +84,53 @@ files:
 - lib/capistrano/scm/mercurial.rb
 - lib/capistrano/scm/perforce.rb
 - lib/capistrano/scm/subversion.rb
+- lib/capistrano/shell.rb
+- lib/capistrano/ssh.rb
+- lib/capistrano/transfer.rb
+- lib/capistrano/utils.rb
+- lib/capistrano/version.rb
+- lib/capistrano.rb
 - examples/sample.rb
 - test/actor_test.rb
 - test/command_test.rb
 - test/configuration_test.rb
 - test/fixtures
-- test/scm
-- test/ssh_test.rb
-- test/utils.rb
 - test/fixtures/config.rb
 - test/fixtures/custom.rb
+- test/scm
 - test/scm/cvs_test.rb
 - test/scm/subversion_test.rb
+- test/ssh_test.rb
+- test/utils.rb
 - README
 - MIT-LICENSE
 - CHANGELOG
 - THANKS
-test_files: []
-
+has_rdoc: false
+homepage: http://www.rubyonrails.org
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- cap
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.10
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Capistrano is a framework and utility for executing commands in parallel on multiple remote machines, via SSH. The primary goal is to simplify and automate the deployment of web applications.
+test_files: []
+