jekyll-s3 0.0.5 → 0.0.6

data/features/cassettes/cucumber_tags/s3-and-cloudfront.yml

@@ -0,0 +1,290 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:19:58 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - XVTH5v7I60Us5NH8Zkjqe+hJt2pZSJufKVDZYyeWa64s44hHkHpniCmXgOwpTz44
+      X-Amz-Request-Id:
+      - 814A58953B2F1408
+      Date:
+      - Sun, 14 Oct 2012 14:20:00 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8"?>
+
+        <ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Owner><ID></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: Sun, 14 Oct 2012 14:19:59 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:19:59 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - kqI8qY2X6hz6gn5LkBZ5ucppTQAnEtwB/WUxm3Mpp5IP9maZEOrudhkrnSZ50L8Z
+      X-Amz-Request-Id:
+      - AA070701525DE2D7
+      Date:
+      - Sun, 14 Oct 2012 14:20:03 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      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></ListBucketResult>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:01 GMT
+- request:
+    method: put
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        Ym9keSB7Cgp9Cg==
+    headers:
+      Content-Type:
+      - ''
+      Content-Length:
+      - '10'
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:20:01 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - yiJ0xvPzssJs1/qbY1JtU4eCcrCb7RoGKmCubzT66JE2f97jBRCh/GrDGQbhzBE0
+      X-Amz-Request-Id:
+      - A48B2F4C626AA36F
+      Date:
+      - Sun, 14 Oct 2012 14:20:04 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:02 GMT
+- request:
+    method: put
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PGh0bWw+CiAgPGhlYWQ+CiAgICA8dGl0bGU+aGVsbG8hPC90aXRsZT4KICA8
+        L2hlYWQ+CjwvaHRtbD4K
+    headers:
+      Content-Type:
+      - ''
+      Content-Length:
+      - '60'
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:20:02 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - jB6/sj8qczNX7hdyr0BxlkN4hbv3ztad+qTDnC6b9XY580AcWSCMKMr2j5AzB/TR
+      X-Amz-Request-Id:
+      - 9EDF08D87D4C7EA2
+      Date:
+      - Sun, 14 Oct 2012 14:20:04 GMT
+      Etag:
+      - ! '"8a8892a2b0fad281f26c0dedbff7011a"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:03 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:20:03 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - 28rS+qE332bAH7P5X4xCZSTKfk41Aa8+8coL6JykVGWgook8UwngNCs+vdp+MUjU
+      X-Amz-Request-Id:
+      - FE954A121529EA60
+      Date:
+      - Sun, 14 Oct 2012 14:20:05 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      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-10-14T14:20:04.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-10-14T14:20:04.000Z</LastModified><ETag>&quot;8a8892a2b0fad281f26c0dedbff7011a&quot;</ETag><Size>60</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:03 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:20:03 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - H8PnL8xdXT/f8NBPuBRM20MoNP3GXwCurPtToM9xm1xRz8dSWhvmZRz5gtbHLEaS
+      X-Amz-Request-Id:
+      - A88E10E350D2ABBF
+      Date:
+      - Sun, 14 Oct 2012 14:20:05 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      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-10-14T14:20:04.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-10-14T14:20:04.000Z</LastModified><ETag>&quot;8a8892a2b0fad281f26c0dedbff7011a&quot;</ETag><Size>60</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:04 GMT
+- request:
+    method: post
+    uri: https://cloudfront.amazonaws.com/2012-05-05/distribution/foo/invalidation
+    body:
+      encoding: US-ASCII
+      string: ! "\n        <InvalidationBatch>\n          <Paths>\n            <Quantity>2</Quantity>\n
+        \           <Items>\n              [\"<Path>/css/styles.css</Path>\", \"<Path>/index.html</Path>\"]\n
+        \           </Items>\n          </Paths>\n          <CallerReference>1350224404</CallerReference>\n
+        \       </InvalidationBatch>\n      "
+    headers:
+      X-Amz-Date:
+      - Sun, 14 Oct 2012 17:20:04 EEST
+      Content-Type:
+      - text/xml
+      Authorization:
+      - AWS
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      X-Amzn-Requestid:
+      - 402b2709-160a-11e2-8263-5718d272b82f
+      Location:
+      - https://cloudfront.amazonaws.com/2012-05-05/distribution/foo/invalidation/I29QRGBBZOGEZ9
+      Content-Type:
+      - text/xml
+      Content-Length:
+      - '394'
+      Date:
+      - Sun, 14 Oct 2012 14:20:06 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0"?>
+
+        <Invalidation xmlns="http://cloudfront.amazonaws.com/doc/2012-05-05/"><Id>I29QRGBBZOGEZ9</Id><Status>InProgress</Status><CreateTime>2012-10-14T14:20:05.839Z</CreateTime><InvalidationBatch><Paths><Quantity>2</Quantity><Items><Path>/index.html</Path><Path>/css/styles.css</Path></Items></Paths><CallerReference>1350224404</CallerReference></InvalidationBatch></Invalidation>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:20:05 GMT
+recorded_with: VCR 2.2.4

data/features/cli-output.feature

@@ -0,0 +1,84 @@
+Feature: Command-line interface feedback
+
+  Scenario: Run jekyll-s3 in the wrong directory
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      I can't find any directory called _site. Are you in the right directory?
+      """
+
+  # For some reason this scenario fails on Travis but on on localhost
+  @skip-on-travis
+  Scenario: Run jekyll-s3 for the first time
+    Given a directory named "_site"
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      I've just generated a file called _jekyll_s3.yml. Go put your details in it!
+      """
+    Then the file "_jekyll_s3.yml" should contain:
+      """
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket: your.blog.bucket.com
+      cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
+      """
+
+  Scenario: Run jekyll-s3 with an empty configuration file
+    Given a directory named "_site"
+    And an empty file named "_jekyll_s3.yml"
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      I can't parse the file _jekyll_s3.yml. It should look like this:
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket: your.blog.bucket.com
+      """
+
+  Scenario: Run jekyll-s3 with a malformed configuration file
+    Given a directory named "_site"
+    And a file named "_jekyll_s3.yml" with:
+      """
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      this is not yaml
+      """
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      I can't parse the file _jekyll_s3.yml. It should look like this:
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket: your.blog.bucket.com
+      """
+
+  Scenario: Run jekyll-s3 with a configuration file that does not contain a bucket
+    Given a directory named "_site"
+    And a file named "_jekyll_s3.yml" with:
+      """
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket:
+      """
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      I can't parse the file _jekyll_s3.yml. It should look like this:
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket: your.blog.bucket.com
+      """
+
+  Scenario: Run jekyll-s3
+    Given a directory named "_site"
+    And a file named "_jekyll_s3.yml" with:
+      """
+      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
+      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
+      s3_bucket: your.blog.bucket.com
+      """
+    When I run `jekyll-s3`
+    Then the output should contain:
+      """
+      Deploying _site/* to your.blog.bucket.com
+      """

data/features/jekyll-s3-cloudfront.feature

@@ -6,17 +6,9 @@ Feature: Invalidate the Cloudfront distribution
   And see, that the items in the distribution were invalidated
   So that my latest updates will be immediately available to readers
 
-  Scenario: Run jekyll-s3 for the first time
-    Given a directory named "_site"
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I've just generated a file called _jekyll_s3.yml. Go put your details in it!
-      """
-    Then the file "_jekyll_s3.yml" should contain:
-      """
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
-      """
+  @s3-and-cloudfront
+  Scenario: Upload to S3 and then invalidate the Cloudfront distribution
+    When my Jekyll site is in "features/support/test_site_dirs/cdn-powered.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 2 new and 0 changed files into S3

data/features/jekyll-s3.feature

@@ -4,82 +4,26 @@ Feature: jekyll-s3
   As a blogger
   I want to run jekyll-s3 and say OMG it just worked!
 
-  Scenario: Run jekyll-s3 in the wrong directory
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I can't find any directory called _site. Are you in the right directory?
-      """
+  @new-files
+  Scenario: Push a new Jekyll site to S3
+    When my Jekyll site is in "features/support/test_site_dirs/my.blog.com"
+    Then jekyll-s3 will push my blog to S3
+    And report that it uploaded 2 new and 0 changed files into S3
 
-  Scenario: Run jekyll-s3 for the first time
-    Given a directory named "_site"
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I've just generated a file called _jekyll_s3.yml. Go put your details in it!
-      """
-    Then the file "_jekyll_s3.yml" should contain:
-      """
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      """
+  @new-and-changed-files
+  Scenario: Upload a new blog post and change an old post
+    When my Jekyll site is in "features/support/test_site_dirs/new-and-changed-files.com"
+    Then jekyll-s3 will push my blog to S3
+    And report that it uploaded 1 new and 1 changed files into S3
 
-  Scenario: Run jekyll-s3 with an empty configuration file
-    Given a directory named "_site"
-    And an empty file named "_jekyll_s3.yml"
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I can't parse the file _jekyll_s3.yml. It should look like this:
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      """
+  @only-changed-files
+  Scenario: Update an existing blog post
+    When my Jekyll site is in "features/support/test_site_dirs/only-changed-files.com"
+    Then jekyll-s3 will push my blog to S3
+    And report that it uploaded 0 new and 1 changed files into S3
 
-  Scenario: Run jekyll-s3 with a malformed configuration file
-    Given a directory named "_site"
-    And a file named "_jekyll_s3.yml" with:
-      """
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      this is not yaml
-      """
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I can't parse the file _jekyll_s3.yml. It should look like this:
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      """
-
-  Scenario: Run jekyll-s3 with a configuration file that does not contain a bucket
-    Given a directory named "_site"
-    And a file named "_jekyll_s3.yml" with:
-      """
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: 
-      """
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      I can't parse the file _jekyll_s3.yml. It should look like this:
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      """
-
-  Scenario: Run jekyll-s3
-    Given a directory named "_site"
-    And a file named "_jekyll_s3.yml" with:
-      """
-      s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
-      s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
-      s3_bucket: your.blog.bucket.com
-      """
-    When I run `jekyll-s3`
-    Then the output should contain:
-      """
-      Deploying _site/* to your.blog.bucket.com
-      """
+  @no-new-or-changed-files
+  Scenario: The user runs jekyll-s3 even though he doesn't have new or changed posts
+    When my Jekyll site is in "features/support/test_site_dirs/no-new-or-changed-files.com"
+    Then jekyll-s3 will push my blog to S3
+    And report that it uploaded 0 new and 0 changed files into S3