middleman-s3_sync 3.0.4 → 3.0.6

data/lib/middleman-s3_sync.rb

@@ -15,9 +15,10 @@ module Middleman
     class << self
       def sync
         puts "Gathering local files."
-        local_files = (Dir[options.public_path + "/**/*"] + Dir[options.public_path + "/**/.*"])
+
+        local_files = (Dir[options.build_dir + "/**/*"] + Dir[options.build_dir + "/**/.*"])
           .reject { |f| File.directory?(f) }
-          .map { |f| f.gsub(/^build\//, '') }
+          .map { |f| f.gsub(/^#{options.build_dir}\//, '') }
         puts "Gathering remote files."
         remote_files = bucket.files.map { |f| f.key }
 
@@ -35,7 +36,7 @@ module Middleman
         files_to_reject = []
         Parallel.each(files_to_evaluate, :in_threads => 4) do |f|
           print '.'
-          local_mtime = File.mtime("build/#{f}")
+          local_mtime = File.mtime("#{options.build_dir}/#{f}")
           remote_mtime = s3_files.get(f).last_modified
           files_to_reject << f if remote_mtime >= local_mtime
         end
@@ -47,7 +48,7 @@ module Middleman
           puts "\n\nDetermine which remaining files are actually different than their S3 counterpart."
           Parallel.each(files_to_evaluate, :in_threads => 4) do |f|
             print '.'
-            local_md5 = Digest::MD5.hexdigest(File.read("build/#{f}"))
+            local_md5 = Digest::MD5.hexdigest(File.read("#{options.build_dir}/#{f}"))
             remote_md5 = s3_files.get(f).etag
             files_to_push << f if local_md5 != remote_md5
           end
@@ -59,14 +60,14 @@ module Middleman
             if remote_files.include?(f)
               puts "Updating #{f}"
               file = s3_files.get(f)
-              file.body = File.open("build/#{f}")
+              file.body = File.open("#{options.build_dir}/#{f}")
               file.public = true
               file.save
             else
               puts "Creating #{f}"
               file = bucket.files.create({
                 :key => f,
-                :body => File.open("build/#{f}"),
+                :body => File.open("#{options.build_dir}/#{f}"),
                 :public => true,
                 :acl => 'public-read'
               })

data/lib/middleman-s3_sync/extension.rb

@@ -4,7 +4,6 @@ module Middleman
   module S3Sync
     class Options < Struct.new(
       :prefix,
-      :public_path,
       :bucket,
       :region,
       :aws_access_key_id,
@@ -12,6 +11,7 @@ module Middleman
       :after_build,
       :delete,
       :existing_remote_file,
+      :build_dir
     )
     end
 
@@ -28,11 +28,12 @@ module Middleman
 
         app.send :include, Helpers
 
-        options.public_path ||= "build"
         app.after_configuration do |config|
-          after_build do |builder|
-            ::Middleman::S3Sync.sync if options.after_build
-          end
+          options.build_dir = build_dir
+        end
+
+        app.after_build do |builder|
+          ::Middleman::S3Sync.sync if options.after_build
         end
       end
 

data/lib/middleman-s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.4"
+    VERSION = "3.0.6"
   end
 end

data/middleman-s3_sync.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'middleman-core', '>= 3.0.0'
   gem.add_runtime_dependency 'fog'
   gem.add_runtime_dependency 'parallel'
+
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -2,14 +2,14 @@
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 3.0.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Frederic Jean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Only syncs files that have been updated to S3.
 email:
 - fred@fredjean.net
@@ -90,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3029396681136123709
+      hash: 4207882760766588596
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -99,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3029396681136123709
+      hash: 4207882760766588596
       version: '0'
 requirements: []
 rubyforge_project: