jekyll-s3 0.0.3 → 0.0.4

data/.gitignore

@@ -1,3 +1,4 @@
+.rvmrc
 *.gem
 .bundle
 Gemfile.lock

data/README.md

@@ -22,18 +22,29 @@ s3_bucket: your.blog.bucket.com
 
   * Run `jekyll-s3`. Done.
 
-## Want `http://www.my-awesome-blog.com/` to render `'index.html'`?
-  
-  * Setup Cloudfront to distribute your s3 bucket files (you can do that
-    through the [AWS management console](https://console.aws.amazon.com/s3/home))
-  * Set the cloudfront root object to index.html (you can use the
-    [aws-cloudfront gem](https://github.com/iltempo/aws-cloudfront) to do so)
+## Want the root url to render index.html?
+
+  * Log into <https://console.aws.amazon.com/s3/home>
+  * Set the Index document to index.html in Bucket Properties >
+    Website.
+  * Visit the website endpoint:
+    (http://yourblog.s3-website...amazonaws.com)
 
 ## Todo
 
-  * Upload new / updated files *only*
-  * Setup Cloudfront distribution
-  * Invalidate updated files on Cloudfront
+  * Upload new / updated files *only* (using s3-sync?)
+  
+## Development
+ 
+  * Install bundler and run `bundle install`
+  * Run the integration tests by running `bundle exec cucumber`
+  * Run the unit tests by running `bundle exec rspec spec/lib/*.rb`
+
+## License
+
+MIT
 
+## Copyright
 
+Copyright (c) 2011 VersaPay, Philippe Creux.
   

data/features/jekyll-s3.feature

@@ -5,7 +5,7 @@ Feature: jekyll-s3
   I want to run jekyll-s3 and say OMG it just worked!
 
   Scenario: Run jekyll-s3 in the wrong directory
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
       I can't find any directory called _site. Are you in the right directory?
@@ -13,7 +13,7 @@ Feature: jekyll-s3
 
   Scenario: Run jekyll-s3 for the first time
     Given a directory named "_site"
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
       I've just generated a file called _jekyll_s3.yml. Go put your details in it!
@@ -28,7 +28,7 @@ Feature: jekyll-s3
   Scenario: Run jekyll-s3 with an empty configuration file
     Given a directory named "_site"
     And an empty file named "_jekyll_s3.yml"
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
       I can't parse the file _jekyll_s3.yml. It should look like this:
@@ -44,7 +44,7 @@ Feature: jekyll-s3
       s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
       this is not yaml
       """
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
       I can't parse the file _jekyll_s3.yml. It should look like this:
@@ -61,7 +61,7 @@ Feature: jekyll-s3
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: 
       """
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
       I can't parse the file _jekyll_s3.yml. It should look like this:
@@ -78,10 +78,8 @@ Feature: jekyll-s3
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
       """
-    When I run "jekyll-s3"
+    When I run `jekyll-s3`
     Then the output should contain:
       """
-      Uploading _site/* to your.blog.bucket.com
+      Deploying _site/* to your.blog.bucket.com
       """
-
-

data/features/support/env.rb

@@ -4,6 +4,7 @@ require 'bundler'
 Bundler.require
 
 require 'aruba/cucumber'
+require 'cucumber/rspec/doubles'
 
 # Following from 'aruba/cucumber'
 Before do

data/jekyll-s3.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-s3'
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'mocha'
   s.add_development_dependency 'cucumber'
-  s.add_development_dependency 'aruba'
+  s.add_development_dependency 'aruba', '>= 0.4.7'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jekyll-s3/uploader.rb

@@ -22,8 +22,22 @@ s3_bucket: your.blog.bucket.com
       end
 
       protected
-
-      include AWS::S3
+      
+      def run_with_retry
+        begin
+          yield
+        rescue AWS::S3::RequestTimeout => e
+          $stderr.puts "Exception Occurred:  #{e.message} (#{e.class})  Retrying in 5 seconds..."
+          sleep 5
+          retry
+        end
+      end
+      
+      def local_files
+        Dir[SITE_DIR + '/**/*'].
+          delete_if { |f| File.directory?(f) }.
+          map { |f| f.gsub(SITE_DIR + '/', '') }
+      end
 
       # Please spec me!
       def upload_to_s3!
@@ -34,25 +48,23 @@ s3_bucket: your.blog.bucket.com
             :secret_access_key => @s3_secret,
             :use_ssl => true
         )
-        unless Service.buckets.map(&:name).include?(@s3_bucket)
+        unless AWS::S3::Service.buckets.map(&:name).include?(@s3_bucket)
           puts("Creating bucket #{@s3_bucket}")
-          Bucket.create(@s3_bucket)
+          AWS::S3::Bucket.create(@s3_bucket)
         end
 
-        bucket = Bucket.find(@s3_bucket)
-
-        local_files = Dir[SITE_DIR + '/**/*'].
-          delete_if { |f| File.directory?(f) }.
-          map { |f| f.gsub(SITE_DIR + '/', '') }
+        bucket = AWS::S3::Bucket.find(@s3_bucket)
 
         remote_files = bucket.objects.map { |f| f.key }
 
         to_upload = local_files
-        to_upload.each do |f| 
-          if S3Object.store(f, open("#{SITE_DIR}/#{f}"), @s3_bucket, :access => 'public-read')
-            puts("Upload #{f}: Success!")
-          else
-            puts("Upload #{f}: FAILURE!")
+        to_upload.each do |f|
+          run_with_retry do
+            if AWS::S3::S3Object.store(f, open("#{SITE_DIR}/#{f}"), @s3_bucket, :access => 'public-read')
+              puts("Upload #{f}: Success!")
+            else
+              puts("Upload #{f}: FAILURE!")
+            end
           end
         end
 
@@ -73,15 +85,18 @@ s3_bucket: your.blog.bucket.com
             end
           end
           if (delete_all || delete) && !(keep_all || keep)
-            if S3Object.delete(f, @s3_bucket)
-              puts("Delete #{f}: Success!")
-            else
-              puts("Delete #{f}: FAILURE!")
+            run_with_retry do
+              if AWS::S3::S3Object.delete(f, @s3_bucket)
+                puts("Delete #{f}: Success!")
+              else
+                puts("Delete #{f}: FAILURE!")
+              end
             end
           end
         end
 
         puts "Done! Go visit: http://#{@s3_bucket}.s3.amazonaws.com/index.html"
+        true
       end
 
       def check_jekyll_project!

data/lib/jekyll-s3/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module S3
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/uploader_spec.rb

@@ -0,0 +1,33 @@
+require  File.dirname(__FILE__) + "/../../lib/jekyll-s3.rb"
+
+RSpec.configure do |config|
+  config.mock_framework = :mocha
+end
+
+describe Jekyll::S3::Uploader do
+  describe "#upload_to_s3" do
+    
+    before :each do
+      AWS::S3::Base.expects(:establish_connection!).at_least(1).returns true
+      AWS::S3::Service.expects(:buckets).at_least(1).returns []
+      AWS::S3::Bucket.expects(:create).at_least(1).returns true
+      bucket = mock()
+      bucket.expects(:objects).returns []
+      AWS::S3::Bucket.expects(:find).at_least(1).returns bucket
+      
+      @uploader = Jekyll::S3::Uploader.new
+      @uploader.expects(:local_files).at_least(1).returns ['index.html']
+      @uploader.expects(:open).at_least(1).returns true
+    end
+    
+    it "should work right when there are no exceptions" do
+      AWS::S3::S3Object.expects(:store).at_least(1).returns(true)
+      @uploader.send(:upload_to_s3!).should
+    end
+    
+    it "should properly handle exceptions on uploading to S3" do
+      AWS::S3::S3Object.expects(:store).raises(AWS::S3::RequestTimeout.new('timeout', 'timeout')).then.at_least(1).returns(true)
+      @uploader.send(:upload_to_s3!).should
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-s3
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Philippe Creux
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -07:00
-default_executable: jekyll-s3
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -47,7 +46,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +60,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: cucumber
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,6 +73,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 4
+        - 7
+        version: 0.4.7
+  type: :development
+  version_requirements: *id005
 description: Push your jekyll blog to AWS S3
 email: 
 - pcreux@gmail.com
@@ -97,7 +112,7 @@ files:
 - lib/jekyll-s3/errors.rb
 - lib/jekyll-s3/uploader.rb
 - lib/jekyll-s3/version.rb
-has_rdoc: true
+- spec/lib/uploader_spec.rb
 homepage: https://github.com/versapay/jekyll-s3
 licenses: []
 
@@ -127,10 +142,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Push your jekyll blog to S3"
-test_files: 
-- features/jekyll-s3.feature
-- features/support/env.rb
+test_files: []
+