middleman-cloudfront 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ceeae12fb6b9a58a9af56cb8ad6c8c0a01064ba
-  data.tar.gz: 4eccab87e01e2070bf51054b2a59e34f07ac0799
+  metadata.gz: 86426bb088d94149e2d8a94a151a9cdebfe56124
+  data.tar.gz: 661a5dababcb3690b5af7b910a241428f3784a9b
 SHA512:
-  metadata.gz: ecaaf4fc80e0d53f7987b75ea905333f7a6b2ea0284f7e15e190851153feb11816e5cec552c16ba67d520f4cb613c6c3cd1ddc6ac78b5f35ba219b2ac1956048
-  data.tar.gz: 939a74033b608adf00b574f7dca2715044d4f140801a195c745be13af4bb17c16193f1c175ece3b6adc2576df5e637c6e4a40e82f9f0f452af4b90846bb7e1d0
+  metadata.gz: 4f75b4a87b8c0d7545d2d88500bc58df6c986a5614ba8fc1488c0f4b51d54468156da7fa4fcee2a7bbf79eee78255627afc5077dc33e5a6bb63b73deee739561
+  data.tar.gz: 70b64829e5a60b459ad7e77d4802591d7a4a42456946798165e27ae91ea7a406c2a7b4df30b10c96e1ba87892a5e427ae228b1b204d7a27c7b100daef50962e2

data/lib/middleman-cloudfront/commands.rb

@@ -19,7 +19,30 @@ module Middleman
       end
 
       desc "cloudfront:invalidate", "A way to deal with your ClodFront distributions"
-      def invalidate
+      def invalidate(options = 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 ||= /.*/
+        [:access_key_id, :secret_access_key, :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"
         cdn = Fog::CDN.new({
           :provider               => 'AWS',
@@ -53,23 +76,6 @@ module Middleman
 
       protected
 
-      def options
-        ::Middleman::Application.server.inst.cloudfront_options
-      rescue
-        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|

data/lib/middleman-cloudfront/extension.rb

@@ -10,17 +10,13 @@ module Middleman
       end
 
       def registered(app, options_hash = {}, &block)
-        options = Options.new options_hash
-        yield options  if block_given?
-
-        options.after_build ||= false
-        options.filter      ||= /.*/
+        @@cloudfront_options = Options.new(options_hash)
+        yield @@cloudfront_options if block_given?
 
         app.after_build do
-          ::Middleman::Cli::CloudFront.new.invalidate  if options.after_build
+          ::Middleman::Cli::CloudFront.new.invalidate(@@cloudfront_options) if @@cloudfront_options.after_build
         end
 
-        @@cloudfront_options = options
         app.send :include, Helpers
       end
       alias :included :registered

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

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

data/middleman-cloudfront.gemspec

@@ -18,13 +18,19 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
 
-  s.add_dependency "middleman-core", ["~> 3.0"]
-  s.add_dependency "fog", ["~> 1.9"]
+  s.add_dependency 'fog', '~> 1.9'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "cucumber"
-  s.add_development_dependency "aruba"
-  s.add_development_dependency "fivemat"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency 'guard-rspec', '~> 3.0.3'
+  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
 end

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

@@ -3,18 +3,16 @@ 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
+  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
@@ -28,7 +26,7 @@ describe Middleman::Cli::CloudFront do
     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
+      cloudfront.invalidate(options)
     end
 
     context 'when the amount of files to invalidate is under the limit' do
@@ -38,7 +36,7 @@ describe Middleman::Cli::CloudFront do
         end
         cloudfront.stub(:list_files).and_return files
         expect(distribution.invalidations).to receive(:create).once.with(paths: files)
-        cloudfront.invalidate
+        cloudfront.invalidate(options)
       end
     end
 
@@ -51,7 +49,7 @@ describe Middleman::Cli::CloudFront do
         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
+        cloudfront.invalidate(options)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cloudfront
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrey Korzhuev
@@ -9,120 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: middleman-core
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: fivemat
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.0'
 description: Adds ability to invalidate a specific set of files in your CloudFront
   cache
 email:
@@ -166,9 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: middleman-cloudfront
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Invalidate CloudFront cache after deployment to S3
 test_files:
 - features/support/env.rb
+has_rdoc: