capistrano 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3783d6041216c4b9c311d09d0e21b4cb59faa047
-  data.tar.gz: 9080286b94f6d929467214fe2beb1e4cbfcf69ac
+  metadata.gz: 59f8fb6442e27e32704d86292e1e22a6c67daa61
+  data.tar.gz: 7ecf7b387a1c3cbf2c0bc2685e3ec6b6a1336d9b
 SHA512:
-  metadata.gz: 1bb13c785e02643ee9a9f511f875fd96eb3d6cf0765b412546e7d0a89aaa04b8e46700700fa58ee47de02ad8ef9b1ac79ea37be6fabd895d74544d5b5a3d59f5
-  data.tar.gz: 6f00a69f1245900b8b1b88dfa7208b0416681fdd87157831c0c7f1415ee02bfb106b3c4e5b997aadeb7bc86cc79aca7dfc4e0c1cb92a94fee927ac292bc7caf5
+  metadata.gz: 4a03a957b09b8b2c28f29e8f3bb81f099fdaca0f4cec6d1741591a82a24617e36416c3e8aa2ba3ff29ae6b9cb612162d8e13bb32bfb04f816fe86736aed5ca12
+  data.tar.gz: 383b341deed499908407ade22a77432bef14797a70247c5e1fc48b19103cd20e3fe4ba5b23256b5b8155ae754b4e5626cd20b2a6aa09a4bab98faffa7358872a

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .ruby-version
 _site
 .rspec
+*.swp

data/CHANGELOG.md

@@ -2,8 +2,27 @@
 
 Reverse Chronological Order:
 
+## master
+
+https://github.com/capistrano/capistrano/compare/v3.2.0...HEAD
+
+## `3.2.0``
+
+The changelog entries here are incomplete, because many authors choose not to
+be credited for their work, check the tag comparison link for Github.
+
+https://github.com/capistrano/capistrano/compare/v3.1.0...v3.2.0
+
+* Minor changes:
+  * Added `keys` method to Server properties to allow introspection of automatically added
+    properties.
+  * Compatibility with Rake 10.2.0 - `ensure_task` is now added to `@top_level_tasks` as a string. (@dmarkow)
+  * Amended the git check command, "ls-remote", to use "-h", limiting the list to refs/heads
+
 ## `3.1.0`
 
+https://github.com/capistrano/capistrano/compare/v3.0.1...v3.1.0
+
 Breaking changes:
 
   * `deploy:restart` task **is no longer run by default**.
@@ -20,7 +39,7 @@ Breaking changes:
   * Config location can now be changed with `deploy_config_path` and `stage_config_path` options (@seenmyfate)
   * `no_release` option is now available (@seenmyfate)
   * Raise an error if developer tries to define `:all` role, which is reserved (@kirs)
-  * `deploy:fallback` hook was added to add some custom behaviour on failed deploy (@seenmyfate)
+  * `deploy:failed` hook was added to add some custom behaviour on failed deploy (@seenmyfate)
   * Correctly infer namespace in task enhancements (@seenmyfate)
   * Add SHA to revision log (@blackxored)
   * Allow configuration of multiple servers with same hostname but different ports (@rsslldnphy)
@@ -37,12 +56,16 @@ Big thanks to @Kriechi for his help.
 
 ## `3.0.1`
 
+https://github.com/capistrano/capistrano/compare/v3.0.0...v3.0.1
+
   * `capify` not listed as executable (@leehambley)
   * Confirm license as MIT (@leehambley)
   * Move the git ssh helper to application path (@mpapis)
 
 ## `3.0.0`
 
+https://github.com/capistrano/capistrano/compare/2.15.5...v3.0.0
+
 If you are coming here to wonder why your Capfile doesn't work anymore, please
 vendor lock your Capistrano at 2.x, whichever version was working for you
 until today.
@@ -79,7 +102,7 @@ extension the trusted contributors and IRC regulars) were able to test for.
 There's a more extensive post about my failure to be able to keep up with the
 demands of maintaining v2 whilst trying to build something which is appropriate
 for the current landscape. If you are affected by the unsupported 2 branch,
-please contact me (Lee Hambley) to dicsuss how my company can help support you.
+please contact me (Lee Hambley) to discuss how my company can help support you.
 Otherwise, please try v3, we're sure you'll like it, and the code is designed
 to be so simple that anyone can work on it.
 

data/CONTRIBUTING.md

@@ -4,11 +4,13 @@
 or improvements to the code.**
 
 If you have a user support query, or you suspect that you might just be holding
-it wrong, drop us a line at [the mailing list]() or on [StackOverflow](). The
+it wrong, drop us a line at [the mailing list](https://groups.google.com/forum/#!forum/capistrano), [StackOverflow](http://stackoverflow.com/questions/tagged/capistrano) or at [CodersClan](http://codersclan.net/?repo_id=325&source=contributing). The
 mailing list is moderated to cut down on spam, so please be patient, if you use
 StackOverflow, make sure to tag your post with "Capistrano". (Not forgetting
 any other tags which might relate, rvm, rbenv, Ubuntu, etc.)
 
+If you have an urgent problem you can use [CodersClan](http://codersclan.net/?repo_id=325&source=contributing) to solve your problem quickly. CodersClan has a community of Capistrano experts dedicated to solve code problems for bounties.
+
 Wherever you post please be sure to include the version of Capistrano you are
 using, which versions of any plugins (*capistrano-rvm*, *capistrano-bundler*,
 etc.). Proper logs are vital, if you need to redact them, go ahead, but be

data/README.md

@@ -1,15 +1,23 @@
-# Capistrano [![Build Status](https://travis-ci.org/capistrano/capistrano.png?branch=v3)](https://travis-ci.org/capistrano/capistrano) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano.png)](https://codeclimate.com/github/capistrano/capistrano)
+# Capistrano [![Build Status](https://travis-ci.org/capistrano/capistrano.png?branch=v3)](https://travis-ci.org/capistrano/capistrano) [![Code Climate](https://codeclimate.com/github/capistrano/capistrano.png)](https://codeclimate.com/github/capistrano/capistrano) <a href="http://codersclan.net/?repo_id=325&source=small"><img src="http://www.codersclan.net/gs_button/?repo_id=325&size=small" width="69"></a>
 
 ## Requirements
 
 * Ruby >= 1.9 (JRuby and C-Ruby/YARV are supported)
 
+## Support
+
+Need help with getting Capistrano up and running? Got a code problem you want to get solved quickly?
+
+Get <a href="http://codersclan.net/?repo_id=325&source=link">Capistrano support on CodersClan.</a>
+
+<a href="http://codersclan.net/?repo_id=325&source=big"><img src="http://www.codersclan.net/gs_button/?repo_id=325" width="200"></a>
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'capistrano', '~> 3.0.1'
+gem 'capistrano', '~> 3.1.0'
 ```
 
 And then execute:
@@ -65,11 +73,19 @@ server 'example.org', roles: [:db, :workers]
 desc "Report Uptimes"
 task :uptime do
   on roles(:all) do |host|
+    execute :any_command, "with args", :here, "and here"
     info "Host #{host} (#{host.roles.to_a.join(', ')}):\t#{capture(:uptime)}"
   end
 end
 ```
 
+**Note**:
+
+**tl;dr**: `execute(:bundle, :install)` and `execute('bundle install')` don't behave identically!
+
+`execute()` has a subtle behaviour. When calling `within './directory' { execute(:bundle, :install) }` for example, the first argument to `execute()` is a *Stringish* with ***no whitespace***. This allows the command to pass through the [SSHKit::CommandMap](https://github.com/capistrano/sshkit#the-command-map) which enables a number of powerful features.
+
+When the first argument to `execute()` contains whitespace, for example `within './directory' { execute('bundle install') }` (or when using a heredoc), neither Capistrano, nor SSHKit can reliably predict how it should be shell escaped, and thus cannot perform any context, or command mapping, that means that the `within(){}` (as well as `with()`, `as()`, etc) have no effect. There have been a few attempts to resolve this, but we don't consider it a bug although we acknowledge that it might be a little counter intuitive.
 ## Before / After
 
 Where calling on the same task name, executed in order of inclusion
@@ -110,12 +126,14 @@ end
 The final way to call out to other tasks is to simply `invoke()` them:
 
 ``` ruby
-task :one do
-  on roles(:all) { info "One" }
-end
-task :two do
-  invoke :one
-  on roles(:all) { info "Two" }
+namespace :example do
+  task :one do
+    on roles(:all) { info "One" }
+  end
+  task :two do
+    invoke "example:one"
+    on roles(:all) { info "Two" }
+  end
 end
 ```
 
@@ -136,12 +154,21 @@ end
 Perfect, who needs telephones.
 
 
+## Using password authentication
+
+Password authentication can be done via `set` and `ask` in your deploy environment file (e.g.: config/environments/production.rb)
+
+```ruby
+set :password, ask('Server password:', nil)
+server 'server.domain.com', user: 'ssh_user_name', port: 22, password: fetch(:password), roles: %w{web app db}
+```
+
 ## Running local tasks
 
 Local tasks can be run by replacing `on` with `run_locally`
 
 ``` ruby
-desc "Notify service of deployment"
+desc 'Notify service of deployment'
 task :notify do
   run_locally do
     with rails_env: :development do
@@ -151,6 +178,21 @@ task :notify do
 end
 ```
 
+Of course, you can always just use standard ruby syntax to run things locally
+``` ruby
+desc 'Notify service of deployment'
+task :notify do
+  %x('RAILS_ENV=development bundle exec rake "service:notify"')
+end
+```
+
+Alternatively you could use the rake syntax
+``` ruby
+desc "Notify service of deployment"
+task :notify do
+   sh 'RAILS_ENV=development bundle exec rake "service:notify"'
+end
+```
 ## Console
 
 **Note:** Here be dragons. The console is very immature, but it's much more
@@ -186,7 +228,7 @@ DEBUG [9ce34809]  leehambley pts/0        2013-06-13 17:11 (port-11262.pppoe.wtn
 
 There is a configuration option which asks the backend driver to ask the remote host
 to assign the connection a *pty*. A *pty* is a pseudo-terminal, which in effect means
-*tell the backend that this is an **interactive** session*. This is normally a bad idea.
+*tell the backend that this is an __interactive__ session*. This is normally a bad idea.
 
 Most of the differences are best explained by [this page](https://github.com/sstephenson/rbenv/wiki/Unix-shell-initialization) from the author of *rbenv*.
 
@@ -209,7 +251,9 @@ The following variables are settable:
 
 | Variable Name         | Description                                                          | Notes                                                           |
 |:---------------------:|----------------------------------------------------------------------|-----------------------------------------------------------------|
-| `:repo_url`           | The URL of your Git repository                                       | file://, https://, or ssh:// are all supported                  |
+| `:repo_url`           | The URL of your scm repository (git, hg, svn)                        | file://, https://, ssh://, or svn+ssh:// are all supported      |
+| `:branch`             | The branch you wish to deploy                                        | This only has meaning for git and hg repos, to specify the branch of an svn repo, set `:repo_url` to the branch location. |
+| `:scm`                | The source control system used                                       | `:git`, `:hg`, `:svn` are currently supported                   |
 | `:tmp_dir`            | The (optional) temp directory that will be used (default: /tmp)      | if you have a shared web host, this setting may need to be set (i.e. /home/user/tmp/capistrano). |
 
 __Support removed__ for following variables:
@@ -225,9 +269,9 @@ connections behind the scenes in Capistrano. Depending on how deep you dig, you
 might run into interfaces that come directly from SSHKit (the configuration is
 a good example).
 
-## Licence
+## License
 
-The MIT License (MIT)
+MIT License (MIT)
 
 Copyright (c) 2012-2013 Tom Clements, Lee Hambley
 

data/features/configuration.feature

@@ -13,3 +13,16 @@ Feature: The path to the configuration can be changed, removing the need to
     But the configuration is in a custom location
     When I run "cap test"
     Then the task is successful
+
+  Scenario: Show install task with configuration in default location
+    When I run "cap -T"
+    Then the task is successful
+    And contains "install" in the output
+
+  Scenario: Show install task with configuration in a custom location
+    And config stage file has line "desc 'Special Task'"
+    And config stage file has line "task :special_stage_task"
+    But the configuration is in a custom location
+    When I run "cap -T"
+    Then the task is successful
+    And contains "special_stage_task" in the output

data/features/step_definitions/assertions.rb

@@ -107,3 +107,7 @@ When(/^an error is raised$/) do
   error = TestApp.shared_path.join('fail')
   run_vagrant_command(test_file_exists(error))
 end
+
+Then(/contains "(.*?)" in the output/) do |expected|
+  expect(@output).to include(expected)
+end

data/features/step_definitions/cap_commands.rb

@@ -7,6 +7,6 @@ When(/^I run cap "(.*?)" as part of a release$/) do |task|
 end
 
 When(/^I run "(.*?)"$/) do |command|
-  @success = TestApp.run(command)
+  @success, @output = TestApp.run(command)
 end
 

data/features/step_definitions/setup.rb

@@ -3,7 +3,7 @@ Given(/^a test app with the default configuration$/) do
 end
 
 Given(/^servers with the roles app and web$/) do
-  vagrant_cli_command('up')
+  vagrant_cli_command('up') rescue nil
 end
 
 Given(/^a required file$/) do
@@ -20,7 +20,11 @@ Given(/^the file does not exist$/) do
 end
 
 Given(/^a custom task to generate a file$/) do
-  TestApp.copy_task_to_test_app('spec/support/tasks/database.cap')
+  TestApp.copy_task_to_test_app('spec/support/tasks/database.rake')
+end
+
+Given(/config stage file has line "(.*?)"/) do |line|
+  TestApp.append_to_deploy_file(line)
 end
 
 Given(/^the configuration is in a custom location$/) do
@@ -29,10 +33,10 @@ end
 
 Given(/^a custom task that will simulate a failure$/) do
   safely_remove_file(TestApp.shared_path.join('failed'))
-  TestApp.copy_task_to_test_app('spec/support/tasks/fail.cap')
+  TestApp.copy_task_to_test_app('spec/support/tasks/fail.rake')
 end
 
 Given(/^a custom task to run in the event of a failure$/) do
   safely_remove_file(TestApp.shared_path.join('failed'))
-  TestApp.copy_task_to_test_app('spec/support/tasks/failed.cap')
+  TestApp.copy_task_to_test_app('spec/support/tasks/failed.rake')
 end

data/lib/capistrano/application.rb

@@ -20,20 +20,16 @@ module Capistrano
       super
     end
 
-    def load_rakefile
-      super
-    end
-
     def top_level_tasks
       if tasks_without_stage_dependency.include?(@top_level_tasks.first)
         @top_level_tasks
       else
-        @top_level_tasks.unshift(ensure_stage)
+        @top_level_tasks.unshift(ensure_stage.to_s)
       end
     end
 
     def exit_because_of_exception(ex)
-      if deploying?
+      if respond_to?(:deploying?) && deploying?
         exit_deploy_because_of_exception(ex)
       else
         super
@@ -45,6 +41,7 @@ module Capistrano
     def load_imports
       if options.show_tasks
         invoke 'load:defaults'
+        set(:stage, '')
         Dir[deploy_config_path, stage_definitions].each { |f| add_import f }
       end
 
@@ -79,7 +76,7 @@ module Capistrano
       ['--roles ROLES', '-r',
        "Filter command to only apply to these roles (separate multiple roles with a comma)",
        lambda { |value|
-         Configuration.env.set(:filter, :roles => value.split(","))
+         Configuration.env.set(:filter, roles: value.split(","))
        }
       ]
     end
@@ -88,7 +85,7 @@ module Capistrano
       ['--hosts HOSTS', '-z',
        "Filter command to only apply to these hosts (separate multiple hosts with a comma)",
        lambda { |value|
-         Configuration.env.set(:filter, :hosts => value.split(","))
+         Configuration.env.set(:filter, hosts: value.split(","))
        }
       ]
     end

data/lib/capistrano/configuration.rb

@@ -30,11 +30,10 @@ module Capistrano
 
     def fetch(key, default=nil, &block)
       value = fetch_for(key, default, &block)
-      if value.respond_to?(:call)
-        set(key, value.call)
-      else
-        value
+      while callable_without_parameters?(value)
+        value = set(key, value.call)
       end
+      return value
     end
 
     def role(name, hosts, options={})
@@ -99,5 +98,8 @@ module Capistrano
       end
     end
 
+    def callable_without_parameters?(x)
+      x.respond_to?(:call) && ( !x.respond_to?(:arity) || x.arity == 0)
+    end
   end
 end

data/lib/capistrano/configuration/server.rb

@@ -51,7 +51,7 @@ module Capistrano
       end
 
       def matches?(other)
-        hostname == other.hostname && port == other.port
+        user == other.user && hostname == other.hostname && port == other.port
       end
 
       private
@@ -86,6 +86,10 @@ module Capistrano
           @roles ||= Set.new
         end
 
+        def keys
+          @properties.keys
+        end
+
         def method_missing(key, value=nil)
           if value
             set(lvalue(key), value)

data/lib/capistrano/defaults.rb

@@ -1,6 +1,6 @@
 set :scm, :git
 set :branch, :master
-set :deploy_to, "/var/www/#{fetch(:application)}"
+set :deploy_to, -> { "/var/www/#{fetch(:application)}" }
 set :tmp_dir, "/tmp"
 
 set :default_env, {}

data/lib/capistrano/dsl.rb

@@ -26,12 +26,6 @@ module Capistrano
       execute :sudo, *args
     end
 
-    def capturing_revisions(&block)
-      set :previous_revision, fetch_revision
-      block.call
-      set :current_revision, fetch_revision
-    end
-
     def revision_log_message
       fetch(:revision_log_message,
         t(:revision_log_message,
@@ -53,11 +47,6 @@ module Capistrano
     def lock(locked_version)
       VersionValidator.new(locked_version).verify
     end
-
-    private
-    def fetch_revision
-      capture("cd #{repo_path} && git rev-parse --short HEAD")
-    end
   end
 end
 self.extend Capistrano::DSL

data/lib/capistrano/dsl/paths.rb

@@ -24,6 +24,7 @@ module Capistrano
       end
 
       def set_release_path(timestamp=now)
+        set(:release_timestamp, timestamp)
         set(:release_path, releases_path.join(timestamp))
       end
 

data/lib/capistrano/dsl/stages.rb

@@ -6,9 +6,6 @@ module Capistrano
         Dir[stage_definitions].map { |f| File.basename(f, '.rb') }
       end
 
-      def infer_stages_from_stage_files
-      end
-
       def stage_definitions
         stage_config_path.join('*.rb')
       end

data/lib/capistrano/dsl/task_enhancements.rb

@@ -2,14 +2,16 @@ module Capistrano
   module TaskEnhancements
     def before(task, prerequisite, *args, &block)
       prerequisite = Rake::Task.define_task(prerequisite, *args, &block) if block_given?
-      Rake::Task[task].enhance [prerequisite]
+      Rake::Task[task].enhance do
+        Rake::Task[prerequisite].invoke(*args)
+      end
     end
 
     def after(task, post_task, *args, &block)
       Rake::Task.define_task(post_task, *args, &block) if block_given?
       post_task = Rake::Task[post_task]
       Rake::Task[task].enhance do
-        post_task.invoke
+        post_task.invoke(args)
       end
     end
 

data/lib/capistrano/git.rb

@@ -18,7 +18,7 @@ class Capistrano::Git < Capistrano::SCM
     end
 
     def check
-      test! :git, :'ls-remote', repo_url
+      test! :git, :'ls-remote -h', repo_url
     end
 
     def clone
@@ -32,5 +32,9 @@ class Capistrano::Git < Capistrano::SCM
     def release
       git :archive, fetch(:branch), '| tar -x -C', release_path
     end
+
+    def fetch_revision
+      context.capture(:git, "rev-parse #{fetch(:branch)}")
+    end
   end
 end

data/lib/capistrano/hg.rb

@@ -29,5 +29,9 @@ class Capistrano::Hg < Capistrano::SCM
     def release
       hg "archive", release_path, "--rev", fetch(:branch)
     end
+
+    def fetch_revision
+      context.capture(:hg, "log --rev #{fetch(:branch)} --template \"{node}\n\"")
+    end
   end
 end

data/lib/capistrano/i18n.rb

@@ -15,6 +15,7 @@ en = {
   keeping_releases:            'Keeping %{keep_releases} of %{releases} deployed releases on %{host}',
   no_old_releases:             'No old releases (keeping newest %{keep_releases}) on %{host}',
   linked_file_does_not_exist:  'linked file %{file} does not exist on %{host}',
+  cannot_rollback:             'There are no older releases to rollback to',
   mirror_exists:               "The repository mirror is at %{at}",
   revision_log_message:        'Branch %{branch} (at %{sha}) deployed as release %{release} by %{user}',
   rollback_log_message:        '%{user} rolled back to release %{release}',

data/lib/capistrano/scm.rb

@@ -28,17 +28,17 @@ module Capistrano
       context.test *args
     end
 
-    # The repository URL accoriding to the context
+    # The repository URL according to the context
     def repo_url
       context.repo_url
     end
 
-    # The repository path accoriding to the context
+    # The repository path according to the context
     def repo_path
       context.repo_path
     end
 
-    # The release path accoriding to the context
+    # The release path according to the context
     def release_path
       context.release_path
     end
@@ -53,7 +53,7 @@ module Capistrano
 
     # @abstract
     #
-    # Your implementation should check the existance of a cache repository on
+    # Your implementation should check the existence of a cache repository on
     # the deployment target
     #
     # @return [Boolean]
@@ -112,5 +112,17 @@ module Capistrano
         "Your SCM strategy module should provide a #release method"
       )
     end
+
+    # @abstract
+    #
+    # Identify the SHA of the commit that will be deployed.  This will most likely involve SshKit's capture method.
+    #
+    # @return void
+    #
+    def fetch_revision
+      raise NotImplementedError.new(
+        "Your SCM strategy module should provide a #fetch_revision method"
+      )
+    end
   end
 end

data/lib/capistrano/svn.rb

@@ -0,0 +1,38 @@
+load File.expand_path("../tasks/svn.rake", __FILE__)
+
+require 'capistrano/scm'
+
+class Capistrano::Svn < Capistrano::SCM
+  
+  # execute svn in context with arguments
+  def svn(*args)
+    args.unshift(:svn)
+    context.execute *args
+  end
+
+  module DefaultStrategy
+    def test
+      test! " [ -d #{repo_path}/.svn ] "
+    end
+
+    def check
+      test! :svn, :info, repo_url
+    end
+
+    def clone
+      svn :checkout, repo_url, repo_path
+    end
+
+    def update
+      svn :update
+    end
+
+    def release
+      svn :export, '.', release_path
+    end
+
+    def fetch_revision
+      context.capture(:svn, "log -r HEAD -q | tail -n 2 | head -n 1 | sed s/\ \|.*/''/")
+    end
+  end
+end

data/lib/capistrano/tasks/deploy.rake

@@ -2,10 +2,12 @@ namespace :deploy do
 
   task :starting do
     invoke 'deploy:check'
+    invoke 'deploy:set_previous_revision'
   end
 
   task :updating => :new_release_path do
     invoke "#{scm}:create_release"
+    invoke "deploy:set_current_revision"
     invoke 'deploy:symlink:shared'
   end
 
@@ -185,18 +187,35 @@ namespace :deploy do
     set_release_path
   end
 
-  task :last_release_path do
+  task :rollback_release_path do
     on release_roles(:all) do
-      last_release = capture(:ls, '-xr', releases_path).split[1]
+      releases = capture(:ls, '-xr', releases_path).split
+      if releases.count < 2
+        error t(:cannot_rollback)
+        exit 1
+      end
+      last_release = releases[1]
       set_release_path(last_release)
+      set(:rollback_timestamp, last_release)
     end
   end
 
-  task :rollback_release_path do
+  desc "Place a REVISION file with the current revision SHA in the current release path"
+  task :set_current_revision  do
+    invoke "#{scm}:set_current_revision"
     on release_roles(:all) do
-      last_release = capture(:ls, '-xr', releases_path).split[1]
-      set_release_path(last_release)
-      set(:rollback_timestamp, last_release)
+      within release_path do
+        execute :echo, "\"#{fetch(:current_revision)}\" >> REVISION"
+      end
+    end
+  end
+
+  task :set_previous_revision do
+    on release_roles(:all) do
+      target = release_path.join('REVISION')
+      if test "[ -f #{target} ]"
+        set(:previous_revision, capture(:cat, target, '2>/dev/null'))
+      end
     end
   end
 

data/lib/capistrano/tasks/git.rake

@@ -49,7 +49,7 @@ namespace :git do
   task update: :'git:clone' do
     on release_roles :all do
       within repo_path do
-        capturing_revisions do
+        with fetch(:git_environmental_variables) do
           strategy.update
         end
       end
@@ -67,5 +67,15 @@ namespace :git do
       end
     end
   end
-end
 
+  desc 'Determine the revision that will be deployed'
+  task :set_current_revision do
+    on release_roles :all do
+      within repo_path do
+        with fetch(:git_environmental_variables) do
+          set :current_revision, strategy.fetch_revision
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/tasks/hg.rake

@@ -40,4 +40,13 @@ namespace :hg do
       end
     end
   end
+
+  desc 'Determine the revision that will be deployed'
+  task :set_current_revision do
+    on release_roles :all do
+      within repo_path do
+        set :current_revision, strategy.fetch_revision
+      end
+    end
+  end
 end

data/lib/capistrano/tasks/svn.rake

@@ -0,0 +1,52 @@
+namespace :svn do
+  def strategy
+    @strategy ||= Capistrano::Svn.new(self, fetch(:svn_strategy, Capistrano::Svn::DefaultStrategy))
+  end
+
+  desc 'Check that the repo is reachable'
+  task :check do
+    on release_roles :all do
+      strategy.check
+    end
+  end
+
+  desc 'Clone the repo to the cache'
+  task :clone do
+    on release_roles :all do
+      if strategy.test
+        info t(:mirror_exists, at: repo_path)
+      else
+        within deploy_path do
+          strategy.clone
+        end
+      end
+    end
+  end
+
+  desc 'Pull changes from the remote repo'
+  task :update => :'svn:clone' do
+    on release_roles :all do
+      within repo_path do
+        strategy.update
+      end
+    end
+  end
+
+  desc 'Copy repo to releases'
+  task :create_release => :'svn:update' do
+    on release_roles :all do
+      within repo_path do
+        strategy.release
+      end
+    end
+  end
+
+  desc 'Determine the revision that will be deployed'
+  task :set_current_revision do
+    on release_roles :all do
+      within repo_path do
+        set :current_revision, strategy.fetch_revision
+      end
+    end
+  end
+end

data/lib/capistrano/templates/Capfile

@@ -22,4 +22,4 @@ require 'capistrano/deploy'
 # require 'capistrano/rails/migrations'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/lib/capistrano/templates/deploy.rb.erb

@@ -5,7 +5,7 @@ set :application, 'my_app_name'
 set :repo_url, 'git@example.com:me/my_repo.git'
 
 # Default branch is :master
-# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
 # Default deploy_to directory is /var/www/my_app
 # set :deploy_to, '/var/www/my_app'

data/lib/capistrano/templates/stage.rb.erb

@@ -1,31 +1,38 @@
 # Simple Role Syntax
 # ==================
-# Supports bulk-adding hosts to roles, the primary
-# server in each group is considered to be the first
-# unless any hosts have the primary property set.
-# Don't declare `role :all`, it's a meta role
+# Supports bulk-adding hosts to roles, the primary server in each group
+# is considered to be the first unless any hosts have the primary
+# property set.  Don't declare `role :all`, it's a meta role.
+
 role :app, %w{deploy@example.com}
 role :web, %w{deploy@example.com}
 role :db,  %w{deploy@example.com}
 
+
 # Extended Server Syntax
 # ======================
-# This can be used to drop a more detailed server
-# definition into the server list. The second argument
-# something that quacks like a hash can be used to set
-# extended properties on the server.
+# This can be used to drop a more detailed server definition into the
+# server list. The second argument is a, or duck-types, Hash and is
+# used to set extended properties on the server.
+
 server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
 
-# you can set custom ssh options
-# it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options
-# you can see them in [net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start)
-# set it globally
+
+# Custom SSH Options
+# ==================
+# You may pass any option but keep in mind that net/ssh understands a
+# limited set of options, consult[net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start).
+#
+# Global options
+# --------------
 #  set :ssh_options, {
 #    keys: %w(/home/rlisowski/.ssh/id_rsa),
 #    forward_agent: false,
 #    auth_methods: %w(password)
 #  }
-# and/or per server
+#
+# And/or per server (overrides global)
+# ------------------------------------
 # server 'example.com',
 #   user: 'user_name',
 #   roles: %w{web app},
@@ -36,4 +43,3 @@ server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
 #     auth_methods: %w(publickey password)
 #     # password: 'please use keys'
 #   }
-# setting per server overrides global ssh_options

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/spec/integration/dsl_spec.rb

@@ -201,16 +201,18 @@ describe Capistrano::DSL do
     describe 'when defining a host using a combination of the `server` and `role` syntax' do
 
       before do
-        dsl.server 'example1.com:1234', roles: %w{web}, active: true
+        dsl.server 'db@example1.com:1234', roles: %w{db}, active: true
+        dsl.server 'root@example1.com:1234', roles: %w{web}, active: true
         dsl.server 'example1.com:5678', roles: %w{web}, active: true
+        dsl.role :app, %w{deployer@example1.com:1234}
         dsl.role :app, %w{example1.com:5678}
       end
 
       describe 'fetching all servers' do
-        subject { dsl.roles(:all).map { |server| "#{server.hostname}:#{server.port}" } }
+        subject { dsl.roles(:all).map { |server| "#{server.user}@#{server.hostname}:#{server.port}" } }
 
-        it 'creates a server instance for each unique host:port combination' do
-          expect(subject).to eq %w{example1.com:1234 example1.com:5678}
+        it 'creates a server instance for each unique user@host:port combination' do
+          expect(subject).to eq %w{db@example1.com:1234 root@example1.com:1234 @example1.com:5678 deployer@example1.com:1234}
         end
       end
 
@@ -220,7 +222,7 @@ describe Capistrano::DSL do
         end
 
         it 'roles defined using the `role` syntax are included' do
-          expect(dsl.roles(:app)).to have(1).items
+          expect(dsl.roles(:app)).to have(2).items
         end
       end
 

data/spec/lib/capistrano/configuration/server_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Capistrano
   class Configuration
     describe Server do
-      let(:server) { Server.new('hostname:1234') }
+      let(:server) { Server.new('root@hostname:1234') }
 
       describe 'adding a role' do
         subject { server.add_role(:test) }
@@ -35,23 +35,23 @@ module Capistrano
       describe 'comparing identity' do
         subject { server.matches? Server[hostname] }
 
-        context 'with the same hostname' do
-          let(:hostname) { 'hostname:1234' }
+        context 'with the same user, hostname and port' do
+          let(:hostname) { 'root@hostname:1234' }
           it { should be_true }
         end
 
-        context 'with the same hostname and a user' do
-          let(:hostname) { 'user@hostname:1234' }
-          it { should be_true }
+        context 'with a different user' do
+          let(:hostname) { 'deployer@hostname:1234' }
+          it { should be_false }
         end
 
-        context 'with the same hostname but different port' do
-          let(:hostname) { 'hostname:5678' }
+        context 'with a different port' do
+          let(:hostname) { 'root@hostname:5678' }
           it { should be_false }
         end
 
         context 'with a different hostname' do
-          let(:hostname) { 'otherserver' }
+          let(:hostname) { 'root@otherserver:1234' }
           it { should be_false }
         end
       end

data/spec/lib/capistrano/configuration/servers_spec.rb

@@ -104,12 +104,18 @@ module Capistrano
           expect(servers.roles_for([:app]).first.hostname).to eq '1'
           expect(servers.roles_for([:web]).first.hostname).to eq '1'
           expect(servers.roles_for([:all]).first.properties.test).to eq :value
-        end
-
-        it 'can accept multiple servers with the same hostname but different ports' do
-          servers.add_host('2', roles: [:app, 'web'], test: :value, port: 12)
-          servers.add_host('2', roles: [:app, 'web'], test: :value, port: 34)
-          expect(servers.count { |server| server.hostname == '2' }).to eq 2
+          expect(servers.roles_for([:all]).first.properties.keys).to eq [:test]
+        end
+
+        it 'can accept multiple servers with the same hostname but different ports or users' do
+          servers.add_host('1', roles: [:app, 'web'], test: :value, port: 12)
+          servers.add_host('1', roles: [:app, 'web'], test: :value, port: 34)
+          servers.add_host('1', roles: [:app, 'web'], test: :value, user: 'root')
+          servers.add_host('1', roles: [:app, 'web'], test: :value, user: 'deployer')
+          servers.add_host('1', roles: [:app, 'web'], test: :value, user: 'root', port: 34)
+          servers.add_host('1', roles: [:app, 'web'], test: :value, user: 'deployer', port: 34)
+          servers.add_host('1', roles: [:app, 'web'], test: :value, user: 'deployer', port: 56)
+          servers.should have(8).items
         end
       end
 

data/spec/lib/capistrano/configuration_spec.rb

@@ -61,6 +61,48 @@ module Capistrano
         end
       end
 
+      context 'value is a lambda' do
+        subject { config.fetch(:key, lambda { :lambda } ) }
+        it 'calls the lambda' do
+          expect(subject).to eq :lambda
+        end
+      end
+
+      context 'value inside proc inside a proc' do
+        subject { config.fetch(:key, Proc.new { Proc.new { "some value" } } ) }
+        it 'calls all procs and lambdas' do
+          expect(subject).to eq "some value"
+        end
+      end
+
+      context 'value inside lambda inside a lambda' do
+        subject { config.fetch(:key, lambda { lambda { "some value" } } ) }
+        it 'calls all procs and lambdas' do
+          expect(subject).to eq "some value"
+        end
+      end
+
+      context 'value inside lambda inside a proc' do
+        subject { config.fetch(:key, Proc.new { lambda { "some value" } } ) }
+        it 'calls all procs and lambdas' do
+          expect(subject).to eq "some value"
+        end
+      end
+
+      context 'value inside proc inside a lambda' do
+        subject { config.fetch(:key, lambda { Proc.new { "some value" } } ) }
+        it 'calls all procs and lambdas' do
+          expect(subject).to eq "some value"
+        end
+      end
+
+      context 'lambda with parameters' do
+        subject { config.fetch(:key, lambda { |c| c }).call(42) }
+        it 'is returned as a lambda' do
+          expect(subject).to eq 42
+        end
+      end
+
       context 'block is passed to fetch' do
         subject { config.fetch(:key, :default) { fail 'we need this!' } }
 

data/spec/lib/capistrano/git_spec.rb

@@ -31,7 +31,7 @@ module Capistrano
     describe "#check" do
       it "should test the repo url" do
         context.expects(:repo_url).returns(:url)
-        context.expects(:test).with(:git, :'ls-remote', :url).returns(true)
+        context.expects(:test).with(:git, :'ls-remote -h', :url).returns(true)
 
         subject.check
       end

data/spec/lib/capistrano/svn_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+require 'capistrano/svn'
+
+module Capistrano
+  describe Svn do
+    let(:context) { Class.new.new }
+    subject { Capistrano::Svn.new(context, Capistrano::Svn::DefaultStrategy) }
+
+    describe "#svn" do
+      it "should call execute svn in the context, with arguments" do
+        context.expects(:execute).with(:svn, :init)
+        subject.svn(:init)
+      end
+    end
+  end
+
+  describe Svn::DefaultStrategy do
+    let(:context) { Class.new.new }
+    subject { Capistrano::Svn.new(context, Capistrano::Svn::DefaultStrategy) }
+
+    describe "#test" do
+      it "should call test for repo HEAD" do  
+        context.expects(:repo_path).returns("/path/to/repo")
+        context.expects(:test).with " [ -d /path/to/repo/.svn ] "
+
+        subject.test
+      end
+    end
+
+    describe "#check" do
+      it "should test the repo url" do
+        context.expects(:repo_url).returns(:url)
+        context.expects(:test).with(:svn, :info, :url).returns(true)
+
+        subject.check
+      end
+    end
+
+    describe "#clone" do
+      it "should run svn checkout" do
+        context.expects(:repo_url).returns(:url)
+        context.expects(:repo_path).returns(:path)
+ 
+        context.expects(:execute).with(:svn, :checkout, :url, :path)
+
+        subject.clone
+      end
+    end
+
+    describe "#update" do
+      it "should run svn update" do
+        context.expects(:execute).with(:svn, :update)
+
+        subject.update
+      end
+    end
+
+    describe "#release" do
+      it "should run svn export" do        
+        context.expects(:release_path).returns(:path)
+        
+        context.expects(:execute).with(:svn, :export, '.', :path)
+
+        subject.release
+      end
+    end
+  end
+end

data/spec/support/test_app.rb

@@ -57,6 +57,12 @@ module TestApp
     end
   end
 
+  def append_to_deploy_file(config)
+    File.open(test_stage_path, 'a') do |file|
+      file.write config + "\n"
+    end
+  end
+
   def prepend_to_capfile(config)
     current_capfile = File.read(capfile)
     File.open(capfile, 'w') do |file|
@@ -78,10 +84,11 @@ module TestApp
   end
 
   def run(command)
+    output = nil
     Dir.chdir(test_app_path) do
-      %x[#{command}]
+      output = %x[#{command}]
     end
-    $?.success?
+    [$?.success?, output]
   end
 
   def stage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -102,7 +102,6 @@ files:
 - Rakefile
 - bin/cap
 - bin/capify
-- capistrano-public_cert.pem
 - capistrano.gemspec
 - features/configuration.feature
 - features/deploy.feature
@@ -140,12 +139,14 @@ files:
 - lib/capistrano/install.rb
 - lib/capistrano/scm.rb
 - lib/capistrano/setup.rb
+- lib/capistrano/svn.rb
 - lib/capistrano/tasks/console.rake
 - lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/framework.rake
 - lib/capistrano/tasks/git.rake
 - lib/capistrano/tasks/hg.rake
 - lib/capistrano/tasks/install.rake
+- lib/capistrano/tasks/svn.rake
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/deploy.rb.erb
 - lib/capistrano/templates/stage.rb.erb
@@ -165,15 +166,16 @@ files:
 - spec/lib/capistrano/git_spec.rb
 - spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/scm_spec.rb
+- spec/lib/capistrano/svn_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitignore
 - spec/support/Vagrantfile
 - spec/support/matchers.rb
-- spec/support/tasks/database.cap
-- spec/support/tasks/fail.cap
-- spec/support/tasks/failed.cap
+- spec/support/tasks/database.rake
+- spec/support/tasks/fail.rake
+- spec/support/tasks/failed.rake
 - spec/support/test_app.rb
 homepage: http://capistranorb.com/
 licenses:
@@ -227,14 +229,15 @@ test_files:
 - spec/lib/capistrano/git_spec.rb
 - spec/lib/capistrano/hg_spec.rb
 - spec/lib/capistrano/scm_spec.rb
+- spec/lib/capistrano/svn_spec.rb
 - spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitignore
 - spec/support/Vagrantfile
 - spec/support/matchers.rb
-- spec/support/tasks/database.cap
-- spec/support/tasks/fail.cap
-- spec/support/tasks/failed.cap
+- spec/support/tasks/database.rake
+- spec/support/tasks/fail.rake
+- spec/support/tasks/failed.rake
 - spec/support/test_app.rb
 has_rdoc: 

data/capistrano-public_cert.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMRIwEAYDVQQDDAlnZW1t
-YXN0ZXIxHDAaBgoJkiaJk/IsZAEZFgxjYXBpc3RyYW5vcmIxEzARBgoJkiaJk/Is
-ZAEZFgNjb20wHhcNMTMwNjI4MTM0MzQ1WhcNMTQwNjI4MTM0MzQ1WjBHMRIwEAYD
-VQQDDAlnZW1tYXN0ZXIxHDAaBgoJkiaJk/IsZAEZFgxjYXBpc3RyYW5vcmIxEzAR
-BgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDnuMT+SoCTQoxEOma65Vf9ftibHTzfaZPGSNcheguiFa3/Mc69/xurtUa7bGY8
-ZyuJbd2pb4pqhx7PcVlByJnBQCmOHzZPzn6wVa5n4n8/VBccYcFNePdPj8+KK13x
-+97E6mjNZJtf4BZm4tZD6Ztyq90+mQ0WeoseYfYdm+ZJ9BNFdB2EHmTnh983MHMj
-WNn52ZC2pAHDRuxKAOj5yq8IZWA8B/IWNjMXQCJbM9eaH0+vVvquC2RyprpkfoqQ
-Xb7BJA2hftizHUMk4LOldNvy220GHjKL0Ot7tlGcD2DzaZNN0aPUfezz306ytsMp
-KDYYLbLcg63TPHFHu1fzyQG9AgMBAAGjgYgwgYUwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBLAwHQYDVR0OBBYEFEzXgfsvOB8Aw2b+Md3t3O9PUGZCMCUGA1UdEQQeMByB
-GmdlbW1hc3RlckBjYXBpc3RyYW5vcmIuY29tMCUGA1UdEgQeMByBGmdlbW1hc3Rl
-ckBjYXBpc3RyYW5vcmIuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQCnS7Pcy/srhZCb
-TrUNkCTHI4QEURAWRNYFLL9TCCl3oyKkwW6aZxarpQbJK3Es99sugsKh/sKijOIE
-xhflvSNN59Zc/BETve1y0VktN+94GiQQ1F82SmRwmY2tJJD7C3jQ6Og6pX7eNBWZ
-W1su8leIv8sj3o5Vdn/Le1HKVXMakFICq9HdLnIH1jW2Brfthlc2ujAg0cOU58GC
-wNkME+L45pR9zggNpbBY23mlbAicPrsmybEdk9SOdaOCgxh+fyGx6Q2n0m5YAXgN
-KVoU0DazqHs6BVyJaajxht4kCpPDD1wUqCvwlOQtotdwD7CCGCPdcYgf6fAp4yQZ
-jC76QR6/
------END CERTIFICATE-----