<pre style='margin:0'>
kimura wataru (kimuraw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4f46ea081817ff326a6a849b42ac97fb2962c0e1">https://github.com/macports/macports-ports/commit/4f46ea081817ff326a6a849b42ac97fb2962c0e1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4f46ea0 lang/ruby22, ruby23: security fix for rubygems
</span>4f46ea0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4f46ea081817ff326a6a849b42ac97fb2962c0e1
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Wed Aug 30 22:56:23 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby22, ruby23: security fix for rubygems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> done for ruby24: https://github.com/macports/macports-ports/pull/720
</span>---
lang/ruby22/Portfile | 6 +-
lang/ruby22/files/rubygems-2613-ruby22.patch | 355 +++++++++++++++++++++++++++
lang/ruby23/Portfile | 5 +-
lang/ruby23/files/rubygems-2613-ruby23.patch | 355 +++++++++++++++++++++++++++
4 files changed, 719 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby22/Portfile b/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50d8a51..dcd4a57 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name ruby22
version 2.2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories lang ruby
maintainers kimuraw openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,10 @@ configure.args --enable-shared \
</span> --program-suffix=2.2 \
--with-rubylibprefix="${prefix}/lib/ruby2.2"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# security fix for rubygems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles rubygems-2613-ruby22.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {${os.major} < 10} {
configure.args-append --disable-dtrace
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby22/files/rubygems-2613-ruby22.patch b/lang/ruby22/files/rubygems-2613-ruby22.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..295b813
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby22/files/rubygems-2613-ruby22.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,355 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems.rb lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f48496aa31..0e1855b148 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@ require 'rbconfig'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require 'thread'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module Gem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VERSION = '2.4.5.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERSION = '2.4.5.3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Must be first since it unloads the prelude from 1.9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/commands/query_command.rb lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 432250e033..44364cfab2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,7 @@ is too hard to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- output << make_entry(matching_tuples, platforms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ output << clean_text(make_entry(matching_tuples, platforms))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,7 +336,8 @@ is too hard to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def spec_summary entry, spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entry << "\n\n" << format_text(spec.summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entry << "\n\n" << format_text(summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/installer.rb lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 10fc1a34a5..a27569fe2e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -646,6 +646,11 @@ class Gem::Installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpack or File.writable?(gem_home)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def verify_spec_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InstallError, "#{spec} has an invalid name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Return the text for an application file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -771,6 +776,8 @@ TEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ensure_loadable_spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ verify_spec_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if options[:install_as_default]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gem.ensure_default_gem_subdirectories gem_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/remote_fetcher.rb lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b1f6dd17fc..2b9d61c0a1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@ class Gem::RemoteFetcher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target = res.target.to_s.strip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if /\.#{Regexp.quote(host)}\z/ =~ target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if URI("http://" + target).host.end_with?(".#{host}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/specification.rb lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab1cd92270..faca837128 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,6 +106,8 @@ class Gem::Specification < Gem::BasicSpecification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private_constant :LOAD_CACHE if defined? private_constant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # :startdoc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2477,9 +2479,15 @@ class Gem::Specification < Gem::BasicSpecification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unless String === name then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if !name.is_a?(String) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "invalid value for attribute name: \"#{name.inspect}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: \"#{name.inspect}\" must be a string"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elsif name !~ /[a-zA-Z]/ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: #{name.dump} must include at least one letter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elsif name !~ VALID_NAME_PATTERN then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if raw_require_paths.empty? then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/text.rb lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c9287ad2e..86a722ffc0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,13 +5,26 @@ require 'rubygems'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module Gem::Text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Remove any non-printable characters and make the text suitable for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # printing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def clean_text(text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def truncate_text(text, description, max_length = 100_000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise ArgumentError, "max_length must be positive" unless max_length > 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return text if text.size <= max_length
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Truncating #{description} to #{max_length.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse} characters:\n" + text[0, max_length]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def format_text(text, wrap, indent=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- work = text.dup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ work = clean_text(text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while work.length > wrap do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if work =~ /^(.{0,#{wrap}})[ \n]/ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_commands_query_command.rb test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 43fa82571d..ccd2621874 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,6 +147,86 @@ a (2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is a lot of text. This is a lot of text. This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this is a summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_execute_details_cleans_text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.summary = 'This is a lot of text. ' * 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.execute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++a (2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This is a lot of text. This is a lot of text. This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this is a summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_execute_details_truncates_summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.summary = 'This is a lot of text. ' * 10_000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.execute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++a (2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Truncating the summary for a-2 to 100,000 characters:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_installer.rb test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6f8012feb8..aba73af181 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1214,6 +1214,26 @@ gem 'other', version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_pre_install_checks_malicious_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec = util_spec '../malicious', '1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def spec.full_name # so the spec is buildable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "malicious-1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def spec.validate; end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ util_build_gem spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gem = File.join(@gemhome, 'cache', spec.file_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @installer = Gem::Installer.at gem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InstallError do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @installer.pre_install_checks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '#<Gem::Specification name=../malicious version=1> has an invalid name', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_shebang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ util_make_exec @spec, "#!/usr/bin/ruby"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_remote_fetcher.rb test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63dd8feb38..ca4627810b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,6 +181,21 @@ gems:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dns.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original_in_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uri = URI.parse "http://example.com/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target.expect :target, "evil.com/a.example.com"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns.expect :getresource, target, [String, Object]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetch = Gem::RemoteFetcher.new nil, dns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal URI.parse("http://example.com/foo"), fetch.api_endpoint(uri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_api_endpoint_ignores_trans_domain_values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uri = URI.parse "http://gems.example.com/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_specification.rb test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3cadc55d5d..4f7076a03a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2610,7 +2610,37 @@ http://opensource.org/licenses/alphabetical
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert_equal 'invalid value for attribute name: ":json"', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal 'invalid value for attribute name: ":json" must be a string', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"[]\" must be a string", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"\" must include at least one letter", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "12345"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"12345\" must include at least one letter", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "../malicious"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"../malicious\" can only include letters, numbers, dashes, and underscores", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "\ba\t"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"\\ba\\t\" can only include letters, numbers, dashes, and underscores", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_validate_non_nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_text.rb test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e5cfc41e61..9b270b481b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,10 @@ Without the wrapping, the text might not look good in the RSS feed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal expected, format_text(text, 78)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_format_removes_nonprintable_characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "text with weird .. stuff .", format_text("text with weird \x1b\x02 stuff \x7f", 40)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_min3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 1, min3(1, 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 1, min3(1, 1, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,4 +75,11 @@ Without the wrapping, the text might not look good in the RSS feed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 7, levenshtein_distance("zentest", "xxxxxxx")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_truncate_text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "abc", truncate_text("abc", "desc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = "ab" * 500_001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/Portfile b/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 898138c..48a03b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby23/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
name ruby23
version 2.3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories lang ruby
maintainers kimuraw openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,9 @@ distname ruby-${version}
</span> # fix accidental removal of the API function rb_thread_fd_close
# https://www.ruby-lang.org/en/news/2017/03/30/ruby-2-3-4-released/
patchfiles patch-thread.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# security fix for rubygems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append rubygems-2613-ruby23.patch
</span>
checksums md5 99961e97566aee6d63635e2da4cf73ac \
rmd160 a44c9f342a401e75c33a2442b9460b2b1ef7f0f5 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/files/rubygems-2613-ruby23.patch b/lang/ruby23/files/rubygems-2613-ruby23.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99f86de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby23/files/rubygems-2613-ruby23.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,355 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems.rb lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 04031c765c..9c0219ce06 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require 'thread'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module Gem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VERSION = '2.5.2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VERSION = '2.5.2.1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Must be first since it unloads the prelude from 1.9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/commands/query_command.rb lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d6196b44ed..61e9808860 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,7 +226,7 @@ def output_versions output, versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- output << make_entry(matching_tuples, platforms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ output << clean_text(make_entry(matching_tuples, platforms))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,7 +344,8 @@ def spec_platforms entry, platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def spec_summary entry, spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entry << "\n\n" << format_text(spec.summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entry << "\n\n" << format_text(summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/installer.rb lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 85358e0d1a..709b77d126 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -693,6 +693,11 @@ def verify_gem_home(unpack = false) # :nodoc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpack or File.writable?(gem_home)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def verify_spec_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InstallError, "#{spec} has an invalid name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Return the text for an application file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -812,6 +817,8 @@ def pre_install_checks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ensure_loadable_spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ verify_spec_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if options[:install_as_default]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gem.ensure_default_gem_subdirectories gem_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/remote_fetcher.rb lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fda1e067ef..254bebfadf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@ def api_endpoint(uri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target = res.target.to_s.strip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if /\.#{Regexp.quote(host)}\z/ =~ target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if URI("http://" + target).host.end_with?(".#{host}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/specification.rb lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8e2557cdb2..dd4fde1776 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,6 +108,8 @@ class Gem::Specification < Gem::BasicSpecification
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private_constant :LOAD_CACHE if defined? private_constant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # :startdoc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2665,9 +2667,15 @@ def validate packaging = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unless String === name then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if !name.is_a?(String) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "invalid value for attribute name: \"#{name.inspect}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: \"#{name.inspect}\" must be a string"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elsif name !~ /[a-zA-Z]/ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: #{name.dump} must include at least one letter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elsif name !~ VALID_NAME_PATTERN then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if raw_require_paths.empty? then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/rubygems/text.rb lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 732f1b99f2..b944b62c27 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,13 +6,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module Gem::Text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Remove any non-printable characters and make the text suitable for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # printing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def clean_text(text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def truncate_text(text, description, max_length = 100_000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise ArgumentError, "max_length must be positive" unless max_length > 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return text if text.size <= max_length
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Truncating #{description} to #{max_length.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse} characters:\n" + text[0, max_length]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def format_text(text, wrap, indent=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- work = text.dup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ work = clean_text(text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while work.length > wrap do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if work =~ /^(.{0,#{wrap}})[ \n]/ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_commands_query_command.rb test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 78c15a1770..9ec715492f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +116,86 @@ def test_execute_details
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is a lot of text. This is a lot of text. This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this is a summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_execute_details_cleans_text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.summary = 'This is a lot of text. ' * 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.execute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++a (2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This is a lot of text. This is a lot of text. This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This is a lot of text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this is a summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_execute_details_truncates_summary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.summary = 'This is a lot of text. ' * 10_000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @cmd.execute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++a (2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Truncating the summary for a-2 to 100,000 characters:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pl (1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Author: A User
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_installer.rb test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5ec71d0a01..1092a0c68f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1227,6 +1227,26 @@ def test_pre_install_checks_wrong_rubygems_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_pre_install_checks_malicious_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spec = util_spec '../malicious', '1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def spec.full_name # so the spec is buildable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "malicious-1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def spec.validate; end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ util_build_gem spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gem = File.join(@gemhome, 'cache', spec.file_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @installer = Gem::Installer.at gem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InstallError do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @installer.pre_install_checks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal '#<Gem::Specification name=../malicious version=1> has an invalid name', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_shebang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ util_make_exec @spec, "#!/usr/bin/ruby"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_remote_fetcher.rb test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 49b6b6656c..a3919c8ef2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,6 +253,21 @@ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dns.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original_in_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uri = URI.parse "http://example.com/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target.expect :target, "evil.com/a.example.com"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns.expect :getresource, target, [String, Object]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fetch = Gem::RemoteFetcher.new nil, dns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal URI.parse("http://example.com/foo"), fetch.api_endpoint(uri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dns.verify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_api_endpoint_timeout_warning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uri = URI.parse "http://gems.example.com/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_specification.rb test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bc1c8d2ca7..9a49bbbf59 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2974,7 +2974,37 @@ def test_validate_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert_equal 'invalid value for attribute name: ":json"', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal 'invalid value for attribute name: ":json" must be a string', e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"[]\" must be a string", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"\" must include at least one letter", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "12345"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"12345\" must include at least one letter", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "../malicious"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"../malicious\" can only include letters, numbers, dashes, and underscores", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.name = "\ba\t"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @a1.validate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "invalid value for attribute name: \"\\ba\\t\" can only include letters, numbers, dashes, and underscores", e.message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_validate_non_nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/rubygems/test_gem_text.rb test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a6e22e04da..04f3f605e8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,10 @@ def test_format_text_trailing # for two spaces after .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal expected, format_text(text, 78)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_format_removes_nonprintable_characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "text with weird .. stuff .", format_text("text with weird \x1b\x02 stuff \x7f", 40)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_min3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 1, min3(1, 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 1, min3(1, 1, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,4 +78,11 @@ def test_levenshtein_distance_replace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_equal 7, levenshtein_distance("zentest", "xxxxxxx")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ def test_truncate_text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "abc", truncate_text("abc", "desc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = "ab" * 500_001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span></pre><pre style='margin:0'>
</pre>