jekyll-s3 2.1.1 → 2.1.2

data/README.md

@@ -16,7 +16,7 @@ Deploy your jekyll site to S3.
 
     gem install jekyll-s3
 
-## Setup
+## Usage
 
 * Go to your jekyll site directory
 * Run `jekyll-s3`. It generates a configuration file called `_jekyll_s3.yml` that looks like this:
@@ -25,13 +25,9 @@ s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
 s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
 s3_bucket: your.blog.bucket.com
 </pre>
-
 * Edit it with your details (you can use [ERB](http://ruby-doc.org/stdlib-1.9.3/libdoc/erb/rdoc/ERB.html) in the file)
 * [Configure your S3 bucket to function like a website](http://docs.amazonwebservices.com/AmazonS3/latest/dev/HostingWebsiteOnS3Setup.html)
-
-## Deploy!
-
-  * Run `jekyll-s3`. Done.
+* Run `jekyll-s3` to push your Jekyll blog to S3
 
 ## Additional features
 
@@ -56,12 +52,10 @@ It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
 
 ### The headless mode
 
-Jekyll-s3 has a headless mode, in which the interactions with a user are
-disabled.
+Jekyll-s3 has a headless mode, where human interactions are disabled.
 
-In the headless mode, Jekyll-s3 will automatically delete the files on the S3
-bucket that are not on your local computer. (You can use the delete feature to
-unpublish blog posts.)
+In the headless mode, `jekyll-s3` will automatically delete the files on the S3
+bucket that are not on your local computer. 
 
 Enable the headless mode by adding the `--headless` or `-h` argument after
 `jekyll-s3`.
@@ -72,7 +66,7 @@ Enable the headless mode by adding the `--headless` or `-h` argument after
 
 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
+bucket in `_jekyll_s3.yml` and then run `jekyll-s3`. Jekyll-s3 will then create
 the bucket in the US Standard region.
 
 ## Development

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.1.2
+
+* Remove a superfluous comma from uploader.rb. The comma might have caused
+  problems for some Ruby 1.8.7 users.
+
 ## 2.1.1
 
 * Remove optional settings from the generated `_jekyll_s3.yml` file

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

data/lib/jekyll-s3/uploader.rb

@@ -55,8 +55,8 @@ module Jekyll
           mime_type = MIME::Types.type_for(file)
           upload_succeeded = s3.buckets[config['s3_bucket']].objects[file].write(
             File.read("#{site_dir}/#{file}"),
-            :content_type => mime_type.first ,
-            :reduced_redundancy => config['s3_reduced_redundancy'],
+            :content_type => mime_type.first,
+            :reduced_redundancy => config['s3_reduced_redundancy']
           )
           if upload_succeeded
             puts("Upload #{file}: Success!")

data/spec/lib/config_loader_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Jekyll::S3::ConfigLoader do
+  it 'supports eRuby syntax in _jekyll_s3.yml' do
+    config = Jekyll::S3::ConfigLoader.load_configuration('spec/sample_files/hyde_site/_site')
+    config['s3_id'].should eq('hello')
+    config['s3_secret'].should eq('world')
+    config['s3_bucket'].should eq('galaxy')
+  end
+end

data/spec/sample_files/hyde_site/_jekyll_s3.yml

@@ -0,0 +1,3 @@
+s3_id: <%= 'hello' %>
+s3_secret: <%= 'world' %>
+s3_bucket: galaxy

data/spec/sample_files/hyde_site/_site/index.html

@@ -0,0 +1 @@
+<div>Hello world</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -268,9 +268,12 @@ files:
 - lib/jekyll-s3/keyboard.rb
 - lib/jekyll-s3/retry.rb
 - lib/jekyll-s3/uploader.rb
+- spec/lib/config_loader_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
+- spec/sample_files/hyde_site/_jekyll_s3.yml
+- spec/sample_files/hyde_site/_site/index.html
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/jekyll-s3
 licenses: []
@@ -331,7 +334,10 @@ test_files:
 - features/support/test_site_dirs/unpublish-a-post.com/_jekyll_s3.yml
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
+- spec/lib/config_loader_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
+- spec/sample_files/hyde_site/_jekyll_s3.yml
+- spec/sample_files/hyde_site/_site/index.html
 - spec/spec_helper.rb