jekyll-s3 2.2.0 → 2.2.1

data/README.md

@@ -67,9 +67,9 @@ Enable the headless mode by adding the `--headless` or `-h` argument after
 ### Only S3 buckets in the US Standard region work
 
 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
-the bucket in the US Standard region.
+bucket is currently on some other region, you can set a non-existing bucket in
+`_jekyll_s3.yml` and then run `configure-s3-website --config-file
+_jekyll_s3.yml`. This creates you a bucket in the US Standard region.
 
 ## Development
 

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.1
+
+* Upload also dot files
+  ([#16](https://github.com/laurilehmijoki/jekyll-s3/pull/16))
+
 ## 2.2.0
 
 * Automatically configure the S3 bucket to function as a website.

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.2.0"
+  s.version     = "2.2.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]
@@ -16,7 +16,7 @@ distribution, making it easy to deliver your blog via the CDN.}
   s.default_executable = %q{jekyll-s3}
 
   s.add_dependency 'aws-sdk', '~> 1.8.0'
-  s.add_dependency 'filey-diff', '~> 0.0.2'
+  s.add_dependency 'filey-diff', '~> 1.0.0'
   s.add_dependency 'simple-cloudfront-invalidator', '~> 1.0.0'
   s.add_dependency 'erubis', '~> 2.7.0'
   s.add_dependency 'mime-types', '= 1.19'

data/lib/jekyll-s3/uploader.rb

@@ -84,7 +84,7 @@ module Jekyll
       end
 
       def self.load_all_local_files(site_dir)
-        Dir[site_dir + '/**/*'].
+        Dir[site_dir + '/**/{*,.*}'].
           delete_if { |f| File.directory?(f) }.
           map { |f| f.gsub(site_dir + '/', '') }
       end

data/spec/lib/upload_spec.rb

@@ -1,86 +1,98 @@
 require 'spec_helper'
 
 describe Jekyll::S3::Uploader do
-  describe 'reduced redundancy setting' do
-    let(:config) {
-      { 's3_reduced_redundancy' => true }
-    }
+  context '#upload_file' do
+    describe 'reduced redundancy setting' do
+      let(:config) {
+        { 's3_reduced_redundancy' => true }
+      }
 
-    it 'allows storing a file under the Reduced Redundancy Storage' do
-      file_to_upload = 'index.html'
-      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-        s3_object.should_receive(:write).with(
-          anything(),
-          :content_type => 'text/html',
-          :reduced_redundancy => true
-        )
+      it 'allows storing a file under the Reduced Redundancy Storage' do
+        file_to_upload = 'index.html'
+        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+          s3_object.should_receive(:write).with(
+            anything(),
+            :content_type => 'text/html',
+            :reduced_redundancy => true
+          )
+        end
+        Jekyll::S3::Uploader.send(:upload_file,
+                                  file_to_upload,
+                                  s3_client,
+                                  config,
+                                  'features/support/test_site_dirs/my.blog.com/_site')
       end
-      Jekyll::S3::Uploader.send(:upload_file,
-                                file_to_upload,
-                                s3_client,
-                                config,
-                                'features/support/test_site_dirs/my.blog.com/_site')
     end
-  end
 
-  describe 'content type resolving' do
-    let(:config) {
-      { 's3_reduced_redundancy' => false }
-    }
+    describe 'content type resolving' do
+      let(:config) {
+        { 's3_reduced_redundancy' => false }
+      }
+
+      it 'adds the content type of the uploaded CSS file into the S3 object' do
+        file_to_upload = 'css/styles.css'
+        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+          s3_object.should_receive(:write).with(
+            anything(),
+            :content_type => 'text/css',
+            :reduced_redundancy => false
+          )
+        end
+        Jekyll::S3::Uploader.send(:upload_file,
+                                  file_to_upload,
+                                  s3_client,
+                                  config,
+                                  'features/support/test_site_dirs/my.blog.com/_site')
+      end
 
-    it 'adds the content type of the uploaded CSS file into the S3 object' do
-      file_to_upload = 'css/styles.css'
-      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-        s3_object.should_receive(:write).with(
-          anything(),
-          :content_type => 'text/css',
-          :reduced_redundancy => false
-        )
+      it 'adds the content type of the uploaded HTML file into the S3 object' do
+        file_to_upload = 'index.html'
+        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+          s3_object.should_receive(:write).with(
+            anything(),
+            :content_type => 'text/html',
+            :reduced_redundancy => false
+          )
+        end
+        Jekyll::S3::Uploader.send(:upload_file,
+                                  file_to_upload,
+                                  s3_client,
+                                  config,
+                                  'features/support/test_site_dirs/my.blog.com/_site')
       end
-      Jekyll::S3::Uploader.send(:upload_file,
-                                file_to_upload,
-                                s3_client,
-                                config,
-                                'features/support/test_site_dirs/my.blog.com/_site')
     end
 
-    it 'adds the content type of the uploaded HTML file into the S3 object' do
-      file_to_upload = 'index.html'
-      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-        s3_object.should_receive(:write).with(
-          anything(),
-          :content_type => 'text/html',
-          :reduced_redundancy => false
-        )
+    def create_verifying_s3_client(file_to_upload, &block)
+      def create_objects(file_to_upload, &block)
+        def create_html_s3_object(file_to_upload, &block)
+          s3_object = stub('s3_object')
+          yield s3_object
+          s3_object
+        end
+        objects = {}
+        objects[file_to_upload] = create_html_s3_object(file_to_upload, &block)
+        objects
       end
-      Jekyll::S3::Uploader.send(:upload_file,
-                                file_to_upload,
-                                s3_client,
-                                config,
-                                'features/support/test_site_dirs/my.blog.com/_site')
+      def create_bucket(file_to_upload, &block)
+        bucket = stub('bucket')
+        bucket.stub(:objects => create_objects(file_to_upload, &block))
+        bucket
+      end
+      buckets = stub('buckets')
+      buckets.stub(:[] => create_bucket(file_to_upload, &block))
+      s3 = stub('s3')
+      s3.stub(:buckets => buckets)
+      s3
     end
   end
 
-  def create_verifying_s3_client(file_to_upload, &block)
-    def create_objects(file_to_upload, &block)
-      def create_html_s3_object(file_to_upload, &block)
-        s3_object = stub('s3_object')
-        yield s3_object
-        s3_object
+  context '#load_all_local_files' do
+    describe 'dotfile support' do
+      it 'loads also dotfiles' do
+        files = Jekyll::S3::Uploader.send(:load_all_local_files,
+                                        'spec/sample_files/hyde_site/_site')
+        files.should eq(['index.html', '.vimrc'])
       end
-      objects = {}
-      objects[file_to_upload] = create_html_s3_object(file_to_upload, &block)
-      objects
-    end
-    def create_bucket(file_to_upload, &block)
-      bucket = stub('bucket')
-      bucket.stub(:objects => create_objects(file_to_upload, &block))
-      bucket
     end
-    buckets = stub('buckets')
-    buckets.stub(:[] => create_bucket(file_to_upload, &block))
-    s3 = stub('s3')
-    s3.stub(:buckets => buckets)
-    s3
   end
 end

data/spec/sample_files/hyde_site/_site/.vimrc

@@ -0,0 +1,5 @@
+" Disable the arrow keys in the normal mode – using them there only slows you down. Use hkjl instead.
+map <Left> :echo "no!"<cr>
+map <Right> :echo "no!"<cr>
+map <Up> :echo "no!"<cr>
+map <Down> :echo "no!"<cr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simple-cloudfront-invalidator
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +289,7 @@ files:
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/sample_files/hyde_site/_jekyll_s3.yml
+- spec/sample_files/hyde_site/_site/.vimrc
 - spec/sample_files/hyde_site/_site/index.html
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/jekyll-s3
@@ -355,5 +356,6 @@ test_files:
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
 - spec/sample_files/hyde_site/_jekyll_s3.yml
+- spec/sample_files/hyde_site/_site/.vimrc
 - spec/sample_files/hyde_site/_site/index.html
 - spec/spec_helper.rb