capistrano 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01115be3e8ab363fc0f9555eb6e3504e3e6eb709
-  data.tar.gz: 9b8b1fc5f765d23f5a336f25c28c2a3078793806
+  metadata.gz: f526bf77fa9d58f9e652b765e48011b3aec097b6
+  data.tar.gz: ac5aac5e993b29a865778972655061a693e0f1c7
 SHA512:
-  metadata.gz: 85916614f98a4f4d0f816b9ad2689e952fe05ec7ec3db49ff83e4ff08423c9d6b9e7a57cb84bdd401020172548a842ecf6bcc8458ed27438d3b9d727401dc8a0
-  data.tar.gz: 9283b6c3631fe2be2884b826141be26944a6b1d4037a2f036c8fed81ed8e776a7fc02c80ffa2a353e97ac084fe793c7429410c95df9dd5dc82c0fdfd1adebcfc
+  metadata.gz: 092d19bf6fd529d8793e0f6058c9679c626d222a1d0dc22888cb5eb3cae2d427a28d92b7f90196ceab23d14bb7064747e44bdbe67106cd3d9462b9ecfd970033
+  data.tar.gz: 1a7564b0f8b876511cd37854177f9bd49265f77c08841fbc871797209f4aea2c95e8e87d1563819115ce1a9dee0285c5d4cb8a2eb8d339ed076ff29e85728285

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 2.15.1 / April 23 2013
+
+* Support for Rails 4 (and other) randomised asset manifest names. (@jimryan)
+
 ## 2.15.0 / April 23 2013
 
 * New varaible :shared_assets_prefix to allow people to host somewhere other

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

@@ -1,3 +1,5 @@
+require 'json'
+
 load 'deploy' unless defined?(_cset)
 
 _cset :asset_env, "RAILS_GROUPS=assets"
@@ -14,6 +16,18 @@ before 'deploy:assets:precompile', 'deploy:assets:update_asset_mtimes'
 after  'deploy:cleanup',           'deploy:assets:clean_expired'
 after  'deploy:rollback:revision', 'deploy:assets:rollback'
 
+def shared_manifest_path
+  @shared_manifest_path ||= capture("ls #{shared_path.shellescape}/#{shared_assets_prefix}/manifest*").strip
+end
+
+# Parses manifest and returns array of uncompressed and compressed asset filenames with and without digests
+# "Intelligently" determines format of string - supports YAML and JSON
+def parse_manifest(str)
+  assets_hash = str[0,1] == '{' ? JSON.parse(str)['assets'] : YAML.load(str)
+
+  assets_hash.to_a.flatten.map {|a| [a, "#{a}.gz"] }.flatten
+end
+
 namespace :deploy do
   namespace :assets do
     desc <<-DESC
@@ -47,8 +61,19 @@ namespace :deploy do
     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 &&
-        cp -- #{shared_path.shellescape}/#{shared_assets_prefix}/manifest.yml #{current_release.to_s.shellescape}/assets_manifest.yml
+        #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile
+      CMD
+
+      # Sync manifest filenames across servers if our manifest has a random filename
+      if shared_manifest_path =~ /manifest-.+\./
+        run <<-CMD.compact
+          [ -e #{shared_manifest_path.shellescape} ] || mv -- #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* #{shared_manifest_path.shellescape}
+        CMD
+      end
+
+      # Copy manifest to release root (for clean_expired task)
+      run <<-CMD.compact
+        cp -- #{shared_manifest_path.shellescape} #{current_release.to_s.shellescape}/assets_manifest#{File.extname(shared_manifest_path)}
       CMD
     end
 
@@ -57,13 +82,11 @@ namespace :deploy do
       This task runs before assets:precompile.
     DESC
     task :update_asset_mtimes, :roles => lambda { assets_role }, :except => { :no_release => true } do
-      # Fetch assets/manifest.yml contents.
-      manifest_path = "#{shared_path}/#{shared_assets_prefix}/manifest.yml"
-      manifest_yml = capture("[ -e #{manifest_path.shellescape} ] && cat #{manifest_path.shellescape} || echo").strip
+      # Fetch assets/manifest contents.
+      manifest_content = capture("[ -e #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* ] && cat #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* || echo").strip
 
-      if manifest_yml != ""
-        manifest = YAML.load(manifest_yml)
-        current_assets = manifest.to_a.flatten.map {|a| [a, "#{a}.gz"] }.flatten
+      if manifest_content != ""
+        current_assets = parse_manifest(manifest_content)
         logger.info "Updating mtimes for ~#{current_assets.count} assets..."
         put current_assets.map{|a| "#{shared_path}/#{shared_assets_prefix}/#{a}" }.join("\n"), "#{deploy_to}/TOUCH_ASSETS", :via => :scp
         run <<-CMD.compact
@@ -97,24 +120,23 @@ namespace :deploy do
       an existing release.
     DESC
     task :clean_expired, :roles => lambda { assets_role }, :except => { :no_release => true } do
-      # Fetch all assets_manifest.yml contents.
+      # Fetch all assets_manifest contents.
       manifests_output = capture <<-CMD.compact
-        for manifest in #{releases_path.shellescape}/*/assets_manifest.yml; do
+        for manifest in #{releases_path.shellescape}/*/assets_manifest.*; do
           cat -- "$manifest" 2> /dev/null && printf ':::' || true;
         done
       CMD
       manifests = manifests_output.split(':::')
 
       if manifests.empty?
-        logger.info "No manifests in #{releases_path}/*/assets_manifest.yml"
+        logger.info "No manifests in #{releases_path}/*/assets_manifest.*"
       else
-        logger.info "Fetched #{manifests.count} manifests from #{releases_path}/*/assets_manifest.yml"
+        logger.info "Fetched #{manifests.count} manifests from #{releases_path}/*/assets_manifest.*"
         current_assets = Set.new
-        manifests.each do |yaml|
-          manifest = YAML.load(yaml)
-          current_assets += manifest.to_a.flatten.map {|f| [f, "#{f}.gz"] }.flatten
+        manifests.each do |content|
+          current_assets += parse_manifest(content)
         end
-        current_assets += %w(manifest.yml sources_manifest.yml)
+        current_assets += [File.basename(shared_manifest_path), "sources_manifest.yml"]
 
         # Write the list of required assets to server.
         logger.info "Writing required assets to #{deploy_to}/REQUIRED_ASSETS..."
@@ -144,18 +166,18 @@ namespace :deploy do
 
     desc <<-DESC
       Rolls back assets to the previous release by symlinking the release's manifest
-      to shared/assets/manifest.yml, and finally recompiling or regenerating nondigest assets.
+      to shared/assets/manifest, and finally recompiling or regenerating nondigest assets.
     DESC
     task :rollback, :roles => lambda { assets_role }, :except => { :no_release => true } do
-      previous_manifest = "#{previous_release}/assets_manifest.yml"
+      previous_manifest = capture("ls #{previous_release.shellescape}/assets_manifest.*").strip
       if capture("[ -e #{previous_manifest.shellescape} ] && echo true || echo false").strip != 'true'
         puts "#{previous_manifest} is missing! Cannot roll back assets. " <<
              "Please run deploy:assets:precompile to update your assets when the rollback is finished."
       else
         run <<-CMD.compact
           cd -- #{previous_release.shellescape} &&
-          cp -f -- #{previous_manifest.shellescape} #{shared_path.shellescape}/#{shared_assets_prefix}/manifest.yml &&
-          #{rake} RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} assets:precompile:nondigest
+          cp -f -- #{previous_manifest.shellescape} #{shared_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
     end

data/lib/capistrano/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Jamis Buck