Update capistrano to 3.1.0.

Changes are too many to write here, please refer CHANGELOG.md.

3 files changed, 82 insertions, 118 deletions

diff --git a/sysutils/capistrano/Makefile b/sysutils/capistrano/Makefile
index d2f95667ac7..1bce9ddf32d 100644
--- a/sysutils/capistrano/Makefile
+++ b/sysutils/capistrano/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2013/09/15 15:56:12 taca Exp $
+# $NetBSD: Makefile,v 1.18 2014/03/14 18:01:03 taca Exp $
 
-DISTNAME=	capistrano-2.15.5
+DISTNAME=	capistrano-3.1.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,11 +8,10 @@ HOMEPAGE=	http://github.com/capistrano/capistrano
 COMMENT=	Tool for parallel execution of commands across multiple machines
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-net-ssh>=2.0.14:../../security/ruby-net-ssh
-DEPENDS+=	${RUBY_PKGPREFIX}-net-ssh-gateway>=1.1.0:../../security/ruby-net-ssh-gateway
-DEPENDS+=	${RUBY_PKGPREFIX}-net-sftp>=2.0.0:../../security/ruby-net-sftp
-DEPENDS+=	${RUBY_PKGPREFIX}-net-scp>=1.0.0:../../security/ruby-net-scp
-DEPENDS+=	${RUBY_PKGPREFIX}-highline>=0:../../devel/ruby-highline
+DEPENDS+=	${RUBY_PKGPREFIX}-sshkit>=1.3:../../security/ruby-net-ssh
+DEPENDS+=	${RUBY_PKGPREFIX}-i18n>=0:../../devel/ruby-i18n
+
+USE_RAKE=	YES
 
 CONFLICTS+=	ruby[1-9][0-9]-capistrano-[0-9]* capistrano-[0-9]*
 
diff --git a/sysutils/capistrano/PLIST b/sysutils/capistrano/PLIST
index 875b42f6ea1..3992c435e22 100644
--- a/sysutils/capistrano/PLIST
+++ b/sysutils/capistrano/PLIST
@@ -1,123 +1,88 @@
-@comment $NetBSD: PLIST,v 1.12 2013/09/15 15:56:12 taca Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/03/14 18:01:03 taca Exp $
 bin/cap
 bin/capify
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.gitignore
 ${GEM_LIBDIR}/.travis.yml
-${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/CHANGELOG.md
+${GEM_LIBDIR}/CONTRIBUTING.md
 ${GEM_LIBDIR}/Gemfile
+${GEM_LIBDIR}/LICENSE.txt
 ${GEM_LIBDIR}/README.md
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/bin/cap
 ${GEM_LIBDIR}/bin/capify
+${GEM_LIBDIR}/capistrano-public_cert.pem
 ${GEM_LIBDIR}/capistrano.gemspec
+${GEM_LIBDIR}/features/configuration.feature
+${GEM_LIBDIR}/features/deploy.feature
+${GEM_LIBDIR}/features/deploy_failure.feature
+${GEM_LIBDIR}/features/installation.feature
+${GEM_LIBDIR}/features/remote_file_task.feature
+${GEM_LIBDIR}/features/step_definitions/assertions.rb
+${GEM_LIBDIR}/features/step_definitions/cap_commands.rb
+${GEM_LIBDIR}/features/step_definitions/setup.rb
+${GEM_LIBDIR}/features/support/env.rb
+${GEM_LIBDIR}/features/support/remote_command_helpers.rb
+${GEM_LIBDIR}/lib/Capfile
 ${GEM_LIBDIR}/lib/capistrano.rb
-${GEM_LIBDIR}/lib/capistrano/callback.rb
-${GEM_LIBDIR}/lib/capistrano/cli.rb
-${GEM_LIBDIR}/lib/capistrano/cli/execute.rb
-${GEM_LIBDIR}/lib/capistrano/cli/help.rb
-${GEM_LIBDIR}/lib/capistrano/cli/help.txt
-${GEM_LIBDIR}/lib/capistrano/cli/options.rb
-${GEM_LIBDIR}/lib/capistrano/cli/ui.rb
-${GEM_LIBDIR}/lib/capistrano/command.rb
+${GEM_LIBDIR}/lib/capistrano/all.rb
+${GEM_LIBDIR}/lib/capistrano/application.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/actions/file_transfer.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/actions/inspect.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/actions/invocation.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/alias_task.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/callbacks.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/connections.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/execution.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/loading.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/log_formatters.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/namespaces.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/roles.rb
+${GEM_LIBDIR}/lib/capistrano/configuration/question.rb
+${GEM_LIBDIR}/lib/capistrano/configuration/server.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration/servers.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/variables.rb
-${GEM_LIBDIR}/lib/capistrano/errors.rb
-${GEM_LIBDIR}/lib/capistrano/ext/multistage.rb
-${GEM_LIBDIR}/lib/capistrano/ext/string.rb
-${GEM_LIBDIR}/lib/capistrano/extensions.rb
-${GEM_LIBDIR}/lib/capistrano/fix_rake_deprecated_dsl.rb
-${GEM_LIBDIR}/lib/capistrano/logger.rb
-${GEM_LIBDIR}/lib/capistrano/processable.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/compat.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/assets.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/dependencies.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/local_dependency.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/remote_dependency.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/accurev.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/base.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/bzr.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/cvs.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/darcs.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/git.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/mercurial.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/none.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/perforce.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/scm/subversion.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/base.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/checkout.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/copy.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/export.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/remote.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/remote_cache.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/standard.rb
-${GEM_LIBDIR}/lib/capistrano/recipes/templates/maintenance.rhtml
-${GEM_LIBDIR}/lib/capistrano/role.rb
-${GEM_LIBDIR}/lib/capistrano/server_definition.rb
-${GEM_LIBDIR}/lib/capistrano/shell.rb
-${GEM_LIBDIR}/lib/capistrano/ssh.rb
-${GEM_LIBDIR}/lib/capistrano/task_definition.rb
-${GEM_LIBDIR}/lib/capistrano/transfer.rb
+${GEM_LIBDIR}/lib/capistrano/configuration/servers/host_filter.rb
+${GEM_LIBDIR}/lib/capistrano/configuration/servers/role_filter.rb
+${GEM_LIBDIR}/lib/capistrano/console.rb
+${GEM_LIBDIR}/lib/capistrano/defaults.rb
+${GEM_LIBDIR}/lib/capistrano/deploy.rb
+${GEM_LIBDIR}/lib/capistrano/dotfile.rb
+${GEM_LIBDIR}/lib/capistrano/dsl.rb
+${GEM_LIBDIR}/lib/capistrano/dsl/env.rb
+${GEM_LIBDIR}/lib/capistrano/dsl/paths.rb
+${GEM_LIBDIR}/lib/capistrano/dsl/stages.rb
+${GEM_LIBDIR}/lib/capistrano/dsl/task_enhancements.rb
+${GEM_LIBDIR}/lib/capistrano/framework.rb
+${GEM_LIBDIR}/lib/capistrano/git.rb
+${GEM_LIBDIR}/lib/capistrano/hg.rb
+${GEM_LIBDIR}/lib/capistrano/i18n.rb
+${GEM_LIBDIR}/lib/capistrano/install.rb
+${GEM_LIBDIR}/lib/capistrano/scm.rb
+${GEM_LIBDIR}/lib/capistrano/setup.rb
+${GEM_LIBDIR}/lib/capistrano/tasks/console.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/deploy.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/framework.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/git.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/hg.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/install.rake
+${GEM_LIBDIR}/lib/capistrano/templates/Capfile
+${GEM_LIBDIR}/lib/capistrano/templates/deploy.rb.erb
+${GEM_LIBDIR}/lib/capistrano/templates/stage.rb.erb
 ${GEM_LIBDIR}/lib/capistrano/version.rb
-${GEM_LIBDIR}/test/cli/execute_test.rb
-${GEM_LIBDIR}/test/cli/help_test.rb
-${GEM_LIBDIR}/test/cli/options_test.rb
-${GEM_LIBDIR}/test/cli/ui_test.rb
-${GEM_LIBDIR}/test/cli_test.rb
-${GEM_LIBDIR}/test/command_test.rb
-${GEM_LIBDIR}/test/configuration/actions/file_transfer_test.rb
-${GEM_LIBDIR}/test/configuration/actions/inspect_test.rb
-${GEM_LIBDIR}/test/configuration/actions/invocation_test.rb
-${GEM_LIBDIR}/test/configuration/alias_task_test.rb
-${GEM_LIBDIR}/test/configuration/callbacks_test.rb
-${GEM_LIBDIR}/test/configuration/connections_test.rb
-${GEM_LIBDIR}/test/configuration/execution_test.rb
-${GEM_LIBDIR}/test/configuration/loading_test.rb
-${GEM_LIBDIR}/test/configuration/namespace_dsl_test.rb
-${GEM_LIBDIR}/test/configuration/roles_test.rb
-${GEM_LIBDIR}/test/configuration/servers_test.rb
-${GEM_LIBDIR}/test/configuration/variables_test.rb
-${GEM_LIBDIR}/test/configuration_test.rb
-${GEM_LIBDIR}/test/deploy/local_dependency_test.rb
-${GEM_LIBDIR}/test/deploy/remote_dependency_test.rb
-${GEM_LIBDIR}/test/deploy/scm/accurev_test.rb
-${GEM_LIBDIR}/test/deploy/scm/base_test.rb
-${GEM_LIBDIR}/test/deploy/scm/bzr_test.rb
-${GEM_LIBDIR}/test/deploy/scm/darcs_test.rb
-${GEM_LIBDIR}/test/deploy/scm/git_test.rb
-${GEM_LIBDIR}/test/deploy/scm/mercurial_test.rb
-${GEM_LIBDIR}/test/deploy/scm/none_test.rb
-${GEM_LIBDIR}/test/deploy/scm/perforce_test.rb
-${GEM_LIBDIR}/test/deploy/scm/subversion_test.rb
-${GEM_LIBDIR}/test/deploy/strategy/copy_test.rb
-${GEM_LIBDIR}/test/extensions_test.rb
-${GEM_LIBDIR}/test/fixtures/cli_integration.rb
-${GEM_LIBDIR}/test/fixtures/config.rb
-${GEM_LIBDIR}/test/fixtures/custom.rb
-${GEM_LIBDIR}/test/logger_formatting_test.rb
-${GEM_LIBDIR}/test/logger_test.rb
-${GEM_LIBDIR}/test/recipes_test.rb
-${GEM_LIBDIR}/test/role_test.rb
-${GEM_LIBDIR}/test/server_definition_test.rb
-${GEM_LIBDIR}/test/shell_test.rb
-${GEM_LIBDIR}/test/ssh_test.rb
-${GEM_LIBDIR}/test/task_definition_test.rb
-${GEM_LIBDIR}/test/transfer_test.rb
-${GEM_LIBDIR}/test/utils.rb
+${GEM_LIBDIR}/lib/capistrano/version_validator.rb
+${GEM_LIBDIR}/spec/integration/dsl_spec.rb
+${GEM_LIBDIR}/spec/integration_spec_helper.rb
+${GEM_LIBDIR}/spec/lib/capistrano/application_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/question_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/server_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers/host_filter_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers/role_filter_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/dsl/paths_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/dsl_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/git_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/hg_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/scm_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/version_validator_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano_spec.rb
+${GEM_LIBDIR}/spec/spec_helper.rb
+${GEM_LIBDIR}/spec/support/.gitignore
+${GEM_LIBDIR}/spec/support/Vagrantfile
+${GEM_LIBDIR}/spec/support/matchers.rb
+${GEM_LIBDIR}/spec/support/tasks/database.cap
+${GEM_LIBDIR}/spec/support/tasks/fail.cap
+${GEM_LIBDIR}/spec/support/tasks/failed.cap
+${GEM_LIBDIR}/spec/support/test_app.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/sysutils/capistrano/distinfo b/sysutils/capistrano/distinfo
index 65a18fa694c..276f6843297 100644
--- a/sysutils/capistrano/distinfo
+++ b/sysutils/capistrano/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2013/09/15 15:56:12 taca Exp $
+$NetBSD: distinfo,v 1.14 2014/03/14 18:01:03 taca Exp $
 
-SHA1 (capistrano-2.15.5.gem) = 186ade52dd274b0ee0728f8a31797eba35a9242a
-RMD160 (capistrano-2.15.5.gem) = 21502bd86aa95c2405bdacc1362e8df2ac90a1e6
-Size (capistrano-2.15.5.gem) = 132096 bytes
+SHA1 (capistrano-3.1.0.gem) = ec183fb162c638c62d1f742a21291dd094001003
+RMD160 (capistrano-3.1.0.gem) = 13726c093a4796ad533dbb9d6f9d279bdb8d29ef
+Size (capistrano-3.1.0.gem) = 38400 bytes