jekyll-s3 2.1.0 → 2.1.1

data/README.md

@@ -33,7 +33,9 @@ s3_bucket: your.blog.bucket.com
 
   * Run `jekyll-s3`. Done.
 
-## Reduced Redundancy
+## Additional features
+
+### Reduced Redundancy
 
 You can reduce the cost of hosting your blog on S3 by using Reduced Redundancy Storage:
 
@@ -41,7 +43,7 @@ You can reduce the cost of hosting your blog on S3 by using Reduced Redundancy S
   * All objects uploaded after this change will use the Reduced Redundancy Storage.
   * If you want to change all of the files in the bucket, you can change them through the AWS console, or update the timestamp on the files before running `jekyll-s3` again
 
-## How to use Cloudfront to deliver your blog
+### How to use Cloudfront to deliver your blog
 
 It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
 
@@ -52,7 +54,7 @@ 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
 
-## The headless mode
+### The headless mode
 
 Jekyll-s3 has a headless mode, in which the interactions with a user are
 disabled.
@@ -64,36 +66,6 @@ unpublish blog posts.)
 Enable the headless mode by adding the `--headless` or `-h` argument after
 `jekyll-s3`.
 
-## Changelog
-
-### 2.1.0
-
-* Added support for S3 reduced redundancy storage
-
-### 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
-* Start using [Semantic versioning](http://semver.org/)
-
-### 0.0.7
-
-* Headless mode
-
-### 0.0.6
-
-* Upload only new or changed files
-* Support ERB syntax in `_jekyll_s3.yml`
-
-### 0.0.5
-
-* Invalidate the Cloudfront distribution of the Jekyll S3 bucket.
-
 ## Known issues
 
 ### Only S3 buckets in the US Standard region work
@@ -106,6 +78,7 @@ the bucket in the US Standard region.
 ## Development
 
   * Install bundler and run `bundle install`
+  * Run all tests by invoking `rake test`
   * Run the integration tests by running `bundle exec cucumber`
   * Run the unit tests by running `bundle exec rspec spec/lib/*.rb`
 

data/changelog.md

@@ -0,0 +1,33 @@
+# Changelog
+
+## 2.1.1
+
+* Remove optional settings from the generated `_jekyll_s3.yml` file
+
+## 2.1.0
+
+* Added support for S3 reduced redundancy storage
+
+## 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
+* Start using [Semantic versioning](http://semver.org/)
+
+## 0.0.7
+
+* Headless mode
+
+## 0.0.6
+
+* Upload only new or changed files
+* Support ERB syntax in `_jekyll_s3.yml`
+
+## 0.0.5
+
+* Invalidate the Cloudfront distribution of the Jekyll S3 bucket.

data/features/cli-output.feature

@@ -21,8 +21,6 @@ Feature: Command-line interface feedback
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
-      s3_reduced_redundancy: false
-      cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
       """
 
   Scenario: Run jekyll-s3 with an empty configuration file
@@ -35,7 +33,6 @@ Feature: Command-line interface feedback
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
-      s3_reduced_redundancy: false
       """
 
   Scenario: Run jekyll-s3 with a malformed configuration file
@@ -52,7 +49,6 @@ Feature: Command-line interface feedback
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
-      s3_reduced_redundancy: false
       """
 
   Scenario: Run jekyll-s3 with a configuration file that does not contain a bucket
@@ -62,7 +58,6 @@ Feature: Command-line interface feedback
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket:
-      s3_reduced_redundancy: false
       """
     When I run `jekyll-s3`
     Then the output should contain:
@@ -71,7 +66,6 @@ Feature: Command-line interface feedback
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
-      s3_reduced_redundancy: false
       """
 
   Scenario: Run jekyll-s3

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     = "2.1.0"
+  s.version     = "2.1.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/jekyll-s3/config_loader.rb

@@ -6,8 +6,6 @@ module Jekyll
 s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
 s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
 s3_bucket: your.blog.bucket.com
-s3_reduced_redundancy: false
-cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
       EOF
 
       def self.check_jekyll_project(site_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -223,6 +223,7 @@ files:
 - README.md
 - Rakefile
 - bin/jekyll-s3
+- changelog.md
 - 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