capistrano 2.15.3 → 2.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3bffa7c743856eaf4e95146f1f113282e185874
-  data.tar.gz: 3108aa72d20619cf5edabf19f58647d25b9764cb
+  metadata.gz: c4615cf068078a3d3a85f9fa103e49a8e5638211
+  data.tar.gz: 5bc4b85e0e535ec07f43fb3c3541115164cea9b3
 SHA512:
-  metadata.gz: fad703fc0ab1689f650dc534f8a4636468464c99ec711431fede61a84dcd0c4aafd5014223a9bf7c5e9795972128b76e3857e22f4e219a489209372366047937
-  data.tar.gz: 36c81df6aa347c7747f726d1955f8ded3723a3e212b04b4a2e7ff266e73fd256d95a6210b0752c699bb7efc862c1ff814b6aaabea1c02d817e42cb97551844f8
+  metadata.gz: b5a3daa8ab41b154219f3707ee0eb42b439d00a9df7990367c099330b6d1afeded2ad13082842888dbf45bea473674aeef5099c1562c1cd1d166ab68db8bd3d9
+  data.tar.gz: d3cf7aca34633ccc485153f992549c13aa450df642b29364cb7fed76dbad0e1a0dca42c5babd236c4eb35829c572f596fa565488261402881d3e22f713df4918

data/CHANGELOG

@@ -1,3 +1,8 @@
+## 2.15.4 / April 29 2013
+
+* Fix parallel command logging (@gnufied)
+* Fix a double-asset manifest problem on Rails upgrades. (@jimryan)
+
 ## 2.15.3 / April 25 2012
 
 * For deploy:cleanup, use try_sudo with rm command. (@joshstaiger)

data/Gemfile

@@ -9,4 +9,5 @@ gemspec
 #
 group :development do
   gem "rake"
+  gem "pry"
 end

data/lib/capistrano/configuration/actions/invocation.rb

@@ -163,10 +163,11 @@ module Capistrano
 
           if tree.branches.any? || tree.fallback
             _, servers = filter_servers(options)
-            branches = servers.map{|server| tree.branches_for(server)}.compact
+            branches = branches_for_servers(tree,servers)
             case branches.size
             when 0
               branches = tree.branches.dup + [tree.fallback]
+              branches.compact!
               case branches.size
               when 1
                 logger.debug "no servers for #{branches.first}"
@@ -178,13 +179,7 @@ module Capistrano
               logger.debug "executing #{branches.first}" unless options[:silent]
             else
               logger.debug "executing multiple commands in parallel"
-              branches.each {|maybe_branch|
-                if(maybe_branch.is_a?(Array))
-                  maybe_branch.each {|branch| logger.trace "-> #{branch.to_s(true)}"}
-                else
-                  logger.trace "-> #{maybe_branch.to_s(true)}"
-                end
-              }
+              branches.each {|branch| logger.trace "-> #{branch.to_s(true)}" }
             end
           else
             raise ArgumentError, "attempt to execute without specifying a command"
@@ -317,6 +312,17 @@ module Capistrano
               exit(-1)
           end
         end
+
+        private
+        def branches_for_servers(tree,servers)
+          servers.inject([]) do |branches,server|
+            if server_branches = tree.branches_for(server)
+              branches += server_branches
+            end
+            branches
+          end
+        end
+
       end
     end
   end

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

@@ -64,6 +64,10 @@ namespace :deploy do
         #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile
       CMD
 
+      if capture("ls -1 #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* | wc -l").to_i > 1
+        raise "More than one asset manifest file was found in '#{shared_path.shellescape}/#{shared_assets_prefix}'.  If you are upgrading a Rails 3 application to Rails 4, follow these instructions: http://github.com/capistrano/capistrano/wiki/Upgrading-to-Rails-4#asset-pipeline"
+      end
+
       # Sync manifest filenames across servers if our manifest has a random filename
       if shared_manifest_path =~ /manifest-.+\./
         run <<-CMD.compact
@@ -174,9 +178,21 @@ namespace :deploy do
         puts "#{previous_manifest} is missing! Cannot roll back assets. " <<
              "Please run deploy:assets:precompile to update your assets when the rollback is finished."
       else
+        # If the user is rolling back a Rails 4 app to Rails 3
+        if File.extname(previous_manifest) == '.yml' && File.extname(shared_manifest_path) == '.json'
+          # Remove the existing JSON manifest
+          run "rm -f -- #{shared_manifest_path.shellescape}"
+
+          # Restore the manifest to the Rails 3 path
+          restored_manifest_path = "#{shared_path.shellescape}/#{shared_assets_prefix}/manifest.yml"
+        else
+          # If the user is not rolling back from Rails 4 to 3, we just want to replace the current manifest
+          restored_manifest_path = shared_manifest_path
+        end
+
         run <<-CMD.compact
           cd -- #{previous_release.shellescape} &&
-          cp -f -- #{previous_manifest.shellescape} #{shared_manifest_path.shellescape} &&
+          cp -f -- #{previous_manifest.shellescape} #{restored_manifest_path.shellescape} &&
           [ -z "$(#{rake} -P | grep assets:precompile:nondigest)" ] || #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile:nondigest
         CMD
       end

data/lib/capistrano/version.rb

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

data/test/configuration/actions/invocation_test.rb

@@ -9,6 +9,7 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     attr_accessor :dry_run
     attr_accessor :preserve_roles
     attr_accessor :servers
+    attr_accessor :roles
 
     def initialize
       @options = {}
@@ -226,6 +227,37 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     @config.invoke_command("ls", :once => true, :via => :foobar)
   end
 
+  def test_parallel_command_execution_with_no_match
+    assert_block("should not raise argument error") do
+      begin
+        @config.parallel do |session|
+          session.when("in?(:app)", "ls") {|ch,stream,data| puts "noop"}
+          session.when("in?(:db)", "pwd") {|ch,stream,data| puts "noop"}
+        end
+        true
+      rescue
+        false
+      end
+    end
+  end
+
+  def test_parallel_command_execution_with_matching_servers
+    @config.expects(:execute_on_servers)
+    assert_block("should not raise Argument error") do
+      begin
+        @config.servers = [:app, :db]
+        @config.roles = {:app => [:app], :db => [:db] }
+        @config.parallel do |session|
+          session.when("in?(:app)", "ls") {|ch,stream,data| puts "noop"}
+          session.when("in?(:db)", "pwd") {|ch,stream,data| puts "noop"}
+        end
+        true
+      rescue
+        false
+      end
+    end
+  end
+
   private
 
     def make_config

data/test/utils.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 require 'mocha'
 
 require 'capistrano/server_definition'
+require 'pry'
 
 module TestExtensions
   def server(host, options={})

metadata

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