middleman-cloudfront 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 007e6bd92ef3aa1bda2443a2bcb204ff9c629359
-  data.tar.gz: bbdd3a6b015710a5da1cc00b8f4124645fa53449
+SHA256:
+  metadata.gz: 45630e9002202a7bb7480ca73b84675937a5068864f7c238dd2c477899cf9184
+  data.tar.gz: 33c8b3c56d298a6f5ea6ff9c3382867b6e684d74617e1de255b90cb5b1744aa9
 SHA512:
-  metadata.gz: c86faeaea4789c2962892e8d6ab4b227fc32b4696b3187b9b78dc26694de484b921cda7547a7bdafb1f93ba97d6f2aebef85fa5900409a875cc4b19855caaec1
-  data.tar.gz: 368a02b61331f1b8f74264825674a3d6cd6f2a998c4521992f91d6d8dd8ba0f3f30df65f627506ee757bfd28efd48df33045e63934e327a13074473941c4a338
+  metadata.gz: a09550094d9d1bc154e36fc2ba60beede436c967c93e698f6bd2d99038dd1ea001825689d31e38b4b72cb61bc5869e97d2c8dfe0e644d48a7723753802a7e1d7
+  data.tar.gz: dac269c7465ae90b45767a485550906f72eaef4417bfe3fbb4c6f9658578e9cbe245700911ef2164af039c2ffd66fdfaf367451522e9d427702acdc89367f650

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
+sudo: false
+cache: bundler
+before_script:
+  - gem update --system
+  - gem update bundler
 rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby
+  - 2.2.5
+  - 2.3.1

data/README.md

@@ -1,4 +1,4 @@
-# Middleman CloudFront [![Build Status](https://travis-ci.org/andrusha/middleman-cloudfront.png)](https://travis-ci.org/andrusha/middleman-cloudfront) [![Dependency Status](https://gemnasium.com/andrusha/middleman-cloudfront.png)](https://gemnasium.com/andrusha/middleman-cloudfront) [![Code Climate](https://codeclimate.com/github/andrusha/middleman-cloudfront.png)](https://codeclimate.com/github/andrusha/middleman-cloudfront)
+# Middleman CloudFront [![Build Status](https://travis-ci.org/andrusha/middleman-cloudfront.svg?branch=master)](https://travis-ci.org/andrusha/middleman-cloudfront) [![Dependency Status](https://gemnasium.com/andrusha/middleman-cloudfront.png)](https://gemnasium.com/andrusha/middleman-cloudfront) [![Code Climate](https://codeclimate.com/github/andrusha/middleman-cloudfront.png)](https://codeclimate.com/github/andrusha/middleman-cloudfront)
 A deploying tool for middleman which allows you to interact with Amazon CloudFront.
 Some of its features are:  
 
@@ -115,3 +115,5 @@ after_s3_sync do |files_by_status|
   invalidate files_by_status[:updated]
 end
 ```
+
+NOTE: The `after_s3_sync` hook only works with middleman-s3_sync v3.x and below. It has been [removed in v4.0](https://github.com/fredjean/middleman-s3_sync/blob/master/Changelog.md#v400).

data/Rakefile

@@ -3,12 +3,6 @@ require 'rspec/core/rake_task'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
-end
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/middleman-cloudfront.rb

@@ -1,7 +1,4 @@
-require 'middleman-core'
-require 'middleman-cloudfront/commands'
+require 'pathname' # for some reason, had to require this because middleman-core 4.1.7 did not.
+require 'middleman-cloudfront/extension'
 
-::Middleman::Extensions.register(:cloudfront, ">= 3.0.0") do
-  require "middleman-cloudfront/extension"
-  ::Middleman::CloudFront
-end
+Middleman::Extensions.register :cloudfront, Middleman::CloudFront::Extension

data/lib/middleman-cloudfront/commands/invalidate.rb

@@ -0,0 +1,146 @@
+require 'middleman-cli'
+require 'middleman-cloudfront/extension'
+require 'fog/aws'
+
+module Middleman
+  module Cli
+    module CloudFront
+      # This class provides an "invalidate" command for the middleman CLI.
+      class Invalidate < ::Thor::Group
+        include Thor::Actions
+
+        INVALIDATION_LIMIT = 1000
+        INDEX_REGEX = /
+          \A
+            (.*\/)?
+            index\.html
+          \z
+        /ix
+
+        check_unknown_options!
+
+        def self.exit_on_failure?
+          true
+        end
+
+        def invalidate(options = nil, files = nil)
+
+          # If called via commandline, discover config (from bin/middleman)
+          if options.nil?
+            app = Middleman::Application.new do
+              config[:mode] = :config
+              config[:exit_before_ready] = true
+              config[:watcher_disable] = true
+              config[:disable_sitemap] = true
+            end
+
+            # Get the options from the cloudfront extension
+            extension = app.extensions[:cloudfront]
+            unless extension.nil?
+              options = extension.options
+            end
+          end
+
+          if options.nil?
+            configuration_usage
+          end
+
+          [:distribution_id, :filter].each do |key|
+            raise StandardError, "Configuration key #{key} is missing." if options.public_send(key).nil?
+          end
+
+          puts '## Invalidating files on CloudFront'
+
+          fog_options = {
+            :provider => 'AWS'
+          }
+
+          fog_options.merge!(
+            if options.access_key_id && options.secret_access_key
+              {
+                :aws_access_key_id     => options.access_key_id,
+                :aws_secret_access_key => options.secret_access_key
+              }
+            else
+              { :use_iam_profile => true }
+            end
+          )
+
+          cdn = Fog::CDN.new(fog_options)
+
+          distribution = cdn.distributions.get(options.distribution_id)
+
+          raise StandardError, "Cannot access Distribution with id #{options.distribution_id}." if distribution.nil?
+
+
+          # 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 = normalize_files(files || list_files(options.filter))
+          return if files.empty?
+
+          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
+
+        protected
+
+        def configuration_usage
+          raise Error, <<-TEXT
+ERROR: You need to activate the cloudfront extension in config.rb.
+
+The example configuration is:
+activate :cloudfront do |cf|
+  cf.access_key_id     = 'I'
+  cf.secret_access_key = 'love'
+  cf.distribution_id   = 'cats'
+  # cf.filter            = /\.html/i  # default /.*/
+  # cf.after_build       = true  # default is false
+end
+          TEXT
+        end
+
+        def list_files(filter)
+          Dir.chdir('build/') do
+            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 }
+            end
+          end
+        end
+
+        def normalize_files(files)
+          # Add directories since they have to be invalidated
+          # as well if :directory_indexes is active
+          files += files.grep(INDEX_REGEX).map do |file|
+            file == 'index.html' ? '/' : File.dirname(file) << '/'
+          end.uniq
+
+          # URI encode and add leading slash
+          files.map { |f| URI::encode(f.start_with?('/') ? f : "/#{f}") }
+        end
+
+        # Add to CLI
+        Base.register(self, 'invalidate', 'invalidate', 'Invalidate a cloudfront distribution.')
+
+        # Map "inv" to "invalidate"
+        Base.map('inv' => 'invalidate')
+      end
+    end
+  end
+end

data/lib/middleman-cloudfront/extension.rb

@@ -1,36 +1,31 @@
 require 'middleman-core'
+require 'middleman-cloudfront/commands/invalidate'
 
 module Middleman
   module CloudFront
-    class Options < Struct.new(:access_key_id, :secret_access_key, :distribution_id, :filter, :after_build); end
-
-    class << self
-      def options
-        @@cloudfront_options
+    class Extension < Middleman::Extension
+      # @param [Symbol] key The name of the option
+      # @param [Object] default The default value for the option
+      # @param [String] description A human-readable description of what the option does
+      option :access_key_id, nil, 'Access key id'
+      option :secret_access_key, nil, 'Secret access key'
+      option :distribution_id, nil, 'Distribution id'
+      option :filter, /.*/, 'Filter files to be invalidated'
+      option :after_build, false, 'Invalidate after build'
+
+      def initialize(app, options_hash={}, &block)
+        super
       end
 
-      def registered(app, options_hash = {}, &block)
-        @@cloudfront_options = Options.new(options_hash)
-        yield @@cloudfront_options if block_given?
-
-        app.after_build do
-          ::Middleman::Cli::CloudFront.new.invalidate(@@cloudfront_options) if @@cloudfront_options.after_build
-        end
-
-        app.send :include, Helpers
+      def after_build
+        Middleman::Cli::CloudFront::Invalidate.new.invalidate(options) if options.after_build
       end
-      alias :included :registered
-    end
 
-    module Helpers
-      def cloudfront_options
-        ::Middleman::CloudFront.options
-      end
-
-      def invalidate(files = nil)
-        ::Middleman::Cli::CloudFront.new.invalidate(cloudfront_options, files)
+      helpers do
+        def invalidate(files = nil)
+          Middleman::Cli::CloudFront::Invalidate.new.invalidate(options, files)
+        end
       end
     end
-
   end
 end

data/lib/middleman-cloudfront/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CloudFront
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/middleman-cloudfront.gemspec

@@ -15,25 +15,16 @@ Gem::Specification.new do |s|
   s.summary     = %q{Invalidate CloudFront cache after deployment to S3}
   s.description = %q{Adds ability to invalidate a specific set of files in your CloudFront cache}
 
-  s.rubyforge_project = "middleman-cloudfront"
-
   s.files         = `git ls-files -z`.split("\0")
   s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'fog', '~> 1.9'
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.add_development_dependency 'cucumber', '~> 1.3'
-  s.add_development_dependency 'aruba', '~> 0.5'
-  s.add_development_dependency 'fivemat', '~> 1.3'
-  s.add_development_dependency 'simplecov', '~> 0.8'
   s.add_development_dependency 'rake', '>= 0.9.0'
   s.add_development_dependency 'rspec', '~> 3.0'
 
-  if RUBY_VERSION <= '1.9.2'
-    s.add_dependency 'middleman-core', '~> 3.0', '<= 3.2.0'
-    s.add_development_dependency 'activesupport', '< 4.0.0'
-  else
-    s.add_dependency 'middleman-core', '~> 3.0'
-  end
+  s.add_dependency 'fog-aws', '>= 0.1.1'
+  s.add_dependency 'middleman-core', '>= 3.0'
+  s.add_dependency 'middleman-cli', '>= 3.0'
 end

data/spec/lib/middleman-cloudfront/invalidate_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+require 'fog/aws/models/cdn/distributions'
+
+describe Middleman::Cli::CloudFront::Invalidate do
+  INVALIDATION_LIMIT = Middleman::Cli::CloudFront::Invalidate::INVALIDATION_LIMIT
+  let(:cloudfront) { described_class.new }
+  let(:options) do
+    config = Middleman::Configuration::ConfigurationManager.new
+    config.access_key_id ='access_key_id_123'
+    config.secret_access_key = 'secret_access_key_123'
+    config.distribution_id = 'distribution_id_123'
+    config.filter = 'filter_123'
+    config.after_build = 'after_build_123'
+    config
+  end
+  let(:distribution) { double('distribution', invalidations: double('invalidations')) }
+
+  before do
+    allow_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).and_return(distribution)
+    allow(distribution.invalidations).to receive(:create) do
+      double('invalidation', status: 'InProgress', wait_for: -> {})
+    end
+  end
+
+  it 'gets the correct distribution' do
+    allow(cloudfront).to receive(:list_files).and_return([])
+    expect_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).with('distribution_id_123')
+    cloudfront.invalidate(options)
+  end
+
+  it 'normalizes paths' do
+    files = %w(file directory/index.html)
+    normalized_files = %w(/file /directory/index.html /directory/)
+    allow(cloudfront).to receive(:list_files).and_return(files)
+    expect(distribution.invalidations).to receive(:create).once.with(paths: normalized_files)
+    cloudfront.invalidate(options)
+  end
+
+  context 'when the amount of files to invalidate is under the limit' do
+    it 'divides them up in packages and creates one invalidation per package' do
+      files = (1..INVALIDATION_LIMIT).map { |i| "/file_#{i}" }
+      allow(cloudfront).to receive(:list_files).and_return(files)
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files)
+      cloudfront.invalidate(options)
+    end
+  end
+
+  context 'when the amount of files to invalidate is over the limit' do
+    it 'creates only one invalidation with all of them' do
+      files = (1..(INVALIDATION_LIMIT * 3)).map { |i| "/file_#{i}" }
+      allow(cloudfront).to receive(:list_files).and_return(files)
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files[0, INVALIDATION_LIMIT])
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files[INVALIDATION_LIMIT, INVALIDATION_LIMIT])
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files[INVALIDATION_LIMIT * 2, INVALIDATION_LIMIT])
+      cloudfront.invalidate(options)
+    end
+  end
+
+  context 'when files to invalidate are explicitly specified' do
+    it 'uses them instead of the files in the build directory' do
+      files = (1..3).map { |i| "/file_#{i}" }
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files)
+      cloudfront.invalidate(options, files)
+    end
+
+    it "doesn't filter them" do
+      files = (1..3).map { |i| "/file_#{i}" }
+      options.filter = /filter that matches no files/
+      expect(distribution.invalidations).to receive(:create).once.with(paths: files)
+      cloudfront.invalidate(options, files)
+    end
+
+    it 'normalizes them' do
+      files = %w(file directory/index.html)
+      normalized_files = %w(/file /directory/index.html /directory/)
+      expect(distribution.invalidations).to receive(:create).once.with(paths: normalized_files)
+      cloudfront.invalidate(options, files)
+    end
+  end
+
+  context 'when the distribution_id is invalid' do
+    it 'it raise_error' do
+      #fog will return nil if the distribution_id is invalid
+      allow_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).and_return(nil)
+      expect { cloudfront.invalidate(options) }.to raise_error(StandardError, "Cannot access Distribution with id distribution_id_123.")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cloudfront
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrey Korzhuev
@@ -9,118 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: fivemat
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
+        version: 0.1.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: middleman-core
+  name: middleman-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Adds ability to invalidate a specific set of files in your CloudFront
@@ -138,14 +96,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- features/support/env.rb
 - lib/middleman-cloudfront.rb
-- lib/middleman-cloudfront/commands.rb
+- lib/middleman-cloudfront/commands/invalidate.rb
 - lib/middleman-cloudfront/extension.rb
 - lib/middleman-cloudfront/version.rb
 - lib/middleman_extension.rb
 - middleman-cloudfront.gemspec
-- spec/lib/middleman-cloudfront/commands_spec.rb
+- spec/lib/middleman-cloudfront/invalidate_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/andrusha/middleman-cloudfront
 licenses: []
@@ -158,18 +115,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: middleman-cloudfront
-rubygems_version: 2.4.5
+rubyforge_project: 
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Invalidate CloudFront cache after deployment to S3
-test_files:
-- features/support/env.rb
-has_rdoc: 
+test_files: []

data/features/support/env.rb

@@ -1,6 +0,0 @@
-require "simplecov"
-SimpleCov.start
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require "middleman-core"
-require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cloudfront')

data/lib/middleman-cloudfront/commands.rb

@@ -1,122 +0,0 @@
-require "middleman-core/cli"
-require "middleman-cloudfront/extension"
-require "fog"
-
-module Middleman
-  module Cli
-
-    class CloudFront < Thor
-      include Thor::Actions
-
-      INVALIDATION_LIMIT = 1000
-      INDEX_REGEX = /
-        \A
-          (.*\/)?
-          index\.html
-        \z
-      /ix
-
-      check_unknown_options!
-
-      namespace :invalidate
-
-      def self.exit_on_failure?
-        true
-      end
-
-      desc "invalidate", "A way to deal with your CloudFront distributions"
-      def invalidate(options = nil, files = nil)
-        if options.nil?
-          app_instance = ::Middleman::Application.server.inst
-          unless app_instance.respond_to?(:cloudfront_options)
-            raise Error, <<-TEXT
-ERROR: You need to activate the cloudfront extension in config.rb.
-
-The example configuration is:
-activate :cloudfront do |cf|
-  cf.access_key_id     = 'I'
-  cf.secret_access_key = 'love'
-  cf.distribution_id   = 'cats'
-  cf.filter            = /\.html/i  # default /.*/
-  cf.after_build       = true  # default is false
-end
-            TEXT
-          end
-          options = app_instance.cloudfront_options
-        end
-        options.filter ||= /.*/
-        [:distribution_id, :filter].each do |key|
-          raise StandardError, "Configuration key #{key} is missing." if options.public_send(key).nil?
-        end
-
-        puts "## Invalidating files on CloudFront"
-
-        fog_options = {
-          :provider => 'AWS'
-        }
-
-        if options.access_key_id && options.secret_access_key
-          fog_options.merge!({
-            :aws_access_key_id      => options.access_key_id,
-            :aws_secret_access_key  => options.secret_access_key
-          })
-        else
-          fog_options.merge!({:use_iam_profile => true})
-        end
-
-        cdn = Fog::CDN.new(fog_options)
-
-        distribution = cdn.distributions.get(options.distribution_id)
-
-        # 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 = normalize_files(files || list_files(options.filter))
-        return if files.empty?
-
-        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
-
-      protected
-
-      def list_files(filter)
-        Dir.chdir('build/') do
-          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 }
-          end
-        end
-      end
-
-      def normalize_files(files)
-        # Add directories since they have to be invalidated
-        # as well if :directory_indexes is active
-        files += files.grep(INDEX_REGEX).map do |file|
-          file == 'index.html' ? '/' : File.dirname(file) << '/'
-        end.uniq
-
-        # URI encode and add leading slash
-        files.map { |f| URI::encode(f.start_with?('/') ? f : "/#{f}") }
-      end
-
-    end
-
-    Base.map({"inv" => "invalidate"})
-  end
-end

data/spec/lib/middleman-cloudfront/commands_spec.rb

@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-require 'fog/aws/models/cdn/distributions'
-
-describe Middleman::Cli::CloudFront do
-  let(:cloudfront) { described_class.new }
-  let(:options) do
-    Middleman::CloudFront::Options.new(
-      'access_key_id_123',
-      'secret_access_key_123',
-      'distribution_id_123',
-      'filter_123',
-      'after_build_123'
-    )
-  end
-  let(:distribution) { double('distribution', invalidations: double('invalidations')) }
-
-  describe '#invalidate' do
-    before do
-      allow_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).and_return(distribution)
-      allow(distribution.invalidations).to receive(:create) do
-        double('invalidation', status: 'InProgress', wait_for: -> {})
-      end
-    end
-
-    it 'gets the correct distribution' do
-      allow(cloudfront).to receive(:list_files).and_return([])
-      expect_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).with('distribution_id_123')
-      cloudfront.invalidate(options)
-    end
-
-    it 'normalizes paths' do
-      files = %w(file directory/index.html)
-      normalized_files = %w(/file /directory/index.html /directory/)
-      allow(cloudfront).to receive(:list_files).and_return(files)
-      expect(distribution.invalidations).to receive(:create).once.with(paths: normalized_files)
-      cloudfront.invalidate(options)
-    end
-
-    context 'when the amount of files to invalidate is under the limit' do
-      it 'divides them up in packages and creates one invalidation per package' do
-        files = (1..Middleman::Cli::CloudFront::INVALIDATION_LIMIT).map { |i| "/file_#{i}" }
-        allow(cloudfront).to receive(:list_files).and_return(files)
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files)
-        cloudfront.invalidate(options)
-      end
-    end
-
-    context 'when the amount of files to invalidate is over the limit' do
-      it 'creates only one invalidation with all of them' do
-        files = (1..(Middleman::Cli::CloudFront::INVALIDATION_LIMIT * 3)).map { |i| "/file_#{i}" }
-        allow(cloudfront).to receive(:list_files).and_return(files)
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[0, Middleman::Cli::CloudFront::INVALIDATION_LIMIT])
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFront::INVALIDATION_LIMIT, Middleman::Cli::CloudFront::INVALIDATION_LIMIT])
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFront::INVALIDATION_LIMIT * 2, Middleman::Cli::CloudFront::INVALIDATION_LIMIT])
-        cloudfront.invalidate(options)
-      end
-    end
-
-    context 'when files to invalidate are explicitly specified' do
-      it 'uses them instead of the files in the build directory' do
-        files = (1..3).map { |i| "/file_#{i}" }
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files)
-        cloudfront.invalidate(options, files)
-      end
-
-      it "doesn't filter them" do
-        files = (1..3).map { |i| "/file_#{i}" }
-        options.filter = /filter that matches no files/
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files)
-        cloudfront.invalidate(options, files)
-      end
-
-      it 'normalizes them' do
-        files = %w(file directory/index.html)
-        normalized_files = %w(/file /directory/index.html /directory/)
-        expect(distribution.invalidations).to receive(:create).once.with(paths: normalized_files)
-        cloudfront.invalidate(options, files)
-      end
-    end
-  end
-end