3 files changed, 105 insertions, 40 deletions

diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index 0f59d7aa51eb..9f0a2d531047 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	capistrano
-PORTVERSION=	1.4.1
+PORTVERSION=	2.1.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,8 @@ COMMENT=	A utility for executing commands in parallel on multiple machines
 
 BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
 		${LOCALBASE}/${SPEC_DIR}/net-sftp-1.1.0.gemspec:${PORTSDIR}/security/rubygem-net-sftp
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${BUILD_DEPENDS} \
+		rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
 
 post-install:
 	@${ECHO_MSG} "======================================================================"
diff --git a/sysutils/rubygem-capistrano/distinfo b/sysutils/rubygem-capistrano/distinfo
index 07fab4a75ee8..57f117cd40ec 100644
--- a/sysutils/rubygem-capistrano/distinfo
+++ b/sysutils/rubygem-capistrano/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/capistrano-1.4.1.gem) = c35b2863b5c9110dc0dff51e85ffac98
-SHA256 (rubygem/capistrano-1.4.1.gem) = 2ed5ec04a2492fa5a9f9dc9b613990c5866935a8c193a9476fd73b29c98a7313
-SIZE (rubygem/capistrano-1.4.1.gem) = 49152
+MD5 (rubygem/capistrano-2.1.0.gem) = 68bb541a4622840e5b068bffe02e9c78
+SHA256 (rubygem/capistrano-2.1.0.gem) = 6b2e6e5feac3243413bf23bb1875bf6f869d2ed7fd3e4e41f2b88438dd63eb0a
+SIZE (rubygem/capistrano-2.1.0.gem) = 91648
diff --git a/sysutils/rubygem-capistrano/pkg-plist b/sysutils/rubygem-capistrano/pkg-plist
index c6e994683c9f..95894d9f9190 100644
--- a/sysutils/rubygem-capistrano/pkg-plist
+++ b/sysutils/rubygem-capistrano/pkg-plist
@@ -1,61 +1,125 @@
 bin/cap
+bin/capify
 %%GEM_CACHE%%
-%%GEM_SPEC%%
+%%GEM_LIB_DIR%%/CHANGELOG
+%%GEM_LIB_DIR%%/MIT-LICENSE
+%%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/bin/cap
+%%GEM_LIB_DIR%%/bin/capify
+%%GEM_LIB_DIR%%/examples/sample.rb
 %%GEM_LIB_DIR%%/lib/capistrano.rb
-%%GEM_LIB_DIR%%/lib/capistrano/actor.rb
+%%GEM_LIB_DIR%%/lib/capistrano/callback.rb
 %%GEM_LIB_DIR%%/lib/capistrano/cli.rb
+%%GEM_LIB_DIR%%/lib/capistrano/cli/execute.rb
+%%GEM_LIB_DIR%%/lib/capistrano/cli/help.rb
+%%GEM_LIB_DIR%%/lib/capistrano/cli/help.txt
+%%GEM_LIB_DIR%%/lib/capistrano/cli/options.rb
+%%GEM_LIB_DIR%%/lib/capistrano/cli/ui.rb
 %%GEM_LIB_DIR%%/lib/capistrano/command.rb
 %%GEM_LIB_DIR%%/lib/capistrano/configuration.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/actions/file_transfer.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/actions/inspect.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/actions/invocation.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/callbacks.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/connections.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/execution.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/loading.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/namespaces.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/roles.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/servers.rb
+%%GEM_LIB_DIR%%/lib/capistrano/configuration/variables.rb
+%%GEM_LIB_DIR%%/lib/capistrano/errors.rb
 %%GEM_LIB_DIR%%/lib/capistrano/extensions.rb
 %%GEM_LIB_DIR%%/lib/capistrano/gateway.rb
 %%GEM_LIB_DIR%%/lib/capistrano/logger.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/compat.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/dependencies.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/local_dependency.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/remote_dependency.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/accurev.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/base.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/bzr.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/cvs.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/darcs.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/git.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/mercurial.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/perforce.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm/subversion.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/base.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/checkout.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/copy.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/export.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/remote.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy/remote_cache.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/templates/maintenance.rhtml
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/standard.rb
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/templates/maintenance.rhtml
+%%GEM_LIB_DIR%%/lib/capistrano/recipes/upgrade.rb
+%%GEM_LIB_DIR%%/lib/capistrano/server_definition.rb
 %%GEM_LIB_DIR%%/lib/capistrano/shell.rb
 %%GEM_LIB_DIR%%/lib/capistrano/ssh.rb
-%%GEM_LIB_DIR%%/lib/capistrano/transfer.rb
-%%GEM_LIB_DIR%%/lib/capistrano/utils.rb
+%%GEM_LIB_DIR%%/lib/capistrano/task_definition.rb
+%%GEM_LIB_DIR%%/lib/capistrano/upload.rb
 %%GEM_LIB_DIR%%/lib/capistrano/version.rb
-%%GEM_LIB_DIR%%/lib/capistrano/generators/rails/loader.rb
-%%GEM_LIB_DIR%%/lib/capistrano/generators/rails/deployment/deployment_generator.rb
-%%GEM_LIB_DIR%%/lib/capistrano/generators/rails/deployment/templates/capistrano.rake
-%%GEM_LIB_DIR%%/lib/capistrano/generators/rails/deployment/templates/deploy.rb
-%%GEM_LIB_DIR%%/lib/capistrano/recipes/standard.rb
-%%GEM_LIB_DIR%%/lib/capistrano/recipes/templates/maintenance.rhtml
-%%GEM_LIB_DIR%%/lib/capistrano/scm/base.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/baz.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/bzr.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/cvs.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/darcs.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/mercurial.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/perforce.rb
-%%GEM_LIB_DIR%%/lib/capistrano/scm/subversion.rb
-%%GEM_LIB_DIR%%/examples/sample.rb
-%%GEM_LIB_DIR%%/test/actor_test.rb
+%%GEM_LIB_DIR%%/test/cli/execute_test.rb
+%%GEM_LIB_DIR%%/test/cli/help_test.rb
+%%GEM_LIB_DIR%%/test/cli/options_test.rb
+%%GEM_LIB_DIR%%/test/cli/ui_test.rb
+%%GEM_LIB_DIR%%/test/cli_test.rb
 %%GEM_LIB_DIR%%/test/command_test.rb
+%%GEM_LIB_DIR%%/test/configuration/actions/file_transfer_test.rb
+%%GEM_LIB_DIR%%/test/configuration/actions/inspect_test.rb
+%%GEM_LIB_DIR%%/test/configuration/actions/invocation_test.rb
+%%GEM_LIB_DIR%%/test/configuration/callbacks_test.rb
+%%GEM_LIB_DIR%%/test/configuration/connections_test.rb
+%%GEM_LIB_DIR%%/test/configuration/execution_test.rb
+%%GEM_LIB_DIR%%/test/configuration/loading_test.rb
+%%GEM_LIB_DIR%%/test/configuration/namespace_dsl_test.rb
+%%GEM_LIB_DIR%%/test/configuration/roles_test.rb
+%%GEM_LIB_DIR%%/test/configuration/servers_test.rb
+%%GEM_LIB_DIR%%/test/configuration/variables_test.rb
 %%GEM_LIB_DIR%%/test/configuration_test.rb
-%%GEM_LIB_DIR%%/test/ssh_test.rb
-%%GEM_LIB_DIR%%/test/utils.rb
+%%GEM_LIB_DIR%%/test/deploy/scm/accurev_test.rb
+%%GEM_LIB_DIR%%/test/deploy/scm/base_test.rb
+%%GEM_LIB_DIR%%/test/deploy/scm/git_test.rb
+%%GEM_LIB_DIR%%/test/deploy/strategy/copy_test.rb
+%%GEM_LIB_DIR%%/test/extensions_test.rb
+%%GEM_LIB_DIR%%/test/fixtures/cli_integration.rb
 %%GEM_LIB_DIR%%/test/fixtures/config.rb
 %%GEM_LIB_DIR%%/test/fixtures/custom.rb
-%%GEM_LIB_DIR%%/test/scm/cvs_test.rb
-%%GEM_LIB_DIR%%/test/scm/subversion_test.rb
-%%GEM_LIB_DIR%%/README
-%%GEM_LIB_DIR%%/MIT-LICENSE
-%%GEM_LIB_DIR%%/CHANGELOG
-%%GEM_LIB_DIR%%/THANKS
-@dirrm %%GEM_LIB_DIR%%/test/scm
+%%GEM_LIB_DIR%%/test/gateway_test.rb
+%%GEM_LIB_DIR%%/test/logger_test.rb
+%%GEM_LIB_DIR%%/test/server_definition_test.rb
+%%GEM_LIB_DIR%%/test/shell_test.rb
+%%GEM_LIB_DIR%%/test/ssh_test.rb
+%%GEM_LIB_DIR%%/test/task_definition_test.rb
+%%GEM_LIB_DIR%%/test/upload_test.rb
+%%GEM_LIB_DIR%%/test/utils.rb
+%%GEM_LIB_DIR%%/test/version_test.rb
+%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test/fixtures
+@dirrm %%GEM_LIB_DIR%%/test/deploy/strategy
+@dirrm %%GEM_LIB_DIR%%/test/deploy/scm
+@dirrm %%GEM_LIB_DIR%%/test/deploy
+@dirrm %%GEM_LIB_DIR%%/test/configuration/actions
+@dirrm %%GEM_LIB_DIR%%/test/configuration
+@dirrm %%GEM_LIB_DIR%%/test/cli
 @dirrm %%GEM_LIB_DIR%%/test
-@dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEM_LIB_DIR%%/lib/capistrano/scm
 @dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes/templates
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/templates
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/strategy
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy/scm
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes/deploy
 @dirrm %%GEM_LIB_DIR%%/lib/capistrano/recipes
-@dirrm %%GEM_LIB_DIR%%/lib/capistrano/generators/rails/deployment/templates
-@dirrm %%GEM_LIB_DIR%%/lib/capistrano/generators/rails/deployment
-@dirrm %%GEM_LIB_DIR%%/lib/capistrano/generators/rails
-@dirrm %%GEM_LIB_DIR%%/lib/capistrano/generators
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/configuration/actions
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/configuration
+@dirrm %%GEM_LIB_DIR%%/lib/capistrano/cli
 @dirrm %%GEM_LIB_DIR%%/lib/capistrano
 @dirrm %%GEM_LIB_DIR%%/lib
+@dirrm %%GEM_LIB_DIR%%/examples
 @dirrm %%GEM_LIB_DIR%%/bin
 @dirrm %%GEM_LIB_DIR%%
 @dirrm %%GEM_DOC_DIR%%