Skip to content

Commit b970c5a

Browse files
committed
Rake without bundle exec
Also RuboCop changes
1 parent 1b637a2 commit b970c5a

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

.rubocop.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ AllCops:
66
DisplayCopNames: true
77
DisplayStyleGuide: true
88
TargetRubyVersion: 3.2
9-
TargetRailsVersion: 7.1
9+
TargetRailsVersion: 7.2
1010
NewCops: enable
1111
Exclude:
1212
- bin/*
@@ -25,7 +25,6 @@ AllCops:
2525
- gemfiles/vendor/bundle/**/*
2626
- vendor/bundle/**/*
2727
- Guardfile
28-
- Rakefile
2928
- vendor/**/*
3029

3130
Layout/LineLength:
@@ -73,6 +72,10 @@ Rails/ApplicationRecord:
7372
Exclude:
7473
- "demo/db/migrate/**"
7574

75+
Rails/RakeEnvironment:
76+
Exclude:
77+
- "Rakefile"
78+
7679
Rails/RefuteMethods:
7780
Enabled: false
7881

Rakefile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
11
begin
2-
require 'bundler/setup'
3-
4-
require 'bundler/gem_tasks'
2+
require "bundler/setup"
3+
require "bundler/gem_tasks"
54
require "minitest/test_task"
6-
require 'rdoc/task'
7-
require 'rubocop/rake_task'
5+
require "rdoc/task"
6+
require "rubocop/rake_task"
87
rescue LoadError
9-
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
8+
puts "You must run `bundle install` to run rake tasks"
109
end
1110

1211
RDoc::Task.new(:rdoc) do |rdoc|
13-
rdoc.rdoc_dir = 'rdoc'
14-
rdoc.title = 'BootstrapForm'
15-
rdoc.options << '--line-numbers'
16-
rdoc.rdoc_files.include('README.md')
17-
rdoc.rdoc_files.include('lib/**/*.rb')
12+
rdoc.rdoc_dir = "rdoc"
13+
rdoc.title = "BootstrapForm"
14+
rdoc.options << "--line-numbers"
15+
rdoc.rdoc_files.include("README.md")
16+
rdoc.rdoc_files.include("lib/**/*.rb")
1817
end
1918

2019
Minitest::TestTask.create(:test) do |t|
21-
t.libs << "test"
22-
t.libs << "lib"
2320
t.warning = false
2421
t.test_globs = ["test/**/*_test.rb"]
2522
end
2623

27-
desc 'Run RuboCop checks'
24+
desc "Run RuboCop checks"
2825
RuboCop::RakeTask.new(:rubocop)
2926

3027
task default: %i[test rubocop:autocorrect]
3128

3229
namespace :test do
3330
desc "Run tests for all supported Rails versions, with current Ruby version"
3431
task :all do
35-
original_gemfile = ENV["BUNDLE_GEMFILE"]
32+
original_gemfile = ENV.fetch("BUNDLE_GEMFILE", nil)
3633
gemfiles = Dir.glob("gemfiles/*.gemfile").reject { |f| File.basename(f) == "common.gemfile" }
3734
gemfiles.each do |f|
3835
ENV["BUNDLE_GEMFILE"] = f
@@ -45,7 +42,6 @@ namespace :test do
4542
ENV.delete("BUNDLE_GEMFILE")
4643
system("bundle check") || system("bundle install")
4744
system("bundle exec rake test:all")
48-
4945
ensure
5046
original_gemfile.nil? ? ENV.delete("BUNDLE_GEMFILE") : ENV["BUNDLE_GEMFILE"] = original_gemfile
5147
Dir.chdir(original_directory) unless original_directory.nil?

0 commit comments

Comments
 (0)