From d9c888d394575cd612c3af7f7bb82d0d01511428 Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Tue, 16 Jun 2020 19:07:21 +0530 Subject: [PATCH] [rubygems/rubygems] Only add .rubocop.yml when --rubocop flag is passed Signed-off-by: Utkarsh Gupta https://github.com/rubygems/rubygems/commit/ef2dae4222 --- lib/bundler/cli/gem.rb | 1 + spec/bundler/commands/newgem_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index 5b0f5b3564fd64..5b4e436d99b732 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -148,6 +148,7 @@ def run "and the Ruby Style Guides (https://github.com/rubocop-hq/ruby-style-guide).") config[:rubocop] = true Bundler.ui.info "RuboCop enabled in config" + templates.merge!("rubocop.yml.tt" => ".rubocop.yml") end templates.merge!("exe/newgem.tt" => "exe/#{name}") if config[:exe] diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb index 3bbd8fab75f3c1..d0add6dfde81d2 100644 --- a/spec/bundler/commands/newgem_spec.rb +++ b/spec/bundler/commands/newgem_spec.rb @@ -169,6 +169,10 @@ def gem_skeleton_assertions rubocop_dep = builder.dependencies.find {|d| d.name == "rubocop" } expect(rubocop_dep).not_to be_nil end + + it "generates a default .rubocop.yml" do + expect(bundled_app("#{gem_name}/.rubocop.yml")).to exist + end end shared_examples_for "--no-rubocop flag" do @@ -192,6 +196,10 @@ def gem_skeleton_assertions rubocop_dep = builder.dependencies.find {|d| d.name == "rubocop" } expect(rubocop_dep).to be_nil end + + it "doesn't generate a default .rubocop.yml" do + expect(bundled_app("#{gem_name}/.rubocop.yml")).to_not exist + end end shared_examples_for "CI config is absent" do