middleman-cdn 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69067babbcf6c181de78867c0a26cd0419f1cd7f
-  data.tar.gz: 9a2adde88d7fce458d9c04d29dd48728403c708d
+  metadata.gz: 1e79d37359ea1e80126fd90bee4767bde571842d
+  data.tar.gz: ede9b99ab9222ebf86bb7d3735fc6cacae481fd5
 SHA512:
-  metadata.gz: 1f353a06b8b40e21e040c5797c504f15afe500b5264ea476e91ba587f7ea26e2e8114aac2bfc9bea10f03c5dab5886d7630cca98ecbc6534557268154c9b01ac
-  data.tar.gz: 2627680904f589d2901a5732549c19105ea017dcbafcac74f986efd57f1747c3e1ab194f0d8bba957c8fa0d1c848ab695b818eb380fe64ea84e6e8aa3a8eb835
+  metadata.gz: 74d22ceecce8e729df8b9e11e8a840ad5c55b051730d1d962bcece2520b890bf92a792c7e920ee85317f3f775c46e5a3d1646f1ee7bbbb317121f31687f51c28
+  data.tar.gz: 87f355883c41f5956f4b6752c8ecb16a02a6228750d11f7f841c4ae5fb164c717d078f0a05189cd79f823dce88414f79e829f993a58e5ef3760a2c9d36c46809

data/lib/middleman-cdn/cdns/cloudflare.rb

@@ -22,8 +22,6 @@ TEXT
       end
 
       def invalidate(options, files)
-        puts "## Invalidating files on CloudFlare"
-
         options[:client_api_key] ||= ENV['CLOUDFLARE_CLIENT_API_KEY']
         options[:email] ||= ENV['CLOUDFLARE_EMAIL']
         [:client_api_key, :email, :zone, :base_urls].each do |key|
@@ -41,12 +39,12 @@ TEXT
             cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
             begin
               url = "#{base_url}#{file}"
-              print "Invalidating #{url}... "
+              ::Middleman::Cli::CDN.say_status("cloudflare".yellow + " invalidating #{url}... ", incomplete: true)
               cloudflare.zone_file_purge(options[:zone], "#{base_url}#{file}")
             rescue => e
-              puts "Error: #{e.message}"
+              ::Middleman::Cli::CDN.say_status(", " + "error: #{e.message}".light_red, header: false)
             else
-              puts "✓"
+              ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
             end
           end
         end

data/lib/middleman-cdn/cdns/cloudfront.rb

@@ -22,8 +22,6 @@ TEXT
       end
 
       def invalidate(options, files)
-        puts "## Invalidating files on CloudFront"
-
         options[:access_key_id] ||= ENV['AWS_ACCESS_KEY_ID']
         options[:secret_access_key] ||= ENV['AWS_SECRET_ACCESS_KEY']
         [:access_key_id, :secret_access_key, :distribution_id].each do |key|
@@ -39,19 +37,22 @@ TEXT
         distribution = cloudfront.distributions.get(options[:distribution_id])
 
         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.'
+          ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating #{files.count} files... ", incomplete: true)
           invalidation = distribution.invalidations.create(:paths => files)
           raise StandardError, %(Invalidation status is #{invalidation.status}. Expected "InProgress") unless invalidation.status == 'InProgress'
+          ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
         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."
+          ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating #{files.count} files in #{slices.count} batch(es) ")
           slices.each_with_index do |slice, i|
-            puts "Invalidating batch #{i + 1}..."
+            ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating batch #{i + 1}... ", incomplete: true)
             invalidation = distribution.invalidations.create(:paths => slice)
             invalidation.wait_for { ready? } unless i == slices.count - 1
+            ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
           end
         end
+        ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " It might take 10 to 15 minutes until all files are invalidated.")
+        ::Middleman::Cli::CDN.say_status("cloudfront".yellow + ' Please check the AWS Management Console to see the status of the invalidation.')
       end
     end
 

data/lib/middleman-cdn/commands.rb

@@ -32,10 +32,8 @@ module Middleman
           raise Error, "ERROR: You must specify a config for one of the supported CDNs.\n#{example_configuration}"
         end
 
-        # 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)
+        ::Middleman::Cli::CDN.say_status("Invalidating #{files.count} files with filter: #{options.filter.source}")
         return if files.empty?
 
         cdns_keyed.each do |cdn_key, cdn|
@@ -44,6 +42,17 @@ module Middleman
         end
       end
 
+      def self.say_status(status, incomplete: false, header: true)
+        message = ""
+        message << :cdn.to_s.rjust(12).light_green + "  " if header
+        message << status
+        if incomplete
+          print message
+        else
+          puts message
+        end
+      end
+
       protected
 
       def cdns

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/middleman-cdn.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'fog', '~> 1.9'
   s.add_dependency 'cloudflare', '~> 2.0'
+  s.add_dependency 'colorize'
 
   s.add_development_dependency 'cucumber', '~> 1.3'
   s.add_development_dependency 'aruba', '~> 0.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Leigh McCulloch
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement