capistrano 2.5.20 → 2.5.21

data/.gitignore

@@ -0,0 +1,10 @@
+coverage
+doc
+pkg
+*.swp
+*.patch
+*.gem
+*.sh
+.DS_Store
+.bundle/*
+Gemfile.lock

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.8.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 2.5.21 / April 6 2011
+	
+	* Fixed to follow best-practice guidelines from Bundler (Ben Langfeld)
+	* No longer force a gemset for Capistrano development. (Ben Langfeld)
+
 ## 2.5.20 / March 16 2011
 
   * `deploy:migrations` will now always operate on the latest_release, not

data/Gemfile

@@ -1,17 +1,4 @@
-#
-# This is the gemfile for local development
-# these are the requirements for running
-# the test suite.
-#
+source "http://rubygems.org"
 
-source :gemcutter
-
-gem 'net-ssh'
-gem 'net-ssh-gateway'
-gem 'net-sftp'
-gem 'net-scp'
-gem 'highline'
-
-group :test do
-  gem "mocha"
-end
+# Specify your gem's dependencies in capistrano.gemspec
+gemspec

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -6,25 +9,3 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.version
-    gem.name            = "capistrano"
-    gem.executables     = %W(capify cap)
-    gem.summary         = %Q{Capistrano - Welcome to easy deployment with Ruby over SSH}
-    gem.description     = %Q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
-    gem.homepage        = "http://github.com/capistrano/capistrano"
-    gem.email           = [ "jamis@jamisbuck.org", "lee.hambley@gmail.com" ]
-    gem.authors         = [ "Jamis Buck", "Lee Hambley" ]
-    gem.add_dependency  "net-ssh",          ">=2.0.14"
-    gem.add_dependency  "net-sftp",         ">=2.0.0"
-    gem.add_dependency  "net-scp",          ">=1.0.0"
-    gem.add_dependency  "net-ssh-gateway",  ">=1.0.0"
-    gem.add_dependency  "highline"
-    gem.add_development_dependency "mocha", ">= 0"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end

data/VERSION

@@ -1 +1 @@
-2.5.20
+2.5.21

data/capistrano.gemspec

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "capistrano/version"
+
+Gem::Specification.new do |s|
+  s.name        = "capistrano"
+  s.version     = Capistrano::Version.to_s
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jamis Buck", "Lee Hambley"]
+  s.email       = ["jamis@jamisbuck.org", "lee.hambley@gmail.com"]
+  s.homepage    = "http://github.com/capistrano/capistrano"
+  s.summary     = %q{Capistrano - Welcome to easy deployment with Ruby over SSH}
+  s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  s.date        = %q{2011-03-22}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.extra_rdoc_files = [
+    "README.mdown"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.14"])
+      s.add_runtime_dependency(%q<net-sftp>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<net-scp>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 2.0.14"])
+      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<mocha>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 2.0.14"])
+    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<mocha>, [">= 0"])
+  end
+end

data/lib/capistrano/configuration/variables.rb

@@ -112,7 +112,7 @@ module Capistrano
       private :protect
 
       def respond_to_with_variables?(sym, include_priv=false) #:nodoc:
-        @variables.has_key?(sym) || respond_to_without_variables?(sym, include_priv)
+        @variables.has_key?(sym.to_sym) || respond_to_without_variables?(sym, include_priv)
       end
 
       def method_missing_with_variables(sym, *args, &block) #:nodoc:
@@ -124,4 +124,4 @@ module Capistrano
       end
     end
   end
-end
+end

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

@@ -140,11 +140,7 @@ module Capistrano
           end
 
           execute = []
-          if args.empty?
-            execute << "#{git} clone #{verbose} #{variable(:repository)} #{destination}"
-          else
-            execute << "#{git} clone #{verbose} #{args.join(' ')} #{variable(:repository)} #{destination}"
-          end
+          execute << "#{git} clone #{verbose} #{args.join(' ')} #{variable(:repository)} #{destination}"
 
           # checkout into a local branch rather than a detached HEAD
           execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"

data/lib/capistrano/ssh.rb

@@ -69,6 +69,8 @@ module Capistrano
       # Once we've loaded the config, we don't need Net::SSH to do it again.
       ssh_options[:config] = false
 
+      ssh_options[:verbose] = :debug if options[:verbose] && options[:verbose] > 0
+
       user = server.user || options[:user] || ssh_options[:username] ||
              ssh_options[:user] || ServerDefinition.default_user
       port = server.port || options[:port] || ssh_options[:port]

data/rvmrc.sample

@@ -0,0 +1 @@
+rvm use 1.8.7@capistrano-devel --create

data/test/configuration/variables_test.rb

@@ -54,6 +54,12 @@ class ConfigurationVariablesTest < Test::Unit::TestCase
     assert @config.respond_to?(:sample)
   end
   
+  def test_respond_to_should_be_true_when_passed_a_string
+    assert !@config.respond_to?('sample')
+    @config[:sample] = :value
+    assert @config.respond_to?('sample')
+  end
+  
   def test_respond_to_with_include_priv_paramter
     assert !@config.respond_to?(:sample, true)
   end

data/test/deploy/scm/git_test.rb

@@ -31,16 +31,16 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:repository] = "git@somehost.com:project.git"
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone -q git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
+    assert_equal "git clone -q  git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
 
     # With :scm_command
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
-    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
+    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev}", @source.checkout(rev, dest).gsub(/\s+/, ' ')
 
     # with submodules
     @config[:git_enable_submodules] = true
-    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update --recursive", @source.checkout(rev, dest)
+    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update --recursive", @source.checkout(rev, dest).gsub(/\s+/, ' ')
   end
 
   def test_checkout_with_verbose_should_not_use_q_switch
@@ -48,7 +48,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:scm_verbose] = true
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone  git@somehost.com:project.git /var/www && cd /var/www && git checkout  -b deploy #{rev}", @source.checkout(rev, dest)
+    assert_equal "git clone   git@somehost.com:project.git /var/www && cd /var/www && git checkout  -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
   def test_diff

data/test/ssh_test.rb

@@ -82,6 +82,15 @@ class SSHTest < Test::Unit::TestCase
     assert_equal success, Capistrano::SSH.connect(@server, :ssh_options => ssh_options, :user => "jamis", :port => 1235)
   end
 
+  def test_connect_with_verbose_option_should_set_verbose_option_on_ssh
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
+    assert_equal success, Capistrano::SSH.connect(@server, :verbose => 0)
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
+    assert_equal success, Capistrano::SSH.connect(@server, :verbose => 1)
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
+    assert_equal success, Capistrano::SSH.connect(@server, :verbose => 2)
+  end
+
   def test_connect_with_ssh_options_should_see_server_options_override_ssh_options
     ssh_options = { :username => "JamisMan", :port => 8125, :forward_agent => true }
     server = server("jamis@capistrano:1235")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 49
+  prerelease: 
   segments: 
   - 2
   - 5
-  - 20
-  version: 2.5.20
+  - 21
+  version: 2.5.21
 platform: ruby
 authors: 
 - Jamis Buck
@@ -16,41 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: net-ssh
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: net-ssh-gateway
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: highline
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,40 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: net-sftp
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: net-scp
-  requirement: *id004
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: highline
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: net-ssh
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +47,12 @@ dependencies:
         - 0
         - 14
         version: 2.0.14
-  name: net-ssh
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  name: net-sftp
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: net-scp
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +79,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: net-scp
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: net-ssh-gateway
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,26 +95,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: net-ssh-gateway
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: highline
-  requirement: *id010
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: mocha
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -179,20 +109,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
-  requirement: *id011
+  type: :development
+  version_requirements: *id006
 description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
 email: 
 - jamis@jamisbuck.org
 - lee.hambley@gmail.com
 executables: 
-- capify
 - cap
+- capify
 extensions: []
 
 extra_rdoc_files: 
 - README.mdown
 files: 
+- .gitignore
+- .rvmrc
 - CHANGELOG
 - Gemfile
 - README.mdown
@@ -200,6 +132,7 @@ files:
 - VERSION
 - bin/cap
 - bin/capify
+- capistrano.gemspec
 - lib/capistrano.rb
 - lib/capistrano/callback.rb
 - lib/capistrano/cli.rb
@@ -258,6 +191,7 @@ files:
 - lib/capistrano/task_definition.rb
 - lib/capistrano/transfer.rb
 - lib/capistrano/version.rb
+- rvmrc.sample
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
 - test/cli/options_test.rb
@@ -329,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH