capistrano 2.13.5 → 2.14.1

data/CHANGELOG

@@ -1,5 +1,10 @@
-## 2.13.5 (tentative) / October 26 2012
+## 2.14.1 (tentative) / January 10 2013
 
+## 2.14.0 / January 9 2013
+
+* Removed ui.output_cols limit of 80 chars (@aussielunix)
+* Added :p4charset variable for Perforce command line (@randyinla)
+* Added support for rolling back assets, and removing expired assets (@ndbroadbent)
 * Merged in `capistrano_colors` gem, and renamed to 'log_formatters', since it does much more than just colors
   (@ndbroadbent)
 * Use more intelligence in setting the :scm variable based on known version control directory names (@czarneckid)

data/lib/capistrano/cli/help.rb

@@ -112,7 +112,7 @@ module Capistrano
 
       def output_columns #:nodoc:
         if ( @output_columns.nil? ) 
-          if ( self.class.ui.output_cols.nil? || self.class.ui.output_cols > 80 )
+          if ( self.class.ui.output_cols.nil? )
             @output_columns = 80 
           else
             @output_columns = self.class.ui.output_cols

data/lib/capistrano/configuration.rb

@@ -43,7 +43,14 @@ module Capistrano
     # Must mix last, because it hooks into previously defined methods
     include Callbacks
 
-    ((self.instance_methods & Kernel.methods) - Namespaces::Namespace.instance_methods).each do |name|
+    (self.instance_methods & Kernel.methods).select do |name|
+      # Select the instance methods owned by the Configuration class.
+      self.instance_method(name).owner.to_s.start_with?("Capistrano::Configuration")
+    end.select do |name|
+      # Of those, select methods that are being shadowed by the Kernel module in the Namespace class.
+      Namespaces::Namespace.method_defined?(name) && Namespaces::Namespace.instance_method(name).owner == Kernel
+    end.each do |name|
+      # Undefine the shadowed methods, since we want Namespace objects to defer handling to the Configuration object.
       Namespaces::Namespace.send(:undef_method, name)
     end
   end

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

@@ -160,7 +160,7 @@ module Capistrano
         # or #invoke_command.
         def run_tree(tree, options={}) #:nodoc:
           if tree.branches.empty? && tree.fallback
-            logger.debug "executing #{tree.fallback}"
+            logger.debug "executing #{tree.fallback}" unless options[:silent]
           elsif tree.branches.any?
             logger.debug "executing multiple commands in parallel"
             tree.each do |branch|

data/lib/capistrano/configuration/namespaces.rb

@@ -213,7 +213,7 @@ module Kernel
 
       namespace = Capistrano::Configuration::Namespaces::Namespace
 
-      if namespace.method_defined?(name) && namespace.method(name).owner == Kernel
+      if namespace.method_defined?(name) && namespace.instance_method(name).owner == Kernel
         namespace.send :undef_method, name
       end
 

data/lib/capistrano/recipes/deploy.rb

@@ -1,8 +1,9 @@
-require 'benchmark'
-require 'yaml'
-require 'shellwords'
-require 'capistrano/recipes/deploy/scm'
-require 'capistrano/recipes/deploy/strategy'
+require "benchmark"
+require "set"
+require "shellwords"
+require "yaml"
+require "capistrano/recipes/deploy/scm"
+require "capistrano/recipes/deploy/strategy"
 
 def _cset(name, *args, &block)
   unless exists?(name)
@@ -287,7 +288,8 @@ namespace :deploy do
     if fetch(:normalize_asset_timestamps, true)
       stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
       asset_paths = fetch(:public_children, %w(images stylesheets javascripts)).map { |p| "#{escaped_release}/public/#{p}" }
-      run("find #{asset_paths.join(" ").shellescape} -exec touch -t -- #{stamp} {} ';'; true", :env => { "TZ" => "UTC" }) if asset_paths.any?
+      run("find #{asset_paths.join(" ")} -exec touch -t #{stamp} -- {} ';'; true",
+          :env => { "TZ" => "UTC" }) if asset_paths.any?
     end
   end
 

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

@@ -3,11 +3,15 @@ load 'deploy' unless defined?(_cset)
 _cset :asset_env, "RAILS_GROUPS=assets"
 _cset :assets_prefix, "assets"
 _cset :assets_role, [:web]
+_cset :expire_assets_after, (3600 * 24 * 7)
 
 _cset :normalize_asset_timestamps, false
 
-before 'deploy:finalize_update', 'deploy:assets:symlink'
-after 'deploy:update_code', 'deploy:assets:precompile'
+before 'deploy:finalize_update',   'deploy:assets:symlink'
+after  'deploy:update_code',       'deploy:assets:precompile'
+before 'deploy:assets:precompile', 'deploy:assets:update_asset_mtimes'
+after  'deploy:cleanup',           'deploy:assets:clean_expired'
+after  'deploy:rollback:revision', 'deploy:assets:rollback'
 
 namespace :deploy do
   namespace :assets do
@@ -20,7 +24,7 @@ namespace :deploy do
       :assets_prefix variable to match.
     DESC
     task :symlink, :roles => assets_role, :except => { :no_release => true } do
-      run <<-CMD
+      run <<-CMD.compact
         rm -rf #{latest_release}/public/#{assets_prefix} &&
         mkdir -p #{latest_release}/public &&
         mkdir -p #{shared_path}/assets &&
@@ -39,7 +43,34 @@ namespace :deploy do
         set :asset_env, "RAILS_GROUPS=assets"
     DESC
     task :precompile, :roles => assets_role, :except => { :no_release => true } do
-      run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile"
+      run <<-CMD.compact
+        cd -- #{latest_release.shellescape} &&
+        #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile &&
+        cp -- #{shared_path.shellescape}/assets/manifest.yml #{current_release.shellescape}/assets_manifest.yml
+      CMD
+    end
+
+    desc <<-DESC
+      [internal] Updates the mtimes for assets that are required by the current release.
+      This task runs before assets:precompile.
+    DESC
+    task :update_asset_mtimes, :roles => assets_role, :except => { :no_release => true } do
+      # Fetch assets/manifest.yml contents.
+      manifest_path = "#{shared_path}/assets/manifest.yml"
+      manifest_yml = capture("[ -e #{manifest_path.shellescape} ] && cat #{manifest_path.shellescape} || echo").strip
+
+      if manifest_yml != ""
+        manifest = YAML.load(manifest_yml)
+        current_assets = manifest.to_a.flatten.map {|a| [a, "#{a}.gz"] }.flatten
+        logger.info "Updating mtimes for ~#{current_assets.count} assets..."
+        put current_assets.map{|a| "#{shared_path}/assets/#{a}" }.join("\n"), "#{deploy_to}/TOUCH_ASSETS"
+        run <<-CMD.compact
+          cat #{deploy_to.shellescape}/TOUCH_ASSETS | while read asset; do
+            touch -cm -- "$asset";
+          done &&
+          rm -f -- #{deploy_to.shellescape}/TOUCH_ASSETS
+        CMD
+      end
     end
 
     desc <<-DESC
@@ -56,5 +87,76 @@ namespace :deploy do
     task :clean, :roles => assets_role, :except => { :no_release => true } do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:clean"
     end
+
+    desc <<-DESC
+      Clean up any assets that haven't been deployed for more than :expire_assets_after seconds.
+      Default time to keep old assets is one week. Set the :expire_assets_after variable
+      to change the assets expiry time. Assets will only be deleted if they are not required by
+      an existing release.
+    DESC
+    task :clean_expired, :roles => assets_role, :except => { :no_release => true } do
+      # Fetch all assets_manifest.yml contents.
+      manifests_output = capture <<-CMD.compact
+        for manifest in #{releases_path.shellescape}/*/assets_manifest.yml; 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"
+      else
+        logger.info "Fetched #{manifests.count} manifests from #{releases_path}/*/assets_manifest.yml"
+        current_assets = Set.new
+        manifests.each do |yaml|
+          manifest = YAML.load(yaml)
+          current_assets += manifest.to_a.flatten.flat_map do |file|
+            [file, "#{file}.gz"]
+          end
+        end
+        current_assets += %w(manifest.yml sources_manifest.yml)
+
+        # Write the list of required assets to server.
+        logger.info "Writing required assets to #{deploy_to}/REQUIRED_ASSETS..."
+        escaped_assets = current_assets.sort.join("\n").gsub("\"", "\\\"") << "\n"
+        put escaped_assets, "#{deploy_to}/REQUIRED_ASSETS"
+
+        # Finds all files older than X minutes, then removes them if they are not referenced
+        # in REQUIRED_ASSETS.
+        expire_after_mins = (expire_assets_after.to_f / 60.0).to_i
+        logger.info "Removing assets that haven't been deployed for #{expire_after_mins} minutes..."
+        # LC_COLLATE=C tells the `sort` and `comm` commands to sort files in byte order.
+        run <<-CMD.compact
+          cd -- #{shared_path.shellescape}/assets/ &&
+          for f in $(
+            find * -mmin +#{expire_after_mins.to_s.shellescape} -type f | LC_COLLATE=C sort |
+            LC_COLLATE=C comm -23 -- - #{deploy_to.shellescape}/REQUIRED_ASSETS
+          ); do
+            echo "Removing unneeded asset: $f";
+            rm -f -- "$f";
+          done;
+          rm -f -- #{deploy_to.shellescape}/REQUIRED_ASSETS
+        CMD
+      end
+    end
+
+    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.
+    DESC
+    task :rollback, :roles => assets_role, :except => { :no_release => true } do
+      previous_manifest = "#{previous_release}/assets_manifest.yml"
+      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."
+        return false
+      else
+        run <<-CMD.compact
+          cd -- #{previous_release.shellescape} &&
+          cp -f -- #{previous_manifest.shellescape} #{shared_path.shellescape}/assets/manifest.yml &&
+          #{rake} RAILS_ENV=#{rails_env.shellescape} #{asset_env} assets:precompile:nondigest
+        CMD
+      end
+    end
   end
 end

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

@@ -83,10 +83,11 @@ module Capistrano
 
           # Builds the set of authentication switches that perforce understands.
           def authentication
-            [ p4port   && "-p #{p4port}",
-              p4user   && "-u #{p4user}",
-              p4passwd && "-P #{p4passwd}",
-              p4client && "-c #{p4client}" ].compact.join(" ")
+            [ p4port    && "-p #{p4port}",
+              p4user    && "-u #{p4user}",
+              p4passwd  && "-P #{p4passwd}",
+              p4client  && "-c #{p4client}",
+              p4charset && "-C #{p4charset}" ].compact.join(" ")
           end
 
           # Returns the command that will sync the given revision to the given
@@ -112,6 +113,10 @@ module Capistrano
           def p4passwd
             variable(:p4passwd) || variable(:scm_password)
           end
+          
+          def p4charset
+            variable(:p4charset)
+          end
 
           def p4sync_flags
             variable(:p4sync_flags) || "-f"

data/lib/capistrano/version.rb

@@ -1,8 +1,8 @@
 module Capistrano
   class Version
     MAJOR = 2
-    MINOR = 13
-    PATCH = 5
+    MINOR = 14
+    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.13.5
+  version: 2.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline