capistrano 3.0.1 → 3.1.0

data/spec/support/tasks/fail.cap

@@ -0,0 +1,7 @@
+set :fail, proc { fail }
+before 'deploy:starting', :fail do
+  on roles :all do
+    execute :touch, shared_path.join('fail')
+  end
+  fetch(:fail)
+end

data/spec/support/tasks/failed.cap

@@ -0,0 +1,5 @@
+after 'deploy:failed', :failed do
+  on roles :all do
+    execute :touch, shared_path.join('failed')
+  end
+end

data/spec/support/test_app.rb

@@ -8,10 +8,9 @@ module TestApp
 
   def default_config
     %{
-      set :stage, :#{stage}
       set :deploy_to, '#{deploy_to}'
       set :repo_url, 'git://github.com/capistrano/capistrano.git'
-      set :branch, 'v3'
+      set :branch, 'master'
       set :ssh_options, { keys: "\#{ENV['HOME']}/.vagrant.d/insecure_private_key" }
       server 'vagrant@localhost:2220', roles: %w{web app}
       set :linked_files, #{linked_files}
@@ -58,6 +57,14 @@ module TestApp
     end
   end
 
+  def prepend_to_capfile(config)
+    current_capfile = File.read(capfile)
+    File.open(capfile, 'w') do |file|
+      file.write config
+      file.write current_capfile
+    end
+  end
+
   def create_shared_directory(path)
     FileUtils.mkdir_p(shared_path.join(path))
   end
@@ -67,9 +74,14 @@ module TestApp
   end
 
   def cap(task)
+    run "bundle exec cap #{stage} #{task}"
+  end
+
+  def run(command)
     Dir.chdir(test_app_path) do
-      %x[bundle exec cap #{stage} #{task}]
+      %x[#{command}]
     end
+    $?.success?
   end
 
   def stage
@@ -135,4 +147,22 @@ module TestApp
   def copy_task_to_test_app(source)
     FileUtils.cp(source, task_dir)
   end
+
+  def config_path
+    test_app_path.join('config')
+  end
+
+  def move_configuration_to_custom_location(location)
+    prepend_to_capfile(
+      %{
+        set :stage_config_path, "app/config/deploy"
+        set :deploy_config_path, "app/config/deploy.rb"
+      }
+    )
+
+    location = test_app_path.join(location)
+    FileUtils.mkdir_p(location)
+    FileUtils.mv(config_path, location)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,48 +81,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-- !ruby/object:Gem::Dependency
-  name: kuroko
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -137,6 +95,7 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -145,7 +104,9 @@ files:
 - bin/capify
 - capistrano-public_cert.pem
 - capistrano.gemspec
+- features/configuration.feature
 - features/deploy.feature
+- features/deploy_failure.feature
 - features/installation.feature
 - features/remote_file_task.feature
 - features/step_definitions/assertions.rb
@@ -161,6 +122,7 @@ files:
 - lib/capistrano/configuration/question.rb
 - lib/capistrano/configuration/server.rb
 - lib/capistrano/configuration/servers.rb
+- lib/capistrano/configuration/servers/host_filter.rb
 - lib/capistrano/configuration/servers/role_filter.rb
 - lib/capistrano/console.rb
 - lib/capistrano/defaults.rb
@@ -176,6 +138,7 @@ files:
 - lib/capistrano/hg.rb
 - lib/capistrano/i18n.rb
 - lib/capistrano/install.rb
+- lib/capistrano/scm.rb
 - lib/capistrano/setup.rb
 - lib/capistrano/tasks/console.rake
 - lib/capistrano/tasks/deploy.rake
@@ -193,12 +156,15 @@ files:
 - spec/lib/capistrano/application_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
+- spec/lib/capistrano/configuration/servers/host_filter_spec.rb
 - spec/lib/capistrano/configuration/servers/role_filter_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb
-- spec/lib/capistrano/dsl/env_spec.rb
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
+- spec/lib/capistrano/git_spec.rb
+- spec/lib/capistrano/hg_spec.rb
+- spec/lib/capistrano/scm_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
@@ -206,13 +172,17 @@ files:
 - spec/support/Vagrantfile
 - spec/support/matchers.rb
 - spec/support/tasks/database.cap
+- spec/support/tasks/fail.cap
+- spec/support/tasks/failed.cap
 - spec/support/test_app.rb
 homepage: http://capistranorb.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 'If you''re updating Capistrano from 2.x.x, we recommend you
-  to read the upgrade guide: http://www.capistranorb.com/documentation/upgrading/'
+post_install_message: |
+  Capistrano 3.1 has some breaking changes, like `deploy:restart` callback should be added manually to your deploy.rb. Please, check the CHANGELOG: http://goo.gl/SxB0lr
+
+  If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB
 rdoc_options: []
 require_paths:
 - lib
@@ -233,7 +203,9 @@ signing_key:
 specification_version: 4
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
+- features/configuration.feature
 - features/deploy.feature
+- features/deploy_failure.feature
 - features/installation.feature
 - features/remote_file_task.feature
 - features/step_definitions/assertions.rb
@@ -246,12 +218,15 @@ test_files:
 - spec/lib/capistrano/application_spec.rb
 - spec/lib/capistrano/configuration/question_spec.rb
 - spec/lib/capistrano/configuration/server_spec.rb
+- spec/lib/capistrano/configuration/servers/host_filter_spec.rb
 - spec/lib/capistrano/configuration/servers/role_filter_spec.rb
 - spec/lib/capistrano/configuration/servers_spec.rb
 - spec/lib/capistrano/configuration_spec.rb
-- spec/lib/capistrano/dsl/env_spec.rb
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
+- spec/lib/capistrano/git_spec.rb
+- spec/lib/capistrano/hg_spec.rb
+- spec/lib/capistrano/scm_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
@@ -259,5 +234,7 @@ test_files:
 - spec/support/Vagrantfile
 - spec/support/matchers.rb
 - spec/support/tasks/database.cap
+- spec/support/tasks/fail.cap
+- spec/support/tasks/failed.cap
 - spec/support/test_app.rb
 has_rdoc: 

data/spec/lib/capistrano/dsl/env_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-module Capistrano
-  module DSL
-
-    describe Env do
-
-    end
-  end
-end