From 2d098d71f32d75d6684bc63791ff342451336516 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 16 Jul 2018 21:25:55 +0200 Subject: [PATCH] Lint with rubocop-jekyll --- .rubocop.yml | 8 +++----- jekyll-compose.gemspec | 2 +- lib/jekyll-compose/file_creator.rb | 2 +- lib/jekyll-compose/file_mover.rb | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index d25e249..65e92f6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,9 +1,7 @@ +require: rubocop-jekyll + inherit_gem: - jekyll: .rubocop.yml -AllCops: - TargetRubyVersion: 2.3 - Exclude: - - vendor/**/* + rubocop-jekyll: .rubocop.yml Lint/AmbiguousOperator: Exclude: diff --git a/jekyll-compose.gemspec b/jekyll-compose.gemspec index 3bdc43e..512e407 100644 --- a/jekyll-compose.gemspec +++ b/jekyll-compose.gemspec @@ -25,5 +25,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "rubocop", "~> 0.57.2" + spec.add_development_dependency "rubocop-jekyll", "~> 0.1" end diff --git a/lib/jekyll-compose/file_creator.rb b/lib/jekyll-compose/file_creator.rb index d64771a..6e2ed8f 100644 --- a/lib/jekyll-compose/file_creator.rb +++ b/lib/jekyll-compose/file_creator.rb @@ -18,7 +18,7 @@ def create! def file_path return file.path if root.nil? || root.empty? - return File.join(root, file.path) + File.join(root, file.path) end private diff --git a/lib/jekyll-compose/file_mover.rb b/lib/jekyll-compose/file_mover.rb index 2c26414..ea16b7a 100644 --- a/lib/jekyll-compose/file_mover.rb +++ b/lib/jekyll-compose/file_mover.rb @@ -55,7 +55,7 @@ def to def file_path(path) return path if root.nil? || root.empty? - return File.join(root, path) + File.join(root, path) end end end