Skip to content
Permalink
Browse files

Bump RuboCop to v0.68.x (#7637)

Merge pull request 7637
  • Loading branch information...
ashmaroli authored and jekyllbot committed Apr 30, 2019
1 parent ced4404 commit a5cac267664afae53f8f6e51865b718d50990fd8
Showing with 9 additions and 9 deletions.
  1. +3 −2 .rubocop.yml
  2. +2 −3 Gemfile
  3. +2 −2 lib/jekyll/configuration.rb
  4. +2 −2 test/helper.rb
@@ -1,6 +1,7 @@
---

require:
- rubocop-performance
- ./rubocop/jekyll

Jekyll/NoPutsAllowed:
@@ -23,9 +24,9 @@ Layout/AlignHash:
EnforcedHashRocketStyle: table
Layout/IndentationWidth:
Severity: error
Layout/IndentArray:
Layout/IndentFirstArrayElement:
EnforcedStyle: consistent
Layout/IndentHash:
Layout/IndentFirstHashElement:
EnforcedStyle: consistent
Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented
@@ -26,9 +26,8 @@ group :test do
gem "nokogiri", "~> 1.7"
gem "rspec"
gem "rspec-mocks"
# Temporary lock on RuboCop version for Windows since Pysch-3.1.0 is not available
# for use on Ruby 2.6-mingw32 platforms
gem "rubocop", Gem.win_platform? ? "~> 0.64.0" : "~> 0.66.0"
gem "rubocop", "~> 0.68.0"
gem "rubocop-performance"
gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
@@ -199,10 +199,10 @@ def read_config_files(files)
new_config = read_config_file(config_file)
configuration = Utils.deep_merge_hashes(configuration, new_config)
end
rescue ArgumentError => err
rescue ArgumentError => e
Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
"Using defaults (and options)."
warn err
warn e
end

configuration.backwards_compatibilize.add_default_collections
@@ -196,8 +196,8 @@ def symlink_if_allowed(target, sym_file)
rescue Errno::EACCES
skip "Permission denied for creating a symlink to #{target.inspect} " \
"on this machine".magenta
rescue NotImplementedError => error
skip error.to_s.magenta
rescue NotImplementedError => e
skip e.to_s.magenta
end
end

0 comments on commit a5cac26

Please sign in to comment.
You can’t perform that action at this time.