jekyll-s3 1.0.0 → 2.0.0

data/README.md

@@ -68,6 +68,12 @@ Enable the headless mode by adding the `--headless` or `-h` argument after
 
 ## Changelog
 
+### 2.0.0
+
+* Set content type of the uploaded files
+* (Increment major version because of the changed return value in
+  Jekyll::S3::CLI::run)
+
 ### 1.0.0
 
 * CloudFront invalidation on changed files only

data/features/cassettes/cucumber_tags/s3-and-cloudfront-when-updating-a-file.yml

@@ -0,0 +1,373 @@
+---
+recorded_with: VCR 2.2.4
+http_interactions:
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:48 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 20:14:47 GMT
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+      X-Amz-Request-Id:
+      - 8080972FB30862AC
+      X-Amz-Id-2:
+      - S8vcQZBZvDhNSsJ3IbFdkdTXkhUlTCuw9/gW9GtFtXe27v+njG/73G49fxQn10UJ
+      Content-Type:
+      - application/xml
+    body:
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName></DisplayName></Owner><Buckets><Bucket><Name>jekyll-s3-test.net</Name><CreationDate>2012-10-14T12:58:37.000Z</CreationDate></Bucket></Buckets></ListAllMyBucketsResult>
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:48 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:48 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 20:14:48 GMT
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+      X-Amz-Request-Id:
+      - 1C989B3F5D04453E
+      X-Amz-Id-2:
+      - Oi66Q4pmZ8ZqD1VI+tIfG6VV1hTlKwlvl/e4uQCTfug8iqsH2o+h8m+ba0S/clUO
+      Content-Type:
+      - application/xml
+    body:
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>jekyll-s3-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>css/styles.css</Key><LastModified>2012-12-04T20:08:29.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>foo83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-12-04T20:08:30.000Z</LastModified><ETag>&quot;8a8892a2b0fad281f26c0dedbff7011a&quot;</ETag><Size>60</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>foo83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:49 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:49 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Last-Modified:
+      - Tue, 04 Dec 2012 20:08:29 GMT
+      Date:
+      - Tue, 04 Dec 2012 20:14:49 GMT
+      Etag:
+      - "\"8fcf43a38cbf0c502f029a50645f2374\""
+      Server:
+      - AmazonS3
+      Accept-Ranges:
+      - bytes
+      X-Amz-Request-Id:
+      - CB0A11392C67D36D
+      Content-Length:
+      - "10"
+      X-Amz-Id-2:
+      - 223ZlIxWI8BGtz62wuef/Z+ONTpOype/yYCIezN+M1NXOe6ziTMiHRWoAL0iTVGz
+      Content-Type:
+      - ""
+    body:
+      string: ""
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:50 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:50 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Last-Modified:
+      - Tue, 04 Dec 2012 20:08:29 GMT
+      Date:
+      - Tue, 04 Dec 2012 20:14:49 GMT
+      Etag:
+      - "\"8fcf43a38cbf0c502f029a50645f2374\""
+      Server:
+      - AmazonS3
+      Accept-Ranges:
+      - bytes
+      X-Amz-Request-Id:
+      - 3C5E638312092222
+      Content-Length:
+      - "10"
+      X-Amz-Id-2:
+      - 7rURYcFJ43UZ8SD8S5L17O63LlagCMeUO0QweiR1yWAJDWQOdqChJCNbIXajrVk2
+      Content-Type:
+      - ""
+    body:
+      string: ""
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:50 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:50 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Last-Modified:
+      - Tue, 04 Dec 2012 20:08:30 GMT
+      Date:
+      - Tue, 04 Dec 2012 20:14:50 GMT
+      Etag:
+      - "\"8a8892a2b0fad281f26c0dedbff7011a\""
+      Server:
+      - AmazonS3
+      Accept-Ranges:
+      - bytes
+      X-Amz-Request-Id:
+      - 34EB3FD0E7A16391
+      Content-Length:
+      - "60"
+      X-Amz-Id-2:
+      - 0jmRBRuywfUE1+I/AHFyNnwEtJVFx11BerAuZ2x6+f88J1Kfc6BeK9tqF399UHmF
+      Content-Type:
+      - ""
+    body:
+      string: ""
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:51 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:51 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Last-Modified:
+      - Tue, 04 Dec 2012 20:08:30 GMT
+      Date:
+      - Tue, 04 Dec 2012 20:14:50 GMT
+      Etag:
+      - "\"8a8892a2b0fad281f26c0dedbff7011a\""
+      Server:
+      - AmazonS3
+      Accept-Ranges:
+      - bytes
+      X-Amz-Request-Id:
+      - 4A9FE67641D8BB37
+      Content-Length:
+      - "60"
+      X-Amz-Id-2:
+      - vKyYjHLhyoJf1UYWBW5yL2gh8TQXwYeXqJmG6lIcvxlhPVEdsntLRsiKxZsXFsxc
+      Content-Type:
+      - ""
+    body:
+      string: ""
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:51 GMT
+- request:
+    method: put
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      string: |
+        <html>
+          <head>
+            <title>hello!</title>
+          </head>
+          <body>
+            This is something for a change!
+          </body>
+        </html>
+
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:51 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Length:
+      - "115"
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 20:14:51 GMT
+      Etag:
+      - "\"c9e51ad849ff680347e121815eada3d1\""
+      Server:
+      - AmazonS3
+      X-Amz-Request-Id:
+      - 61EEF921591CDDE1
+      Content-Length:
+      - "0"
+      X-Amz-Id-2:
+      - KNbrgH9WWTLC3+M6aAH5zhD0212aJKK96XTu40ZN2JSt2PtGANhlF8ym9tTGgSpR
+    body:
+      string: ""
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:52 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      string: ""
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 22:14:52 +0200
+      Accept:
+      - "*/*"
+      Authorization:
+      - AWS
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.8.7 i686-darwin11.4.0
+      Content-Type:
+      - ""
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 20:14:52 GMT
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+      X-Amz-Request-Id:
+      - 03E62619256C31A7
+      X-Amz-Id-2:
+      - BdmZizRUIFpIJeRQp2BeJqu4bViMq7i97ZSl111JKI0giDYkkmOIUMu3HltRvCZ1
+      Content-Type:
+      - application/xml
+    body:
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>jekyll-s3-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>css/styles.css</Key><LastModified>2012-12-04T20:08:29.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>foo83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-12-04T20:14:51.000Z</LastModified><ETag>&quot;c9e51ad849ff680347e121815eada3d1&quot;</ETag><Size>115</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>foo83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:53 GMT
+- request:
+    method: post
+    uri: https://cloudfront.amazonaws.com/2012-05-05/distribution/foo/invalidation
+    body:
+      string: "\n        <InvalidationBatch>\n          <Paths>\n            <Quantity>2</Quantity>\n            <Items>\n              <Path>/index.html</Path><Path>/</Path>\n            </Items>\n          </Paths>\n          <CallerReference>1354652093</CallerReference>\n        </InvalidationBatch>\n      "
+    headers:
+      X-Amz-Date:
+      - Tue, 04 Dec 2012 22:14:53 EET
+      Authorization:
+      - AWS
+      Content-Type:
+      - text/xml
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Date:
+      - Tue, 04 Dec 2012 20:14:53 GMT
+      Location:
+      - https://cloudfront.amazonaws.com/2012-05-05/distribution/foo/invalidation/I35VKBAYIKCW1J
+      Content-Length:
+      - "380"
+      Content-Type:
+      - text/xml
+      X-Amzn-Requestid:
+      - 434f5fea-3e4f-11e2-a5d7-53af0194f490
+    body:
+      string: |-
+        <?xml version="1.0"?>
+        <Invalidation xmlns="http://cloudfront.amazonaws.com/doc/2012-05-05/"><Id>I35VKBAYIKCW1J</Id><Status>InProgress</Status><CreateTime>2012-12-04T20:14:53.123Z</CreateTime><InvalidationBatch><Paths><Quantity>2</Quantity><Items><Path>/</Path><Path>/index.html</Path></Items></Paths><CallerReference>1354652093</CallerReference></InvalidationBatch></Invalidation>
+    http_version:
+  recorded_at: Tue, 04 Dec 2012 20:14:55 GMT

data/features/jekyll-s3-cloudfront.feature

@@ -12,3 +12,11 @@ Feature: Invalidate the Cloudfront distribution
     And the configuration contains the Cloudfront distribution id
     Then jekyll-s3 will push my blog to S3 and invalidate the Cloudfront distribution
     And report that it uploaded 2 new and 0 changed files into S3
+
+  @s3-and-cloudfront-when-updating-a-file
+  Scenario: Update a blog entry and then upload
+    When my Jekyll site is in "features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi"
+    And the configuration contains the Cloudfront distribution id
+    Then jekyll-s3 will push my blog to S3 and invalidate the Cloudfront distribution
+    And report that it uploaded 0 new and 1 changed files into S3
+    And report that it invalidated only the changed file on Cloudfront

data/features/step_definitions/steps.rb

@@ -10,7 +10,7 @@ When /^the configuration contains the Cloudfront distribution id$/ do
   # Just here for readability
 end
 
-Then /^jekyll-s(\d+) will push my blog to S(\d+) and invalidate the Cloudfront distribution$/ do 
+Then /^jekyll-s(\d+) will push my blog to S(\d+) and invalidate the Cloudfront distribution$/ do
   |arg1, arg2|
   do_run
 end
@@ -25,8 +25,19 @@ Then /^report that it deleted (\d+) file from S3$/ do |amount_of_deleted_files|
   raise unless @amount_of_deleted_files == amount_of_deleted_files.to_i
 end
 
+Then /^report that it invalidated only the changed file on Cloudfront$/ do
+  # The Cloudfront root object is always invalidated;
+  # it counts as an invalidation.
+  root_object_count = 1
+  changed_files = 1
+  raise unless @amount_of_invalidated_items == root_object_count + changed_files
+end
+
 def do_run
   in_headless_mode = true
-  @amount_of_new_files, @amount_of_changed_files, @amount_of_deleted_files =
-    Jekyll::S3::CLI.new.run("#{@blog_dir}/_site", in_headless_mode)
+  result = Jekyll::S3::CLI.new.run("#{@blog_dir}/_site", in_headless_mode)
+  @amount_of_new_files = result[:new_files_count]
+  @amount_of_changed_files = result[:changed_files_count]
+  @amount_of_deleted_files = result[:deleted_files_count]
+  @amount_of_invalidated_items = result[:invalidated_items_count]
 end

data/features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_jekyll_s3.yml

@@ -0,0 +1,4 @@
+s3_id: foo
+s3_secret: foo
+s3_bucket: jekyll-s3-test.net
+cloudfront_distribution_id: foo

data/features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/index.html

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+  <body>
+    This is something for a change!
+  </body>
+</html>

data/features/support/vcr.rb

@@ -11,5 +11,6 @@ VCR.cucumber_tags do |t|
   t.tag '@only-changed-files'
   t.tag '@no-new-or-changed-files'
   t.tag '@s3-and-cloudfront'
+  t.tag '@s3-and-cloudfront-when-updating-a-file'
   t.tag '@one-file-to-delete'
 end

data/jekyll-s3.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "jekyll-s3"
-  s.version     = "1.0.0"
+  s.version     = "2.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]
@@ -17,8 +17,9 @@ distribution, making it easy to deliver your blog via the CDN.}
 
   s.add_dependency 'aws-sdk', '~> 1.5.6'
   s.add_dependency 'filey-diff', '~> 0.0.2'
-  s.add_dependency 'simple-cloudfront-invalidator', '~> 0.0.1'
+  s.add_dependency 'simple-cloudfront-invalidator', '~> 1.0.0'
   s.add_dependency 'erubis', '~> 2.7.0'
+  s.add_dependency 'mime-types', '= 1.19'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-expectations'

data/lib/cloudfront/invalidator.rb

@@ -14,7 +14,8 @@ module Jekyll
         report = SimpleCloudfrontInvalidator::CloudfrontClient.new(
           aws_key, aws_secret, cloudfront_distribution_id).invalidate(
             s3_object_keys)
-        puts report
+        puts report[:text_report]
+        report[:invalidated_items_count]
       end
     end
   end

data/lib/jekyll-s3.rb

@@ -4,6 +4,7 @@ require 'erubis'
 require 'aws-sdk'
 require 'simple-cloudfront-invalidator'
 require 'filey-diff'
+require 'mime/types'
 
 module Jekyll
   module S3

data/lib/jekyll-s3/cli.rb

@@ -10,10 +10,16 @@ module Jekyll
       def run(site_dir, in_headless_mode = false)
         CLI.check_configuration site_dir
         config = Jekyll::S3::ConfigLoader.load_configuration site_dir
-        new_files_count, changed_files_count, deleted_files_count, changed_files = 
+        new_files_count, changed_files_count, deleted_files_count, changed_files =
           Uploader.run(site_dir, config, in_headless_mode)
-        CLI.invalidate_cf_dist_if_configured(config, changed_files)
-        [new_files_count, changed_files_count, deleted_files_count]
+        invalidated_items_count =
+          CLI.invalidate_cf_dist_if_configured(config, changed_files)
+        {
+          :new_files_count => new_files_count,
+          :changed_files_count => changed_files_count,
+          :deleted_files_count => deleted_files_count,
+          :invalidated_items_count => invalidated_items_count
+        }
       rescue JekyllS3Error => e
         puts e.message
         exit 1
@@ -24,7 +30,11 @@ module Jekyll
       def self.invalidate_cf_dist_if_configured(config, changed_files)
         cloudfront_configured = config['cloudfront_distribution_id'] &&
           (not config['cloudfront_distribution_id'].empty?)
-        Jekyll::Cloudfront::Invalidator.invalidate(config, changed_files) if cloudfront_configured
+        invalidated_items_count = if cloudfront_configured
+          Jekyll::Cloudfront::Invalidator.invalidate(config, changed_files)
+        else
+          0
+        end
       end
 
       def self.check_configuration(site_dir)

data/lib/jekyll-s3/uploader.rb

@@ -53,7 +53,12 @@ module Jekyll
 
       def self.upload_file(file, s3, s3_bucket_name, site_dir)
         Retry.run_with_retry do
-          if s3.buckets[s3_bucket_name].objects[file].write( File.read("#{site_dir}/#{file}"))
+          mime_type = MIME::Types.type_for(file)
+          upload_succeeded = s3.buckets[s3_bucket_name].objects[file].write(
+            File.read("#{site_dir}/#{file}"),
+            :content_type => mime_type.first
+          )
+          if upload_succeeded
             puts("Upload #{file}: Success!")
           else
             puts("Upload #{file}: FAILURE!")

data/spec/lib/upload_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Jekyll::S3::Uploader do
+  describe 'content type resolving' do
+    it 'adds the content type of the uploaded CSS file into the S3 object' do
+      file_to_upload = 'css/styles.css'
+      Jekyll::S3::Uploader.send(:upload_file,
+                                file_to_upload,
+                                create_content_type_verifying_s3(file_to_upload),
+                                'some_bucket_name',
+                                'features/support/test_site_dirs/my.blog.com/_site')
+    end
+
+    it 'adds the content type of the uploaded HTML file into the S3 object' do
+      file_to_upload = 'index.html'
+      Jekyll::S3::Uploader.send(:upload_file,
+                                file_to_upload,
+                                create_content_type_verifying_s3(file_to_upload),
+                                'some_bucket_name',
+                                'features/support/test_site_dirs/my.blog.com/_site')
+    end
+
+    def create_content_type_verifying_s3(file_to_upload)
+      def create_objects(file_to_upload)
+        def create_html_s3_object(file_to_upload)
+          s3_object = stub('s3_object')
+          content_type = (file_to_upload.end_with?'html') ? 'text/html' : 'text/css'
+          s3_object.should_receive(:write).with(
+            anything(),
+            # Ensure that the write method is called with the correct content type:
+            :content_type => content_type
+          )
+          s3_object
+        end
+        objects = {}
+        objects[file_to_upload] = create_html_s3_object(file_to_upload)
+        objects
+      end
+      def create_bucket(file_to_upload)
+        bucket = stub('bucket')
+        bucket.stub(:objects => create_objects(file_to_upload))
+        bucket
+      end
+      buckets = stub('buckets')
+      buckets.stub(:[] => create_bucket(file_to_upload))
+      s3 = stub('s3')
+      s3.stub(:buckets => buckets)
+      s3
+    end
+  end
+end

metadata

@@ -1,201 +1,222 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jekyll-s3
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Philippe Creux
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 5
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.5.6
-  prerelease: false
   type: :runtime
-  name: aws-sdk
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
-        version: 0.0.2
-  prerelease: false
-  type: :runtime
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
   name: filey-diff
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
   name: simple-cloudfront-invalidator
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: erubis
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
   prerelease: false
-  type: :development
-  name: rspec
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: rspec-expectations
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: 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: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 4
-        - 7
-        version: 0.4.7
-  prerelease: 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: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: 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: vcr
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: 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: webmock
-  requirement: *id011
-description: |-
-  This Gem allows you to push your Jekyll blog to AWS S3.
+  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'
+description: ! 'This Gem allows you to push your Jekyll blog to AWS S3.
+
   In addition, you can use this Gem to invalidate the related Cloudfront
-  distribution, making it easy to deliver your blog via the CDN.
-email: 
+
+  distribution, making it easy to deliver your blog via the CDN.'
+email:
 - pcreux@gmail.com
 - lauri.lehmijoki@iki.fi
-executables: 
+executables:
 - jekyll-s3
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -207,6 +228,7 @@ files:
 - features/cassettes/cucumber_tags/no-new-or-changed-files.yml
 - features/cassettes/cucumber_tags/one-file-to-delete.yml
 - features/cassettes/cucumber_tags/only-changed-files.yml
+- features/cassettes/cucumber_tags/s3-and-cloudfront-when-updating-a-file.yml
 - features/cassettes/cucumber_tags/s3-and-cloudfront.yml
 - features/cli-output.feature
 - features/jekyll-s3-cloudfront.feature
@@ -217,6 +239,9 @@ files:
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
 - features/support/test_site_dirs/cdn-powered.blog.fi/_site/css/styles.css
 - features/support/test_site_dirs/cdn-powered.blog.fi/_site/index.html
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_jekyll_s3.yml
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/css/styles.css
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/index.html
 - features/support/test_site_dirs/my.blog.com/_jekyll_s3.yml
 - features/support/test_site_dirs/my.blog.com/_site/css/styles.css
 - features/support/test_site_dirs/my.blog.com/_site/index.html
@@ -244,46 +269,39 @@ files:
 - lib/jekyll-s3/uploader.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
+- spec/lib/upload_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/jekyll-s3
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Push your Jekyll blog to S3
-test_files: 
+test_files:
 - features/cassettes/cucumber_tags/new-and-changed-files.yml
 - features/cassettes/cucumber_tags/new-files.yml
 - features/cassettes/cucumber_tags/no-new-or-changed-files.yml
 - features/cassettes/cucumber_tags/one-file-to-delete.yml
 - features/cassettes/cucumber_tags/only-changed-files.yml
+- features/cassettes/cucumber_tags/s3-and-cloudfront-when-updating-a-file.yml
 - features/cassettes/cucumber_tags/s3-and-cloudfront.yml
 - features/cli-output.feature
 - features/jekyll-s3-cloudfront.feature
@@ -294,6 +312,9 @@ test_files:
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
 - features/support/test_site_dirs/cdn-powered.blog.fi/_site/css/styles.css
 - features/support/test_site_dirs/cdn-powered.blog.fi/_site/index.html
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_jekyll_s3.yml
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/css/styles.css
+- features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/index.html
 - features/support/test_site_dirs/my.blog.com/_jekyll_s3.yml
 - features/support/test_site_dirs/my.blog.com/_site/css/styles.css
 - features/support/test_site_dirs/my.blog.com/_site/index.html
@@ -311,4 +332,5 @@ test_files:
 - features/support/vcr.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
+- spec/lib/upload_spec.rb
 - spec/spec_helper.rb