jekyll-s3 3.1.1 → 3.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. data/.gitignore +0 -1
  2. data/Gemfile.lock +79 -0
  3. data/Rakefile +2 -0
  4. data/changelog.md +4 -0
  5. data/features/cassettes/cucumber_tags/new-files.yml +218 -74
  6. data/features/cassettes/cucumber_tags/no-new-or-changed-files.yml +107 -103
  7. data/features/cassettes/cucumber_tags/only-changed-files.yml +131 -117
  8. data/features/support/test_site_dirs/only-changed-files.com/_site/index.html +1 -0
  9. data/jekyll-s3.gemspec +2 -2
  10. data/lib/jekyll-s3/uploader.rb +16 -7
  11. metadata +14 -7
data/features/support/test_site_dirs/only-changed-files.com/_site/index.html CHANGED
@@ -4,5 +4,6 @@
4
4
  </head>
5
5
  <body>
6
6
  i got some new content for you, arnie
7
+ z
7
8
  </body>
8
9
  </html>
data/jekyll-s3.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "jekyll-s3"
6
- s.version = "3.1.1"
6
+ s.version = "3.1.2"
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Philippe Creux", "Lauri Lehmijoki"]
9
9
  s.email = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]
@@ -27,7 +27,7 @@ distribution, making it easy to deliver your blog via the CDN.}
27
27
  s.add_development_dependency 'cucumber'
28
28
  s.add_development_dependency 'aruba', '~> 0.5.1'
29
29
  s.add_development_dependency 'rake'
30
- s.add_development_dependency 'vcr'
30
+ s.add_development_dependency 'vcr', '~> 2.5.0'
31
31
  s.add_development_dependency 'webmock', '~> 1.8.0'
32
32
 
33
33
  s.files = `git ls-files`.split("\n")
data/lib/jekyll-s3/uploader.rb CHANGED
@@ -54,18 +54,27 @@ module Jekyll
54
54
  pre_upload_report << "#{changed_files.length} changed" if changed_files.length > 0
55
55
  pre_upload_report << "file(s)"
56
56
  puts pre_upload_report.join(' ')
57
- upload_in_parallel to_upload, s3, config, site_dir
57
+ upload_in_parallel_or_sequentially to_upload, s3, config, site_dir
58
58
  end
59
59
  [new_files.length, changed_files.length, changed_files]
60
60
  end
61
61
 
62
- def self.upload_in_parallel(files_to_upload, s3, config, site_dir)
63
- threads = files_to_upload.map do |f|
64
- Thread.new(f) { |f|
65
- upload_file(f, s3, config, site_dir)
66
- }
62
+ def self.upload_in_parallel_or_sequentially(files_to_upload, s3, config, site_dir)
63
+ do_upload_file = lambda { |f|
64
+ upload_file(f, s3, config, site_dir)
65
+ }
66
+ if ENV['disable_parallel_processing']
67
+ files_to_upload.each do |f|
68
+ do_upload_file.call f
69
+ end
70
+ else
71
+ threads = files_to_upload.map do |f|
72
+ Thread.new(f) { |f|
73
+ do_upload_file.call f
74
+ }
75
+ end
76
+ threads.each { |thread| thread.join }
67
77
  end
68
- threads.each { |thread| thread.join }
69
78
  end
70
79
 
71
80
  def self.upload_file(file, s3, config, site_dir)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-s3
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.1
4
+ version: 3.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-06-17 00:00:00.000000000 Z
13
+ date: 2013-06-22 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: aws-sdk
@@ -193,17 +193,17 @@ dependencies:
193
193
  requirement: !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
- - - ! '>='
196
+ - - ~>
197
197
  - !ruby/object:Gem::Version
198
- version: '0'
198
+ version: 2.5.0
199
199
  type: :development
200
200
  prerelease: false
201
201
  version_requirements: !ruby/object:Gem::Requirement
202
202
  none: false
203
203
  requirements:
204
- - - ! '>='
204
+ - - ~>
205
205
  - !ruby/object:Gem::Version
206
- version: '0'
206
+ version: 2.5.0
207
207
  - !ruby/object:Gem::Dependency
208
208
  name: webmock
209
209
  requirement: !ruby/object:Gem::Requirement
@@ -236,6 +236,7 @@ files:
236
236
  - .gitignore
237
237
  - .travis.yml
238
238
  - Gemfile
239
+ - Gemfile.lock
239
240
  - README.md
240
241
  - Rakefile
241
242
  - bin/jekyll-s3
@@ -340,15 +341,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
340
341
  - - ! '>='
341
342
  - !ruby/object:Gem::Version
342
343
  version: '0'
344
+ segments:
345
+ - 0
346
+ hash: -3787363599528242274
343
347
  required_rubygems_version: !ruby/object:Gem::Requirement
344
348
  none: false
345
349
  requirements:
346
350
  - - ! '>='
347
351
  - !ruby/object:Gem::Version
348
352
  version: '0'
353
+ segments:
354
+ - 0
355
+ hash: -3787363599528242274
349
356
  requirements: []
350
357
  rubyforge_project:
351
- rubygems_version: 1.8.24
358
+ rubygems_version: 1.8.25
352
359
  signing_key:
353
360
  specification_version: 3
354
361
  summary: Push your Jekyll blog to S3