capistrano 2.15.4 → 2.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4615cf068078a3d3a85f9fa103e49a8e5638211
-  data.tar.gz: 5bc4b85e0e535ec07f43fb3c3541115164cea9b3
+  metadata.gz: f6d390cc4fc2f8e025b2aba4fa2c287e36c999ed
+  data.tar.gz: 04a65a40859de8159af366edc9b73248a28cdca2
 SHA512:
-  metadata.gz: b5a3daa8ab41b154219f3707ee0eb42b439d00a9df7990367c099330b6d1afeded2ad13082842888dbf45bea473674aeef5099c1562c1cd1d166ab68db8bd3d9
-  data.tar.gz: d3cf7aca34633ccc485153f992549c13aa450df642b29364cb7fed76dbad0e1a0dca42c5babd236c4eb35829c572f596fa565488261402881d3e22f713df4918
+  metadata.gz: ebf02e5b3c3bd832ca9c67f8c9cae56cbaf424ef6797d43d611604db68088c43b79f7577e9887b7960984f328162390c566ed38c479754a877fb955b3325a86f
+  data.tar.gz: 43ad8672fb85662636eb379a98987fe32bf0ff72af01d5718b6d303eb95335277aabdbfc058f62b6f249973cd1d97a53a66bcca56029847a837179e3f2466222

data/CHANGELOG

@@ -1,3 +1,10 @@
+## 2.15.5 / July 4 2013
+
+* Fix multistage argument parsing when using the `-s` option. (@jmazzi)
+* Tweaks to the asset recipes. (@curtislinden)
+* Use quotes around SCM usernames and passwords (@carloslopes)
+* Avoid git warning when cloning Git repository using sha1 (@bpaquet)
+
 ## 2.15.4 / April 29 2013
 
 * Fix parallel command logging (@gnufied)

data/lib/capistrano/configuration/loading.rb

@@ -163,6 +163,14 @@ module Capistrano
         end
       end
 
+      def file_in_load_path?(file)
+        begin
+          !!find_file_in_load_path(file)
+        rescue LoadError
+          false
+        end
+      end
+
       private
 
         # Load a recipe from the named file. If +name+ is given, the file will

data/lib/capistrano/ext/multistage.rb

@@ -15,14 +15,19 @@ Capistrano::Configuration.instance.load do
     desc "Set the target stage to `#{name}'."
     task(name) do
       set :stage, name.to_sym
-      load "#{location}/#{stage}" if File.exist?(File.join(location, "#{stage}.rb"))
+
+      file = "#{location}/#{stage}"
+      load file if file_in_load_path?(file)
     end
   end
 
   on :load do
-    if stages.include?(ARGV.first)
+    # The first non option argument
+    env = ARGV.detect { |a| a.to_s !~ /\A-/ && a.to_s !~ /=/ }
+
+    if stages.include?(env)
       # Execute the specified stage so that recipes required in stage can contribute to task list
-      find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
+      find_and_execute_task(env) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
     else
       # Execute the default stage so that recipes required in stage can contribute tasks
       find_and_execute_task(default_stage) if exists?(:default_stage)

data/lib/capistrano/recipes/deploy/assets.rb

@@ -60,8 +60,8 @@ namespace :deploy do
     DESC
     task :precompile, :roles => lambda { assets_role }, :except => { :no_release => true } do
       run <<-CMD.compact
-        cd -- #{latest_release} &&
-        #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile
+        cd -- #{latest_release} && 
+        RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} #{rake} assets:precompile
       CMD
 
       if capture("ls -1 #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* | wc -l").to_i > 1

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

@@ -84,7 +84,7 @@ module Capistrano
           case text
           when /\bpassword.*:/i
             # prompting for a password
-            "#{variable(:scm_password) || variable(:password)}\n"
+            %("#{variable(:scm_password) || variable(:password)}"\n)
           when %r{\(yes/no\)}
             # let's be agreeable...
             "yes\n"

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

@@ -136,7 +136,7 @@ module Capistrano
           args = []
 
           # Add an option for the branch name so :git_shallow_clone works with branches
-          args << "-b #{variable(:branch)}" unless variable(:branch).nil?
+          args << "-b #{variable(:branch)}" unless variable(:branch).nil? || variable(:branch) == revision
           args << "-o #{remote}" unless remote == 'origin'
           if depth = variable(:git_shallow_clone)
             args << "--depth #{depth}"
@@ -263,7 +263,7 @@ module Capistrano
             unless pass = variable(:scm_password)
               pass = Capistrano::CLI.password_prompt
             end
-            "#{pass}\n"
+            %("#{pass}"\n)
           when %r{\(yes/no\)}
             # git is asking whether or not to connect
             "yes\n"
@@ -272,7 +272,7 @@ module Capistrano
             unless pass = variable(:scm_passphrase)
               pass = Capistrano::CLI.password_prompt
             end
-            "#{pass}\n"
+            %("#{pass}"\n)
           when /accept \(t\)emporarily/
             # git is asking whether to accept the certificate
             "t\n"

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

@@ -73,7 +73,7 @@ module Capistrano
           when /^user:/mi
             # support :scm_user for backwards compatibility of this module
             if user = variable(:scm_username) || variable(:scm_user)
-              "#{user}\n"
+              %("#{user}"\n)
             else
               raise "No variable :scm_username specified and Mercurial asked!\n" +
                 "Prompt was: #{text}"
@@ -84,7 +84,7 @@ module Capistrano
               raise "No variable :scm_password specified and Mercurial asked!\n" +
                 "Prompt was: #{text}"
             end
-            "#{pass}\n"
+            %("#{pass}"\n)
           when /yes\/no/i
             "yes\n"
           end

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

@@ -73,13 +73,13 @@ module Capistrano
           case text
           when /\bpassword.*:/i
             # subversion is prompting for a password
-            "#{scm_password_prompt}\n"
+            %("#{scm_password_prompt}"\n)
           when %r{\(yes/no\)}
             # subversion is asking whether or not to connect
             "yes\n"
           when /passphrase/i
             # subversion is asking for the passphrase for the user's key
-            "#{variable(:scm_passphrase)}\n"
+            %("#{variable(:scm_passphrase)}"\n)
           when /The entry \'(.+?)\' is no longer a directory/
             raise Capistrano::Error, "subversion can't update because directory '#{$1}' was replaced. Please add it to svn:ignore."
           when /accept \(t\)emporarily/
@@ -97,8 +97,8 @@ module Capistrano
           def authentication
             username = variable(:scm_username)
             return "" unless username
-            result = "--username #{variable(:scm_username)} "
-            result << "--password #{variable(:scm_password)} " unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
+            result = %(--username "#{variable(:scm_username)}")
+            result << %(--password "#{variable(:scm_password)}") unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
             result << "--no-auth-cache " unless variable(:scm_auth_cache)
             result
           end

data/lib/capistrano/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Version
     MAJOR = 2
     MINOR = 15
-    PATCH = 4
+    PATCH = 5
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

data/test/configuration/loading_test.rb

@@ -129,4 +129,20 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
     assert_equal :custom, @config.ping
     assert_equal :custom, config2.ping
   end
+
+  def test_file_in_load_path_returns_true_when_file_is_in_load_path
+    File.stubs(:file?).returns(false)
+    File.stubs(:file?).with("custom/path/for/file.rb").returns(true)
+
+    @config.load_paths << "custom/path/for"
+    assert_equal true, @config.file_in_load_path?("file")
+  end
+
+  def test_file_in_load_path_returns_false_when_file_is_not_in_load_path
+    File.stubs(:file?).returns(false)
+    File.stubs(:file?).with("custom/path/for/file.rb").returns(false)
+
+    @config.load_paths << "custom/path/for"
+    assert_equal false, @config.file_in_load_path?("file")
+  end
 end

data/test/deploy/scm/git_test.rb

@@ -43,6 +43,21 @@ class DeploySCMGitTest < Test::Unit::TestCase
     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_branching
+    @config[:repository] = "git@somehost.com:project.git"
+    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 c2d9e79", @source.checkout(rev, dest)
+
+    # with :branch
+    @config[:branch] = "master"
+    assert_equal "git clone -q -b master git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy c2d9e79", @source.checkout(rev, dest)
+
+    # with :branch with hash code
+    @config[:branch] = "c2d9e79"
+    assert_equal "git clone -q git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy c2d9e79", @source.checkout(rev, dest)
+  end
+
   def test_checkout_submodules_without_recursive
     @config[:repository] = "git@somehost.com:project.git"
     dest = "/var/www"
@@ -217,5 +232,43 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "git", @source.local.command
     assert_equal "/foo/bar/git", @source.command
   end
+
+  def test_sends_password_if_set
+    require 'capistrano/logger'
+    text = "password:"
+    @config[:scm_password] = "opensesame"
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  def test_prompt_password
+    require 'capistrano/logger'
+    require 'capistrano/cli'
+    Capistrano::CLI.stubs(:password_prompt).returns("opensesame")
+
+    text = 'password:'
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  def test_sends_passphrase_if_set
+    require 'capistrano/logger'
+    text = "passphrase:"
+    @config[:scm_passphrase] = "opensesame"
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  def test_prompt_passphrase
+    require 'capistrano/logger'
+    require 'capistrano/cli'
+    Capistrano::CLI.stubs(:password_prompt).returns("opensesame")
+
+    text = 'passphrase:'
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  private
+
+    def mock_state
+      { :channel => { :host => "abc" } }
+    end
 end
 

data/test/deploy/scm/mercurial_test.rb

@@ -48,10 +48,10 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     require 'capistrano/logger'
     @config[:scm_user] = "fred"
     text = "user:"
-    assert_equal "fred\n", @source.handle_data(mock_state, :test_stream, text)
+    assert_equal %("fred"\n), @source.handle_data(mock_state, :test_stream, text)
     # :scm_username takes priority
     @config[:scm_username] = "wilma"
-    assert_equal "wilma\n", @source.handle_data(mock_state, :test_stream, text)
+    assert_equal %("wilma"\n), @source.handle_data(mock_state, :test_stream, text)
   end
 
   def test_sync
@@ -72,7 +72,7 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     require 'capistrano/logger'
     text = "password:"
     @config[:scm_password] = "opensesame"
-    assert_equal "opensesame\n", @source.handle_data(mock_state, :test_stream, text)
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
   end
 
   def test_prompts_for_password_if_preferred
@@ -81,7 +81,7 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     Capistrano::CLI.stubs(:password_prompt).with("hg password: ").returns("opensesame")
     @config[:scm_prefer_prompt] = true
     text = "password:"
-    assert_equal "opensesame\n", @source.handle_data(mock_state, :test_stream, text)
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
   end
 
 

data/test/deploy/scm/subversion_test.rb

@@ -37,4 +37,32 @@ Last Changed Date: 2009-03-11 11:04:25 -0700 (Wed, 11 Mar 2009)
     assert_equal "svn switch -q  -r602 http://svn.github.com/capistrano/capistrano.git /var/www", @source.sync(rev, dest)
   end
 
+  def test_sends_password_if_set
+    require 'capistrano/logger'
+    text = "password:"
+    @config[:scm_password] = "opensesame"
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  def test_prompt_password
+    require 'capistrano/logger'
+    require 'capistrano/cli'
+    Capistrano::CLI.stubs(:password_prompt).returns("opensesame")
+
+    text = 'password:'
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  def test_sends_passphrase
+    require 'capistrano/logger'
+    text = 'passphrase:'
+    @config[:scm_passphrase] = "opensesame"
+    assert_equal %("opensesame"\n), @source.handle_data(mock_state, :test_stream, text)
+  end
+
+  private
+
+    def mock_state
+      { :channel => { :host => "abc" } }
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.15.4
+  version: 2.15.5
 platform: ruby
 authors:
 - Jamis Buck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline