capistrano 3.0.0.pre13 → 3.0.0.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30b25d97cfa811596b16d276fb221d0ea55ac9a
-  data.tar.gz: 2fcf56587e9193ed85b61e822fcd73bf7ecf4809
+  metadata.gz: 8d396873548e6dd9e20c1853f741bc8808e7a529
+  data.tar.gz: 24aa535d127498013298938e5effb7e38bd26fbb
 SHA512:
-  metadata.gz: 589c4f870e7f58a316ed3f5cad74b3febbcc3c4ededb3dfb30decdee293c09030c2f75f4f180c9e504bd2825d32d5b452c08c94a77d9c31eca281686ae658b19
-  data.tar.gz: 20f0cc7c0cad5561b3e9bad0e048d63c6912f4ef5b12a5cac05625090fc99640125f4254be236bcdd46e8f0831c83813ff6572181d6c739e37755c97599829f9
+  metadata.gz: 828006f69722330dcfbf09833922f0547a00fde78bd2d59948b4ebd59b139afa779f69c87e7d69e22e1fff7e9377d84484594dc5edaa544919a644c39d9d9338
+  data.tar.gz: 8cfb03d51c92cac8ab9c6bd8cd7ba4d3416731de893927db8ab1b0117e5478af71c4e9256aaea8350a7cf23f663432ae1f7b1b19b5cad80e10890a607bb4c245

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Reverse Chronological Order:
 
+## `3.0.0.pre14`
+
+ * Thanks to numerous contributors, in particular (@teohm) for a series of improvements.
+
+## `3.0.0.pre13`
+
+ * Fixed typos in the Capfile. (@teohm)
+ * Allow setting SSH options globally. (@korin)
+ * Change the flow (and hooks) see http://www.capistranorb.com/documentation/getting-started/flow/ for more information. Requires min SSHKit 0.0.34 (@teohm)
+ * Fix sorting releases in lexicographical order (@teohm)
+
 ## `3.0.0.pre12`
 
  * `capistrano/bundler` now runs bundle on all roles, this addresses the same

data/README.md

@@ -135,6 +135,22 @@ end
 
 Perfect, who needs telephones.
 
+
+## Running local tasks
+
+Local tasks can be run by replacing `on` with `run_locally`
+
+``` ruby
+desc "Notify service of deployment"
+task :notify do
+  run_locally do
+    with rails_env: :development do
+      rake 'service:notify'
+    end
+  end
+end
+```
+
 ## Console
 
 **Note:** Here be dragons. The console is very immature, but it's much more
@@ -196,6 +212,7 @@ The following variables are settable:
 | `:repo_url`           | The URL of your Git repository                                      | file://, https://, or ssh:// are all supported                  |
 | `:git_https_username` | The (optional) username for accessing your Git repostory over HTTPS | if this is an SSH connection, this setting will have no effect. |
 | `:git_https_password` | The (optional) password for accessing your Git repostory over HTTPS | if this is an SSH connection, this setting will have no effect. |
+| `: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). |
 
 ## SSHKit
 

data/capistrano.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.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/"
+
   #gem.signing_key = '/Volumes/SD Card/leehambley-private_key.pem'
   #gem.cert_chain  = ['capistrano-public_cert.pem', 'leehambley-public_cert.pem']
 

data/lib/capistrano.rb

@@ -4,6 +4,7 @@ require 'sshkit'
 Rake.application.options.trace = true
 
 require 'capistrano/version'
+require 'capistrano/version_validator'
 require 'capistrano/i18n'
 require 'capistrano/dsl'
 require 'capistrano/application'

data/lib/capistrano/application.rb

@@ -13,7 +13,7 @@ module Capistrano
     end
 
     def sort_options(options)
-      options.push(version)
+      options.push(version,dry_run)
       super
     end
 
@@ -22,6 +22,14 @@ module Capistrano
       super
     end
 
+    def top_level_tasks
+      if tasks_without_stage_dependency.include?(@top_level_tasks.first)
+        @top_level_tasks
+      else
+        @top_level_tasks.unshift('deploy:ensure_stage')
+      end
+    end
+
     private
 
     # allows the `cap install` task to load without a capfile
@@ -29,6 +37,15 @@ module Capistrano
       File.expand_path(File.join(File.dirname(__FILE__),'..','Capfile'))
     end
 
+    def tasks_without_stage_dependency
+      defined_stages = Dir['config/deploy/*.rb'].map { |f| File.basename(f, '.rb') }
+      defined_stages + default_tasks
+    end
+
+    def default_tasks
+      %w{install}
+    end
+
     def version
       ['--version', '-V',
        "Display the program version.",
@@ -38,6 +55,15 @@ module Capistrano
        }
       ]
     end
+
+    def dry_run
+      ['--dry-run', '-n',
+       "Do a dry run without executing actions",
+       lambda { |value|
+         Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
+       }
+      ]
+    end
   end
 
 end

data/lib/capistrano/configuration.rb

@@ -56,9 +56,11 @@ module Capistrano
         sshkit.format           = fetch(:format)
         sshkit.output_verbosity = fetch(:log_level)
         sshkit.default_env      = fetch(:default_env)
+        sshkit.backend          = fetch(:sshkit_backend, SSHKit::Backend::Netssh)
         sshkit.backend.configure do |backend|
           backend.pty                = fetch(:pty)
           backend.connection_timeout = fetch(:connection_timeout)
+          backend.ssh_options        = fetch(:ssh_options) if fetch(:ssh_options)
         end
       end
     end

data/lib/capistrano/configuration/server.rb

@@ -35,6 +35,12 @@ module Capistrano
         @properties ||= Properties.new
       end
 
+      def netssh_options_with_options
+        @netssh_options ||= netssh_options_without_options.merge( fetch(:ssh_options) || {} )
+      end
+      alias_method :netssh_options_without_options, :netssh_options
+      alias_method :netssh_options, :netssh_options_with_options
+
       class Properties
 
         def initialize

data/lib/capistrano/defaults.rb

@@ -1,11 +1,21 @@
 set :scm, :git
 set :branch, :master
 set :deploy_to, "/var/www/#{fetch(:application)}"
+set :tmp_dir, "/tmp"
 
-set :default_environment, {}
+set :default_env, {}
 set :keep_releases, 5
 
 set :format, :pretty
 set :log_level, :debug
 
 set :pty, true
+
+namespace :deploy do
+  task :ensure_stage do
+    unless stage_set?
+      puts t(:stage_not_set)
+      exit 1
+    end
+  end
+end

data/lib/capistrano/dsl.rb

@@ -22,6 +22,10 @@ module Capistrano
       fetch(:scm)
     end
 
+    def sudo(*args)
+      execute :sudo, *args
+    end
+
     def revision_log_message
       fetch(:revision_log_message,
             t(:revision_log_message, branch: fetch(:branch), user: local_user, release: release_timestamp))
@@ -35,6 +39,10 @@ module Capistrano
       `whoami`
     end
 
+    def lock(locked_version)
+      VersionValidator.new(locked_version).verify
+    end
+
   end
 end
 self.extend Capistrano::DSL

data/lib/capistrano/tasks/bundler.rake

@@ -9,5 +9,5 @@ namespace :deploy do
     end
   end
 
-  after 'deploy:update', 'deploy:bundle'
+  before 'deploy:updated', 'deploy:bundle'
 end

data/lib/capistrano/tasks/deploy.rake

@@ -1,16 +1,29 @@
 namespace :deploy do
 
-  task :started do
+  task :starting do
     invoke 'deploy:check'
   end
 
-  task :update do
+  task :updating do
     invoke "#{scm}:create_release"
     invoke 'deploy:symlink:shared'
   end
 
-  task :finalize do
+  task :reverting do
+    invoke 'deploy:revert_release'
+  end
+
+  task :publishing do
     invoke 'deploy:symlink:release'
+    invoke 'deploy:restart'
+  end
+
+  task :finishing do
+    invoke 'deploy:cleanup'
+  end
+
+  task :finishing_rollback do
+    invoke 'deploy:cleanup_rollback'
   end
 
   task :finished do
@@ -81,7 +94,7 @@ namespace :deploy do
           target = release_path.join(dir)
           source = shared_path.join(dir)
           unless test "[ -L #{target} ]"
-            if test "[ -f #{target} ]"
+            if test "[ -d #{target} ]"
               execute :rm, '-rf', target
             end
             execute :ln, '-s', source, target
@@ -123,6 +136,22 @@ namespace :deploy do
     end
   end
 
+  desc 'Remove and archive rolled-back release.'
+  task :cleanup_rollback do
+    on roles(:all) do
+      last_release = capture(:ls, '-xr', releases_path).split.first
+      last_release_path = releases_path.join(last_release)
+      if test "[ `readlink #{current_path}` != #{last_release_path} ]"
+        execute :tar, '-czf',
+          deploy_path.join("rolled-back-release-#{last_release}.tar.gz"),
+        last_release_path
+        execute :rm, '-rf', last_release_path
+      else
+        debug 'Last release is the current release, skip cleanup_rollback.'
+      end
+    end
+  end
+
   desc 'Log details of the deploy'
   task :log_revision do
     on roles(:all) do
@@ -132,19 +161,14 @@ namespace :deploy do
     end
   end
 
-  desc 'Rollback to the last release'
-  task :rollback do
+  desc 'Revert to previous release timestamp'
+  task :revert_release do
     on roles(:all) do
       last_release = capture(:ls, '-xr', releases_path).split[1]
       set(:rollback_release_timestamp, last_release)
       set(:branch, last_release)
       set(:revision_log_message, rollback_log_message)
     end
-
-    on roles :app do
-      %w{check finalize restart finishing finished}.each do |task|
-        invoke "deploy:#{task}"
-      end
-    end
   end
+
 end

data/lib/capistrano/tasks/framework.rake

@@ -1,6 +1,6 @@
 namespace :deploy do
 
-  desc 'Starting'
+  desc 'Start a deployment, make sure server(s) ready.'
   task :starting do
   end
 
@@ -8,37 +8,61 @@ namespace :deploy do
   task :started do
   end
 
-  desc 'Update'
-  task :update do
+  desc 'Update server(s) by setting up a new release.'
+  task :updating do
   end
 
-  desc 'Finalize'
-  task :finalize do
+  desc 'Updated'
+  task :updated do
   end
 
-  desc 'Restart'
-  task :restart do
+  desc 'Revert server(s) to previous release.'
+  task :reverting do
   end
 
-  desc 'Finishing'
+  desc 'Reverted'
+  task :reverted do
+  end
+
+  desc 'Publish the release.'
+  task :publishing do
+  end
+
+  desc 'Published'
+  task :published do
+  end
+
+  desc 'Finish the deployment, clean up server(s).'
   task :finishing do
   end
 
+  desc 'Finish the rollback, clean up server(s).'
+  task :finishing_rollback do
+  end
+
   desc 'Finished'
   task :finished do
   end
 
-  before :starting, :ensure_stage do
-    unless stage_set?
-      puts t(:stage_not_set)
-      exit 1
+  before :starting, :ensure_stage
+
+  desc 'Rollback to previous release.'
+  task :rollback do
+    %w{ starting started
+        reverting reverted
+        publishing published
+        finishing_rollback finished }.each do |task|
+      invoke "deploy:#{task}"
     end
   end
 end
 
-desc 'Deploy'
+desc 'Deploy a new release.'
 task :deploy do
-  %w{starting started update finalize restart finishing finished}.each do |task|
+  %w{ starting started
+      updating updated
+      publishing published
+      finishing finished }.each do |task|
     invoke "deploy:#{task}"
   end
 end

data/lib/capistrano/tasks/git.rake

@@ -1,15 +1,15 @@
 namespace :git do
 
   git_environmental_variables = {
-    git_askpass: '/bin/echo',
-    git_ssh:     '/tmp/git-ssh.sh'
+    git_askpass: "/bin/echo",
+    git_ssh:     "#{fetch(:tmp_dir)}/git-ssh.sh"
   }
 
   desc 'Upload the git wrapper script, this script guarantees that we can script git without getting an interactive prompt'
   task :wrapper do
     on roles :all do
-      upload! StringIO.new("#!/bin/sh -e\nexec /usr/bin/ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n"), '/tmp/git-ssh.sh'
-      execute :chmod, "+x", '/tmp/git-ssh.sh'
+      upload! StringIO.new("#!/bin/sh -e\nexec /usr/bin/ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n"), "#{fetch(:tmp_dir)}/git-ssh.sh"
+      execute :chmod, "+x", "#{fetch(:tmp_dir)}/git-ssh.sh"
     end
   end
 
@@ -56,7 +56,6 @@ namespace :git do
             '--depth 1',                                                  \
             '--recursive',                                                \
             '--no-hardlinks',                                             \
-            '--',                                                         \
             repo_path, release_path
         end
       end

data/lib/capistrano/templates/Capfile

@@ -36,7 +36,7 @@ namespace :deploy do
   after :restart, :clear_cache do
     on roles(:web), in: :groups, limit: 3, wait: 10 do
       # Here we can do anything such as:
-      # within latest_relese_path do
+      # within latest_release_path do
       #   execute :rake, 'cache:clear'
       # end
     end

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

@@ -1,7 +1,7 @@
 set :application, 'my app name'
 set :repo_url, 'git@example.com:me/my_repo.git'
 
-ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
 
 # set :deploy_to, '/var/www/my_app'
 # set :scm, :git
@@ -13,5 +13,5 @@ ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
 # set :linked_files, %w{config/database.yml}
 # set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
 
-# set :default_environment, { path: "/opt/ruby/bin:$PATH" }
+# set :default_env, { path: "/opt/ruby/bin:$PATH" }
 # set :keep_releases, 5

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

@@ -17,4 +17,26 @@ role :db,  %w{deploy@example.com}
 # extended properties on the server.
 server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
 
-# set :rails_env, :<%= stage %>
+# 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
+#  set :ssh_options, {
+#    keys: %w(/home/rlisowski/.ssh/id_rsa),
+#    forward_agent: false,
+#    auth_methods: %w(password)
+#  }
+# and/or per server
+# server 'example.com',
+#   user: 'user_name',
+#   roles: %w{web app},
+#   ssh_options: {
+#     user: 'user_name', # overrides user setting above
+#     keys: %w(/home/user_name/.ssh/id_rsa),
+#     forward_agent: false,
+#     auth_methods: %w(publickey password)
+#     # password: 'please use keys'
+#   }
+# setting per server overrides global ssh_options
+
+# fetch(:default_env).merge!(:rails_env, :<%= stage %>)

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.0.0.pre13"
+  VERSION = "3.0.0.pre14"
 end

data/lib/capistrano/version_validator.rb

@@ -0,0 +1,37 @@
+module Capistrano
+  class VersionValidator
+
+    def initialize(version)
+      @version = version
+    end
+
+    def verify
+      if match?
+        self
+      else
+        fail "Capfile locked at #{version}, but #{current_version} is loaded"
+      end
+    end
+
+    private
+    attr_reader :version
+
+
+    def match?
+      available =~ requested
+    end
+
+    def current_version
+      VERSION
+    end
+
+    def available
+      Gem::Dependency.new('cap', version)
+    end
+
+    def requested
+      Gem::Dependency.new('cap', current_version)
+    end
+
+  end
+end

data/spec/integration/deploy_finalize_spec.rb

@@ -21,8 +21,8 @@ describe 'cap deploy:finished', slow: true do
     describe 'log_revision' do
       before do
         cap 'deploy:started'
-        cap 'deploy:update'
-        cap 'deploy:finalize'
+        cap 'deploy:updating'
+        cap 'deploy:publishing'
         cap 'deploy:finished'
       end
 

data/spec/integration/deploy_finished_spec.rb

@@ -21,8 +21,8 @@ describe 'cap deploy:finished', slow: true do
     describe 'symlink' do
       before do
         cap 'deploy:started'
-        cap 'deploy:update'
-        cap 'deploy:finalize'
+        cap 'deploy:updating'
+        cap 'deploy:publishing'
       end
 
       describe 'release' do

data/spec/integration/deploy_update_spec.rb

@@ -1,6 +1,6 @@
 require 'integration_spec_helper'
 
-describe 'cap deploy:update', slow: true do
+describe 'cap deploy:updating', slow: true do
   before do
     install_test_app_with(config)
   end

data/spec/integration/dsl_spec.rb

@@ -234,6 +234,11 @@ describe Capistrano::DSL do
       dsl.set(:default_env, default_env)
       dsl.set(:pty, true)
       dsl.set(:connection_timeout, 10)
+      dsl.set(:ssh_options, {
+        keys: %w(/home/user/.ssh/id_rsa),
+        forward_agent: false,
+        auth_methods: %w(publickey password)
+      })
       dsl.configure_backend
     end
 
@@ -256,6 +261,13 @@ describe Capistrano::DSL do
     it 'sets the backend connection timeout' do
       expect(backend.connection_timeout).to eq 10
     end
+
+    it 'sets the backend ssh_options' do
+      expect(backend.ssh_options[:keys]).to eq %w(/home/user/.ssh/id_rsa)
+      expect(backend.ssh_options[:forward_agent]).to eq false
+      expect(backend.ssh_options[:auth_methods]).to eq %w(publickey password)
+    end
+
   end
 
 end

data/spec/integration/installation_spec.rb

@@ -1,6 +1,6 @@
 require 'integration_spec_helper'
 
-describe 'cap install', slow: true do
+describe 'cap install' do
 
   context 'with defaults' do
     before :all do

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

@@ -134,6 +134,47 @@ module Capistrano
         end
       end
 
+      describe 'assign ssh_options' do
+        let(:server) { Server.new('user_name@hostname') }
+
+        context 'defaults' do
+          it 'forward agent' do
+            expect(server.netssh_options[:forward_agent]).to eq true
+          end
+          it 'contains user' do
+            expect(server.netssh_options[:user]).to eq 'user_name'
+          end
+        end
+
+        context 'custom' do
+          let(:properties) do
+            { ssh_options: {
+              user: 'another_user',
+              keys: %w(/home/another_user/.ssh/id_rsa),
+              forward_agent: false,
+              auth_methods: %w(publickey password) } }
+          end
+
+          before do
+            server.with(properties)
+          end
+
+          it 'not forward agent' do
+            expect(server.netssh_options[:forward_agent]).to eq false
+          end
+          it 'contains correct user' do
+            expect(server.netssh_options[:user]).to eq 'another_user'
+          end
+          it 'contains keys' do
+            expect(server.netssh_options[:keys]).to eq %w(/home/another_user/.ssh/id_rsa)
+          end
+          it 'contains auth_methods' do
+            expect(server.netssh_options[:auth_methods]).to eq %w(publickey password)
+          end
+        end
+
+      end
+
     end
   end
 end

data/spec/lib/capistrano/dsl_spec.rb

@@ -6,6 +6,7 @@ module Capistrano
     include DSL
   end
 
+  # see also - spec/integration/dsl_spec.rb
   describe DSL do
     let(:dsl) { DummyDSL.new }
 
@@ -47,5 +48,16 @@ module Capistrano
         it { should be_false }
       end
     end
+
+    describe '#sudo' do
+
+      before do
+        dsl.expects(:execute).with(:sudo, :my, :command)
+      end
+
+      it 'prepends sudo, delegates to execute' do
+        dsl.sudo(:my, :command)
+      end
+    end
   end
 end

data/spec/lib/capistrano/version_validator_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+module Capistrano
+
+  describe VersionValidator do
+    let(:validator) { VersionValidator.new(version) }
+    let(:version) { stub }
+
+    describe '#new' do
+      it 'takes a version' do
+        expect(validator)
+      end
+    end
+
+    describe '#verify' do
+      let(:current_version) { '3.0.1' }
+
+      subject { validator.verify }
+
+      before do
+        validator.stubs(:current_version).returns(current_version)
+      end
+
+      context 'with exact version' do
+        context 'valid' do
+          let(:version) { '3.0.1' }
+          it { should be_true }
+        end
+
+        context 'invalid - lower' do
+          let(:version) { '3.0.0' }
+
+          it 'fails' do
+            expect { subject }.to raise_error
+          end
+        end
+
+        context 'invalid - higher' do
+          let(:version) { '3.0.2' }
+
+          it 'fails' do
+            expect { subject }.to raise_error
+          end
+        end
+
+      end
+
+      context 'with optimistic versioning' do
+        context 'valid' do
+          let(:version) { '>= 3.0.0' }
+          it { should be_true }
+        end
+
+        context 'invalid - lower' do
+          let(:version) { '<= 2.0.0' }
+
+          it 'fails' do
+            expect { subject }.to raise_error
+          end
+        end
+      end
+
+
+
+      context 'with pessimistic versioning' do
+        context '2 decimal places' do
+          context 'valid' do
+            let(:version) { '~> 3.0.0' }
+            it { should be_true }
+          end
+
+          context 'invalid' do
+            let(:version) { '~> 3.1.0' }
+
+            it 'fails' do
+              expect { subject }.to raise_error
+            end
+          end
+        end
+
+        context '1 decimal place' do
+          let(:current_version) { '3.5.0' }
+
+          context 'valid' do
+            let(:version) { '~> 3.1' }
+            it { should be_true }
+          end
+
+          context 'invalid' do
+            let(:version) { '~> 3.6' }
+            it 'fails' do
+              expect { subject }.to raise_error
+            end
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre13
+  version: 3.0.0.pre14
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -133,6 +133,7 @@ files:
 - lib/capistrano/templates/deploy.rb.erb
 - lib/capistrano/templates/stage.rb.erb
 - lib/capistrano/version.rb
+- lib/capistrano/version_validator.rb
 - spec/integration/deploy_finalize_spec.rb
 - spec/integration/deploy_finished_spec.rb
 - spec/integration/deploy_started_spec.rb
@@ -148,6 +149,7 @@ files:
 - spec/lib/capistrano/dsl/env_spec.rb
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
+- spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
@@ -155,7 +157,8 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+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/'
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +194,8 @@ test_files:
 - spec/lib/capistrano/dsl/env_spec.rb
 - spec/lib/capistrano/dsl/paths_spec.rb
 - spec/lib/capistrano/dsl_spec.rb
+- spec/lib/capistrano/version_validator_spec.rb
 - spec/lib/capistrano_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/support/test_app.rb
-has_rdoc: