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

ruby-changes:58706

From: Nobuyoshi <ko1@a...>
Date: Mon, 11 Nov 2019 12:22:16 +0900 (JST)
Subject: [ruby-changes:58706] 390293525a (master): Remove binary data at installation

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

From 390293525a8c8564c62f7691414194705a193b40 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 11 Nov 2019 12:19:40 +0900
Subject: Remove binary data at installation

And revert "Relaxed warning assertions",
6f9be8505d172b110ec449478a791d70b9b74afb.

diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 8972b6c..1590c04 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -509,11 +509,11 @@ class TestGemRequire < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_require.rb#L509
         _, err = capture_subprocess_io do
           system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
         end
-        assert_includes err, "main.rb:1: warning: uplevel\ntest\n"
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
         _, err = capture_subprocess_io do
           system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
         end
-        assert_includes err, "main.rb:1: warning: uplevel\ntest\n"
+        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
       end
     end
 
@@ -524,11 +524,11 @@ class TestGemRequire < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_require.rb#L524
         _, err = capture_subprocess_io do
           system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
         end
-        assert_includes err, "{:x=>1}\n{:y=>2}\n"
+        assert_equal "{:x=>1}\n{:y=>2}\n", err
         _, err = capture_subprocess_io do
           system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
         end
-        assert_includes err, "{:x=>1}\n{:y=>2}\n"
+        assert_equal "{:x=>1}\n{:y=>2}\n", err
       end
     end
   end
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 0475901..28fa95e 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -838,7 +838,7 @@ def install_default_gem(dir, srcdir) https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L838
     puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
     gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
     open_for_install(gemspec_path, $data_mode) do
-      gemspec.to_ruby
+      gemspec.to_ruby.gsub(/.*\0.*\n/, '')
     end
 
     specific_gem_dir = File.join(gem_dir, 'gems', full_name)
-- 
cgit v0.10.2


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

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