[前][次][番号順一覧][スレッド一覧]

ruby-changes:61224

From: Hiroshi <ko1@a...>
Date: Wed, 13 May 2020 07:55:13 +0900 (JST)
Subject: [ruby-changes:61224] fcb5a9ee46 (master): Resolved the file path of gemspec for ruby core repository

https://git.ruby-lang.org/ruby.git/commit/?id=fcb5a9ee46

From fcb5a9ee46e75cef38ee79c7307dadfae7a8b865 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 11 May 2020 17:26:43 +0900
Subject: Resolved the file path of gemspec for ruby core repository


diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 7ef32a5..660a681 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -330,7 +330,7 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/helpers.rb#L330
 
         replace_version_file(version, dir: build_path) # rubocop:disable Style/HashSyntax
 
-        gem_command! "build bundler.gemspec", :dir => build_path
+        gem_command! "build #{shipped_gemspec}", :dir => build_path
 
         yield(bundler_path)
       ensure
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index b851fa3..c64f555 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -37,6 +37,10 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/path.rb#L37
       @tracked_files ||= sys_exec(ruby_core? ? "git ls-files -z -- lib/bundler lib/bundler.rb spec/bundler man/bundler*" : "git ls-files -z", :dir => root).split("\x0")
     end
 
+    def shipped_gemspec
+      @shipped_gemspec ||= ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec"
+    end
+
     def shipped_files
       @shipped_files ||= sys_exec(ruby_core? ? "git ls-files -z -- lib/bundler lib/bundler.rb man/bundler* libexec/bundle*" : "git ls-files -z -- lib man exe CHANGELOG.md LICENSE.md README.md bundler.gemspec", :dir => root).split("\x0")
     end
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]