From f1086fa754467ad8ca510b478081fd210db02cf0 Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Sat, 12 Sep 2020 04:50:33 +0530 Subject: [PATCH 1/3] Drop `git ls-files` in gemspec Closes: #1353 Signed-off-by: Utkarsh Gupta --- shoulda-matchers.gemspec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec index 5dbec5147..0fcb2a082 100644 --- a/shoulda-matchers.gemspec +++ b/shoulda-matchers.gemspec @@ -27,10 +27,7 @@ Gem::Specification.new do |s| 'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers', } - s.files = Dir.chdir(File.expand_path(__dir__)) do - `git ls-files -z -- {docs,lib,README.md,MIT-LICENSE,shoulda-matchers.gemspec}`. - split("\x0") - end + s.files = Dir['{docs,lib}/**/*', 'README.md', 'MIT-LICENSE', 'shoulda-matchers.gemspec'] s.require_paths = ['lib'] s.required_ruby_version = '>= 2.4.0' From d95f5f7f908926fbfbfb9850ffdcdd95e005e25d Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Sat, 12 Sep 2020 04:53:14 +0530 Subject: [PATCH 2/3] Add the Packaging extension of RuboCop More about the extension can be found at: https://docs.rubocop.org/rubocop-packaging/ Signed-off-by: Utkarsh Gupta --- .rubocop.yml | 4 +++- Gemfile | 1 + Gemfile.lock | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 6688b803a..e7b3ddd94 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ -require: rubocop-rails +require: + - rubocop-packaging + - rubocop-rails AllCops: NewCops: disable TargetRubyVersion: 2.4 diff --git a/Gemfile b/Gemfile index 1704bcd26..36d0457c1 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gem 'pry-byebug' gem 'rake', '13.0.1' gem 'rspec', '~> 3.9' gem 'rubocop', require: false +gem 'rubocop-packaging', require: false gem 'rubocop-rails', require: false gem 'warnings_logger' gem 'zeus', require: false diff --git a/Gemfile.lock b/Gemfile.lock index bebd46c45..ef73728a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,8 @@ GEM unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.3.0) parser (>= 2.7.1.4) + rubocop-packaging (0.4.0) + rubocop (~> 0.89) rubocop-rails (2.0.1) rack (>= 1.1) rubocop (>= 0.70.0) @@ -76,6 +78,7 @@ DEPENDENCIES rouge rspec (~> 3.9) rubocop + rubocop-packaging rubocop-rails warnings_logger yard From 0519f877f7b23b6b2321ccc76cb2b9da1c66d419 Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Sat, 12 Sep 2020 04:55:08 +0530 Subject: [PATCH 3/3] Use require over require_relative for cross-lib calls Avoid using `require_relative` with relative path to lib. Use `require` instead. More details about this cop can be found at: https://docs.rubocop.org/rubocop-packaging/cops_packaging.html#packagingrequirerelativehardcodinglib Signed-off-by: Utkarsh Gupta --- tasks/documentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/documentation.rb b/tasks/documentation.rb index c47b51662..3abb38a71 100644 --- a/tasks/documentation.rb +++ b/tasks/documentation.rb @@ -1,4 +1,4 @@ -require_relative '../lib/shoulda/matchers/version' +require 'shoulda/matchers/version' require 'erb' module Shoulda