diff --git a/.rubocop.yml b/.rubocop.yml index 0fdff616..51f96642 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,7 +21,6 @@ AllCops: - lib/jekyll/layout.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - - lib/jekyll/plugin_manager.rb - lib/jekyll/reader.rb - lib/jekyll/readers/layout_reader.rb - lib/jekyll/readers/page_reader.rb diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb index 45eeaa79..ff8def48 100644 --- a/lib/jekyll/plugin_manager.rb +++ b/lib/jekyll/plugin_manager.rb @@ -24,7 +24,9 @@ module Jekyll # # Returns nothing. def require_gems - Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) }) + Jekyll::External.require_with_graceful_fail( + site.gems.select { |gem| plugin_allowed?(gem) } + ) end def self.require_from_bundler @@ -33,7 +35,8 @@ module Jekyll Bundler.setup required_gems = Bundler.require(:jekyll_plugins) - Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}") + message = "Required #{required_gems.map(&:name).join(", ")}" + Jekyll.logger.debug("PluginManager:", message) ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true" true @@ -57,7 +60,7 @@ module Jekyll # Returns an array of strings, each string being the name of a gem name # that is allowed to be used. def whitelist - @whitelist ||= Array[site.config['whitelist']].flatten + @whitelist ||= Array[site.config["whitelist"]].flatten end # Require all .rb files if safe mode is off @@ -76,16 +79,17 @@ module Jekyll # # Returns an Array of plugin search paths def plugins_path - if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'] - [site.in_source_dir(site.config['plugins_dir'])] + if site.config["plugins_dir"] == Jekyll::Configuration::DEFAULTS["plugins_dir"] + [site.in_source_dir(site.config["plugins_dir"])] else - Array(site.config['plugins_dir']).map { |d| File.expand_path(d) } + Array(site.config["plugins_dir"]).map { |d| File.expand_path(d) } end end def deprecation_checks - pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate) - if site.config['paginate'] && !pagination_included + pagination_included = (site.config["gems"] || []).include?("jekyll-paginate") || + defined?(Jekyll::Paginate) + if site.config["paginate"] && !pagination_included Jekyll::Deprecator.deprecation_message "You appear to have pagination " \ "turned on, but you haven't included the `jekyll-paginate` gem. " \ "Ensure you have `gems: [jekyll-paginate]` in your configuration file."