diff --git a/Support-latest-did_you_mean.patch b/Support-latest-did_you_mean.patch deleted file mode 100644 index c9913e3..0000000 --- a/Support-latest-did_you_mean.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 98dbec75e4237fb8fb1b4190fd91cc22ad65068f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Rodr=C3=ADguez?= -Date: Wed, 22 Dec 2021 13:54:23 +0100 -Subject: [PATCH] Support latest did_you_mean - -Using `DidYouMean::SPELL_CHECKERS.merge!` has been deprecated. ---- - lib/thor/error.rb | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/lib/thor/error.rb b/lib/thor/error.rb -index c7c285906..893b135ec 100644 ---- a/lib/thor/error.rb -+++ b/lib/thor/error.rb -@@ -102,9 +102,14 @@ class MalformattedArgumentError < InvocationError - end - - if Correctable -- DidYouMean::SPELL_CHECKERS.merge!( -- 'Thor::UndefinedCommandError' => UndefinedCommandError::SpellChecker, -- 'Thor::UnknownArgumentError' => UnknownArgumentError::SpellChecker -- ) -+ if DidYouMean.respond_to?(:correct_error) -+ DidYouMean.correct_error(Thor::UndefinedCommandError, UndefinedCommandError::SpellChecker) -+ DidYouMean.correct_error(Thor::UnknownArgumentError, UnknownArgumentError::SpellChecker) -+ else -+ DidYouMean::SPELL_CHECKERS.merge!( -+ 'Thor::UndefinedCommandError' => UndefinedCommandError::SpellChecker, -+ 'Thor::UnknownArgumentError' => UnknownArgumentError::SpellChecker -+ ) -+ end - end - end diff --git a/Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch b/rubygem-thor-1.2.1-Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch similarity index 98% rename from Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch rename to rubygem-thor-1.2.1-Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch index ad9d6de..ccfd775 100644 --- a/Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch +++ b/rubygem-thor-1.2.1-Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch @@ -1,4 +1,4 @@ -From 0def4cfba5bf470f76877eb3b8a8895f0018e574 Mon Sep 17 00:00:00 2001 +From f87021fee1023457bf693dae95ccfe765c3bff61 Mon Sep 17 00:00:00 2001 From: Tim Diggins Date: Fri, 4 Mar 2022 12:16:58 +0000 Subject: [PATCH] fix expectations for ruby 3 treatment of hash arg @@ -9,7 +9,7 @@ Subject: [PATCH] fix expectations for ruby 3 treatment of hash arg 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spec/line_editor_spec.rb b/spec/line_editor_spec.rb -index 575fd336e..f034ec8df 100644 +index 575fd336..f034ec8d 100644 --- a/spec/line_editor_spec.rb +++ b/spec/line_editor_spec.rb @@ -13,7 +13,7 @@ @@ -31,7 +31,7 @@ index 575fd336e..f034ec8df 100644 expect(Thor::LineEditor.readline("Enter your name ", :default => "Brian")).to eq("George") end diff --git a/spec/shell/basic_spec.rb b/spec/shell/basic_spec.rb -index b51c5e8af..b795a80a8 100644 +index b51c5e8a..b795a80a 100644 --- a/spec/shell/basic_spec.rb +++ b/spec/shell/basic_spec.rb @@ -70,80 +70,80 @@ def shell diff --git a/rubygem-thor-1.1.0-Fix-rspec-mocks-3.10.2-compatibility.patch b/rubygem-thor-1.2.1-Fix-rspec-mocks-3.11.0-compatibility.patch similarity index 100% rename from rubygem-thor-1.1.0-Fix-rspec-mocks-3.10.2-compatibility.patch rename to rubygem-thor-1.2.1-Fix-rspec-mocks-3.11.0-compatibility.patch diff --git a/rubygem-thor-1.2.1-did_you_mean-ruby32.patch b/rubygem-thor-1.2.1-did_you_mean-ruby32.patch new file mode 100644 index 0000000..b5b5366 --- /dev/null +++ b/rubygem-thor-1.2.1-did_you_mean-ruby32.patch @@ -0,0 +1,58 @@ +From 46d1422902e1c66b31fae79be7dca79ff8b2e81b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Rodr=C3=ADguez?= +Date: Wed, 15 Jun 2022 19:35:27 +0200 +Subject: [PATCH] Reimplement did_you_mean suggestions to keep behaviour + accross rubies + +Ruby 3.2 will introduce `Exception#detailed_message` and `did_you_mean` +has been already updated in Ruby 3.2 to use that. + +The new behaviour means not changing the original `Exception#message`. +That means it is hard to get the previous error output, because +`Exception#detailed_message` includes not only `did_you_mean` +decorations, but also additional information like the exception class. + +To fix this, I bring the old did_you_mean behavior into Thor, so that +the above changes do not affect us. +--- + lib/thor/error.rb | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +diff --git a/lib/thor/error.rb b/lib/thor/error.rb +index 893b135e..cc3dfe41 100644 +--- a/lib/thor/error.rb ++++ b/lib/thor/error.rb +@@ -11,7 +11,15 @@ def initialize(dictionary) + end + end + +- DidYouMean::Correctable ++ Module.new do ++ def to_s ++ super + DidYouMean.formatter.message_for(corrections) ++ end ++ ++ def corrections ++ @corrections ||= self.class.const_get(:SpellChecker).new(self).corrections ++ end ++ end + end + + # Thor::Error is raised when it's caused by wrong usage of thor classes. Those +@@ -100,16 +108,4 @@ class RequiredArgumentMissingError < InvocationError + + class MalformattedArgumentError < InvocationError + end +- +- if Correctable +- if DidYouMean.respond_to?(:correct_error) +- DidYouMean.correct_error(Thor::UndefinedCommandError, UndefinedCommandError::SpellChecker) +- DidYouMean.correct_error(Thor::UnknownArgumentError, UnknownArgumentError::SpellChecker) +- else +- DidYouMean::SPELL_CHECKERS.merge!( +- 'Thor::UndefinedCommandError' => UndefinedCommandError::SpellChecker, +- 'Thor::UnknownArgumentError' => UnknownArgumentError::SpellChecker +- ) +- end +- end + end diff --git a/rubygem-thor.spec b/rubygem-thor.spec index 25158be..a2d1d0d 100644 --- a/rubygem-thor.spec +++ b/rubygem-thor.spec @@ -1,50 +1,49 @@ %global gem_name thor -Name: rubygem-%{gem_name} -Version: 1.1.0 -Release: 4 -Summary: Thor is a toolkit for building powerful command-line interfaces -License: MIT -URL: http://whatisthor.com/ -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: %{gem_name}-%{version}-spec.txz -Patch0: rubygem-thor-1.1.0-Fix-rspec-mocks-3.10.2-compatibility.patch -Patch1: Support-latest-did_you_mean.patch -Patch2: Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch +Name: rubygem-%{gem_name} +Version: 1.2.1 +Release: 1 +Summary: Thor is a toolkit for building powerful command-line interfaces +License: MIT +URL: http://whatisthor.com/ +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: %{gem_name}-%{version}-spec.txz -Requires: rubygem(io-console) -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby -BuildRequires: rubygem(io-console) -BuildRequires: rubygem(rspec) -BuildRequires: rubygem(webmock) rubygem(rexml) -BuildRequires: rubygem(did_you_mean) -BuildRequires: git -BuildRequires: rubygem-bigdecimal rubygem-io-console rubygem-openssl rubygem-psych -BuildArch: noarch +Patch0: rubygem-thor-1.2.1-Fix-expectations-for-ruby-3-treatment-of-hash-arg.patch +Patch1: rubygem-thor-1.2.1-Fix-rspec-mocks-3.11.0-compatibility.patch +Patch2: rubygem-thor-1.2.1-did_you_mean-ruby32.patch + +Requires: rubygem(io-console) +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby +BuildRequires: rubygem(io-console) +BuildRequires: rubygem(rake) +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(webmock) +BuildRequires: rubygem(did_you_mean) +BuildRequires: git +BuildArch: noarch %description Thor is a toolkit for building powerful command-line interfaces. - %package doc Summary: Documentation for %{name} Requires: %{name} = %{version}-%{release} BuildArch: noarch -%description doc +%description doc Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -b1 +%patch2 -p1 pushd %{_builddir} %patch0 -p1 -%patch2 -p1 -popd - %patch1 -p1 +popd %build gem build ../%{gem_name}-%{version}.gemspec @@ -84,12 +83,14 @@ popd %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CONTRIBUTING.md %doc %{gem_instdir}/README.md %{gem_instdir}/thor.gemspec %changelog +* Thu Aug 10 2023 wubijie - 1.2.1-1 +- Upgrade to version 1.2.1 + * Tue Jan 17 2023 yaoxin - 1.1.0-4 - Fix build failed due to ruby update to 3.1.3 @@ -108,3 +109,4 @@ popd * Mon Aug 10 2020 yanan li - 0.20.3-1 - Package init + diff --git a/thor-1.1.0.gem b/thor-1.1.0.gem deleted file mode 100644 index 2677414..0000000 Binary files a/thor-1.1.0.gem and /dev/null differ diff --git a/thor-1.1.0-spec.txz b/thor-1.2.1-spec.txz similarity index 93% rename from thor-1.1.0-spec.txz rename to thor-1.2.1-spec.txz index 8cb21f3..fc9dc37 100644 Binary files a/thor-1.1.0-spec.txz and b/thor-1.2.1-spec.txz differ diff --git a/thor-1.2.1.gem b/thor-1.2.1.gem new file mode 100644 index 0000000..d7e14e1 Binary files /dev/null and b/thor-1.2.1.gem differ