From 65d43ef398b81127c692995664170e561bca8da7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 17 Jan 2015 16:43:07 -0800 Subject: [PATCH] Move previous runtime dependencies to development dependencies. --- Gemfile | 9 ++++++++- jekyll.gemspec | 9 --------- lib/jekyll.rb | 9 +-------- lib/jekyll/configuration.rb | 1 + lib/jekyll/related_posts.rb | 2 +- lib/jekyll/tags/highlight.rb | 4 ++-- site/_docs/configuration.md | 2 +- test/test_coffeescript.rb | 1 + test/test_configuration.rb | 2 ++ 9 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Gemfile b/Gemfile index 88d5e641..c7edecf7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,14 @@ source 'https://rubygems.org' gemspec +gem 'pygments.rb', '~> 0.6.0' +gem 'redcarpet', '~> 3.1' +gem 'toml', '~> 0.1.0' +gem 'jekyll-paginate', '~> 1.0' +gem 'jekyll-gist', '~> 1.0' +gem 'jekyll-coffeescript', '~> 1.0' +gem 'classifier-reborn', '~> 2.0' + gem 'rake', '~> 10.1' gem 'rdoc', '~> 3.11' gem 'redgreen', '~> 1.2' @@ -16,7 +24,6 @@ gem 'mime-types', '~> 1.5' gem 'activesupport', '~> 3.2.13' gem 'jekyll_test_plugin' gem 'jekyll_test_plugin_malicious' -gem 'rouge', '~> 1.7' gem 'liquid-c', '~> 0.0.3' gem 'minitest' if RUBY_PLATFORM =~ /cygwin/ gem 'test-unit' if RUBY_PLATFORM =~ /cygwin/ || RUBY_VERSION.start_with?("2.2") diff --git a/jekyll.gemspec b/jekyll.gemspec index e24f7a91..470781c7 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -33,16 +33,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('mercenary', '~> 0.3.3') s.add_runtime_dependency('safe_yaml', '~> 1.0') s.add_runtime_dependency('colorator', '~> 0.1') - - # Before 3.0 drops, phase the following gems out as dev dependencies - # and gracefully handle their absence. - s.add_runtime_dependency('redcarpet', '~> 3.1') - s.add_runtime_dependency('toml', '~> 0.1.0') - s.add_runtime_dependency('jekyll-paginate', '~> 1.0') - s.add_runtime_dependency('jekyll-gist', '~> 1.0') - s.add_runtime_dependency('jekyll-coffeescript', '~> 1.0') s.add_runtime_dependency('rouge', '~> 1.7') s.add_runtime_dependency('jekyll-sass-converter', '~> 1.0') s.add_runtime_dependency('jekyll-watch', '~> 1.1') - s.add_runtime_dependency('classifier-reborn', '~> 2.0') end diff --git a/lib/jekyll.rb b/lib/jekyll.rb index dd464503..02aa40b1 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -169,11 +169,4 @@ require_all 'jekyll/converters/markdown' require_all 'jekyll/generators' require_all 'jekyll/tags' -# Eventually remove these for 3.0 as non-core -Jekyll::External.require_with_graceful_fail(%w[ - toml - jekyll-paginate - jekyll-gist - jekyll-coffeescript - jekyll-sass-converter -]) +require 'jekyll-sass-converter' diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index b53f123a..77cc90a7 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -115,6 +115,7 @@ module Jekyll def safe_load_file(filename) case File.extname(filename) when /\.toml/i + Jekyll::External.require_with_graceful_fail('toml') unless defined?(TOML) TOML.load_file(filename) when /\.ya?ml/i SafeYAML.load_file(filename) diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb index 041ee551..b6899ec3 100644 --- a/lib/jekyll/related_posts.rb +++ b/lib/jekyll/related_posts.rb @@ -10,7 +10,7 @@ module Jekyll def initialize(post) @post = post @site = post.site - require 'classifier-reborn' if site.lsi + Jekyll::External.require_with_graceful_fail('classifier-reborn') if site.lsi end def build diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb index 480c956c..adf6bcd7 100644 --- a/lib/jekyll/tags/highlight.rb +++ b/lib/jekyll/tags/highlight.rb @@ -75,7 +75,7 @@ eos end def render_pygments(code, is_safe) - Jekyll::External.require_with_graceful_fail 'pygments' + Jekyll::External.require_with_graceful_fail('pygments') @options[:encoding] = 'utf-8' @@ -100,7 +100,7 @@ eos end def render_rouge(code) - Jekyll::External.require_with_graceful_fail 'rouge' + Jekyll::External.require_with_graceful_fail('rouge') formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false) lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText code = formatter.format(lexer.lex(code)) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index 6d59119d..d09c5ab7 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -490,7 +490,7 @@ gems: [] # Conversion markdown: kramdown -highlighter: pygments +highlighter: rouge lsi: false excerpt_separator: "\n\n" diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb index 2c589f81..49b838a1 100644 --- a/test/test_coffeescript.rb +++ b/test/test_coffeescript.rb @@ -3,6 +3,7 @@ require 'helper' class TestCoffeeScript < Test::Unit::TestCase context "converting CoffeeScript" do setup do + External.require_with_graceful_fail('jekyll-coffeescript') @site = fixture_site @site.process @test_coffeescript_file = dest_dir("js/coffeescript.js") diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 77247def..fffbc2db 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -181,6 +181,8 @@ class TestConfiguration < Test::Unit::TestCase end should "load multiple config files" do + External.require_with_graceful_fail('toml') + mock(SafeYAML).load_file(@paths[:default]) { Hash.new } mock(SafeYAML).load_file(@paths[:other]) { Hash.new } mock(TOML).load_file(@paths[:toml]) { Hash.new }