From 08c58e3c0db8aaa6b573fe6c34a6318a17a83c68 Mon Sep 17 00:00:00 2001 From: David Rodríguez Date: Fri, 16 Aug 2019 08:45:11 +0200 Subject: [bundler/bundler] Extract a `gemspec_dir` helper https://github.com/bundler/bundler/commit/71a29e286a --- spec/bundler/commands/newgem_spec.rb | 3 +-- spec/bundler/support/path.rb | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'spec/bundler') diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb index 2ade1653fc..beb21f9c2b 100644 --- a/spec/bundler/commands/newgem_spec.rb +++ b/spec/bundler/commands/newgem_spec.rb @@ -309,8 +309,7 @@ RSpec.describe "bundle gem" do end it "sets a minimum ruby version" do - gemspec_path = ruby_core? ? "../../../lib/bundler" : "../.." - bundler_gemspec = Bundler::GemHelper.new(File.expand_path(gemspec_path, __dir__)).gemspec + bundler_gemspec = Bundler::GemHelper.new(gemspec_dir).gemspec expect(bundler_gemspec.required_ruby_version).to eq(generated_gemspec.required_ruby_version) end diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb index 73d828cb5d..9493c5422a 100644 --- a/spec/bundler/support/path.rb +++ b/spec/bundler/support/path.rb @@ -13,6 +13,10 @@ module Spec @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec") end + def gemspec_dir + @gemspec_dir ||= gemspec.parent + end + def bindir @bindir ||= root.join(ruby_core? ? "libexec" : "exe") end -- cgit v1.2.3