<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/d3cbdbed932aceb6d74fc66957194c5c09ca01b8">https://github.com/macports/macports-ports/commit/d3cbdbed932aceb6d74fc66957194c5c09ca01b8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d3cbdbed932aceb6d74fc66957194c5c09ca01b8
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Fri Sep 15 23:53:18 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby23: update to 2.3.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add a patch to fix build problem with variant +gmp or +jemalloc.
</span><span style='display:block; white-space:pre;color:#404040;'> see https://bugs.ruby-lang.org/issues/1389
</span><span style='display:block; white-space:pre;color:#404040;'> this problem will be solved in next release (version 2.3.6).
</span><span style='display:block; white-space:pre;color:#404040;'> - patch-configure.diff
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> delete patch files merged in this release.
</span><span style='display:block; white-space:pre;color:#404040;'> - rubygems-2613-ruby23.patch
</span><span style='display:block; white-space:pre;color:#404040;'> - lang/ruby23/files/patch-thread.c.diff
</span>---
lang/ruby23/Portfile | 23 +-
lang/ruby23/files/patch-configure.diff | 18 ++
lang/ruby23/files/patch-thread.c.diff | 15 --
lang/ruby23/files/rubygems-2613-ruby23.patch | 355 ---------------------------
4 files changed, 29 insertions(+), 382 deletions(-)
<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 48a03b9..3d792a4e 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;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup select 1.0
name ruby23
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories lang ruby
maintainers kimuraw openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,17 +25,15 @@ master_sites ruby:2.3
</span> use_bzip2 yes
distname ruby-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix accidental removal of the API function rb_thread_fd_close
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://www.ruby-lang.org/en/news/2017/03/30/ruby-2-3-4-released/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-thread.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# security fix for rubygems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append rubygems-2613-ruby23.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby-2.3.5 cannot link libgmp nor jemalloc (will be fixed in 2.3.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.ruby-lang.org/issues/13402
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.ruby-lang.org/issues/13899
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 99961e97566aee6d63635e2da4cf73ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a44c9f342a401e75c33a2442b9460b2b1ef7f0f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f5b18e7149ec7620444c91962e695708829d0216 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cd9808bb53824d6edb58beaadd3906cb23b987438ce75ab7bb279b2229930e2f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 e1efc3d5a948ca1f552005efe5925513 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 37c3619b6bebf5857602c493e62f46942c49c80e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 48302800c78ef9bbfc293ffcc4b6e2c728705bca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f71c4b67ba1bef424feba66774dc9d4bbe02375f5787e41596bc7f923739128b
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,6 +113,7 @@ variant gmp description "use gmp" {
</span>
variant jemalloc description "use jemalloc" {
configure.args-delete --without-jemalloc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jemalloc
</span> depends_lib-append port:jemalloc
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/files/patch-configure.diff b/lang/ruby23/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fdd16dc
</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/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-09-15 23:19:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-09-15 23:19:53.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10366,6 +10366,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_res=$ac_cv_search___gmpz_init
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$ac_res" != no; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "#define HAVE_LIBGMP 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10435,6 +10436,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_res=$ac_cv_search_malloc_conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$ac_res" != no; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "#define HAVE_LIBJEMALLOC 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_jemalloc=no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby23/files/patch-thread.c.diff b/lang/ruby23/files/patch-thread.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35ffc29..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby23/files/patch-thread.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- thread.c.orig 2017-03-28 01:54:09.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ thread.c 2017-04-12 20:30:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2187,6 +2187,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return busy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+rb_thread_fd_close(int fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (rb_notify_fd_close(fd));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * call-seq:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * thr.raise
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 99f86de..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby23/files/rubygems-2613-ruby23.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,355 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems.rb lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 04031c765c..9c0219ce06 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require 'thread'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- module Gem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VERSION = '2.5.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VERSION = '2.5.2.1'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Must be first since it unloads the prelude from 1.9.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems/commands/query_command.rb lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6196b44ed..61e9808860 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems/commands/query_command.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,7 +226,7 @@ def output_versions output, versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- output << make_entry(matching_tuples, platforms)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ output << clean_text(make_entry(matching_tuples, platforms))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -344,7 +344,8 @@ def spec_platforms entry, platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def spec_summary entry, spec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- entry << "\n\n" << format_text(spec.summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ entry << "\n\n" << format_text(summary, 68, 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems/installer.rb lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 85358e0d1a..709b77d126 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems/installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -693,6 +693,11 @@ def verify_gem_home(unpack = false) # :nodoc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unpack or File.writable?(gem_home)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def verify_spec_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise Gem::InstallError, "#{spec} has an invalid name"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Return the text for an application file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -812,6 +817,8 @@ def pre_install_checks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ensure_loadable_spec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ verify_spec_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if options[:install_as_default]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gem.ensure_default_gem_subdirectories gem_home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems/remote_fetcher.rb lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fda1e067ef..254bebfadf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems/remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@ def api_endpoint(uri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target = res.target.to_s.strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if /\.#{Regexp.quote(host)}\z/ =~ target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if URI("http://" + target).host.end_with?(".#{host}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems/specification.rb lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8e2557cdb2..dd4fde1776 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems/specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,6 +108,8 @@ class Gem::Specification < Gem::BasicSpecification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private_constant :LOAD_CACHE if defined? private_constant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # :startdoc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2665,9 +2667,15 @@ def validate packaging = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unless String === name then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if !name.is_a?(String) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "invalid value for attribute name: \"#{name.inspect}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "invalid value for attribute name: \"#{name.inspect}\" must be a string"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elsif name !~ /[a-zA-Z]/ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "invalid value for attribute name: #{name.dump} must include at least one letter"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elsif name !~ VALID_NAME_PATTERN then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise Gem::InvalidSpecificationException,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if raw_require_paths.empty? then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/rubygems/text.rb lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 732f1b99f2..b944b62c27 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/rubygems/text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,13 +6,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- module Gem::Text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Remove any non-printable characters and make the text suitable for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # printing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def clean_text(text)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def truncate_text(text, description, max_length = 100_000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise ArgumentError, "max_length must be positive" unless max_length > 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return text if text.size <= max_length
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "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:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # characters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def format_text(text, wrap, indent=0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- work = text.dup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ work = clean_text(text)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while work.length > wrap do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if work =~ /^(.{0,#{wrap}})[ \n]/ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 78c15a1770..9ec715492f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/rubygems/test_gem_commands_query_command.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,6 +116,86 @@ def test_execute_details
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- This is a lot of text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pl (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Author: A User
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this is a summary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_execute_details_cleans_text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.summary = 'This is a lot of text. ' * 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @cmd.execute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+a (2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ This is a lot of text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pl (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Author: A User
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Homepage: http://example.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this is a summary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal expected, @ui.output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal '', @ui.error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_execute_details_truncates_summary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ spec_fetcher do |fetcher|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fetcher.spec 'a', 2 do |s|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.summary = 'This is a lot of text. ' * 10_000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.homepage = "http://a.example.com/\x03"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fetcher.legacy_platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @cmd.handle_options %w[-r -d]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @cmd.execute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ expected = <<-EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*** REMOTE GEMS ***
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+a (2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Authors: Abraham Lincoln ., . Hirohito
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Homepage: http://a.example.com/.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Truncating the summary for a-2 to 100,000 characters:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#{" 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:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Platform: i386-linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Author: A User
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git test/rubygems/test_gem_installer.rb test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5ec71d0a01..1092a0c68f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/rubygems/test_gem_installer.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1227,6 +1227,26 @@ def test_pre_install_checks_wrong_rubygems_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_pre_install_checks_malicious_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ spec = util_spec '../malicious', '1'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def spec.full_name # so the spec is buildable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "malicious-1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def spec.validate; end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ util_build_gem spec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gem = File.join(@gemhome, 'cache', spec.file_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_ui @ui do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @installer = Gem::Installer.at gem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InstallError do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @installer.pre_install_checks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal '#<Gem::Specification name=../malicious version=1> has an invalid name', e.message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_shebang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util_make_exec @spec, "#!/usr/bin/ruby"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 49b6b6656c..a3919c8ef2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/rubygems/test_gem_remote_fetcher.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- dns.verify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original_in_path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uri = URI.parse "http://example.com/foo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target.expect :target, "evil.com/a.example.com"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dns = MiniTest::Mock.new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dns.expect :getresource, target, [String, Object]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fetch = Gem::RemoteFetcher.new nil, dns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal URI.parse("http://example.com/foo"), fetch.api_endpoint(uri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target.verify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dns.verify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_api_endpoint_timeout_warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uri = URI.parse "http://gems.example.com/foo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git test/rubygems/test_gem_specification.rb test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bc1c8d2ca7..9a49bbbf59 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/rubygems/test_gem_specification.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2974,7 +2974,37 @@ def test_validate_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert_equal 'invalid value for attribute name: ":json"', e.message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal 'invalid value for attribute name: ":json" must be a string', e.message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.name = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal "invalid value for attribute name: \"[]\" must be a string", e.message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.name = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal "invalid value for attribute name: \"\" must include at least one letter", e.message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.name = "12345"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.name = "../malicious"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.name = "\ba\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ e = assert_raises Gem::InvalidSpecificationException do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @a1.validate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_validate_non_nil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git test/rubygems/test_gem_text.rb test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a6e22e04da..04f3f605e8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/rubygems/test_gem_text.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,10 @@ def test_format_text_trailing # for two spaces after .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_equal expected, format_text(text, 78)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_format_removes_nonprintable_characters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_min3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_equal 1, min3(1, 1, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_equal 1, min3(1, 1, 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,4 +78,11 @@ def test_levenshtein_distance_replace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_equal 7, levenshtein_distance("zentest", "xxxxxxx")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def test_truncate_text
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal "abc", truncate_text("abc", "desc")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s = "ab" * 500_001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span></pre><pre style='margin:0'>
</pre>