middleman-cloudfront 0.0.5 → 0.0.6

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.8.7

data/README.md

@@ -7,7 +7,6 @@ Some of its features are:
 * Ability to filter files which are going to be invalidated by regex;  
 
 # Usage
-andrusha/middleman-cloudfront
 
 ## Installation
 Add this to `Gemfile`:  
@@ -48,7 +47,7 @@ bundle exec middleman invalidate
 ## S3 + Cloudfront deploying
 
 In real world this gem shouldn't be used alone, but as a part of your 
-deployment solution. As for me I use it with [cloudfront-sync](https://github.com/karlfreeman/middleman-sync) and my configuration file looks like this:
+deployment solution. As for me I use it with [middleman-sync](https://github.com/karlfreeman/middleman-sync) and my configuration file looks like this:
 
 ```ruby
 configure :build do

data/lib/middleman-cloudfront/commands.rb

@@ -8,6 +8,8 @@ module Middleman
     class CloudFront < Thor
       include Thor::Actions
 
+      INVALIDATION_LIMIT = 1000
+
       check_unknown_options!
 
       namespace :invalidate
@@ -25,13 +27,25 @@ module Middleman
           :aws_secret_access_key  => options.secret_access_key
         })
 
-        distribution = cdn.distributions.get options.distribution_id
+        distribution = cdn.distributions.get(options.distribution_id)
 
-        # CloudFront limits amount of files which can be invalidated by one request
-        list_files(options.filter).each_slice(1000) do |slice|
-          puts "Please wait while Cloudfront is reloading #{slice.length} paths, it might take up to 10 minutes"
-          invalidation = distribution.invalidations.create :paths => slice
-          invalidation.wait_for { ready? }
+        # CloudFront limits the amount of files which can be invalidated by one request to 1000.
+        # If there are more than 1000 files to invalidate, do so sequentially and wait until each validation is ready.
+        # If there are max 1000 files, create the invalidation and return immediately.
+        files = list_files(options.filter)
+        if files.count <= INVALIDATION_LIMIT
+          puts "Invalidating #{files.count} files. It might take 10 to 15 minutes until all files are invalidated."
+          puts 'Please check the AWS Management Console to see the status of the invalidation.'
+          invalidation = distribution.invalidations.create(:paths => files)
+          raise StandardError, %(Invalidation status is #{invalidation.status}. Expected "InProgress") unless invalidation.status == 'InProgress'
+        else
+          slices = files.each_slice(INVALIDATION_LIMIT)
+          puts "Invalidating #{files.count} files in #{slices.count} batch(es). It might take 10 to 15 minutes per batch until all files are invalidated."
+          slices.each_with_index do |slice, i|
+            puts "Invalidating batch #{i + 1}..."
+            invalidation = distribution.invalidations.create(:paths => slice)
+            invalidation.wait_for { ready? } unless i == slices.count - 1
+          end
         end
       end
 
@@ -56,14 +70,22 @@ module Middleman
 
       def list_files(filter)
         Dir.chdir('build/') do
-          files = Dir.glob('**/*', File::FNM_DOTMATCH).reject { |f| File.directory? f }
-          # if :directory_indexes is active, we must invalidate both files and dirs
-          files += files.map{|f| f.gsub(/\/index\.html$/, '/') }
-          files.uniq!
-          files.map!    { |f| f.start_with?('/') ? f : "/#{f}" }
-          files.reject! { |f| not filter =~ f }
-
-          files
+          Dir.glob('**/*', File::FNM_DOTMATCH).tap do |files|
+            # Remove directories
+            files.reject! { |f| File.directory?(f) }
+
+            # Remove files that do not match filter
+            files.reject! { |f| f !~ filter }
+
+            # Add directories of index.html files since they have to be
+            # invalidated as well if :directory_indexes is active
+            index_files = files.select { |f| f =~ %r(/index\.html\z) }
+            index_file_dirs = index_files.map { |f| f[%r((.+)index\.html\z), 1] }
+            files.concat index_file_dirs
+
+            # Add leading slash
+            files.map! { |f| f.start_with?('/') ? f : "/#{f}" }
+          end
         end
       end
 

data/lib/middleman-cloudfront/pkg-info.rb

@@ -1,6 +1,6 @@
 module Middleman
   module CloudFront
     PACKAGE = 'middleman-cloudfront'
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/middleman-cloudfront.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = Middleman::CloudFront::PACKAGE
   s.version     = Middleman::CloudFront::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Andrey Korzhuev"]
+  s.authors     = ["Andrey Korzhuev", "Manuel Meurer"]
   s.email       = ["andrew@korzhuev.com"]
   s.homepage    = "https://github.com/andrusha/middleman-cloudfront"
   s.summary     = %q{Invalidate CloudFront cache after deployment to S3}

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cloudfront
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
 - Andrey Korzhuev
+- Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core