s3_website 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 738dbf4da599ae01973619d033c4f6810d2f9378
+  data.tar.gz: d3368566d619e4ee1352ac67683283f76045968a
+SHA512:
+  metadata.gz: e17da88a98541bc84052d59214e47bff501d0d0bfcb1e8acdb22609cba320b9c3f65335e539ac3bc886dbacf576a7ae107a21530cac9581bb4a95ba4495edb16
+  data.tar.gz: 5bef4373d9f2466728d6d6e1b56fc34a083fd95b74e3a02871c9ac72f72924be3df10b8bdefc900f376bc36903f298df84d4c572cc6f1910e1ee40a1a32f0d96

data/README.md

@@ -7,38 +7,46 @@
 
 * Create and configure an S3 website for you
 * Upload your static website to AWS S3
+ * Jekyll and Nanoc are automatically supported
 * Help you use AWS Cloudfront to distribute your website
 * Improve page speed with HTTP cache control and gzipping
 * Set HTTP redirects for your website
 * (for other features, see the documentation below)
 
-`s3_website` automatically supports [Jekyll](http://jekyllrb.com) and
-[Nanoc](http://nanoc.ws) by recognising their output directories (*_site* for
-Jekyll and *public/output* for Nanoc). If your website resides in some other
-directory, you can point the directory to `s3_website` with a parameter. See
-`s3_website help push` for more info.
-
 ## Install
 
-This project is still on beta level. Expect backward incompatible changes.
-
     gem install s3_website
 
 ## Usage
 
 Here's how you can get started:
 
+* In [AWS IAM](https://console.aws.amazon.com/iam), create API credentials that have sufficient permissions to S3
 * Go to your website directory
-* Run `s3_website cfg create`. It generates a configuration file called `s3_website.yml`
-* 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)
+* Run `s3_website cfg create`. This generates a configuration file called `s3_website.yml`.
+* Put your AWS credentials and the S3 bucket name into the file
 * Run `s3_website cfg apply`. This will configure your bucket to function as an
   S3 website. If the bucket does not exist, the command will create it for you.
 * Run `s3_website push` to push your website to S3. Congratulations! You are live.
 
-`s3_website` attempts to be a command-line interface tool that is easy to
-understand and use. For example, `s3_website --help` should print you all the
-things it can perform. Please create an issue if you think the tool is
-incomprehensible or inconsistent.
+### For Jekyll users
+
+Run the `s3_website cfg create` in the root directory of your Jekyll project.
+`s3_website` will automatically look for the site output in the *_site*
+directory.
+
+### For Nanoc users
+
+Run the `s3_website cfg create` in the root directory of your Nanoc project.
+`s3_website` will automatically look for the site output in the *public/output*
+directory.
+
+### For others
+
+It's a good idea to store the `s3_website.yml` file in your project's root.
+Let's say the contents you wish to upload to your S3 website bucket are in
+*my_website_output*. You can upload the contents of that directory with
+`s3_website push --site my_website_output`.
 
 ### Using environment variables
 
@@ -68,8 +76,14 @@ you can omit the `s3_id` and `s3_secret` keys in the config file.)
   bucket
 * Let the power users benefit from advanced S3 website features such as
   redirects, Cache-Control headers and gzip support
+* Be as fast as possible. Do in parallel all that can be done in parallel.
 * Maintain 90% backward compatibility with the jekyll-s3 gem
 
+`s3_website` attempts to be a command-line interface tool that is easy to
+understand and use. For example, `s3_website --help` should print you all the
+things it can perform. Please create an issue if you think the tool is
+incomprehensible or inconsistent.
+
 ## Additional features
 
 ### Cache Control
@@ -291,8 +305,6 @@ s3_website uses [Semantic Versioning](http://semver.org).
 
   * 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`
 
 ### Contributing
 
@@ -320,8 +332,8 @@ MIT. See the LICENSE file for more information.
 
 ## Contributors
 
-This gem is created by [Lauri Lehmijoki](https://github.com/laurilehmijoki).
-Without the valuable work of [Philippe Creux](https://github.com/pcreux) on
+This gem is created by Lauri Lehmijoki. Without the valuable work of [Philippe
+Creux](https://github.com/pcreux) on
 [jekyll-s3](https://github.com/laurilehmijoki/jekyll-s3), this project would not
 exist.
 

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.0.1
+
+* Set default concurrency level to 100. Related to issue [#6](https://github.com/laurilehmijoki/s3_website/issues/6).
+
 ## 1.0.0
 
 * Make 0.4.0 the version 1.0.0

data/lib/s3_website/parallelism.rb

@@ -6,13 +6,19 @@ module S3Website
           operation.call item
         end
       else
-        threads = items.map do |item|
-          Thread.new(item) { |item|
-            operation.call item
-          }
-        end
-        threads.each { |thread| thread.join }
+        items.each_slice(DEFAULT_CONCURRENCY_LEVEL) { |items|
+          threads = items.map do |item|
+            Thread.new(item) { |item|
+              operation.call item
+            }
+          end
+          threads.each(&:join)
+        }
       end
     end
+
+    private
+
+    DEFAULT_CONCURRENCY_LEVEL = 100
   end
 end

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

data/spec/lib/parallelism_spec.rb

@@ -40,4 +40,23 @@ describe S3Website::Parallelism do
       ints.should_not eq(after_processing) # Parallel processing introduces non-determinism
     end
   end
+
+  context 'limiting parallelism' do
+    before(:each) {
+      ints = (0..199).to_a
+      @after_processing = []
+      S3Website::Parallelism.each_in_parallel_or_sequentially(ints) { |int|
+        @after_processing << int
+      }
+    }
+
+    it "does at most #{S3Website::Parallelism::DEFAULT_CONCURRENCY_LEVEL} operations in parallel" do
+      @after_processing.slice(0, 99).all? do |int|
+        int <= 99
+      end.should be true
+      @after_processing.slice(100, 199).all? do |int|
+        int >= 100 and int <= 199
+      end.should be true
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: filey-diff
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-cloudfront-invalidator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: configure-s3-website
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,55 +111,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
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,23 +167,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
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,12 +202,11 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
-description: ! "\n    Sync website files, set redirects, use HTTP performance optimisations,
+description: "\n    Sync website files, set redirects, use HTTP performance optimisations,
   deliver via\n    CloudFront.\n  "
 email:
 - lauri.lehmijoki@iki.fi
@@ -358,33 +329,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/s3_website
 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: 2083958356287664166
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2083958356287664166
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage your S3 website
 test_files:
 - features/as-library.feature