Ticket #8828: no_servers_found.patch

a/lib/capistrano/configuration/connections.rb

@@ -93 +93 @@
-        raise ArgumentError, "expected a block" unless block_given?
-
-        if task = current_task
-servers = 
-
+task_options = options_to_
+
-          if servers.empty?
-ScriptError, "`#{task.fully_qualified_name}' is only run for servers matching #{task.
+Capistrano::NoMatchingServersError, "`#{task.fully_qualified_name}' is only run for servers matching #{task_
-          end
-
-          if task.continue_on_error?
@@ -105 +105 @@
-          end
-        else
-          servers = find_servers(options)
-Script
+Capistrano::NoMatchingServers
-        end
-
-        servers = [servers.first] if options[:once]

a/lib/capistrano/configuration/servers.rb

@@ -1 +1 @@
-module Capistrano
-  class Configuration
-    module Servers
+      # Returns a hash for use with #find_servers using the given task. 
+      def options_to_find_servers_for_task(task, options={})
+        task.options_without_desc.merge(options)
+      end
+      
-      # Identifies all servers that the given task should be executed on.
-      # The options hash accepts the same arguments as #find_servers, and any
-      # preexisting options there will take precedence over the options in
-      # the task.
-      def find_servers_for_task(task, options={})
-task.options.merge(
+options_to_find_servers_for_task(task, 
-      end
-
-      # Attempts to find all defined servers that match the given criteria.

a/lib/capistrano/errors.rb

@@ -3 +3 @@
-
-  class CaptureError < Error; end
-  class NoSuchTaskError < Error; end
+  class NoMatchingServersError < Error; end
-  
-  class RemoteError < Error
-    attr_accessor :hosts

a/lib/capistrano/shell.rb

@@ -160 +160 @@
-          connect(task)
-          configuration.execute_task(task)
-        end
-
+MatchingServersError, Capistrano::No
-        warn "error: #{error.message}"
-      end
-

a/lib/capistrano/task_definition.rb

@@ -9 +9 @@
-      @name, @namespace, @options = name, namespace, options
-      @body = block or raise ArgumentError, "a task requires a block"
-      @servers = nil
+    end
+    
+    def options_without_desc
+      o = options.dup
+      o.delete(:desc)
+      o
-    end
-
-    # Returns the task's fully-qualified name, including the namespace

a/test/configuration/connections_test.rb

@@ -138 +138 @@
-
-  def test_execute_on_servers_without_current_task_should_raise_error_if_no_matching_servers
-    @config.expects(:find_servers).with(:a => :b, :c => :d).returns([])
-Script
+Capistrano::NoMatchingServers
-  end
-
-  def test_execute_on_servers_should_raise_an_error_if_the_current_task_has_no_matching_servers_by_default
-    @config.current_task = mock_task
-
-
+
+
+
-      @config.execute_on_servers do
-        flunk "should not get here"
-      end
@@ -154 +155 @@
-  def test_execute_on_servers_should_determine_server_list_from_active_task
-    assert @config.sessions.empty?
-    @config.current_task = mock_task
-
+
+
-    Capistrano::SSH.expects(:connect).times(3).returns(:success)
-    @config.execute_on_servers {}
-    assert_equal %w(cap1 cap2 cap3), @config.sessions.keys.sort.map { |s| s.host }
@@ -163 +165 @@
-  def test_execute_on_servers_should_yield_server_list_to_block
-    assert @config.sessions.empty?
-    @config.current_task = mock_task
-
+
+
-    Capistrano::SSH.expects(:connect).times(3).returns(:success)
-    block_called = false
-    @config.execute_on_servers do |servers|
@@ -179 +182 @@
-  def test_execute_on_servers_with_once_option_should_establish_connection_to_and_yield_only_the_first_server
-    assert @config.sessions.empty?
-    @config.current_task = mock_task
-
+
+
+
-    Capistrano::SSH.expects(:connect).returns(:success)
-    block_called = false
-    @config.execute_on_servers(:once => true) do |servers|
@@ -192 +197 @@
-  
-  def test_execute_servers_should_raise_connection_error_on_failure_by_default
-    @config.current_task = mock_task
-
+
+
-    Capistrano::SSH.expects(:connect).raises(Exception)
-    assert_raises(Capistrano::ConnectionError) {
-      @config.execute_on_servers do
@@ -203 +209 @@
-  
-  def test_execute_servers_should_not_raise_connection_error_on_failure_with_on_errors_continue
-    @config.current_task = mock_task(:on_error => :continue)
-
+
+
-    Capistrano::SSH.expects(:connect).times(2).raises(Exception).then.returns(:success)
-    assert_nothing_raised {
-      @config.execute_on_servers do |servers|
@@ -215 +222 @@
-  def test_execute_on_servers_should_not_try_to_connect_to_hosts_with_connection_errors_with_on_errors_continue
-    list = [server("cap1"), server("cap2")]
-    @config.current_task = mock_task(:on_error => :continue)
-
+
+
-    Capistrano::SSH.expects(:connect).times(2).raises(Exception).then.returns(:success)
-    @config.expects(:failed!).with(server("cap1"))
-    @config.execute_on_servers do |servers|
-      assert_equal %w(cap2), servers.map { |s| s.host }
-    end
-
+
+
-    @config.execute_on_servers do |servers|
-      assert_equal %w(cap2), servers.map { |s| s.host }
-    end
@@ -231 +240 @@
-    cap1 = server("cap1")
-    cap2 = server("cap2")
-    @config.current_task = mock_task(:on_error => :continue)
-
+
+
-    Capistrano::SSH.expects(:connect).times(2).returns(:success)
-    @config.execute_on_servers do |servers|
-      error = Capistrano::CommandError.new
-      error.hosts = [cap1]
-      raise error
-    end
-
+
+
-    @config.execute_on_servers do |servers|
-      assert_equal %w(cap2), servers.map { |s| s.host }
-    end
@@ -248 +259 @@
-    cap1 = server("cap1")
-    cap2 = server("cap2")
-    @config.current_task = mock_task(:on_error => :continue)
-
+
+
-    Capistrano::SSH.expects(:connect).times(2).returns(:success)
-    @config.execute_on_servers do |servers|
-      error = Capistrano::UploadError.new
-      error.hosts = [cap1]
-      raise error
-    end
-
+
+
-    @config.execute_on_servers do |servers|
-      assert_equal %w(cap2), servers.map { |s| s.host }
-    end
@@ -264 +277 @@
-  def test_connect_should_establish_connections_to_all_servers_in_scope
-    assert @config.sessions.empty?
-    @config.current_task = mock_task
-
+
+
-    Capistrano::SSH.expects(:connect).times(3).returns(:success)
-    @config.connect!
-    assert_equal %w(cap1 cap2 cap3), @config.sessions.keys.sort.map { |s| s.host }
@@ -273 +287 @@
-  def test_connect_should_honor_once_option
-    assert @config.sessions.empty?
-    @config.current_task = mock_task
-
+
+
-    Capistrano::SSH.expects(:connect).returns(:success)
-    @config.connect! :once => true
-    assert_equal %w(cap1), @config.sessions.keys.sort.map { |s| s.host }