frizz 1.3.3 → 1.4.3

data/README.md

@@ -8,6 +8,7 @@ some nifty Middleman integrations for managing environments.
 * Sets Content-Type (including CSS files which S3 is notoriously bad at)
 * Only uploads files that have changed
 * Removes files that have been deleted locally
+* Invalidate changed files on CloudFront
 
 ### Middleman Features
 
@@ -65,6 +66,17 @@ Specify a different local build dir:
 site = Frizz::Site.new("my-static-site.com", from: "build/public")
 ```
 
+### Deploy with CloudFront invalidation
+
+Optionally provide a CloudFront Distribution ID and Frizz will invalidate
+the cache for any files that changed or were removed in the deploy. Note:
+invalidating a CloudFront cache can take some time.
+
+```ruby
+site = Frizz::Site.new("my-bucket", distribution: "DISTRIBUTION_ID")
+site.deploy!
+```
+
 ## Usage With Middleman
 
 Managing more than the basic two environments (dev and build) in a Middleman app
@@ -100,6 +112,7 @@ environments:
     host: "staging.example.com"
   production:
     host: "example.com"
+    distribution "CLOUDFRONT_DISTRIBUTION_ID"
 ```
 
 Frizz would give us the following Rake tasks:

data/frizz.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize", "~> 0.6.0"
   spec.add_dependency "mime-types", "~> 1.25"
   spec.add_dependency "listen", "~> 1.2.2"
+  spec.add_dependency "cloudfront-invalidator", "~> 0.2.0"
 end

data/lib/frizz/distribution.rb

@@ -0,0 +1,37 @@
+require "cloudfront-invalidator"
+
+module Frizz
+  class Distribution
+    def initialize(id)
+      @id = id
+    end
+
+    def invalidate!(keys)
+      return unless keys.any?
+      puts "Invalidating distribution cache for: #{keys}".blue
+
+      # $stdout.sync = true
+      print "This can take a while".blue
+      invalidator.invalidate(keys) do |status, time|
+        case status
+        when "InProgress"
+          print ".".blue
+        when "Complete"
+          puts "#{status} in #{time}".green
+        end
+      end
+    end
+
+    private
+
+    attr_reader :id
+
+    def invalidator
+      @invalidator ||= CloudfrontInvalidator.new(
+        Frizz.configuration.access_key_id,
+        Frizz.configuration.secret_access_key,
+        id
+      )
+    end
+  end
+end

data/lib/frizz/middleman/tasks.rb

@@ -34,7 +34,7 @@ module Frizz
             relevant_environments.each do |name, env|
               desc "Deploy build dir to #{env.name}: #{env.bucket}"
               task env.name do
-                Frizz::Site.new(env.bucket).deploy!
+                Frizz::Site.new(env.bucket, distribution: env.distribution).deploy!
               end
             end
           end
@@ -42,9 +42,7 @@ module Frizz
           namespace :release do
             relevant_environments.each do |name, env|
               desc "Build and deploy #{env.name}: #{env.bucket}"
-              task env.name => ["frizz:build:#{env.name}"] do
-                Frizz::Site.new(env.bucket).deploy!
-              end
+              task env.name => ["frizz:build:#{env.name}", "frizz:deploy:#{env.name}"] do; end
             end
           end
         end

data/lib/frizz/site.rb

@@ -2,17 +2,23 @@ module Frizz
   class Site
     def initialize(host, options={})
       @options = { from: "build" }.merge options
-      @local = Frizz::Local.new(path_to_deploy)
-      @remote = Frizz::Remote.new(host)
+
+      @local = Local.new(path_to_deploy)
+      @remote = Remote.new(host)
+
+      if @options[:distribution]
+        @distribution = Distribution.new(@options[:distribution])
+      end
     end
 
     def deploy!
-      Frizz::Sync.new(local, remote).run!
+      changes = Sync.new(local, remote).run!
+      distribution.invalidate!(changes) if distribution
     end
 
     private
 
-    attr_reader :local, :remote, :options
+    attr_reader :local, :remote, :options, :distribution
 
     def path_to_deploy
       File.expand_path(options[:from])

data/lib/frizz/sync.rb

@@ -6,28 +6,40 @@ module Frizz
     end
 
     def run!
+      changes = []
+
+      # Sync existing files
       remote.files.each do |remote_file|
         local_path = remote_file.key
         local_file_md5 = local_index[local_path]
 
         if local_file_md5.nil?
           puts "#{local_path}: deleted".red
+
           remote_file.destroy
+          changes << remote_file.key
         elsif local_file_md5 == remote_file.etag
           puts "#{local_path}: unchanged"
+
           local_index.delete(local_path)
         else
           puts "#{local_path}: updated".green
+
           remote.upload local.file_for(local_path), local_path
           local_index.delete(local_path)
+          changes << local_path
         end
       end
 
       # Upload new files
       local_index.each do |local_path, md5|
         puts "#{local_path}: new".green
+
         remote.upload local.file_for(local_path), local_path
+        changes << local_path
       end
+
+      changes
     end
 
     private

data/lib/frizz/version.rb

@@ -1,3 +1,3 @@
 module Frizz
-  VERSION = "1.3.3"
+  VERSION = "1.4.3"
 end

data/lib/frizz.rb

@@ -5,6 +5,7 @@ module Frizz
   autoload :Site, "frizz/site"
   autoload :Local, "frizz/local"
   autoload :Remote, "frizz/remote"
+  autoload :Distribution, "frizz/distribution"
   autoload :Sync, "frizz/sync"
   autoload :Configuration, "frizz/configuration"
   autoload :Environment, "frizz/environment"

metadata

@@ -2,14 +2,14 @@
 name: frizz
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.3.3
+  version: 1.4.3
 platform: ruby
 authors:
 - patbenatar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -107,6 +107,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.2
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: cloudfront-invalidator
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    none: false
 description: Utility for deploying static sites to S3
 email:
 - nick@gophilosophie.com
@@ -122,6 +138,7 @@ files:
 - frizz.gemspec
 - lib/frizz.rb
 - lib/frizz/configuration.rb
+- lib/frizz/distribution.rb
 - lib/frizz/environment.rb
 - lib/frizz/local.rb
 - lib/frizz/middleman/extension.rb
@@ -144,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -2310730605007625868
+      hash: 3629913277282744277
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -153,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -2310730605007625868
+      hash: 3629913277282744277
       version: '0'
   none: false
 requirements: []