capistrano 2.8.0 → 2.9.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree

data/CHANGELOG

@@ -1,3 +1,56 @@
+## 2.9.0 / September 24 2011
+
+A vairly heavy release, including some new features which most of you won't
+need, but power users have contributed, this also marks the beginning of the
+end of the 2.x series, more information will follow in due course, but with
+the proliferation of Bundler, and better ways to do deployment, we will be
+introducing heavier changes to Capistrano to keep the tool current.
+
+**Please note, following some reported problems with the asset pipeline code
+being not found, remember Capistrano needs to be in your Gemfile, and as such
+needs to be run with Bundler, otherwise you risk loading a system-wide version
+of Capistrano who's behaviour might be different from that specified in your
+Gemfile. This is also good practice because much of the deploy logic resides
+in the Gem, and you wouldn't want that to change without your knowledge. Rails
+applications include Cap in the Gemfile anyway, you should follow this
+convention.**
+
+* find_servers() will no longer raise if there are no servers, this behaviour
+can be modified by way of the `:on_no_matching_servers` option. Thanks to
+`@ppgengler`.
+
+* Short Git SHA1 fragments are now supported in commands such as `cap deploy
+-s revision=d7e99f` thanks to `@ndbroadbent`.
+
+* One can now specify individual SCM commands by setting
+`:scm_arguments_<command_name>`. Thanks to `@alextk`.
+
+* Travis CI build now passes thanks to @andrew, build tested against MRI
+`1.8.7`. `1.9.2` and `REE`.
+
+* Support for Perforce labels, I don't know much about this, but I believe
+it's much like deploying a Git tag, thanks to `@ak47`.
+
+* Git SCM now correctly adheres to the `:scm_verbose` setting. Thanks
+`@dubek`.
+
+* `set()` can now be used to set a `false` value, previously this was a no-op.
+Thanks to `@nilbus`.
+
+* Support for Git 1.6x submodules, The Git SCM strategy now queries Git on the
+server-side to ensure it supports the `--recursive` flag, if it doesn't then
+it will fall back to using the long-hand. Many thanks to all those involved in
+the discussion surrounding this topic, and to `@nilbus` for a beautifully
+clean solution which doesn't hold us back.
+
+* When using `:cached_copy` with Subversion, use `svn switch` to for more
+reliable switching of branches/etc. Thanks to `@iGEL` for the patch that we
+accepted finally, and to `@richmeyers` who also submitted a patch and
+contributed to the discssion.
+
+Other cleanups and minor improvements to the code and tests were committed by yours truly
+(@leehambley), @maxim, @ak47 and @andrew).
+
 ## 2.8.0 / August 3 2011
 
 A short release, after the last. Announcing Rails 3.1 asset pipeline support.

data/Gemfile

@@ -8,7 +8,7 @@ gemspec
 # are merged here.
 #
 group :development do
-  gem 'rake'
+  gem 'rake', '0.8.7'
   gem 'ruby-debug',   :platform => :mri_18
   gem 'ruby-debug19', :platform => :mri_19
 end

data/README.mdown

@@ -1,5 +1,9 @@
 ## Capistrano
 
+[![Build
+Status](https://secure.travis-ci.org/capistrano/capistrano.png)](http://travis-ci.org/capistrano/capistrano)
+
+
 Capistrano is a utility and framework for executing commands in parallel on
 multiple remote machines, via SSH. It uses a simple DSL (borrowed in part from
 [Rake](http://rake.rubyforge.org/)) that allows you to define _tasks_, which may
@@ -54,6 +58,19 @@ By default, the script will look for a file called one of `capfile` or
 "cap -h" to see all the available options and "cap -T" to see all the available
 tasks.
 
+## CONTRIBUTING:
+
+* Fork Capistrano
+* Create a topic branch - `git checkout -b my_branch`
+* Rebase your branch so that all your changes are reflected in one
+  commit
+* Push to your branch - `git push origin my_branch`
+* Create a Pull Request from your branch, include as much documentation
+  as you can in the commit message/pull request, following these
+[guidelies on writing a good commit message](http://spheredev.org/wiki/Git_for_the_lazy#Writing_good_commit_messages)
+* That's it!
+
+
 ## LICENSE:
 
 Permission is hereby granted, free of charge, to any person obtaining

data/capistrano.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/capistrano/capistrano"
   s.summary     = %q{Capistrano - Welcome to easy deployment with Ruby over SSH}
   s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
-  s.date        = %q{2011-03-22}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/capistrano/configuration/servers.rb

@@ -54,13 +54,14 @@ module Capistrano
             filter_server_list(hosts.uniq)
           end
         else
-					roles = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
-					roles = roles & Array(options[:roles]) if preserve_roles && !options[:roles].nil?
+          roles = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
+          roles = roles & Array(options[:roles]) if preserve_roles && !options[:roles].nil?
 
           only   = options[:only] || {}
           except = options[:except] || {}
           
-          servers = roles.inject([]) { |list, role| list.concat(self.roles[role]) }
+          # If we don't have a def for a role it means its bogus, skip it so higher level can handle
+          servers = roles.inject([]) { |list, role| list.concat(self.roles[role] || []) }
           servers = servers.select { |server| only.all? { |key,value| server.options[key] == value } }
           servers = servers.reject { |server| except.any? { |key,value| server.options[key] == value } }
 
@@ -103,7 +104,6 @@ module Capistrano
         roles = build_list(roles)
         roles.map do |role|
           role = String === role ? role.strip.to_sym : role
-          raise ArgumentError, "unknown role `#{role}'" unless self.roles.key?(role)
           role
         end
       end

data/lib/capistrano/recipes/deploy/scm/base.rb

@@ -163,9 +163,9 @@ module Capistrano
           # consideration the current mode ("normal" vs. "local").
           def variable(name, default = nil)
             if local? && configuration.exists?("local_#{name}".to_sym)
-              return configuration["local_#{name}".to_sym] || default
+              return configuration["local_#{name}".to_sym].nil? ? default : configuration["local_#{name}".to_sym]
             else
-              configuration[name] || default
+              configuration[name].nil? ? default : configuration[name]
             end
           end
 
@@ -186,8 +186,12 @@ module Capistrano
             variable(:repository)
           end
 
-          def arguments
-            variable(:scm_arguments)
+          def arguments(command = :all)
+            value = variable(:scm_arguments)
+            if value.is_a?(Hash)
+              value = value[command]
+            end
+            value
           end
       end
 

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -151,11 +151,12 @@ module Capistrano
             if false == variable(:git_submodules_recursive)
               execute << "#{git} submodule #{verbose} update --init"
             else
-              execute << "#{git} submodule #{verbose} update --init --recursive"
+              execute << %Q(export GIT_RECURSIVE=$([ ! "`#{git} --version`" \\< "git version 1.6.5" ] && echo --recursive))
+              execute << "#{git} submodule #{verbose} update --init $GIT_RECURSIVE"
             end
           end
 
-          execute.join(" && ").compact
+          execute.compact.join(" && ").gsub(/\s+/, ' ')
         end
 
         # An expensive export. Performs a checkout as above, then
@@ -194,7 +195,8 @@ module Capistrano
             if false == variable(:git_submodules_recursive)
               execute << "#{git} submodule #{verbose} update --init"
             else
-              execute << "#{git} submodule #{verbose} update --init --recursive"
+              execute << %Q(export GIT_RECURSIVE=$([ ! "`#{git} --version`" \\< "git version 1.6.5" ] && echo --recursive))
+              execute << "#{git} submodule #{verbose} update --init $GIT_RECURSIVE"
             end
           end
 
@@ -232,6 +234,12 @@ module Capistrano
               break
             end
           end
+          return newrev if newrev =~ /^[0-9a-f]{40}$/
+
+          # If sha is not found on remote, try expanding from local repository
+          command = scm('rev-parse --revs-only', revision)
+          newrev = yield(command).to_s.strip
+
           raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/
           return newrev
         end
@@ -274,9 +282,10 @@ module Capistrano
           # If verbose output is requested, return nil, otherwise return the
           # command-line switch for "quiet" ("-q").
           def verbose
-            variable(:scm_verbose, true) ? "-q" : nil
+            variable(:scm_verbose) ? nil : "-q"
           end
       end
     end
   end
 end
+

data/lib/capistrano/recipes/deploy/scm/perforce.rb

@@ -1,9 +1,9 @@
 require 'capistrano/recipes/deploy/scm/base'
 
-# Notes: 
+# Notes:
 #  no global verbose flag for scm_verbose
 #  sync, checkout and export are just sync in p4
-#  
+#
 module Capistrano
   module Deploy
     module SCM
@@ -27,7 +27,7 @@ module Capistrano
         def checkout(revision, destination)
           p4_sync(revision, destination, p4sync_flags)
         end
-        
+
         # Returns the command that will sync the given revision to the given
         # destination directory. The perforce client has a fixed destination so
         # the files must be copied from there to their intended resting place.
@@ -41,7 +41,7 @@ module Capistrano
         def export(revision, destination)
           p4_sync(revision, destination, p4sync_flags)
         end
-               
+
         # Returns the command that will do an "p4 diff2" for the two revisions.
         def diff(from, to=head)
           scm authentication, :diff2, "-u -db", "//#{p4client}/...#{rev_no(from)}", "//#{p4client}/...#{rev_no(to)}"
@@ -72,11 +72,11 @@ module Capistrano
 	          raise Capistrano::Error, "scm_password (or p4passwd) is incorrect or unset"
           when /Can.t create a new user.*/i
 	          raise Capistrano::Error, "scm_username (or p4user) is incorrect or unset"
-          when /Perforce client error\:/i	 
+          when /Perforce client error\:/i
 	          raise Capistrano::Error, "p4port is incorrect or unset"
           when /Client \'[\w\-\_\.]+\' unknown.*/i
 	          raise Capistrano::Error, "p4client is incorrect or unset"
-          end	             
+          end
         end
 
         private
@@ -90,11 +90,11 @@ module Capistrano
           end
 
           # Returns the command that will sync the given revision to the given
-          # destination directory with specific options. The perforce client has 
-          # a fixed destination so the files must be copied from there to their 
-          # intended resting place.          
+          # destination directory with specific options. The perforce client has
+          # a fixed destination so the files must be copied from there to their
+          # intended resting place.
           def p4_sync(revision, destination, options="")
-            scm authentication, :sync, options, "#{rev_no(revision)}", "&& cp -rf #{p4client_root} #{destination}"          
+            scm authentication, :sync, options, "#{rev_no(revision)}", "&& cp -rf #{p4client_root} #{destination}"
           end
 
           def p4client
@@ -108,7 +108,7 @@ module Capistrano
           def p4user
             variable(:p4user) || variable(:scm_username)
           end
-          
+
           def p4passwd
             variable(:p4passwd) || variable(:scm_password)
           end
@@ -120,16 +120,25 @@ module Capistrano
           def p4client_root
             variable(:p4client_root) || "`#{command} #{authentication} client -o | grep ^Root | cut -f2`"
           end
-          
-          def rev_no(revision)                     
+
+          def rev_no(revision)
+            if variable(:p4_label)
+              p4_label = if variable(:p4_label) =~ /\A@/
+                variable(:p4_label)
+              else
+                "@#{variable(:p4_label)}"
+              end
+              return p4_label
+            end
+
             case revision.to_s
             when "head"
               "#head"
-            when /^\d+/  
+            when /^\d+/
               "@#{revision}"
             else
               revision
-            end          
+            end
           end
       end
 

data/lib/capistrano/recipes/deploy/scm/subversion.rb

@@ -21,29 +21,29 @@ module Capistrano
         # Returns the command that will check out the given revision to the
         # given destination.
         def checkout(revision, destination)
-          scm :checkout, arguments, verbose, authentication, "-r#{revision}", repository, destination
+          scm :checkout, arguments, arguments(:checkout), verbose, authentication, "-r#{revision}", repository, destination
         end
 
         # Returns the command that will do an "svn update" to the given
         # revision, for the working copy at the given destination.
         def sync(revision, destination)
-          scm :update, arguments, verbose, authentication, "-r#{revision}", destination
+          scm :switch, arguments, verbose, authentication, "-r#{revision}", repository, destination
         end
 
         # Returns the command that will do an "svn export" of the given revision
         # to the given destination.
         def export(revision, destination)
-          scm :export, arguments, verbose, authentication, "-r#{revision}", repository, destination
+          scm :export, arguments, arguments(:export), verbose, authentication, "-r#{revision}", repository, destination
         end
 
         # Returns the command that will do an "svn diff" for the two revisions.
         def diff(from, to=nil)
-          scm :diff, repository, authentication, "-r#{from}:#{to || head}"
+          scm :diff, repository, arguments(:diff), authentication, "-r#{from}:#{to || head}"
         end
 
         # Returns an "svn log" command for the two revisions.
         def log(from, to=nil)
-          scm :log, repository, authentication, "-r#{from}:#{to || head}"
+          scm :log, repository, arguments(:log), authentication, "-r#{from}:#{to || head}"
         end
 
         # Attempts to translate the given revision identifier to a "real"
@@ -52,7 +52,7 @@ module Capistrano
         # executed (svn info), and will extract the revision from the response.
         def query_revision(revision)
           return revision if revision =~ /^\d+$/
-          command = scm(:info, arguments, repository, authentication, "-r#{revision}")
+          command = scm(:info, arguments, arguments(:info), repository, authentication, "-r#{revision}")
           result = yield(command)
           yaml = YAML.load(result)
           raise "tried to run `#{command}' and got unexpected result #{result.inspect}" unless Hash === yaml

data/lib/capistrano/recipes/deploy/strategy/copy.rb

@@ -86,13 +86,12 @@ module Capistrano
 
             if copy_exclude.any?
               logger.debug "processing exclusions..."
-              if copy_exclude.any?
-                copy_exclude.each do |pattern|
-                  delete_list = Dir.glob(File.join(destination, pattern), File::FNM_DOTMATCH)
-                  # avoid the /.. trap that deletes the parent directories
-                  delete_list.delete_if { |dir| dir =~ /\/\.\.$/ }
-                  FileUtils.rm_rf(delete_list.compact)
-                end
+
+              copy_exclude.each do |pattern|
+                delete_list = Dir.glob(File.join(destination, pattern), File::FNM_DOTMATCH)
+                # avoid the /.. trap that deletes the parent directories
+                delete_list.delete_if { |dir| dir =~ /\/\.\.$/ }
+                FileUtils.rm_rf(delete_list.compact)
               end
             end
           end

data/lib/capistrano/version.rb

@@ -4,7 +4,7 @@ module Capistrano
   class Version
 
     MAJOR = 2
-    MINOR = 8
+    MINOR = 9
     PATCH = 0
 
     def self.to_s

data/test/command_test.rb

@@ -205,6 +205,7 @@ class CommandTest < Test::Unit::TestCase
     new_channel = Proc.new do |times|
       ch = mock("channel")
       returns = [false] * (times-1)
+      ch.stubs(:to_ary)
       ch.stubs(:[]).with(:closed).returns(*(returns + [true]))
       ch.expects(:[]).with(:status).returns(0)
       ch

data/test/configuration/servers_test.rb

@@ -39,11 +39,11 @@ class ConfigurationServersTest < Test::Unit::TestCase
     assert_equal %w(web1 web2).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   end
 
-  def test_task_with_unknown_role_should_raise_exception
+  # NOTE Rather than throw an error, as it used to, we return an
+  #  empty array so that if a task is okay with a missing role it can continue on
+  def test_task_with_unknown_role_should_return_empty_array
     task = new_task(:testing, @config, :roles => :bogus)
-    assert_raises(ArgumentError) do
-      @config.find_servers_for_task(task)
-    end
+    assert_equal [], @config.find_servers_for_task(task)
   end
 
   def test_task_with_hosts_option_should_apply_only_to_those_hosts

data/test/deploy/scm/git_test.rb

@@ -15,7 +15,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
   def test_head
     assert_equal "HEAD", @source.head
-    
+
     # With :branch
     @config[:branch] = "master"
     assert_equal "master", @source.head
@@ -40,14 +40,31 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
     # with submodules
     @config[:git_enable_submodules] = true
-    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update --init --recursive", @source.checkout(rev, dest).gsub(/\s+/, ' ')
+    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && export GIT_RECURSIVE=$([ ! \"`#{git} --version`\" \\< \"git version 1.6.5\" ] && echo --recursive) && #{git} submodule -q update --init $GIT_RECURSIVE", @source.checkout(rev, dest).gsub(/\s+/, ' ')
   end
 
-  def test_checkout_with_verbose_should_use_q_switch
+  def test_checkout_submodules_without_recursive
+    @config[:repository] = "git@somehost.com:project.git"
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    @config[:git_enable_submodules] = true
+    @config[:git_submodules_recursive] = false
+    assert_equal "git clone -q git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && git submodule -q update --init", @source.checkout(rev, dest).gsub(/\s+/, ' ')
+  end
+
+  def test_checkout_with_verbose_should_not_use_q_switch
     @config[:repository] = "git@somehost.com:project.git"
     @config[:scm_verbose] = true
     dest = "/var/www"
     rev = 'c2d9e79'
+    assert_equal "git clone git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+  end
+
+  def test_checkout_with_verbose_off_should_use_q_switch
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:scm_verbose] = false
+    dest = "/var/www"
+    rev = 'c2d9e79'
     assert_equal "git clone -q git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
@@ -61,7 +78,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "git log master..branch", @source.log('master', 'branch')
   end
 
-  def test_query_revision
+  def test_query_revision_from_remote
     revision = @source.query_revision('HEAD') do |o|
       assert_equal "git ls-remote . HEAD", o
       "d11006102c07c94e5d54dd0ee63dca825c93ed61\tHEAD"
@@ -69,6 +86,15 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
   end
 
+  def test_query_revision_falls_back_to_local
+    revision = @source.query_revision('d11006') do |o|
+      return nil if o == "git ls-remote . d11006"
+      assert_equal "git rev-parse --revs-only d11006", o
+      "d11006102c07c94e5d54dd0ee63dca825c93ed61"
+    end
+    assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
+  end
+
   def test_query_revision_has_whitespace
     revision = @source.query_revision('HEAD') do |o|
       assert_equal "git ls-remote . HEAD", o
@@ -101,7 +127,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
     # with submodules
     @config[:git_enable_submodules] = true
-    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} fetch --tags -q origin && #{git} reset -q --hard #{rev} && #{git} submodule -q init && for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done && #{git} submodule -q sync && #{git} submodule -q update --init --recursive && #{git} clean -q -d -x -f", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} fetch --tags -q origin && #{git} reset -q --hard #{rev} && #{git} submodule -q init && for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done && #{git} submodule -q sync && export GIT_RECURSIVE=$([ ! \"`#{git} --version`\" \\< \"git version 1.6.5\" ] && echo --recursive) && #{git} submodule -q update --init $GIT_RECURSIVE && #{git} clean -q -d -x -f", @source.sync(rev, dest)
   end
 
   def test_sync_with_remote
@@ -138,7 +164,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:git_enable_submodules] = true
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && git submodule -q update --init --recursive", @source.checkout(rev, dest)
+    assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && export GIT_RECURSIVE=$([ ! \"`git --version`\" \\< \"git version 1.6.5\" ] && echo --recursive) && git submodule -q update --init $GIT_RECURSIVE", @source.checkout(rev, dest)
   end
 
   # Tests from base_test.rb, makin' sure we didn't break anything up there!
@@ -182,3 +208,4 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "/foo/bar/git", @source.command
   end
 end
+

data/test/deploy/scm/perforce_test.rb

@@ -0,0 +1,23 @@
+require "utils"
+require 'capistrano/recipes/deploy/scm/perforce'
+
+class DeploySCMPerforceTest < Test::Unit::TestCase
+  class TestSCM < Capistrano::Deploy::SCM::Perforce
+    default_command "perforce"
+  end
+  def setup
+    @config = { :repository => "." }
+    @source = TestSCM.new(@config)
+  end
+
+  def test_p4_label
+    @config[:p4_label] = "some_p4_label"
+    assert_equal "@some_p4_label", @source.send(:rev_no, 'foo')
+  end
+
+  def test_p4_label_with_symbol
+    @config[:p4_label] = "@some_p4_label"
+    assert_equal "@some_p4_label", @source.send(:rev_no, 'foo')
+  end
+
+end

data/test/deploy/scm/subversion_test.rb

@@ -29,4 +29,12 @@ Last Changed Date: 2009-03-11 11:04:25 -0700 (Wed, 11 Mar 2009)
     end
     assert_equal 2095, revision
   end
+
+  def test_sync
+    @config[:repository] = "http://svn.github.com/capistrano/capistrano.git"
+    rev = '602'
+    dest = "/var/www"
+    assert_equal "svn switch -q  -r602 http://svn.github.com/capistrano/capistrano.git /var/www", @source.sync(rev, dest)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-22 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2165629280 !ruby/object:Gem::Requirement
+  requirement: &70363620892360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165629280
+  version_requirements: *70363620892360
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2165744820 !ruby/object:Gem::Requirement
+  requirement: &70363620908220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +33,10 @@ dependencies:
         version: 2.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *2165744820
+  version_requirements: *70363620908220
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2165744300 !ruby/object:Gem::Requirement
+  requirement: &70363620907740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +44,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165744300
+  version_requirements: *70363620907740
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &2165743700 !ruby/object:Gem::Requirement
+  requirement: &70363620907260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165743700
+  version_requirements: *70363620907260
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &2165743120 !ruby/object:Gem::Requirement
+  requirement: &70363620906780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +66,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165743120
+  version_requirements: *70363620906780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2165742540 !ruby/object:Gem::Requirement
+  requirement: &70363620906300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165742540
+  version_requirements: *70363620906300
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -93,6 +92,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - README.mdown
@@ -188,6 +188,7 @@ files:
 - test/deploy/scm/git_test.rb
 - test/deploy/scm/mercurial_test.rb
 - test/deploy/scm/none_test.rb
+- test/deploy/scm/perforce_test.rb
 - test/deploy/scm/subversion_test.rb
 - test/deploy/strategy/copy_test.rb
 - test/extensions_test.rb
@@ -203,7 +204,6 @@ files:
 - test/task_definition_test.rb
 - test/transfer_test.rb
 - test/utils.rb
-has_rdoc: true
 homepage: http://github.com/capistrano/capistrano
 licenses: []
 post_install_message: 
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -256,6 +256,7 @@ test_files:
 - test/deploy/scm/git_test.rb
 - test/deploy/scm/mercurial_test.rb
 - test/deploy/scm/none_test.rb
+- test/deploy/scm/perforce_test.rb
 - test/deploy/scm/subversion_test.rb
 - test/deploy/strategy/copy_test.rb
 - test/extensions_test.rb