jekyll-s3 0.0.5 → 0.0.6

data/README.md

@@ -4,9 +4,14 @@
 Status](https://secure.travis-ci.org/laurilehmijoki/jekyll-s3.png)]
 (http://travis-ci.org/laurilehmijoki/jekyll-s3)
 
-
 Deploy your jekyll site to S3.
 
+## What jekyll-s3 can do for you
+
+* Upload your site to AWS S3
+* Help you use AWS Cloudfront to distribute your Jekyll blog
+* Create the S3 bucket for you
+
 ## Install
 
     gem install jekyll-s3
@@ -23,6 +28,8 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
 </pre>
 
   * Edit it with your details.
+  * Hint: you can use ERB syntax in `_jekyll_s3.yml`. This is handy, if you
+    want to store the AWS credentials as environmental variables.
 
 ## Deploy!
 
@@ -47,9 +54,20 @@ It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
   * Run `jekyll-s3` to deploy your site to S3 and invalidate the Cloudfront
     distribution
 
-## Todo
+## Changelog
+
+### 0.0.5
+
+Invalidate the Cloudfront distribution of the Jekyll S3 bucket.
+
+## Known issues
+
+### Only S3 buckets in the US Standard region work
 
-  * Upload new / updated files *only* (using s3-sync?)
+Jekyll-s3 supports only S3 buckets that are in the US Standard region. If your 
+bucket is currently on some other region, you can set a non-existing 
+bucket in *_jekyll_s3.yml* and then run `jekyll-s3`. Jekyll-s3 will then create
+the bucket in the US Standard region.
 
 ## Development
 
@@ -65,3 +83,7 @@ MIT
 
 Copyright (c) 2011 VersaPay, Philippe Creux.
 
+Contributors (in alphabetical order)
+* Cory Kaufman-Schofield
+* Chris Kelly
+* Lauri Lehmijoki

data/Rakefile

@@ -7,5 +7,5 @@ task :default => 'test'
 desc "Run tests"
 task :test do
     sh "bundle exec rspec"
-    sh "bundle exec cucumber"
+    sh "bundle exec cucumber --tags ~@skip-on-travis"
 end

data/bin/jekyll-s3

@@ -2,4 +2,4 @@
 
 require File.dirname(__FILE__) + '/../lib/jekyll-s3'
 
-Jekyll::S3::CLI.run!
+Jekyll::S3::CLI.run

data/features/cassettes/cucumber_tags/new-and-changed-files.yml

@@ -0,0 +1,302 @@
+---
+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:14:01 +0300
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - orlRqs/RF8uYvJI2d9tVL12XEYpm46FqapMdLCIvGJQWTJikCWuFNKm11vLbdLjF
+      X-Amz-Request-Id:
+      - 3C8A86AB4D31B5AC
+      Date:
+      - Sun, 14 Oct 2012 14:14:03 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:14:02 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:14:02 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - +pN1CGWrRBJxfsGM0WXcIiY5wOT5SbXTvDuXlJgRevU0fBEp/iNk0KimMhmVsKdU
+      X-Amz-Request-Id:
+      - 79E726191E75A2D0
+      Date:
+      - Sun, 14 Oct 2012 14:14:04 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-14T13:40:28.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:02 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    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:14:02 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - WJ47InZU7nSIGOL9Q2bLlZs6RhAgwVx/io0DxdmOq1ZTPh0wrJsNC67jv/FkKDQe
+      X-Amz-Request-Id:
+      - 592387EFBC362DBB
+      Date:
+      - Sun, 14 Oct 2012 14:14:04 GMT
+      Last-Modified:
+      - Sun, 14 Oct 2012 13:40:28 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - ''
+      Content-Length:
+      - '10'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:03 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    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:14:03 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - 5H1mYUoiZcJeO5nftsVwd5w9oP8sl5wKifRuZFoT9Pq6gqgzNKTWbGChBI4QbYqU
+      X-Amz-Request-Id:
+      - F6F2142B1502F43D
+      Date:
+      - Sun, 14 Oct 2012 14:14:05 GMT
+      Last-Modified:
+      - Sun, 14 Oct 2012 13:40:28 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - ''
+      Content-Length:
+      - '10'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:03 GMT
+- request:
+    method: put
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        Ym9keSB7CiAgY29sb3I6IGdyZWVuOwp9Cg==
+    headers:
+      Content-Type:
+      - ''
+      Content-Length:
+      - '25'
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:14:03 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - yliF5Grb6a8Yo+Lie67G5zwFYx8xgPuNtWCJ0HfWtMsZkvMdEWrPBm98kfLjOWSk
+      X-Amz-Request-Id:
+      - BFCBBD5E772E0547
+      Date:
+      - Sun, 14 Oct 2012 14:14:06 GMT
+      Etag:
+      - ! '"5ac030ccfb37ddf75a62710f78d06155"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:04 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+CiAgPGJvZHk+CiAgICBpIGFtIGEgbmV3IGJsb2cgcG9zdAogIDwv
+        Ym9keT4KPC9odG1sPgo=
+    headers:
+      Content-Type:
+      - ''
+      Content-Length:
+      - '104'
+      User-Agent:
+      - aws-sdk-ruby/1.5.6 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Sun, 14 Oct 2012 17:14:04 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - XjFrlZq5Z9aPjiaIoyGoN1eiI7e9alc4Sa6RdBF0QokIEGjK/t1nEWyUz58RkAx4
+      X-Amz-Request-Id:
+      - C9A3686A7D14C6AC
+      Date:
+      - Sun, 14 Oct 2012 14:14:06 GMT
+      Etag:
+      - ! '"84c3aea67581d0a7b28ea245e6cf4af7"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:05 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:14:05 +0300
+      Authorization:
+      - AWS 
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - 68PpHfR44lRsWadqGgOf5A0wL0//lsinEm1fmKhKJW3hNGxYRmuvEvXHFDsSBeZp
+      X-Amz-Request-Id:
+      - DA9C1CFF45061692
+      Date:
+      - Sun, 14 Oct 2012 14:14:07 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:14:06.000Z</LastModified><ETag>&quot;5ac030ccfb37ddf75a62710f78d06155&quot;</ETag><Size>25</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-10-14T14:14:06.000Z</LastModified><ETag>&quot;84c3aea67581d0a7b28ea245e6cf4af7&quot;</ETag><Size>104</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 14:14:05 GMT
+recorded_with: VCR 2.2.4

data/features/cassettes/cucumber_tags/new-files.yml

@@ -0,0 +1,211 @@
+---
+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 16:40:24 +0300
+      Authorization:
+      - AWS foo:foo=
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - oPO1kjdvRumCNZHfhZaWYgyeqf1rszjLU6Yv5VmeJlagrp0L7xDlja33A3NEB+lF
+      X-Amz-Request-Id:
+      - 0ADF25683FCFEA3B
+      Date:
+      - Sun, 14 Oct 2012 13:40:27 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>x</ID><DisplayName>x</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 13:40:25 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 16:40:25 +0300
+      Authorization:
+      - AWS foo:foo=
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - QTSymXMQalg5cw/APPEwt9g6sYMDXbxW0Aaps1zAQ0u/4SwrvkOeNt3jKm54/VMM
+      X-Amz-Request-Id:
+      - AA208FECCB1E85EE
+      Date:
+      - Sun, 14 Oct 2012 13:40:27 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 13:40:26 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 16:40:26 +0300
+      Authorization:
+      - AWS foo:foo=
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - xhRbNnKb3BflLa4OrGe9qeM2gSadOHcnWNdpqaMwEYL909QAoBkaUTJZGqcYABhq
+      X-Amz-Request-Id:
+      - E5428005DF85FB78
+      Date:
+      - Sun, 14 Oct 2012 13:40:28 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 13:40:26 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 16:40:26 +0300
+      Authorization:
+      - AWS foo:foo=
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - /qDHDvVyWt95mWDmaswN75KKtnBPN2ISIlgdBOFSvWyy/Ovva2u8SMDd4aQJSoVj
+      X-Amz-Request-Id:
+      - EDC7726801AA0AE2
+      Date:
+      - Sun, 14 Oct 2012 13:40:29 GMT
+      Etag:
+      - ! '"8a8892a2b0fad281f26c0dedbff7011a"'
+      Content-Length:
+      - '0'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Sun, 14 Oct 2012 13:40:27 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 16:40:27 +0300
+      Authorization:
+      - AWS foo:foo
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - ZIix7PUbt+Kpmb1wbV5hYk4fPyZYjj9doj54LQAQjsXqskA7Yk442vj47FeoD6sC
+      X-Amz-Request-Id:
+      - 62CBD66CCEB953BA
+      Date:
+      - Sun, 14 Oct 2012 13:40:29 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-14T13:40:28.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-14T13:40:29.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 13:40:28 GMT
+recorded_with: VCR 2.2.4