Skip to content

Commit ef2dae4

Browse files
committed
Only add .rubocop.yml when --rubocop flag is passed
Signed-off-by: Utkarsh Gupta <utkarsh@debian.org>
1 parent 2f48245 commit ef2dae4

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

bundler/lib/bundler/cli/gem.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ def run
7979
]
8080

8181
templates.merge!("gitignore.tt" => ".gitignore") if Bundler.git_present?
82-
templates.merge!("rubocop.yml.tt" => ".rubocop.yml")
8382

8483
if test_framework = ask_and_set_test_framework
8584
config[:test] = test_framework
@@ -149,6 +148,7 @@ def run
149148
"and the Ruby Style Guides (https://github.com/rubocop-hq/ruby-style-guide).")
150149
config[:rubocop] = true
151150
Bundler.ui.info "RuboCop enabled in config"
151+
templates.merge!("rubocop.yml.tt" => ".rubocop.yml")
152152
end
153153

154154
templates.merge!("exe/newgem.tt" => "exe/#{name}") if config[:exe]

bundler/spec/commands/newgem_spec.rb

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ def gem_skeleton_assertions
169169
rubocop_dep = builder.dependencies.find {|d| d.name == "rubocop" }
170170
expect(rubocop_dep).not_to be_nil
171171
end
172+
173+
it "generates a default .rubocop.yml" do
174+
expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
175+
end
172176
end
173177

174178
shared_examples_for "--no-rubocop flag" do
@@ -192,6 +196,10 @@ def gem_skeleton_assertions
192196
rubocop_dep = builder.dependencies.find {|d| d.name == "rubocop" }
193197
expect(rubocop_dep).to be_nil
194198
end
199+
200+
it "doesn't generate a default .rubocop.yml" do
201+
expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist
202+
end
195203
end
196204

197205
shared_examples_for "CI config is absent" do
@@ -318,7 +326,6 @@ def create_temporary_dir(dir)
318326
expect(bundled_app("#{gem_name}/lib/#{require_path}.rb")).to exist
319327
expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb")).to exist
320328
expect(bundled_app("#{gem_name}/.gitignore")).to exist
321-
expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
322329

323330
expect(bundled_app("#{gem_name}/bin/setup")).to exist
324331
expect(bundled_app("#{gem_name}/bin/console")).to exist
@@ -377,12 +384,6 @@ def create_temporary_dir(dir)
377384
expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(/class Error < StandardError; end$/)
378385
end
379386

380-
it "creates a default .rubocop.yml" do
381-
bundle "gem #{gem_name}"
382-
383-
expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist
384-
end
385-
386387
it "runs rake without problems" do
387388
bundle "gem #{gem_name}"
388389

0 commit comments

Comments
 (0)