diff --git a/.rubocop.yml b/.rubocop.yml index a078dd3..d01139e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,14 +1,14 @@ +require: rubocop-jekyll + inherit_gem: - jekyll: .rubocop.yml + rubocop-jekyll: .rubocop.yml AllCops: - TargetRubyVersion: 2.3 - Include: - - report - - github/jwt + TargetRubyVersion: 2.5 Exclude: - sites/**/* - vendor/**/* + - Gemfile Jekyll/NoPutsAllowed: Enabled: false diff --git a/.travis.yml b/.travis.yml index db9b125..6a6f231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: ruby -rvm: 2.4 +rvm: 2.5 cache: bundler branches: @@ -16,6 +16,6 @@ before_script: matrix: include: - name: Rubocop - script: bundle exec rubocop -D + script: bundle exec rubocop -S -D -E - name: bench script: ./bench diff --git a/Gemfile b/Gemfile index 0bacf43..45057a7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source "https://rubygems.org" repo = ENV.fetch("REPO", "https://github.com/jekyll/jekyll.git") @@ -5,7 +7,7 @@ repo = ENV.fetch("REPO", "https://github.com/jekyll/jekyll.git") if ENV["REF"] gem "jekyll", git: repo, ref: ENV["REF"] elsif ENV["PR"] - gem "jekyll", git: repo, ref: "refs/pull/#{ENV['PR']}/head" + gem "jekyll", git: repo, ref: "refs/pull/#{ENV["PR"]}/head" else gem "jekyll", git: repo, branch: "master" end @@ -63,5 +65,5 @@ gem "redcarpet" gem "uswds-jekyll" group :dev do - gem "rubocop", "~> 0.66.0" + gem "rubocop-jekyll", "~> 0.11" end