middleman-cloudfront 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ceeae12fb6b9a58a9af56cb8ad6c8c0a01064ba
+  data.tar.gz: 4eccab87e01e2070bf51054b2a59e34f07ac0799
+SHA512:
+  metadata.gz: ecaaf4fc80e0d53f7987b75ea905333f7a6b2ea0284f7e15e190851153feb11816e5cec552c16ba67d520f4cb613c6c3cd1ddc6ac78b5f35ba219b2ac1956048
+  data.tar.gz: 939a74033b608adf00b574f7dca2715044d4f140801a195c745be13af4bb17c16193f1c175ece3b6adc2576df5e637c6e4a40e82f9f0f452af4b90846bb7e1d0

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
+  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Guardfile

@@ -0,0 +1,9 @@
+guard 'rspec', cli: '--drb --profile', all_after_pass: false do
+  # Specs
+  watch(%r(^spec/.+_spec\.rb$))
+  watch('spec/spec_helper.rb')       { 'spec' }
+  watch(%r(^spec/support/(.+)\.rb$)) { 'spec' }
+
+  # Files
+  watch(%r(^lib/(.+)\.rb$))          { |m| "spec/lib/#{m[1]}_spec.rb" }
+end

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rspec/core/rake_task'
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -9,8 +11,6 @@ end
 
 require 'rake/clean'
 
-task :test => ["cucumber"]
-
 require "middleman-cloudfront/pkg-info"
 
 PACKAGE = "#{Middleman::CloudFront::PACKAGE}"
@@ -32,4 +32,6 @@ task :release => :package do
   end
 end
 
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/middleman-cloudfront/commands.rb

@@ -33,6 +33,8 @@ module Middleman
         # 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)
+        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.'
@@ -54,18 +56,18 @@ module Middleman
       def options
         ::Middleman::Application.server.inst.cloudfront_options
       rescue
-        raise Error, <<-EOF.lines.map(&:strip).join("\n")
-          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
-        EOF
+        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)
@@ -79,9 +81,10 @@ module Middleman
 
             # 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
+            files.each do |file|
+              file_dir = file.sub(/\bindex\.html\z/, '')
+              files << file_dir if file_dir != file
+            end
 
             # Add leading slash
             files.map! { |f| f.start_with?('/') ? f : "/#{f}" }

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

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

data/middleman-cloudfront.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "aruba"
   s.add_development_dependency "fivemat"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency 'guard-rspec', '~> 3.0.3'
 end

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

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+require 'fog/aws/models/cdn/distributions'
+
+describe Middleman::Cli::CloudFront do
+  let(:cloudfront) do
+    described_class.new.tap do |cloudfront|
+      cloudfront.stub(:options).and_return Middleman::CloudFront::Options.new(
+        'access_key_id_123',
+        'secret_access_key_123',
+        'distribution_id_123',
+        'filter_123',
+        'after_build_123'
+      );
+    end
+  end
+
+  let(:distribution) { double('distribution', invalidations: double('invalidations')) }
+
+  describe '#invalidate' do
+    before do
+      Fog::CDN::AWS::Distributions.any_instance.stub(:get).and_return(distribution)
+      distribution.invalidations.stub(:create) do
+        double('invalidation', status: 'InProgress', wait_for: ->{} )
+      end
+    end
+
+    it 'gets the correct distribution' do
+      cloudfront.stub(:list_files).and_return []
+      expect_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).with('distribution_id_123')
+      cloudfront.invalidate
+    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 do |i|
+          "file_#{i}"
+        end
+        cloudfront.stub(:list_files).and_return files
+        expect(distribution.invalidations).to receive(:create).once.with(paths: files)
+        cloudfront.invalidate
+      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 do |i|
+          "file_#{i}"
+        end
+        cloudfront.stub(: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
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'middleman-cloudfront'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end
+
+Fog.mock!

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cloudfront
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Andrey Korzhuev
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,83 +42,87 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 description: Adds ability to invalidate a specific set of files in your CloudFront
   cache
 email:
@@ -135,6 +134,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -145,29 +145,30 @@ files:
 - lib/middleman-cloudfront/pkg-info.rb
 - lib/middleman_extension.rb
 - middleman-cloudfront.gemspec
+- spec/lib/middleman-cloudfront/commands_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/andrusha/middleman-cloudfront
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: middleman-cloudfront
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Invalidate CloudFront cache after deployment to S3
 test_files:
 - features/support/env.rb