module Capistrano
  class Configuration
    module Servers

      alias_method :original_find_servers, :find_servers

      def find_servers(options={})
        servers = original_find_servers options
        stack_roles = task_call_frames.collect {|frame| frame.task.options[:roles]}.compact
        servers = servers.select { |server| stack_roles.all? { |role| self.roles[role].include?(server) } }
        servers.uniq
      end
    end
  end
end