capistrano-wp 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98be3e324966ecf9c84649b23e8b54ad86767dfb
-  data.tar.gz: fc2e875f93cfa6029b1e70472e9bc4fe49285e6c
+  metadata.gz: 147bfeb0ee55815c2458736e43b0efc700aff339
+  data.tar.gz: 27322fe3e00cb12a1a9d94438f2c1cf06af2494a
 SHA512:
-  metadata.gz: 9a8b81e7f6cd17f17b092ad1fdcbbaec23893fa0705203d5682f8b02196e0529a1e7b19f7c355d5e35c3fd9568d3da27f0722d342fbb4ee29de98eeb39125578
-  data.tar.gz: 07ccb73f9b3bd6090b1f11f8d9f5c5ec2c379b182bd1ef8e0f3080b5ba0f176159c7bad8d6e992cf9e8283f3dc4162c3c981ba0605190e1482a9739dbdad57e7
+  metadata.gz: 99bed1c708ae020cdecc6cdd3c257da94ad48a63aa9c8370e447a8504e10cfdda21ea6671048fd0d91e3fc4e10c9996b63cb93dc4126b98b80a6595ae375aa2a
+  data.tar.gz: cbef8e57a17e0e52bc8568f5ae03499647c39a5608b980727bdd9234b35143f94925f61fd92dbdfbd22e0d5d0cf39eb0c20974c0473c11752389184bfd1cbf6b

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.5.0

data/capistrano-wp.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-wp 0.4.10 ruby lib
+# stub: capistrano-wp 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-wp"
-  s.version = "0.4.10"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Crowd Favorite"]
-  s.date = "2014-09-23"
+  s.date = "2014-10-22"
   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

@@ -110,48 +110,57 @@ module CrowdFavorite::Tasks::LocalChanges
         set(:snapshot_force, true)
         snapshot
 
-        # Hand-tooled diff-parsing - handles either shasum-style or ls -ld output
-        # Hashes store filename => [host, host, host]
+        # Hand-tooled file diffs - handles either shasum-style or ls -ld output
+        # Hashes store filename => {host => hash, host => hash, host => hash}
         left = {}
         right = {}
         changed = {}
-        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('')
+        [default_hash_path, snapshot_hash_path].each do |hashpath|
+          Dir.mktmpdir do |hashdownload|
+            download(hashpath, File.join(hashdownload, "$CAPISTRANO:HOST$"))
+            Dir.foreach(hashdownload) do |servername|
+              if not File.directory?(File.join(hashdownload, servername)) then
+                File.open(File.join(hashdownload, servername)) do |serverfile|
+                  serverfile.each_line do |line|
+                    line.strip!
+                    parts = line.split(/\s+/)
+                    if hash_creation.match(/ls -ld/)
+                      # -rw-rw-r-- 1 example example 41 Sep 19 14:58 index.php
+                      hash_result = parts.slice!(0, 8)
+                    else
+                      # 198ed94e9f1e5c69e159e8ba6d4420bb9c039715  index.php
+                      hash_result = parts.slice!(0, 1)
+                    end
 
-              bucket[filename] ||= []
-              bucket[filename].push(channel[:host])
+                    bucket = (hashpath == default_hash_path) ? left : right
+                    filename = parts.join('')
+                    bucket[filename] ||= {}
+                    bucket[filename][servername] = hash_result
+                  end
+                end
+              end
             end
           end
         end
+
         if !(left.empty? && right.empty?)
           left.each do |filename, servers|
             if right.has_key?(filename)
-              servers.each do |host|
-                if right[filename].delete(host)
-                  changed[filename] ||= []
-                  changed[filename].push(host)
-                  left[filename].delete(host)
+              servers.each do |host, hash_result|
+                right_hash_result = right[filename].delete(host)
+                if right_hash_result and right_hash_result != hash_result
+                  changed[filename] ||= {}
+                  changed[filename][host] = true
                 end
+                left[filename].delete(host)
               end
-
               left.delete(filename) if left[filename].empty?
               right.delete(filename) if right[filename].empty?
             end
           end
         end
+
         excludes = fetch(:localchanges_excludes)
         excludes[:any] ||= []
         logger.important "Excluding from #{current_release}: #{excludes.inspect}"
@@ -160,6 +169,9 @@ module CrowdFavorite::Tasks::LocalChanges
         [[left, :deleted], [right, :created], [changed, :changed]].each do |filegroup, excluder|
           excludes[excluder] ||= []
           filegroup.each do |filename, servers|
+            if servers.respond_to? :keys
+              servers = servers.keys
+            end
             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
@@ -198,7 +210,7 @@ module CrowdFavorite::Tasks::LocalChanges
                 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})"
+                logger.important "#{File.basename filename} in #{File.dirname filename} (on #{servers.keys.inspect})"
               end
             end
           end
@@ -216,7 +228,7 @@ module CrowdFavorite::Tasks::LocalChanges
         logger.important "deleted: " + results[:left].inspect
         logger.important "created: " + results[:right].inspect
         logger.important "changed: " + results[:changed].inspect
-        if results.has_key?[:excluded]
+        if results.has_key? :excluded
           logger.important "excluded: " + results[:excluded].inspect
         end
         return true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-wp
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Crowd Favorite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano