[DRE-commits] [capistrano] 01/03: Merge tag 'upstream/3.4.0'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository capistrano.

commit 1218513de3feb4c81062ec7898a98f52e755bf97
Merge: 4390982 2332f38
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Apr 10 16:12:51 2015 +0200

    Merge tag 'upstream/3.4.0'
    
    Upstream version 3.4.0
    
    # gpg: Signature made Sex 10 Abr 2015 16:12:49 CEST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .travis.yml                                        |   9 +-
 CHANGELOG.md                                       | 146 +++++++++++-
 Gemfile                                            |   6 +-
 README.md                                          | 240 ++++---------------
 Rakefile                                           |   6 +-
 capistrano.gemspec                                 |   5 +-
 checksums.yaml.gz                                  | Bin 267 -> 0 bytes
 features/configuration.feature                     |   4 +-
 features/deploy.feature                            |  17 +-
 features/sshconnect.feature                        |  11 +
 features/step_definitions/assertions.rb            |  42 ++--
 features/step_definitions/cap_commands.rb          |   2 +-
 features/step_definitions/setup.rb                 |  22 +-
 features/support/env.rb                            |  17 +-
 features/support/remote_command_helpers.rb         |   5 +-
 features/support/vagrant_helpers.rb                |  35 +++
 lib/capistrano/all.rb                              |   3 +-
 lib/capistrano/application.rb                      |  59 ++++-
 lib/capistrano/configuration.rb                    |  55 ++++-
 lib/capistrano/configuration/filter.rb             |  56 +++++
 lib/capistrano/configuration/question.rb           |  34 ++-
 lib/capistrano/configuration/server.rb             |  87 +++----
 lib/capistrano/configuration/servers.rb            |  66 +++---
 .../configuration/servers/host_filter.rb           |  82 -------
 .../configuration/servers/role_filter.rb           |  86 -------
 lib/capistrano/defaults.rb                         |  20 +-
 lib/capistrano/dsl.rb                              |  15 +-
 lib/capistrano/dsl/env.rb                          |  18 +-
 lib/capistrano/dsl/paths.rb                        |   2 +-
 lib/capistrano/dsl/task_enhancements.rb            |   8 +-
 lib/capistrano/git.rb                              |  12 +-
 lib/capistrano/hg.rb                               |   8 +-
 lib/capistrano/svn.rb                              |   4 +-
 lib/capistrano/tasks/deploy.rake                   |  21 +-
 lib/capistrano/tasks/git.rake                      |   2 +-
 lib/capistrano/tasks/install.rake                  |  31 +--
 lib/capistrano/templates/Capfile                   |  10 +-
 lib/capistrano/templates/deploy.rb.erb             |  22 +-
 lib/capistrano/templates/stage.rb.erb              |  46 ++--
 lib/capistrano/upload_task.rb                      |   9 +
 lib/capistrano/version.rb                          |   2 +-
 metadata.yml                                       |  61 ++---
 spec/integration/dsl_spec.rb                       | 256 ++++++++++++++-------
 spec/lib/capistrano/application_spec.rb            |  30 ++-
 spec/lib/capistrano/configuration/filter_spec.rb   | 111 +++++++++
 spec/lib/capistrano/configuration/question_spec.rb |  30 ++-
 spec/lib/capistrano/configuration/server_spec.rb   |  71 ++++--
 .../configuration/servers/host_filter_spec.rb      |  84 -------
 .../configuration/servers/role_filter_spec.rb      | 140 -----------
 spec/lib/capistrano/configuration/servers_spec.rb  | 162 +++++++++++--
 spec/lib/capistrano/configuration_spec.rb          |  38 ++-
 spec/lib/capistrano/dsl/paths_spec.rb              | 203 ++++++++++++----
 spec/lib/capistrano/dsl/task_enhancements_spec.rb  |  88 +++++++
 spec/lib/capistrano/dsl_spec.rb                    |  15 +-
 spec/lib/capistrano/git_spec.rb                    |  19 +-
 spec/lib/capistrano/hg_spec.rb                     |  15 +-
 spec/lib/capistrano/scm_spec.rb                    |   6 +-
 spec/lib/capistrano/svn_spec.rb                    |  12 +-
 spec/lib/capistrano/upload_task_spec.rb            |  19 ++
 spec/lib/capistrano/version_validator_spec.rb      |   8 +-
 spec/spec_helper.rb                                |   3 +-
 spec/support/Vagrantfile                           |  25 +-
 spec/support/tasks/root.rake                       |  11 +
 spec/support/test_app.rb                           |   4 +-
 64 files changed, 1635 insertions(+), 1101 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/capistrano.git