octopress-deploy 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6606cff1ff42e965567713c41b4da108d87e9b6f
-  data.tar.gz: 2d2a9ddc507baaed0bb08b255a5092839ac8ed02
+  metadata.gz: aaf29f35bfa57acc33ee25af7d0f5c9b5adcadb2
+  data.tar.gz: f085e982084365aeef29b3ca26276f4d440478bb
 SHA512:
-  metadata.gz: d20780fe819e5233b6debeab56442de4fef9470bb6123869635b9bc614689a6c783cc81f36a12414c1110e3979309888ded340cb5229bd0dc03d7c585c43c41d
-  data.tar.gz: fb5bf4c2574fa50fa05301464426cfb13233d1bfbda31871ed1d5bc3c7d1a1cd01e08a671dfc5b8ca906348bb61c097f80b61d6b13f270645f82848a7672004b
+  metadata.gz: 491ff56f994ec6f573776df8474162158ea1dc27b801e1296c2be0cb89780854b2eb4a644baa0995c3f28078f148db3c9dfe4ac7bcbd9eba01ca6441e1f4ed71
+  data.tar.gz: ff49d3b5e4469e5d4c1937cc7cc4309309ef857f1d7505fa158477e023591bdab921dc82683c653c3a79afc43b540042d0930e4c4dde424288ca3614cb1ef4c1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-### 1.0.5 - 2015-02-06
+### 1.2.0 - 2015-03-07 
+
+- Added Support for Cloudfront invalidation [#49](https://github.com/octopress/deploy/pull/49)
+
+### 1.1.0 - 2015-02-06
 
 - Added incremental uploads to S3. [#46](https://github.com/octopress/deploy/pull/46)
 

data/README.md

@@ -73,7 +73,7 @@ Mainly you'd do this if you're troubleshooting deployment and you want to see if
 
 ## Amazon S3 Deployment Configuration
 
-To deploy with Amazon S3 you will need to install the [aws-sdk gem](https://rubygems.org/gems/aws-sdk).
+To deploy with Amazon S3 you will need to install the [aws-sdk-v1 gem](https://rubygems.org/gems/aws-sdk-v1).
 
 Important: when using S3, you must add your `_deploy.yml` to your .gitignore to prevent accidentally sharing
 account access information.
@@ -85,6 +85,7 @@ account access information.
 | `bucket_name`       | S3 bucket name                                        |              |
 | `access_key_id`     | AWS access key                                        |              |
 | `secret_access_key` | AWS secret key                                        |              |
+| `distribution_id`   | [optional] AWS CloudFront distribution id             |              |
 | `remote_path`       | Directory files should be synced to.                  | /            |
 | `verbose`           | [optional] Display all file actions during deploy.    | false        |
 | `incremental`       | [optional] Incremental deploy (only updated files)    | false        |

data/lib/octopress-deploy/s3.rb

@@ -7,9 +7,9 @@ module Octopress
 
       def initialize(options)
         begin
-          require 'aws-sdk'
+          require 'aws-sdk-v1'
         rescue LoadError
-          abort "Deploying to S3 requires the aws-sdk gem. Install with `gem install aws-sdk`."
+          abort "Deploying to S3 requires the aws-sdk-v1 gem. Install with `gem install aws-sdk-v1`."
         end
         @options     = options
         @local       = options[:site_dir]          || '_site'
@@ -17,6 +17,7 @@ module Octopress
         @access_key  = options[:access_key_id]     || ENV['AWS_ACCESS_KEY_ID']
         @secret_key  = options[:secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY']
         @region      = options[:region]            || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+        @distro_id   = options[:distribution_id]   || ENV['AWS_DISTRIBUTION_ID']
         @remote_path = (options[:remote_path]      || '/').sub(/^\//,'')
         @verbose     = options[:verbose]
         @incremental = options[:incremental]
@@ -67,17 +68,24 @@ module Octopress
       def connect
         AWS.config(access_key_id: @access_key, secret_access_key: @secret_key, region: @region)
         @s3 = AWS.s3
+        @cloudfront = AWS.cloud_front.client
       end
 
       # Write site files to the selected bucket
       #
       def write_files
         puts "Writing #{pluralize('file', site_files.size)}:" if @verbose
+        files_to_invalidate = []
         site_files.each do |file|
           s3_filename = remote_path(file)
           o = @bucket.objects[s3_filename]
           file_with_options = get_file_with_metadata(file, s3_filename);
-          s3sum = o.etag.tr('"','')
+
+          begin
+            s3sum = o.etag.tr('"','') if o.exists?
+          rescue AWS::S3::Errors::NoSuchKey
+            s3sum = ""
+          end
 
           if @incremental && (s3sum == Digest::MD5.file(file).hexdigest)
             if @verbose
@@ -87,6 +95,7 @@ module Octopress
             end
           else 
             o.write(file_with_options)
+            files_to_invalidate.push(file)
             if @verbose
               puts "+ #{remote_path(file)}"
             else
@@ -94,6 +103,23 @@ module Octopress
             end
           end
         end
+
+        invalidate_cache(files_to_invalidate) unless @distro_id.nil?
+      end
+
+      def invalidate_cache(files)
+        puts "Invalidating cache for #{pluralize('file', site_files.size)}" if @verbose
+        @cloudfront.create_invalidation(
+          distribution_id: @distro_id, 
+          invalidation_batch:{
+            paths:{
+              quantity: files.size,
+              items: files.map{|file| "/" + remote_path(file)}
+            }, 
+            # String of 8 random chars to uniquely id this invalidation
+            caller_reference: (0...8).map { ('a'..'z').to_a[rand(26)] }.join
+          }
+        ) unless files.empty?
       end
 
       def get_file_with_metadata(file, s3_filename)
@@ -237,6 +263,7 @@ module Octopress
 #{"bucket_name: #{options[:bucket_name]}".ljust(40)}  # Name of the S3 bucket where these files will be stored.
 #{"access_key_id: #{options[:access_key_id]}".ljust(40)}  # Get this from your AWS console at aws.amazon.com.
 #{"secret_access_key: #{options[:secret_access_key]}".ljust(40)}  # Keep it safe; keep it secret. Keep this file in your .gitignore.
+#{"distribution_id: #{options[:distribution_id]}".ljust(40)}  # Get this from your CloudFront page at https://console.aws.amazon.com/cloudfront/
 #{"remote_path: #{options[:remote_path] || '/'}".ljust(40)}  # relative path on bucket where files should be copied.
 #{"region: #{options[:remote_path] || 'us-east-1'}".ljust(40)}  # Region where your bucket is located.
 #{"verbose: #{options[:verbose] || 'false'}".ljust(40)}  # Print out all file operations.

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/octopress-deploy.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "octopress"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "clash"
-  spec.add_development_dependency "aws-sdk"
+  spec.add_development_dependency "aws-sdk-v1"
 
   if RUBY_VERSION >= "2"
     spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="