From 773203ec5ad595a25b4107b1c6cf8de1e921ec9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 19 Mar 2019 17:08:17 +0100 Subject: Reuse `execute_bundle_gem` method --- spec/commands/newgem_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index e6d6794462..a317f13a2e 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -727,8 +727,7 @@ RSpec.describe "bundle gem" do describe "uncommon gem names" do it "can deal with two dashes" do - bundle "gem a--a" - Bundler.clear_gemspec_cache + execute_bundle_gem("a--a") expect(bundled_app("a--a/a--a.gemspec")).to exist end -- cgit v1.2.1 From 3df138318f19b6607d829d8918594d0f0d9d2cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 26 Jun 2019 16:35:37 +0200 Subject: Fix local variable name --- spec/commands/newgem_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index a317f13a2e..fd28a417ab 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -411,8 +411,8 @@ RSpec.describe "bundle gem" do end it "depends on a specific version of minitest" do - rspec_dep = generated_gemspec.development_dependencies.find {|d| d.name == "minitest" } - expect(rspec_dep).to be_specific + minitest_dep = generated_gemspec.development_dependencies.find {|d| d.name == "minitest" } + expect(minitest_dep).to be_specific end it "builds spec skeleton" do -- cgit v1.2.1 From 02177d0e109e73b492f84614525008060af52e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 26 Jun 2019 16:35:49 +0200 Subject: Generate new gem development dependencies in Gemfile --- lib/bundler/templates/newgem/Gemfile.tt | 8 ++++++++ lib/bundler/templates/newgem/newgem.gemspec.tt | 7 ------- spec/commands/newgem_spec.rb | 24 +++++++++++++++++------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/bundler/templates/newgem/Gemfile.tt b/lib/bundler/templates/newgem/Gemfile.tt index 4cd2e40f4f..83878ec7f8 100644 --- a/lib/bundler/templates/newgem/Gemfile.tt +++ b/lib/bundler/templates/newgem/Gemfile.tt @@ -2,3 +2,11 @@ source "https://rubygems.org" # Specify your gem's dependencies in <%= config[:name] %>.gemspec gemspec + +gem "rake", "~> 12.0" +<%- if config[:ext] -%> +gem "rake-compiler" +<%- end -%> +<%- if config[:test] -%> +gem "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>" +<%- end -%> diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index 7feae6b18c..0aa2a61784 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -33,11 +33,4 @@ Gem::Specification.new do |spec| <%- end -%> spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>" - spec.add_development_dependency "rake", "~> 12.0" -<%- if config[:ext] -%> - spec.add_development_dependency "rake-compiler" -<%- end -%> -<%- if config[:test] -%> - spec.add_development_dependency "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>" -<%- end -%> end diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index fd28a417ab..94f4d82e98 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -363,9 +363,14 @@ RSpec.describe "bundle gem" do expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist end - it "depends on a specific version of rspec" do - rspec_dep = generated_gemspec.development_dependencies.find {|d| d.name == "rspec" } - expect(rspec_dep).to be_specific + it "depends on a specific version of rspec in generated Gemfile" do + Dir.chdir(bundled_app("test_gem")) do + builder = Bundler::Dsl.new + builder.eval_gemfile(bundled_app("test_gem/Gemfile")) + builder.dependencies + rspec_dep = builder.dependencies.find {|d| d.name == "rspec" } + expect(rspec_dep).to be_specific + end end it "requires 'test-gem'" do @@ -411,8 +416,13 @@ RSpec.describe "bundle gem" do end it "depends on a specific version of minitest" do - minitest_dep = generated_gemspec.development_dependencies.find {|d| d.name == "minitest" } - expect(minitest_dep).to be_specific + Dir.chdir(bundled_app("test_gem")) do + builder = Bundler::Dsl.new + builder.eval_gemfile(bundled_app("test_gem/Gemfile")) + builder.dependencies + minitest_dep = builder.dependencies.find {|d| d.name == "minitest" } + expect(minitest_dep).to be_specific + end end it "builds spec skeleton" do @@ -703,7 +713,7 @@ RSpec.describe "bundle gem" do end it "includes rake-compiler" do - expect(bundled_app("test_gem/test_gem.gemspec").read).to include('spec.add_development_dependency "rake-compiler"') + expect(bundled_app("test_gem/Gemfile").read).to include('gem "rake-compiler"') end it "depends on compile task for build" do @@ -808,7 +818,7 @@ Usage: "bundle gem NAME [OPTIONS]" RAKEFILE expect(bundled_app("foobar/Rakefile").read).to eq(rakefile) - expect(bundled_app("foobar/foobar.gemspec").read).to include('spec.add_development_dependency "rspec"') + expect(bundled_app("foobar/Gemfile").read).to include('gem "rspec"') end it "asks about MIT license" do -- cgit v1.2.1 From f8584fb864fc2e7e2527d5ba2c50907a38328c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 26 Jun 2019 16:37:19 +0200 Subject: Not sure how much this buys us, remove it --- lib/bundler/templates/newgem/newgem.gemspec.tt | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index 0aa2a61784..9bb3d0ff50 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -31,6 +31,4 @@ Gem::Specification.new do |spec| <%- if config[:ext] -%> spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"] <%- end -%> - - spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>" end -- cgit v1.2.1