middleman-s3_sync 3.0.28 → 3.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e216c35299295bd25bf9c095d627a57d3de6ef94
-  data.tar.gz: b12a21e124b649a52c068e3c37c1abd916745490
+  metadata.gz: 171d7b4a7a89adb9efc3e8f364e4a66ed120f434
+  data.tar.gz: 3e927d5727e6dd30ff120e6dc9c96b0ef7f9ebcf
 SHA512:
-  metadata.gz: 63df5416f4776612a216ccc61efa9f2350912dcf5e62effa86c09e60992917a8614be91371e0726883fc20460917391312eee4aa185616980f451ebddfe79030
-  data.tar.gz: d47cbba2841bdc2ceed9b0c97cdfb56d6dfdea413373e30be06401e19352e07917e6b054105098d253952377a0e39e34f951fb501b1bbd3c4d447c381ebb9b20
+  metadata.gz: 86caf76c11fecaaa3f0a9e6d4cdf3507fb3a3da18e47c7b31f232340cfb0b58510803ee0c39dd84c3e679ba99a8de8feff178d1f8892d457c89777706300d48e
+  data.tar.gz: ba16c95c0ca083c1c77bf872a553d94bbc8d9d593d9228c5e6e52b625744607fe9c9379e86ba25013ecea3f92b997def45836f741a9be5f2315971b18b0d7cb0

data/lib/middleman/s3_sync.rb

@@ -63,7 +63,7 @@ module Middleman
       def paths
         @paths ||= begin
                      say_status "Gathering the paths to evaluate."
-                     (remote_paths + local_paths).uniq.sort
+                     (remote_paths.map { |rp| rp.gsub(/^#{s3_sync_options.prefix}/, '')} + local_paths).uniq.sort
                    end
       end
 
@@ -76,7 +76,7 @@ module Middleman
                              local_paths.reject! { |p| p =~ /\.gz$/ && File.exist?(p.gsub(/\.gz$/, '')) }
                            end
 
-                           local_paths.pmap(32) { |p| p.gsub(/#{build_dir}\//, s3_sync_options.prefix) }
+                           local_paths.pmap(32) { |p| p.gsub(/#{build_dir}\//, '') }
                          end
       end
 

data/lib/middleman/s3_sync/resource.rb

@@ -57,7 +57,7 @@ module Middleman
 
       def update!
         body { |body|
-          say_status "Updating".blue + " #{path}#{ gzipped ? ' (gzipped)'.white : ''}"
+          say_status "Updating".blue + " #{remote_path}#{ gzipped ? ' (gzipped)'.white : ''}"
           if options.verbose
             say_status "Original:    #{original_path.white}"
             say_status "Local Path:  #{local_path.white}"
@@ -92,21 +92,21 @@ module Middleman
       end
 
       def local_path
-        local_path = build_dir + '/' + path
+        local_path = build_dir + '/' + path.gsub(/^#{options.prefix}/, '')
         if options.prefer_gzip && File.exist?(local_path + ".gz")
           @gzipped = true
           local_path += ".gz"
         end
-        local_path.sub(options.prefix, '')
+        local_path
       end
 
       def destroy!
-        say_status "Deleting".red + " #{path}"
+        say_status "Deleting".red + " #{remote_path}"
         bucket.files.destroy remote_path
       end
 
       def create!
-        say_status "Creating".green + " #{path}#{ gzipped ? ' (gzipped)'.white : ''}"
+        say_status "Creating".green + " #{remote_path}#{ gzipped ? ' (gzipped)'.white : ''}"
         if options.verbose
           say_status "Original:    #{original_path.white}"
           say_status "Local Path:  #{local_path.white}"
@@ -125,7 +125,7 @@ module Middleman
                  elsif alternate_encoding?
                    'alternate encoding'
                  end
-        say_status "Ignoring".yellow + " #{path} #{ reason ? "(#{reason})".white : "" }"
+        say_status "Ignoring".yellow + " #{remote_path} #{ reason ? "(#{reason})".white : "" }"
       end
 
       def to_delete?

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.28"
+    VERSION = "3.0.29"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.28
+  version: 3.0.29
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core