RubyGems - capistrano - Versions diffs - 2.15.11 → 3.0.0.pre - Mend

capistrano 2.15.11 → 3.0.0.pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (158) hide show

checksums.yaml +5 -5
data/.gitignore +17 -8
data/Gemfile +1 -12
data/LICENSE.txt +18 -0
data/README.md +65 -68
data/Rakefile +4 -10
data/bin/cap +2 -3
data/bin/capify +7 -91
data/capistrano.gemspec +20 -34
data/lib/Capfile +2 -0
data/lib/capistrano/application.rb +28 -0
data/lib/capistrano/bundler.rb +1 -0
data/lib/capistrano/configuration/question.rb +42 -0
data/lib/capistrano/configuration/server.rb +24 -0
data/lib/capistrano/configuration/servers.rb +43 -95
data/lib/capistrano/configuration.rb +81 -44
data/lib/capistrano/console.rb +1 -0
data/lib/capistrano/defaults.rb +11 -0
data/lib/capistrano/deploy.rb +3 -0
data/lib/capistrano/dotfile.rb +3 -0
data/lib/capistrano/dsl/env.rb +57 -0
data/lib/capistrano/dsl/paths.rb +74 -0
data/lib/capistrano/dsl/stages.rb +15 -0
data/lib/capistrano/dsl/task_enhancements.rb +15 -0
data/lib/capistrano/dsl.rb +38 -0
data/lib/capistrano/git.rb +1 -0
data/lib/capistrano/i18n.rb +33 -0
data/lib/capistrano/install.rb +1 -0
data/lib/capistrano/setup.rb +17 -0
data/lib/capistrano/tasks/bundler.rake +13 -0
data/lib/capistrano/tasks/console.rake +21 -0
data/lib/capistrano/tasks/deploy.rake +153 -0
data/lib/capistrano/tasks/framework.rake +45 -0
data/lib/capistrano/tasks/git.rake +65 -0
data/lib/capistrano/tasks/install.rake +39 -0
data/lib/capistrano/templates/Capfile +43 -0
data/lib/capistrano/templates/deploy.rb.erb +17 -0
data/lib/capistrano/templates/stage.rb.erb +20 -0
data/lib/capistrano/version.rb +1 -11
data/lib/capistrano.rb +9 -3
data/spec/lib/capistrano/configuration/question_spec.rb +54 -0
data/spec/lib/capistrano/configuration/server_spec.rb +48 -0
data/spec/lib/capistrano/configuration/servers_spec.rb +79 -0
data/spec/lib/capistrano/configuration_spec.rb +80 -0
data/spec/lib/capistrano/dsl/env_spec.rb +83 -0
data/spec/lib/capistrano/dsl/paths_spec.rb +69 -0
data/spec/lib/capistrano/dsl_spec.rb +51 -0
data/spec/lib/capistrano_spec.rb +8 -0
data/spec/spec_helper.rb +14 -0
metadata +89 -215
data/.travis.yml +0 -9
data/CHANGELOG +0 -1203
data/lib/capistrano/callback.rb +0 -45
data/lib/capistrano/cli/execute.rb +0 -85
data/lib/capistrano/cli/help.rb +0 -125
data/lib/capistrano/cli/help.txt +0 -81
data/lib/capistrano/cli/options.rb +0 -243
data/lib/capistrano/cli/ui.rb +0 -40
data/lib/capistrano/cli.rb +0 -47
data/lib/capistrano/command.rb +0 -303
data/lib/capistrano/configuration/actions/file_transfer.rb +0 -50
data/lib/capistrano/configuration/actions/inspect.rb +0 -46
data/lib/capistrano/configuration/actions/invocation.rb +0 -329
data/lib/capistrano/configuration/alias_task.rb +0 -26
data/lib/capistrano/configuration/callbacks.rb +0 -147
data/lib/capistrano/configuration/connections.rb +0 -237
data/lib/capistrano/configuration/execution.rb +0 -142
data/lib/capistrano/configuration/loading.rb +0 -205
data/lib/capistrano/configuration/log_formatters.rb +0 -75
data/lib/capistrano/configuration/namespaces.rb +0 -223
data/lib/capistrano/configuration/roles.rb +0 -83
data/lib/capistrano/configuration/variables.rb +0 -127
data/lib/capistrano/errors.rb +0 -19
data/lib/capistrano/ext/multistage.rb +0 -67
data/lib/capistrano/ext/string.rb +0 -5
data/lib/capistrano/extensions.rb +0 -57
data/lib/capistrano/fix_rake_deprecated_dsl.rb +0 -8
data/lib/capistrano/logger.rb +0 -166
data/lib/capistrano/processable.rb +0 -55
data/lib/capistrano/recipes/compat.rb +0 -32
data/lib/capistrano/recipes/deploy/assets.rb +0 -202
data/lib/capistrano/recipes/deploy/dependencies.rb +0 -44
data/lib/capistrano/recipes/deploy/local_dependency.rb +0 -54
data/lib/capistrano/recipes/deploy/remote_dependency.rb +0 -117
data/lib/capistrano/recipes/deploy/scm/accurev.rb +0 -169
data/lib/capistrano/recipes/deploy/scm/base.rb +0 -200
data/lib/capistrano/recipes/deploy/scm/bzr.rb +0 -86
data/lib/capistrano/recipes/deploy/scm/cvs.rb +0 -153
data/lib/capistrano/recipes/deploy/scm/darcs.rb +0 -96
data/lib/capistrano/recipes/deploy/scm/git.rb +0 -299
data/lib/capistrano/recipes/deploy/scm/mercurial.rb +0 -137
data/lib/capistrano/recipes/deploy/scm/none.rb +0 -55
data/lib/capistrano/recipes/deploy/scm/perforce.rb +0 -152
data/lib/capistrano/recipes/deploy/scm/subversion.rb +0 -121
data/lib/capistrano/recipes/deploy/scm.rb +0 -19
data/lib/capistrano/recipes/deploy/strategy/base.rb +0 -92
data/lib/capistrano/recipes/deploy/strategy/checkout.rb +0 -20
data/lib/capistrano/recipes/deploy/strategy/copy.rb +0 -338
data/lib/capistrano/recipes/deploy/strategy/export.rb +0 -20
data/lib/capistrano/recipes/deploy/strategy/remote.rb +0 -52
data/lib/capistrano/recipes/deploy/strategy/remote_cache.rb +0 -57
data/lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb +0 -21
data/lib/capistrano/recipes/deploy/strategy.rb +0 -20
data/lib/capistrano/recipes/deploy.rb +0 -625
data/lib/capistrano/recipes/standard.rb +0 -37
data/lib/capistrano/recipes/templates/maintenance.rhtml +0 -53
data/lib/capistrano/role.rb +0 -102
data/lib/capistrano/server_definition.rb +0 -56
data/lib/capistrano/shell.rb +0 -265
data/lib/capistrano/ssh.rb +0 -95
data/lib/capistrano/task_definition.rb +0 -77
data/lib/capistrano/transfer.rb +0 -218
data/test/cli/execute_test.rb +0 -132
data/test/cli/help_test.rb +0 -165
data/test/cli/options_test.rb +0 -329
data/test/cli/ui_test.rb +0 -28
data/test/cli_test.rb +0 -17
data/test/command_test.rb +0 -322
data/test/configuration/actions/file_transfer_test.rb +0 -61
data/test/configuration/actions/inspect_test.rb +0 -76
data/test/configuration/actions/invocation_test.rb +0 -306
data/test/configuration/alias_task_test.rb +0 -118
data/test/configuration/callbacks_test.rb +0 -201
data/test/configuration/connections_test.rb +0 -439
data/test/configuration/execution_test.rb +0 -175
data/test/configuration/loading_test.rb +0 -148
data/test/configuration/namespace_dsl_test.rb +0 -332
data/test/configuration/roles_test.rb +0 -157
data/test/configuration/servers_test.rb +0 -183
data/test/configuration/variables_test.rb +0 -190
data/test/configuration_test.rb +0 -77
data/test/deploy/local_dependency_test.rb +0 -76
data/test/deploy/remote_dependency_test.rb +0 -146
data/test/deploy/scm/accurev_test.rb +0 -23
data/test/deploy/scm/base_test.rb +0 -55
data/test/deploy/scm/bzr_test.rb +0 -51
data/test/deploy/scm/darcs_test.rb +0 -37
data/test/deploy/scm/git_test.rb +0 -274
data/test/deploy/scm/mercurial_test.rb +0 -134
data/test/deploy/scm/none_test.rb +0 -35
data/test/deploy/scm/perforce_test.rb +0 -23
data/test/deploy/scm/subversion_test.rb +0 -68
data/test/deploy/strategy/copy_test.rb +0 -360
data/test/extensions_test.rb +0 -69
data/test/fixtures/cli_integration.rb +0 -5
data/test/fixtures/config.rb +0 -5
data/test/fixtures/custom.rb +0 -3
data/test/logger_formatting_test.rb +0 -149
data/test/logger_test.rb +0 -134
data/test/recipes_test.rb +0 -25
data/test/role_test.rb +0 -11
data/test/server_definition_test.rb +0 -121
data/test/shell_test.rb +0 -96
data/test/ssh_test.rb +0 -113
data/test/task_definition_test.rb +0 -117
data/test/transfer_test.rb +0 -168
data/test/utils.rb +0 -37
data/test/version_test.rb +0 -11

data/lib/capistrano/recipes/templates/maintenance.rhtml DELETED Viewed

@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>System down for maintenance</title>
-  <style type="text/css">
-    div.outer {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 500px;
-      height: 300px;
-      margin-left: -260px;
-      margin-top: -150px;
-    }
-    .DialogBody {
-      margin: 0;
-      padding: 10px;
-      text-align: left;
-      border: 1px solid #ccc;
-      border-right: 1px solid #999;
-      border-bottom: 1px solid #999;
-      background-color: #fff;
-    }
-    body { background-color: #fff; }
-  </style>
-</head>
-<body>
-  <div class="outer">
-     <div class="DialogBody" style="text-align: center;">
-       <div style="text-align: center; width: 200px; margin: 0 auto;">
-         <p style="color: red; font-size: 16px; line-height: 20px;">
-           The system is down for <%= reason ? reason : "maintenance" %>
-           as of <%= Time.now.strftime("%H:%M %Z") %>.
-         </p>
-         <p style="color: #666;">
-           It'll be back <%= deadline ? deadline : "shortly" %>.
-         </p>
-       </div>
-     </div>
-  </div>
-</body>
-</html>

data/lib/capistrano/role.rb DELETED Viewed

@@ -1,102 +0,0 @@
-module Capistrano
-  class Role
-    include Enumerable
-    def initialize(*list)
-      @static_servers = []
-      @dynamic_servers = []
-      push(*list)
-    end
-    def each(&block)
-      servers.each &block
-    end
-    def push(*list)
-      options = list.last.is_a?(Hash) ? list.pop : {}
-      list.each do |item|
-        if item.respond_to?(:call)
-          @dynamic_servers << DynamicServerList.new(item, options)
-        else
-          @static_servers << self.class.wrap_server(item, options)
-        end
-      end
-    end
-    alias_method :<<, :push
-    def servers
-      @static_servers + dynamic_servers
-    end
-    alias_method :to_ary, :servers
-    def empty?
-      servers.empty?
-    end
-    def clear
-      @dynamic_servers.clear
-      @static_servers.clear
-    end
-    def include?(server)
-      servers.include?(server)
-    end
-    protected
-    # This is the combination of a block, a hash of options, and a cached value.
-    class DynamicServerList
-      def initialize (block, options)
-        @block = block
-        @options = options
-        @cached = []
-        @is_cached = false
-      end
-      # Convert to a list of ServerDefinitions
-      def to_ary
-        unless @is_cached
-          @cached = Role::wrap_list(@block.call(@options), @options)
-          @is_cached = true
-        end
-        @cached
-      end
-      # Clear the cached value
-      def reset!
-        @cached.clear
-        @is_cached = false
-      end
-    end
-    # Attribute reader for the cached results of executing the blocks in turn
-    def dynamic_servers
-      @dynamic_servers.inject([]) { |list, item| list.concat item }
-    end
-    # Wraps a string in a ServerDefinition, if it isn't already.
-    # This and wrap_list should probably go in ServerDefinition in some form.
-    def self.wrap_server (item, options)
-      item.is_a?(ServerDefinition) ? item : ServerDefinition.new(item, options)
-    end
-    # Turns a list, or something resembling a list, into a properly-formatted
-    # ServerDefinition list. Keep an eye on this one -- it's entirely too
-    # magical for its own good. In particular, if ServerDefinition ever inherits
-    # from Array, this will break.
-    def self.wrap_list (*list)
-      options = list.last.is_a?(Hash) ? list.pop : {}
-      if list.length == 1
-        if list.first.nil?
-          return []
-        elsif list.first.is_a?(Array)
-          list = list.first
-        end
-      end
-      options.merge! list.pop if list.last.is_a?(Hash)
-      list.map do |item|
-        self.wrap_server item, options
-      end
-    end
-  end
-end

data/lib/capistrano/server_definition.rb DELETED Viewed

@@ -1,56 +0,0 @@
-module Capistrano
-  class ServerDefinition
-    include Comparable
-    attr_reader :host
-    attr_reader :user
-    attr_reader :port
-    attr_reader :options
-    # The default user name to use when a user name is not explicitly provided
-    def self.default_user
-      ENV['USER'] || ENV['USERNAME'] || "not-specified"
-    end
-    def initialize(string, options={})
-      @user, @host, @port = string.match(/^(?:([^;,:=]+)@|)(.*?)(?::(\d+)|)$/)[1,3]
-      @options = options.dup
-      user_opt, port_opt = @options.delete(:user), @options.delete(:port)
-      @user ||= user_opt
-      @port ||= port_opt
-      @port = @port.to_i if @port
-    end
-    def <=>(server)
-      [host, port, user] <=> [server.host, server.port, server.user]
-    end
-    # Redefined, so that Array#uniq will work to remove duplicate server
-    # definitions, based solely on their host names.
-    def eql?(server)
-      host == server.host &&
-        user == server.user &&
-        port == server.port
-    end
-    alias :== :eql?
-    # Redefined, so that Array#uniq will work to remove duplicate server
-    # definitions, based on their connection information.
-    def hash
-      @hash ||= [host, user, port].hash
-    end
-    def to_s
-      @to_s ||= begin
-        s = host
-        s = "#{user}@#{s}" if user
-        s = "#{s}:#{port}" if port && port != 22
-        s
-      end
-    end
-  end
-end

data/lib/capistrano/shell.rb DELETED Viewed

@@ -1,265 +0,0 @@
-require 'thread'
-require 'capistrano/processable'
-module Capistrano
-  # The Capistrano::Shell class is the guts of the "shell" task. It implements
-  # an interactive REPL interface that users can employ to execute tasks and
-  # commands. It makes for a GREAT way to monitor systems, and perform quick
-  # maintenance on one or more machines.
-  class Shell
-    include Processable
-    # A Readline replacement for platforms where readline is either
-    # unavailable, or has not been installed.
-    class ReadlineFallback #:nodoc:
-      HISTORY = []
-      def self.readline(prompt)
-        STDOUT.print(prompt)
-        STDOUT.flush
-        STDIN.gets
-      end
-    end
-    # The configuration instance employed by this shell
-    attr_reader :configuration
-    # Instantiate a new shell and begin executing it immediately.
-    def self.run(config)
-      new(config).run!
-    end
-    # Instantiate a new shell
-    def initialize(config)
-      @configuration = config
-    end
-    # Start the shell running. This method will block until the shell
-    # terminates.
-    def run!
-      setup
-      puts <<-INTRO
-====================================================================
-Welcome to the interactive Capistrano shell! This is an experimental
-feature, and is liable to change in future releases. Type 'help' for
-a summary of how to use the shell.
---------------------------------------------------------------------
-INTRO
-      loop do
-        break if !read_and_execute
-      end
-      @bgthread.kill
-    end
-    def read_and_execute
-      command = read_line
-      case command
-        when "?", "help" then help
-        when "quit", "exit" then
-          puts "exiting"
-          return false
-        when /^set -(\w)\s*(\S+)/
-          set_option($1, $2)
-        when /^set :(.*)\s+(.*)/
-          configuration.set($1.to_sym, $2)
-          puts "updated :#{$1} to #{$2}"
-        when /^(?:(with|on)\s*(\S+))?\s*(\S.*)?/i
-          process_command($1, $2, $3)
-        else
-          raise "eh?"
-      end
-      return true
-    end
-    private
-      # Present the prompt and read a single line from the console. It also
-      # detects ^D and returns "exit" in that case. Adds the input to the
-      # history, unless the input is empty. Loops repeatedly until a non-empty
-      # line is input.
-      def read_line
-        loop do
-          command = reader.readline("cap> ")
-          if command.nil?
-            command = "exit"
-            puts(command)
-          else
-            command.strip!
-          end
-          unless command.empty?
-            reader::HISTORY << command
-            return command
-          end
-        end
-      end
-      # Display a verbose help message.
-      def help
-        puts <<-HELP
---- HELP! ---------------------------------------------------
-"Get me out of this thing. I just want to quit."
--> Easy enough. Just type "exit", or "quit". Or press ctrl-D.
-"I want to execute a command on all servers."
--> Just type the command, and press enter. It will be passed,
-   verbatim, to all defined servers.
-"What if I only want it to execute on a subset of them?"
--> No problem, just specify the list of servers, separated by
-   commas, before the command, with the `on' keyword:
-   cap> on app1.foo.com,app2.foo.com echo ping
-"Nice, but can I specify the servers by role?"
--> You sure can. Just use the `with' keyword, followed by the
-   comma-delimited list of role names:
-   cap> with app,db echo ping
-"Can I execute a Capistrano task from within this shell?"
--> Yup. Just prefix the task with an exclamation mark:
-   cap> !deploy
-HELP
-      end
-      # Determine which servers the given task requires a connection to, and
-      # establish connections to them if necessary. Return the list of
-      # servers (names).
-      def connect(task)
-        servers = configuration.find_servers_for_task(task)
-        needing_connections = servers - configuration.sessions.keys
-        unless needing_connections.empty?
-          puts "[establishing connection(s) to #{needing_connections.join(', ')}]"
-          configuration.establish_connections_to(needing_connections)
-        end
-        servers
-      end
-      # Execute the given command. If the command is prefixed by an exclamation
-      # mark, it is assumed to refer to another capistrano task, which will
-      # be invoked. Otherwise, it is executed as a command on all associated
-      # servers.
-      def exec(command)
-        @mutex.synchronize do
-          if command[0] == ?!
-            exec_tasks(command[1..-1].split)
-          else
-            servers = connect(configuration.current_task)
-            exec_command(command, servers)
-          end
-        end
-      ensure
-        STDOUT.flush
-      end
-      # Given an array of task names, invoke them in sequence.
-      def exec_tasks(list)
-        list.each do |task_name|
-          task = configuration.find_task(task_name)
-          raise Capistrano::NoSuchTaskError, "no such task `#{task_name}'" unless task
-          connect(task)
-          configuration.execute_task(task)
-        end
-      rescue Capistrano::NoMatchingServersError, Capistrano::NoSuchTaskError => error
-        warn "error: #{error.message}"
-      end
-      # Execute a command on the given list of servers.
-      def exec_command(command, servers)
-        command = command.gsub(/^(\s*)sudo\b|([|;&])\s*sudo\b/, "\\0 -p '#{configuration.sudo_prompt}'")
-        processor = configuration.sudo_behavior_callback(Configuration.default_io_proc)
-        sessions = servers.map { |server| configuration.sessions[server] }
-        options = configuration.add_default_command_options({})
-        cmd = Command.new(command, sessions, options.merge(:logger => configuration.logger), &processor)
-        previous = trap("INT") { cmd.stop! }
-        cmd.process!
-      rescue Capistrano::Error => error
-        warn "error: #{error.message}"
-      ensure
-        trap("INT", previous)
-      end
-      # Return the object that will be used to query input from the console.
-      # The returned object will quack (more or less) like Readline.
-      def reader
-        @reader ||= begin
-          require 'readline'
-          Readline
-        rescue LoadError
-          ReadlineFallback
-        end
-      end
-      # Prepare every little thing for the shell. Starts the background
-      # thread and generally gets things ready for the REPL.
-      def setup
-        configuration.logger.level = Capistrano::Logger::INFO
-        wait_for = 0.1
-        @mutex = Mutex.new
-        @bgthread = Thread.new do
-          loop do
-            ret = @mutex.synchronize { process_iteration(wait_for) }
-            sleep wait_for if !ret
-          end
-        end
-      end
-      # Set the given option to +value+.
-      def set_option(opt, value)
-        case opt
-          when "v" then
-            puts "setting log verbosity to #{value.to_i}"
-            configuration.logger.level = value.to_i
-          when "o" then
-            case value
-            when "vi" then
-              puts "using vi edit mode"
-              reader.vi_editing_mode
-            when "emacs" then
-              puts "using emacs edit mode"
-              reader.emacs_editing_mode
-            else
-              puts "unknown -o option #{value.inspect}"
-            end
-          else
-            puts "unknown setting #{opt.inspect}"
-        end
-      end
-      # Process a command. Interprets the scope_type (must be nil, "with", or
-      # "on") and the command. If no command is given, then the scope is made
-      # effective for all subsequent commands. If the scope value is "all",
-      # then the scope is unrestricted.
-      def process_command(scope_type, scope_value, command)
-        env_var = case scope_type
-            when "with" then "ROLES"
-            when "on"   then "HOSTS"
-          end
-        old_var, ENV[env_var] = ENV[env_var], (scope_value == "all" ? nil : scope_value) if env_var
-        if command
-          begin
-            exec(command)
-          ensure
-            ENV[env_var] = old_var if env_var
-          end
-        else
-          puts "scoping #{scope_type} #{scope_value}"
-        end
-      end
-      # All open sessions, needed to satisfy the Command::Processable include
-      def sessions
-        configuration.sessions.values
-      end
-    end
-end

data/lib/capistrano/ssh.rb DELETED Viewed

@@ -1,95 +0,0 @@
-require 'net/ssh'
-module Capistrano
-  # A helper class for dealing with SSH connections.
-  class SSH
-    # Patch an accessor onto an SSH connection so that we can record the server
-    # definition object that defines the connection. This is useful because
-    # the gateway returns connections whose "host" is 127.0.0.1, instead of
-    # the host on the other side of the tunnel.
-    module Server #:nodoc:
-      def self.apply_to(connection, server)
-        connection.extend(Server)
-        connection.xserver = server
-        connection
-      end
-      attr_accessor :xserver
-    end
-    # An abstraction to make it possible to connect to the server via public key
-    # without prompting for the password. If the public key authentication fails
-    # this will fall back to password authentication.
-    #
-    # +server+ must be an instance of ServerDefinition.
-    #
-    # If a block is given, the new session is yielded to it, otherwise the new
-    # session is returned.
-    #
-    # If an :ssh_options key exists in +options+, it is passed to the Net::SSH
-    # constructor. Values in +options+ are then merged into it, and any
-    # connection information in +server+ is added last, so that +server+ info
-    # takes precedence over +options+, which takes precendence over ssh_options.
-    def self.connect(server, options={})
-      connection_strategy(server, options) do |host, user, connection_options|
-        connection = Net::SSH.start(host, user, connection_options)
-        Server.apply_to(connection, server)
-      end
-    end
-    # Abstracts the logic for establishing an SSH connection (which includes
-    # testing for connection failures and retrying with a password, and so forth,
-    # mostly made complicated because of the fact that some of these variables
-    # might be lazily evaluated and try to do something like prompt the user,
-    # which should only happen when absolutely necessary.
-    #
-    # This will yield the hostname, username, and a hash of connection options
-    # to the given block, which should return a new connection.
-    def self.connection_strategy(server, options={}, &block)
-      methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
-      password_value = nil
-      # construct the hash of ssh options that should be passed more-or-less
-      # directly to Net::SSH. This will be the general ssh options, merged with
-      # the server-specific ssh-options.
-      ssh_options = (options[:ssh_options] || {}).merge(server.options[:ssh_options] || {})
-      # load any SSH configuration files that were specified in the SSH options. This
-      # will load from ~/.ssh/config and /etc/ssh_config by default (see Net::SSH
-      # for details). Merge the explicitly given ssh_options over the top of the info
-      # from the config file.
-      ssh_options = Net::SSH.configuration_for(server.host, ssh_options.fetch(:config, true)).merge(ssh_options)
-      # 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]
-      # the .ssh/config file might have changed the host-name on us
-      host = ssh_options.fetch(:host_name, server.host)
-      ssh_options[:port] = port if port
-      # delete these, since we've determined which username to use by this point
-      ssh_options.delete(:username)
-      ssh_options.delete(:user)
-      begin
-        connection_options = ssh_options.merge(
-          :password => password_value,
-          :auth_methods => ssh_options[:auth_methods] || methods.shift
-        )
-        yield host, user, connection_options
-      rescue Net::SSH::AuthenticationFailed
-        raise if methods.empty? || ssh_options[:auth_methods]
-        password_value = options[:password]
-        retry
-      end
-    end
-  end
-end

data/lib/capistrano/task_definition.rb DELETED Viewed

@@ -1,77 +0,0 @@
-require 'capistrano/server_definition'
-module Capistrano
-  class TaskDefinition
-    attr_reader :name, :namespace, :options, :body, :desc, :on_error, :max_hosts
-    def initialize(name, namespace, options={}, &block)
-      @name, @namespace, @options = name, namespace, options
-      @desc      = @options.delete(:desc)
-      @on_error  = options.delete(:on_error)
-      @max_hosts = options[:max_hosts] && options[:max_hosts].to_i
-      @body      = block or raise ArgumentError, "a task requires a block"
-      @servers   = nil
-    end
-    # Returns the task's fully-qualified name, including the namespace
-    def fully_qualified_name
-      @fully_qualified_name ||= begin
-        if namespace.default_task == self
-          namespace.fully_qualified_name
-        else
-          [namespace.fully_qualified_name, name].compact.join(":")
-        end
-      end
-    end
-    def name=(value)
-      raise ArgumentError, "expected a valid task name" if !value.respond_to?(:to_sym)
-      @name = value.to_sym
-    end
-    # Returns the description for this task, with newlines collapsed and
-    # whitespace stripped. Returns the empty string if there is no
-    # description for this task.
-    def description(rebuild=false)
-      @description = nil if rebuild
-      @description ||= begin
-        description = @desc || ""
-        indentation = description[/\A\s+/]
-        if indentation
-          reformatted_description = ""
-          description.strip.each_line do |line|
-            line = line.chomp.sub(/^#{indentation}/, "")
-            line = line.gsub(/#{indentation}\s*/, " ") if line[/^\S/]
-            reformatted_description << line << "\n"
-          end
-          description = reformatted_description
-        end
-        description.strip.gsub(/\r\n/, "\n")
-      end
-    end
-    # Returns the first sentence of the full description. If +max_length+ is
-    # given, the result will be truncated if it is longer than +max_length+,
-    # and an ellipsis appended.
-    def brief_description(max_length=nil)
-      brief = description[/^.*?\.(?=\s|$)/] || description
-      if max_length && brief.length > max_length
-        brief = brief[0,max_length-3] + "..."
-      end
-      brief
-    end
-    # Indicates whether the task wants to continue, even if a server has failed
-    # previously
-    def continue_on_error?
-      @on_error == :continue
-    end
-  end
-end