capistrano-wp 0.4.3 → 0.4.6

data/README.md

@@ -239,6 +239,24 @@ or your stage specific files.
 set :snapshot_allow_differences, true
 ```
 
+If you would like to ignore changes to specific files, you can declare an option:
+
+```ruby
+set :localchanges_excludes, {
+  :deleted => ['deleted_file_to_ignore'],
+  :created => ['subdirectory/createdfile'],
+  :changed => ['changedfile'],
+  :any => ['ignoredfile']
+}
+```
+
+Filenames are relative to the webroot, and are exact; there is no current provision
+for globbing or directory tree exclusion.  The `:any` list will ignore all changes
+to a given file - deletion, creation, or content changes - while the other lists
+may be useful for more limited exclusions - for instance, a file that can be deleted
+but should never be changed if it remains present.
+
+
 ## Development
 
 [rubygems]: http://rubygems.org/pages/download

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.6

data/capistrano-wp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-wp"
-  s.version = "0.4.3"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Crowd Favorite"]
-  s.date = "2013-09-25"
+  s.date = "2013-11-12"
   s.description = "Recipes for deploying and maintaining remote WordPress installations with\nCapistrano.  Pulls in WordPress from SVN, optionally using a local or\nremote cache, and supports a number of common operations and tasks towards\nthe care and feeding of sites that may not be 100% maintained through\nversion control.\n"
   s.executables = ["capify-wp"]
   s.extra_rdoc_files = [

data/lib/crowdfavorite/tasks/localchanges.rb

@@ -40,7 +40,14 @@ module CrowdFavorite::Tasks::LocalChanges
     _cset(:hash_suffix) { "_hash" }
     _cset(:hash_compare_suffix) { "compare" }
     _cset(:hashes) { capture("ls -xt #{File.join(hash_directory, '*' + hash_suffix)}").split.reverse }
-
+    _cset(:localchanges_excludes) {
+      {
+        :deleted => [],
+        :created => [],
+        :changed => [],
+        :any => []
+      }
+    }
 
     def _snapshot_exists(path)
         retcode = (capture("test -f " + Shellwords::escape(path) + "; echo $?").to_s.strip.to_i)
@@ -145,11 +152,30 @@ module CrowdFavorite::Tasks::LocalChanges
             end
           end
         end
+        excludes = fetch(:localchanges_excludes)
+        excludes[:any] ||= []
+        logger.important "Excluding from #{current_release}: #{excludes.inspect}"
+        excluded = {:left => {}, :right => {}, :changed => {}}
+        found_exclusion = false
+        [[left, :deleted], [right, :created], [changed, :changed]].each do |filegroup, excluder|
+          excludes[excluder] ||= []
+          filegroup.each do |filename, servers|
+            if excludes[excluder].detect {|f| f == filename or File.join(current_release, f) == filename} or
+              excludes[:any].detect {|f| f == filename or File.join(current_release, f) == filename}
+              found_exclusion = true
+              excluded[excluder] ||= {}
+              excluded[excluder][filename] ||= []
+              excluded[excluder][filename].push(*servers)
+              excluded[excluder][filename].uniq!
+              filegroup.delete(filename)
+            end
+          end
+        end
 
         unset(:snapshot_target)
         unset(:snapshot_hash_path)
         unset(:snapshot_force)
-        return {:left => left, :right => right, :changed => changed}
+        return {:left => left, :right => right, :changed => changed, :excluded => excluded}
       end
 
       def _do_snapshot_diff(results, format = :full)
@@ -157,13 +183,29 @@ module CrowdFavorite::Tasks::LocalChanges
           return false
         end
         if results[:left].empty? && results[:right].empty? && results[:changed].empty?
+          if results.has_key?(:excluded)
+            logger.important "excluded: " + results[:excluded].inspect
+          end
           return false
         end
 
         if format == :basic || !(fetch(:strategy).class <= Capistrano::Deploy::Strategy.new(:remote).class)
-          logger.important "deleted: " + results[:left].inspect
-          logger.important "created: " + results[:right].inspect
-          logger.important "changed: " + results[:changed].inspect
+          [[:left, 'deleted'], [:right, 'created'], [:changed, 'changed']].each do |resultgroup, verb|
+            if !results[resultgroup].empty?
+              logger.important "#{verb}: "
+              results[resultgroup].each do |thefile, servers|
+                filename = thefile
+                if filename.start_with? current_release
+                  filename = thefile.slice(current_release.length..-1)
+                end
+                logger.important "#{File.basename filename} in #{File.dirname filename} (on #{servers.inspect})"
+              end
+            end
+          end
+
+          if results.has_key?(:excluded)
+            logger.info "excluded: " + results[:excluded].inspect
+          end
           return true
         end
 
@@ -174,41 +216,10 @@ module CrowdFavorite::Tasks::LocalChanges
         logger.important "deleted: " + results[:left].inspect
         logger.important "created: " + results[:right].inspect
         logger.important "changed: " + results[:changed].inspect
-        return true
-
-        todostuff = <<-'EOTODO'
-        File.join(shared_path, configuration[:repository_cache] || "cached-copy")
-        if fetch(:scm) == :git
-          if fetch(:copy_exclude, []).include?(".git")
-            run("echo 'gitdir: #{}
-
-        end
-
-
-        run("diff " + default_hash_path + " " + snapshot_hash_path + " || true") do |channel, stream, data|
-          data.each_line do |line|
-            line.strip!
-            if line.match(/^\s*[<>]/)
-              parts = line.split(/\s+/)
-              if hash_creation.match(/ls -ld/)
-                # > -rw-rw-r-- 1 example example 41 Sep 19 14:58 index.php
-                parts.slice!(0, 9)
-              else
-                # < 198ed94e9f1e5c69e159e8ba6d4420bb9c039715  index.php
-                parts.slice!(0,2)
-              end
-
-              bucket = line.match(/^\s*</) ? left : right
-              filename = parts.join('')
-
-              bucket[filename] ||= []
-              bucket[filename].push(channel[:host])
-            end
-          end
+        if results.has_key?[:excluded]
+          logger.important "excluded: " + results[:excluded].inspect
         end
-        logger.important "oh hey, fully featured"
         return true
-        EOTODO
       end
 
       desc "Check the current release for changes made on the server; abort if changes are detected."
@@ -233,7 +244,7 @@ module CrowdFavorite::Tasks::LocalChanges
         else
           logger.info "keeping #{count} of #{hashes.length} release hashes"
           hashpaths = (hashes - hashes.last(count)).map{ |thehash|
-            File.join(hash_directory, thehash) + " " + File.join(hash_directory, thehash + hash_compare_suffix)
+            File.join(thehash) + " " + File.join(thehash + hash_compare_suffix)
           }.join(" ")
           try_sudo "rm -f #{hashpaths}"
         end

data/lib/crowdfavorite/wordpress.rb

@@ -21,6 +21,7 @@ module CrowdFavorite::WordPress
   extend CrowdFavorite::Support::Namespace
   namespace :cf do
     after "deploy:finalize_update", "cf:localchanges:snapshot_deploy"
+    after "deploy:cleanup", "cf:localchanges:cleanup"
     before "deploy", "cf:localchanges:compare"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-wp
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano