capistrano 2.6.0 → 2.6.1.pre

data/CHANGELOG

@@ -1,3 +1,29 @@
+## 2.6.1 / June 25 2011
+
+A short maintenance release, Some fixes to the verbose flag inside the Git SCM
+as well as another argument for the (internal) `variable()` command, offering
+a default. The Git SCM is now verbose by default, but can be disabled by
+setting `:scm_verbose` to false.
+
+There has been an additional method added to string, within the context of the
+test suite, I'm always sketchy about adding additional methods to core
+classes, but it's a short term fix until I make the time to patch the test
+suite not to compare strings literally. The method is `String#compact`, and is
+implemented simply as `self.gsub(/\s+/, ' ')`.
+
+Here's the run-down of changes, and their committers, as always - a huge thank
+you to the community that continues to drive Capistrano's development.
+
+* `deploy:setup` now respects `:group_writable` (Mathew Davies)
+* Fixes to `:scm_verbose` for the Git module (defaults to On.) (Daniel Duvall)
+* Will now copy hidden files in the project's root into the release
+directory (Mark Jaquith)
+* Now handles closing already-dead connections in a sane way (does not raise
+an exception) (Will Bryant)
+* Renamed `Capistrano::VERSION::TINY` to `Capistrano::VERSION::PATCH` (Lee
+Hambley)
+* Removed the `VERSION` file (Lee Hambley)
+
 ## 2.6.0 / May 3 2011
 
 A rather large release, feature-version bump because of the new

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in capistrano.gemspec
 gemspec
+
+gem "rake"

data/lib/capistrano.rb

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

data/lib/capistrano/cli/help.txt

@@ -74,5 +74,8 @@ The following options are understood:
   <%= color 'HOSTFILTER', :bold %>
 	Execute tasks against this comma-separated list of host, but only if the host has the proper role for the task.
 
+  <%= color 'HOSTROLEFILTER', :bold %>
+	Execute tasks against the hosts in this comma-separated list of roles, but only if the host has the proper role for the task.
+
   <%= color 'ROLES', :bold %>
 	Execute tasks against this comma-separated list of roles.  Hosts which do not have the right roles will be skipped.

data/lib/capistrano/configuration/connections.rb

@@ -138,8 +138,11 @@ module Capistrano
       # Destroys sessions for each server in the list.
       def teardown_connections_to(servers)
         servers.each do |server|
-          sessions[server].close
-          sessions.delete(server)
+          begin
+            sessions.delete(server).close
+          rescue IOError
+            # the TCP connection is already dead
+          end
         end
       end
 

data/lib/capistrano/configuration/servers.rb

@@ -26,6 +26,9 @@ module Capistrano
       # Yet additionally, if the HOSTFILTER environment variable is set, it
       # will limit the result to hosts found in that (comma-separated) list.
       #
+      # If the HOSTROLEFILTER environment variable is set, it will limit the
+      # result to hosts found in that (comma-separated) list of roles 
+      #
       # Usage:
       #
       #   # return all known servers
@@ -39,6 +42,9 @@ module Capistrano
       #   # returns the given hosts, translated to ServerDefinition objects
       #   servers = find_servers :hosts => "jamis@example.host.com"
       def find_servers(options={})
+        return [] if options.key?(:hosts) && (options[:hosts].nil? || [] == options[:hosts])
+        return [] if options.key?(:roles) && (options[:roles].nil? || [] == options[:roles])
+        
         hosts  = server_list_from(ENV['HOSTS'] || options[:hosts])
         
         if hosts.any?
@@ -69,9 +75,21 @@ module Capistrano
     protected
 
       def filter_server_list(servers)
-        return servers unless ENV['HOSTFILTER']
-        filters = ENV['HOSTFILTER'].split(/,/)
-        servers.select { |server| filters.include?(server.host) }
+        return servers unless ENV['HOSTFILTER'] or ENV['HOSTROLEFILTER']
+        if ENV['HOSTFILTER']
+          filters = ENV['HOSTFILTER'].split(/,/)
+          servers.select { |server| filters.include?(server.host) }
+        elsif ENV['HOSTROLEFILTER']
+          filters = ENV['HOSTROLEFILTER'].split(/,/).map do |role|
+            local_roles = roles[role.to_sym]
+            if local_roles.is_a? Array
+              roles[role.to_sym]
+            else
+              roles[role.to_sym].servers
+            end
+          end.flatten
+          servers.select { |server| filters.include?(server) }
+        end
       end
 
       def server_list_from(hosts)

data/lib/capistrano/ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def compact
+    self.gsub(/\s+/, ' ')
+  end
+end

data/lib/capistrano/recipes/deploy.rb

@@ -183,7 +183,8 @@ namespace :deploy do
   task :setup, :except => { :no_release => true } do
     dirs = [deploy_to, releases_path, shared_path]
     dirs += shared_children.map { |d| File.join(shared_path, d) }
-    run "#{try_sudo} mkdir -p #{dirs.join(' ')} && #{try_sudo} chmod g+w #{dirs.join(' ')}"
+    run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
+    run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
   end
 
   desc <<-DESC

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

@@ -161,11 +161,11 @@ module Capistrano
 
           # A helper for accessing variable values, which takes into
           # consideration the current mode ("normal" vs. "local").
-          def variable(name)
+          def variable(name, default = nil)
             if local? && configuration.exists?("local_#{name}".to_sym)
-              return configuration["local_#{name}".to_sym]
+              return configuration["local_#{name}".to_sym] || default
             else
-              configuration[name]
+              configuration[name] || default
             end
           end
 

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

@@ -144,16 +144,16 @@ module Capistrano
 
           # checkout into a local branch rather than a detached HEAD
           execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
-          
+
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
             execute << "#{git} submodule #{verbose} update --init --recursive"
           end
 
-          execute.join(" && ")
+          execute.join(" && ").compact
         end
-        
+
         # An expensive export. Performs a checkout as above, then
         # removes the repo.
         def export(revision, destination)
@@ -199,8 +199,8 @@ module Capistrano
 
         # Returns a string of diffs between two revisions
         def diff(from, to=nil)
-          from << "..#{to}" if to
-          scm :diff, from
+          return scm :diff, from unless to
+          scm :diff, "#{from}..#{to}"
         end
 
         # Returns a log of changes between the two revisions (inclusive).
@@ -266,7 +266,7 @@ module Capistrano
           # If verbose output is requested, return nil, otherwise return the
           # command-line switch for "quiet" ("-q").
           def verbose
-            variable(:scm_verbose) ? nil : "-q"
+            variable(:scm_verbose, true) ? "-q" : nil
           end
       end
     end

data/lib/capistrano/recipes/deploy/strategy/remote_cache.rb

@@ -39,14 +39,14 @@ module Capistrano
 
           def copy_repository_cache
             logger.trace "copying the cached version to #{configuration[:release_path]}"
-            if copy_exclude.empty? 
+            if copy_exclude.empty?
               run "cp -RPp #{repository_cache} #{configuration[:release_path]} && #{mark}"
             else
               exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
-              run "rsync -lrpt #{exclusions} #{repository_cache}/* #{configuration[:release_path]} && #{mark}"
+              run "rsync -lrpt #{exclusions} #{repository_cache}/ #{configuration[:release_path]} && #{mark}"
             end
           end
-          
+
           def copy_exclude
             @copy_exclude ||= Array(configuration.fetch(:copy_exclude, []))
           end

data/lib/capistrano/version.rb

@@ -3,16 +3,14 @@ module Capistrano
 
   class Version
 
-    CURRENT = File.read(File.dirname(__FILE__) + '/../../VERSION')
-
-    MAJOR, MINOR, TINY = CURRENT.scanf('%d.%d.%d')
-
-    STRING = CURRENT.to_s
+    MAJOR = 2
+    MINOR = 6
+    PATCH = 1
 
     def self.to_s
-      CURRENT
+      "#{MAJOR}.#{MINOR}.#{PATCH}.pre"
     end
-    
+
   end
 
 end

data/test/configuration/connections_test.rb

@@ -355,6 +355,24 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     assert_equal 2, block_called
   end
   
+  def test_execute_on_servers_should_cope_with_already_dropped_connections_when_attempting_to_close_them
+    cap1 = server("cap1")
+    cap2 = server("cap2")
+    connection1 = mock()
+    connection2 = mock()
+    connection3 = mock()
+    connection4 = mock()
+    connection1.expects(:close).raises(IOError)
+    connection2.expects(:close)
+    connection3.expects(:close)
+    connection4.expects(:close)
+    @config.current_task = mock_task(:max_hosts => 1)
+    @config.expects(:find_servers_for_task).times(2).with(@config.current_task, {}).returns([cap1, cap2])
+    Capistrano::SSH.expects(:connect).times(4).returns(connection1).then.returns(connection2).then.returns(connection3).then.returns(connection4)
+    @config.execute_on_servers {}
+    @config.execute_on_servers {}
+  end
+  
   def test_connect_should_honor_once_option
     assert @config.sessions.empty?
     @config.current_task = mock_task

data/test/configuration/servers_test.rb

@@ -131,6 +131,14 @@ class ConfigurationServersTest < Test::Unit::TestCase
     ENV.delete('HOSTFILTER')
   end
 
+  def test_task_with_hostrolefilter_environment_variable_should_apply_only_to_those_hosts
+    ENV['HOSTROLEFILTER'] = "web"
+    task = new_task(:testing)
+    assert_equal %w(web1 web2).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('HOSTROLEFILTER')
+  end
+
   def test_task_with_only_should_apply_only_to_matching_tasks
     task = new_task(:testing, @config, :roles => :app, :only => { :primary => true })
     assert_equal %w(app1), @config.find_servers_for_task(task).map { |s| s.host }
@@ -155,4 +163,21 @@ class ConfigurationServersTest < Test::Unit::TestCase
     assert_equal %w(app1 app2 app3), @config.find_servers(:roles => lambda { :app }).map { |s| s.host }.sort
     assert_equal %w(app2 file), @config.find_servers(:roles => lambda { [:report, :file] }).map { |s| s.host }.sort
   end
+  
+  def test_find_servers_with_hosts_nil_or_empty
+    assert_equal [], @config.find_servers(:hosts => nil)
+    assert_equal [], @config.find_servers(:hosts => [])
+    result = @config.find_servers(:hosts => @config.find_servers(:roles => :report)[0])
+    assert_equal 1, result.size
+    result = @config.find_servers(:hosts => "app1")
+    assert_equal 1, result.size
+  end
+  
+  def test_find_servers_with_rolees_nil_or_empty
+    assert_equal [], @config.find_servers(:roles => nil)
+    assert_equal [], @config.find_servers(:roles => [])
+    result = @config.find_servers(:roles => :report)
+    assert_equal 1, result.size
+  end
+  
 end

data/test/deploy/scm/git_test.rb

@@ -31,7 +31,7 @@ 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"
@@ -43,12 +43,12 @@ class DeploySCMGitTest < Test::Unit::TestCase
     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 --init --recursive", @source.checkout(rev, dest).gsub(/\s+/, ' ')
   end
 
-  def test_checkout_with_verbose_should_not_use_q_switch
+  def test_checkout_with_verbose_should_use_q_switch
     @config[:repository] = "git@somehost.com:project.git"
     @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 -q git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
   def test_diff
@@ -68,7 +68,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     end
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
   end
-  
+
   def test_query_revision_has_whitespace
     revision = @source.query_revision('HEAD') do |o|
       assert_equal "git ls-remote . HEAD", o

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 961915984
+  prerelease: 6
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  - pre
+  version: 2.6.1.pre
 platform: ruby
 authors: 
 - Jamis Buck
@@ -155,6 +156,7 @@ files:
 - lib/capistrano/configuration/servers.rb
 - lib/capistrano/configuration/variables.rb
 - lib/capistrano/errors.rb
+- lib/capistrano/ext/string.rb
 - lib/capistrano/extensions.rb
 - lib/capistrano/logger.rb
 - lib/capistrano/processable.rb
@@ -254,12 +256,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: