jekyll-s3 2.4.2 → 2.4.3

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
 - 1.8.7
 - 1.9.2
 - 1.9.3
+- 2.0.0

data/README.md

@@ -125,6 +125,16 @@ bucket that are not on your local computer.
 Enable the headless mode by adding the `--headless` or `-h` argument after
 `jekyll-s3`.
 
+## Using `jekyll-s3` as a library
+
+By nature, `jekyll-s3` is a command-line interface tool. You can, however, use
+it programmatically by calling the same API as the executable `jekyll-s3` does:
+
+````ruby
+is_headless = true
+Jekyll::S3::CLI.new.run('/path/to/your/jekyll-site/_site/', is_headless)
+````
+
 ## Known issues
 
 None. Please send a pull request if you spot any.

data/changelog.md

@@ -2,6 +2,15 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.4.3
+
+* Make `s3_endpoint` optional in `_jekyll_s3.yml` when using `jekyll-s3` as a
+  library
+* Load dotfiles also with Ruby 2.0.0
+
+  The `Dir.glob` implementation changed a bit in Ruby 2, and this resulted in
+  `jekyll-s3` not uploading files that start with a dot.
+
 ## 2.4.2
 
 * Fix problem where gzipped files were always re-uploaded

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.4.2"
+  s.version     = "2.4.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/jekyll-s3/config_loader.rb

@@ -24,7 +24,6 @@ s3_bucket: your.blog.bucket.com
       # Raise MalformedConfigurationFileError if the configuration file does not contain the keys we expect
       def self.load_configuration(site_dir)
         config = load_yaml_file_and_validate site_dir
-        config['s3_endpoint'] = config['s3_endpoint'] || 'us-east-1'
         return config
       end
 

data/lib/jekyll-s3/endpoint.rb

@@ -1,9 +1,11 @@
 module Jekyll
   module S3
     class Endpoint
+      DEFAULT_LOCATION_CONSTRAINT = 'us-east-1'
       attr_reader :region, :location_constraint, :hostname, :website_hostname
 
-      def initialize(location_constraint)
+      def initialize(location_constraint=nil)
+        location_constraint = DEFAULT_LOCATION_CONSTRAINT if location_constraint.nil?
         raise "Invalid S3 location constraint #{location_constraint}" unless
           location_constraints.has_key?location_constraint
         @region = location_constraints.fetch(location_constraint)[:region]

data/lib/jekyll-s3/uploader.rb

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

data/spec/lib/config_loader_spec.rb

@@ -8,9 +8,9 @@ describe Jekyll::S3::ConfigLoader do
     config['s3_bucket'].should eq('galaxy')
   end
 
-  it 'uses the "us-east-1" as the default endpoint' do
+  it 'does not define default endpoint' do
     config = Jekyll::S3::ConfigLoader.load_configuration('spec/sample_files/hyde_site/_site')
-    config['s3_endpoint'].should eq('us-east-1')
+    config['s3_endpoint'].should be_nil
   end
 
   it 'reads the S3 endpoint setting from _jekyll_s3.yml' do

data/spec/lib/endpoint_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'pp'
+
+describe Jekyll::S3::Endpoint do
+
+  it 'uses the "us-east-1" as the default location' do
+    endpoint = Jekyll::S3::Endpoint.new
+    endpoint.location_constraint.should eq(Jekyll::S3::Endpoint::DEFAULT_LOCATION_CONSTRAINT)
+  end
+
+  it 'takes a valid location constraint as a constructor parameter' do
+    endpoint = Jekyll::S3::Endpoint.new('EU')
+    endpoint.location_constraint.should eq('EU')
+  end
+
+  it 'fails if the location constraint is invalid' do
+    expect {
+      Jekyll::S3::Endpoint.new('andromeda')
+    }.to raise_error
+  end
+end

data/spec/lib/keyboard_spec.rb

@@ -41,12 +41,6 @@ describe Jekyll::S3::Keyboard do
       deleted_keys.should eq([])
     end
 
-    it 'can keep all s3 objects' do
-      standard_input.stub(:gets).and_return("k", "k", "k")
-      deleted_keys = call_keyboard(s3_object_keys, standard_input)
-      deleted_keys.should eq([])
-    end
-
     it 'can keep all s3 objects' do
       standard_input.stub(:gets).and_return("K")
       deleted_keys = call_keyboard(s3_object_keys, standard_input)

data/spec/lib/uploader_spec.rb

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
 describe Jekyll::S3::Uploader do
-  context '#upload_file' do
-  end
-
   context '#load_all_local_files' do
     let(:files) {
       Jekyll::S3::Uploader.send(:load_all_local_files,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -305,6 +305,7 @@ files:
 - 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/retry_spec.rb
 - spec/lib/upload_spec.rb
@@ -396,6 +397,7 @@ test_files:
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
 - spec/lib/config_loader_spec.rb
+- spec/lib/endpoint_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb