jekyll-s3 3.1.2 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5ad1b011484b20902e39cb8f5b8efd4048cee3da
+  data.tar.gz: 80f7697bcbc82520378a00eef6aca4b57c54d4bf
+SHA512:
+  metadata.gz: 709e15a09766c29914b57625a6b90e9ae8e8c52ee4b8ec2c225fe6ee286ccc508399ee43b466d3b40c12bbbeea7ef1fee072148c5f92b7ac17647812974aef16
+  data.tar.gz: 73146c0d5b31920c9920374f8f7404d54f55cb0611c9aa549eaaffdd30df5cc8bb35178aaf6993e8dbdb5e9737bc75dac2648e3ed35f29a17c22c9370b96473e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-s3 (3.1.2)
+    jekyll-s3 (3.2.0)
       aws-sdk (~> 1.8.5)
       configure-s3-website (~> 1)
       erubis (~> 2.7.0)

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 3.2.0
+
+* Delete files in parallel
+
 ## 3.1.2
 
 * VCR is not threadsafe. Because of this, disable parallelism during tests.

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.1.2"
+  s.version     = "3.2.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.rb

@@ -12,7 +12,7 @@ module Jekyll
   end
 end
 
-%w{errors upload uploader cli config_loader retry keyboard diff_helper endpoint}.each do |file|
+%w{errors upload uploader cli config_loader retry keyboard diff_helper endpoint parallelism}.each do |file|
   require File.dirname(__FILE__) + "/jekyll-s3/#{file}"
 end
 

data/lib/jekyll-s3/keyboard.rb

@@ -4,7 +4,7 @@ module Jekyll
       def self.if_user_confirms_delete(to_delete, standard_input=STDIN)
         delete_all = false
         keep_all = false
-        to_delete.each do |f|
+        confirmed_deletes = to_delete.map do |f|
           delete = false
           keep = false
           until delete || delete_all || keep || keep_all
@@ -17,9 +17,12 @@ module Jekyll
             end
           end
           if (delete_all || delete) && !(keep_all || keep)
-            yield f
+            f
           end
-        end
+        end.select { |f| f }
+        Parallelism.each_in_parallel_or_sequentially(confirmed_deletes) { |f|
+          yield f
+        }
       end
     end
   end

data/lib/jekyll-s3/parallelism.rb

@@ -0,0 +1,20 @@
+module Jekyll
+  module S3
+    class Parallelism
+      def self.each_in_parallel_or_sequentially(items, &operation)
+        if ENV['disable_parallel_processing']
+          items.each do |item|
+            operation.call item
+          end
+        else
+          threads = items.map do |item|
+            Thread.new(item) { |item|
+              operation.call item
+            }
+          end
+          threads.each { |thread| thread.join }
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-s3/uploader.rb

@@ -60,21 +60,9 @@ module Jekyll
       end
 
       def self.upload_in_parallel_or_sequentially(files_to_upload, s3, config, site_dir)
-        do_upload_file = lambda { |f|
+        Parallelism.each_in_parallel_or_sequentially(files_to_upload) { |f|
           upload_file(f, s3, config, site_dir)
         }
-        if ENV['disable_parallel_processing']
-          files_to_upload.each do |f|
-            do_upload_file.call f
-          end
-        else
-          threads = files_to_upload.map do |f|
-            Thread.new(f) { |f|
-              do_upload_file.call f
-            }
-          end
-          threads.each { |thread| thread.join }
-        end
       end
 
       def self.upload_file(file, s3, config, site_dir)

data/spec/lib/parallelism_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Jekyll::S3::Parallelism do
+  context 'user has disabled parallelism' do
+    before(:all) {
+      @original_disable_state = ENV['disable_parallel_processing']
+      ENV['disable_parallel_processing'] = 'true'
+    }
+
+    after(:all) {
+      ENV['disable_parallel_processing'] = @original_disable_state
+    }
+
+    it 'runs things sequentially' do
+      ints = (0..100).to_a
+      after_processing = []
+      Jekyll::S3::Parallelism.each_in_parallel_or_sequentially(ints) { |int|
+        after_processing << int
+      }
+      ints.should eq(after_processing)
+    end
+  end
+
+  context 'user has not disabled parallelism' do
+    before(:all) {
+      @original_disable_state = ENV['disable_parallel_processing']
+      ENV.delete 'disable_parallel_processing'
+    }
+
+    after(:all) {
+      ENV['disable_parallel_processing'] = @original_disable_state if @original_disable_state
+    }
+
+    it 'runs things in parallel' do
+      ints = (0..100).to_a
+      after_processing = []
+      Jekyll::S3::Parallelism.each_in_parallel_or_sequentially(ints) { |int|
+        after_processing << int
+      }
+      ints.should_not eq(after_processing) # Parallel processing introduces non-determinism
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 3.1.2
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Philippe Creux
@@ -15,7 +14,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: filey-diff
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-cloudfront-invalidator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: configure-s3-website
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,55 +98,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,7 +147,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,23 +154,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -199,7 +175,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -207,7 +182,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -215,16 +189,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
-description: ! 'This Gem allows you to push your Jekyll blog to AWS S3.
-
+description: |-
+  This Gem allows you to push your Jekyll blog to AWS S3.
   In addition, you can use this Gem to invalidate the related Cloudfront
-
-  distribution, making it easy to deliver your blog via the CDN.'
+  distribution, making it easy to deliver your blog via the CDN.
 email:
 - pcreux@gmail.com
 - lauri.lehmijoki@iki.fi
@@ -311,12 +283,14 @@ files:
 - lib/jekyll-s3/endpoint.rb
 - lib/jekyll-s3/errors.rb
 - lib/jekyll-s3/keyboard.rb
+- lib/jekyll-s3/parallelism.rb
 - lib/jekyll-s3/retry.rb
 - lib/jekyll-s3/upload.rb
 - lib/jekyll-s3/uploader.rb
 - spec/lib/config_loader_spec.rb
 - spec/lib/endpoint_spec.rb
 - spec/lib/keyboard_spec.rb
+- spec/lib/parallelism_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/lib/uploader_spec.rb
@@ -331,33 +305,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/jekyll-s3
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3787363599528242274
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3787363599528242274
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Push your Jekyll blog to S3
 test_files:
 - features/cassettes/cucumber_tags/create-redirect.yml
@@ -423,6 +390,7 @@ test_files:
 - spec/lib/config_loader_spec.rb
 - spec/lib/endpoint_spec.rb
 - spec/lib/keyboard_spec.rb
+- spec/lib/parallelism_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/lib/uploader_spec.rb