jekyll-s3 3.0.0 → 3.1.0

data/README.md

@@ -313,4 +313,5 @@ Contributors (in alphabetical order)
 * Michael Bleigh
 * Shigeaki Matsumura
 * stanislas
+* Trevor Fitzgerald
 * Zee Spencer

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 3.1.0
+
+* Upload files in parallel
+
 ## 3.0.0
 
 * Set `text/html; charset=utf-8` as the `content_type` for each `text/html`

data/example-configurations.md

@@ -41,3 +41,20 @@ Above, we store the AWS credentials and the id of the CloudFront distribution as
 environment variables. It's convenient, since you can keep the `_jekyll_s3.yml`
 in a public Git repo, and thus have your deployment configurations
 version-controlled.
+
+## Using redirects
+
+````yaml
+s3_id: hello
+s3_secret: galaxy
+redirects:
+  index.php: /
+  about.php: about.html
+routing_rules:
+  - condition:
+      key_prefix_equals: code/repositories/git/
+    redirect:
+      host_name: git.johnny.com
+      replace_key_prefix_with: ""
+      http_redirect_code: 301
+````

data/features/jekyll-s3-upload.feature

@@ -35,12 +35,21 @@ Feature: upload Jekyll site to S3
   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 the output should equal
+    And the output should contain
       """
       Deploying _site/* to jekyll-s3-test.net
       Uploading 1 new and 1 changed file(s)
+      """
+    And the output should contain
+      """
       Upload css/styles.css: Success!
+      """
+    And the output should contain
+      """
       Upload index.html: Success!
+      """
+    And the output should contain
+      """
       Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """

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     = "3.0.0"
+  s.version     = "3.1.0"
   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

@@ -54,13 +54,20 @@ module Jekyll
           pre_upload_report << "#{changed_files.length} changed" if changed_files.length > 0
           pre_upload_report << "file(s)"
           puts pre_upload_report.join(' ')
-          to_upload.each do |f|
-            upload_file(f, s3, config, site_dir)
-          end
+          upload_in_parallel to_upload, s3, config, site_dir
         end
         [new_files.length, changed_files.length, changed_files]
       end
 
+      def self.upload_in_parallel(files_to_upload, s3, config, site_dir)
+        threads = files_to_upload.map do |f|
+          Thread.new {
+            upload_file(f, s3, config, site_dir)
+          }
+        end
+        threads.each { |thread| thread.join }
+      end
+
       def self.upload_file(file, s3, config, site_dir)
         Retry.run_with_retry do
           upload = Upload.new(file, s3, config, site_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -340,21 +340,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2932196294779507205
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2932196294779507205
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Push your Jekyll blog to S3