From 3ab98412725b5f70d5f1811e9d532eff65f70fed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 28 Oct 2013 14:03:34 -0400 Subject: [PATCH 1/3] Fix 1.8.7 syntax errors. --- lib/jekyll/commands/build.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index 56fe90e6..5948dd89 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -37,9 +37,8 @@ module Jekyll destination = options['destination'] begin - ignored = Regexp.new(Regexp.escape(Pathname.new(destination) - .relative_path_from(Pathname.new(source)) - .to_path)) + dest = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_path + ignored = Regexp.new(Regexp.escape(dest)) rescue ArgumentError # Destination is outside the source, no need to ignore it. ignored = nil @@ -47,7 +46,7 @@ module Jekyll Jekyll.logger.info "Auto-regeneration:", "enabled" - listener = Listen.to(source, ignore: ignored) do |modified, added, removed| + listener = Listen.to(source, :ignore => ignored) do |modified, added, removed| t = Time.now.strftime("%Y-%m-%d %H:%M:%S") n = modified.length + added.length + removed.length print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} " From a0a9c5f6764f70a6bd6bcd08d0718c614730a7ae Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 28 Oct 2013 14:04:37 -0400 Subject: [PATCH 2/3] Allow any versions of listen < 2.0 and >= 1.3 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index b4d3483f..5754e2e7 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('liquid', "~> 2.5.2") s.add_runtime_dependency('classifier', "~> 1.3") - s.add_runtime_dependency('listen', "~> 1.3.0") + s.add_runtime_dependency('listen', "~> 1.3") s.add_runtime_dependency('maruku', "~> 0.6.0") s.add_runtime_dependency('pygments.rb', "~> 0.5.0") s.add_runtime_dependency('commander', "~> 4.1.3") From 0c2d7c0864ae846caf4ee1cfb559158270b9253c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 28 Oct 2013 14:16:06 -0400 Subject: [PATCH 3/3] Restrict mime-types gem to pre-2.0. A coveralls dep has a '>=' dependency on mime-types. --- jekyll.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/jekyll.gemspec b/jekyll.gemspec index 5754e2e7..53882996 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -46,6 +46,7 @@ Gem::Specification.new do |s| s.add_development_dependency('simplecov', "~> 0.7") s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1") s.add_development_dependency('coveralls', "~> 0.7.0") + s.add_development_dependency('mime-types', "~> 1.5") s.add_development_dependency('activesupport', '~> 3.2.13') s.add_development_dependency('jekyll_test_plugin')