From ce834ad899f254617e14e603ac9899be7ff1f4b2 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 12 Feb 2024 10:14:02 +0100 Subject: [PATCH] Revert "spec/mspec/tool/wrap_with_guard.rb 'ruby_version_is ""..."3.4"' spec/ruby/library/getoptlong/**/*.rb" This reverts commit 8538c30a8a6ea45264b014a5990986aae8997aed. --- library/getoptlong/each_option_spec.rb | 11 +- library/getoptlong/each_spec.rb | 11 +- library/getoptlong/error_message_spec.rb | 35 +++--- library/getoptlong/get_option_spec.rb | 11 +- library/getoptlong/get_spec.rb | 11 +- library/getoptlong/initialize_spec.rb | 41 +++--- library/getoptlong/ordering_spec.rb | 57 ++++----- library/getoptlong/set_options_spec.rb | 151 +++++++++++------------ library/getoptlong/terminate_spec.rb | 47 ++++--- library/getoptlong/terminated_spec.rb | 23 ++-- 10 files changed, 184 insertions(+), 214 deletions(-) diff --git a/library/getoptlong/each_option_spec.rb b/library/getoptlong/each_option_spec.rb index 87dd825264..c6d82af86d 100644 --- a/library/getoptlong/each_option_spec.rb +++ b/library/getoptlong/each_option_spec.rb @@ -1,10 +1,7 @@ require_relative '../../spec_helper' +require 'getoptlong' +require_relative 'shared/each' -ruby_version_is ""..."3.4" do - require 'getoptlong' - require_relative 'shared/each' - - describe "GetoptLong#each_option" do - it_behaves_like :getoptlong_each, :each_option - end +describe "GetoptLong#each_option" do + it_behaves_like :getoptlong_each, :each_option end diff --git a/library/getoptlong/each_spec.rb b/library/getoptlong/each_spec.rb index d40b17d8cb..d9022f02af 100644 --- a/library/getoptlong/each_spec.rb +++ b/library/getoptlong/each_spec.rb @@ -1,10 +1,7 @@ require_relative '../../spec_helper' +require 'getoptlong' +require_relative 'shared/each' -ruby_version_is ""..."3.4" do - require 'getoptlong' - require_relative 'shared/each' - - describe "GetoptLong#each" do - it_behaves_like :getoptlong_each, :each - end +describe "GetoptLong#each" do + it_behaves_like :getoptlong_each, :each end diff --git a/library/getoptlong/error_message_spec.rb b/library/getoptlong/error_message_spec.rb index bcca728720..1ed9419f6c 100644 --- a/library/getoptlong/error_message_spec.rb +++ b/library/getoptlong/error_message_spec.rb @@ -1,26 +1,23 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' +describe "GetoptLong#error_message" do + it "returns nil if no error occurred" do + opts = GetoptLong.new + opts.error_message.should == nil + end - describe "GetoptLong#error_message" do - it "returns nil if no error occurred" do + it "returns the error message of the last error that occurred" do + argv [] do opts = GetoptLong.new - opts.error_message.should == nil - end - - it "returns the error message of the last error that occurred" do - argv [] do - opts = GetoptLong.new - opts.quiet = true - opts.get - -> { - opts.ordering = GetoptLong::PERMUTE - }.should raise_error(ArgumentError) { |e| - e.message.should == "argument error" - opts.error_message.should == "argument error" - } - end + opts.quiet = true + opts.get + -> { + opts.ordering = GetoptLong::PERMUTE + }.should raise_error(ArgumentError) { |e| + e.message.should == "argument error" + opts.error_message.should == "argument error" + } end end end diff --git a/library/getoptlong/get_option_spec.rb b/library/getoptlong/get_option_spec.rb index f8f81bce50..3cb2044379 100644 --- a/library/getoptlong/get_option_spec.rb +++ b/library/getoptlong/get_option_spec.rb @@ -1,10 +1,7 @@ require_relative '../../spec_helper' +require 'getoptlong' +require_relative 'shared/get' -ruby_version_is ""..."3.4" do - require 'getoptlong' - require_relative 'shared/get' - - describe "GetoptLong#get_option" do - it_behaves_like :getoptlong_get, :get_option - end +describe "GetoptLong#get_option" do + it_behaves_like :getoptlong_get, :get_option end diff --git a/library/getoptlong/get_spec.rb b/library/getoptlong/get_spec.rb index bb901dff78..a8ec586fc9 100644 --- a/library/getoptlong/get_spec.rb +++ b/library/getoptlong/get_spec.rb @@ -1,10 +1,7 @@ require_relative '../../spec_helper' +require 'getoptlong' +require_relative 'shared/get' -ruby_version_is ""..."3.4" do - require 'getoptlong' - require_relative 'shared/get' - - describe "GetoptLong#get" do - it_behaves_like :getoptlong_get, :get - end +describe "GetoptLong#get" do + it_behaves_like :getoptlong_get, :get end diff --git a/library/getoptlong/initialize_spec.rb b/library/getoptlong/initialize_spec.rb index f0e5d605b2..782edbd981 100644 --- a/library/getoptlong/initialize_spec.rb +++ b/library/getoptlong/initialize_spec.rb @@ -1,31 +1,28 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' +describe "GetoptLong#initialize" do + it "sets ordering to REQUIRE_ORDER if ENV['POSIXLY_CORRECT'] is set" do + begin + old_env_value = ENV["POSIXLY_CORRECT"] + ENV["POSIXLY_CORRECT"] = "" - describe "GetoptLong#initialize" do - it "sets ordering to REQUIRE_ORDER if ENV['POSIXLY_CORRECT'] is set" do - begin - old_env_value = ENV["POSIXLY_CORRECT"] - ENV["POSIXLY_CORRECT"] = "" - - opt = GetoptLong.new - opt.ordering.should == GetoptLong::REQUIRE_ORDER - ensure - ENV["POSIXLY_CORRECT"] = old_env_value - end + opt = GetoptLong.new + opt.ordering.should == GetoptLong::REQUIRE_ORDER + ensure + ENV["POSIXLY_CORRECT"] = old_env_value end + end - it "sets ordering to PERMUTE if ENV['POSIXLY_CORRECT'] is not set" do - begin - old_env_value = ENV["POSIXLY_CORRECT"] - ENV["POSIXLY_CORRECT"] = nil + it "sets ordering to PERMUTE if ENV['POSIXLY_CORRECT'] is not set" do + begin + old_env_value = ENV["POSIXLY_CORRECT"] + ENV["POSIXLY_CORRECT"] = nil - opt = GetoptLong.new - opt.ordering.should == GetoptLong::PERMUTE - ensure - ENV["POSIXLY_CORRECT"] = old_env_value - end + opt = GetoptLong.new + opt.ordering.should == GetoptLong::PERMUTE + ensure + ENV["POSIXLY_CORRECT"] = old_env_value end end end diff --git a/library/getoptlong/ordering_spec.rb b/library/getoptlong/ordering_spec.rb index b0b5b9be54..695d1cafa7 100644 --- a/library/getoptlong/ordering_spec.rb +++ b/library/getoptlong/ordering_spec.rb @@ -1,41 +1,38 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' - - describe "GetoptLong#ordering=" do - it "raises an ArgumentError if called after processing has started" do - argv [ "--size", "10k", "--verbose" ] do - opts = GetoptLong.new([ '--size', GetoptLong::REQUIRED_ARGUMENT ], - [ '--verbose', GetoptLong::NO_ARGUMENT ]) - opts.quiet = true - opts.get - - -> { - opts.ordering = GetoptLong::PERMUTE - }.should raise_error(ArgumentError) - end - end - - it "raises an ArgumentError if given an invalid value" do - opts = GetoptLong.new +describe "GetoptLong#ordering=" do + it "raises an ArgumentError if called after processing has started" do + argv [ "--size", "10k", "--verbose" ] do + opts = GetoptLong.new([ '--size', GetoptLong::REQUIRED_ARGUMENT ], + [ '--verbose', GetoptLong::NO_ARGUMENT ]) + opts.quiet = true + opts.get -> { - opts.ordering = 12345 + opts.ordering = GetoptLong::PERMUTE }.should raise_error(ArgumentError) end + end - it "does not allow changing ordering to PERMUTE if ENV['POSIXLY_CORRECT'] is set" do - begin - old_env_value = ENV['POSIXLY_CORRECT'] - ENV['POSIXLY_CORRECT'] = "" + it "raises an ArgumentError if given an invalid value" do + opts = GetoptLong.new - opts = GetoptLong.new - opts.ordering = GetoptLong::PERMUTE - opts.ordering.should == GetoptLong::REQUIRE_ORDER - ensure - ENV['POSIXLY_CORRECT'] = old_env_value - end + -> { + opts.ordering = 12345 + }.should raise_error(ArgumentError) + end + + it "does not allow changing ordering to PERMUTE if ENV['POSIXLY_CORRECT'] is set" do + begin + old_env_value = ENV['POSIXLY_CORRECT'] + ENV['POSIXLY_CORRECT'] = "" + + opts = GetoptLong.new + opts.ordering = GetoptLong::PERMUTE + opts.ordering.should == GetoptLong::REQUIRE_ORDER + ensure + ENV['POSIXLY_CORRECT'] = old_env_value end end end diff --git a/library/getoptlong/set_options_spec.rb b/library/getoptlong/set_options_spec.rb index 0e77696a95..36b9c579c4 100644 --- a/library/getoptlong/set_options_spec.rb +++ b/library/getoptlong/set_options_spec.rb @@ -1,101 +1,98 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' - - describe "GetoptLong#set_options" do - before :each do - @opts = GetoptLong.new - end +describe "GetoptLong#set_options" do + before :each do + @opts = GetoptLong.new + end - it "allows setting command line options" do - argv ["--size", "10k", "-v", "arg1", "arg2"] do - @opts.set_options( - ["--size", GetoptLong::REQUIRED_ARGUMENT], - ["--verbose", "-v", GetoptLong::NO_ARGUMENT] - ) + it "allows setting command line options" do + argv ["--size", "10k", "-v", "arg1", "arg2"] do + @opts.set_options( + ["--size", GetoptLong::REQUIRED_ARGUMENT], + ["--verbose", "-v", GetoptLong::NO_ARGUMENT] + ) - @opts.get.should == ["--size", "10k"] - @opts.get.should == ["--verbose", ""] - @opts.get.should == nil - end + @opts.get.should == ["--size", "10k"] + @opts.get.should == ["--verbose", ""] + @opts.get.should == nil end + end - it "discards previously defined command line options" do - argv ["--size", "10k", "-v", "arg1", "arg2"] do - @opts.set_options( - ["--size", GetoptLong::REQUIRED_ARGUMENT], - ["--verbose", "-v", GetoptLong::NO_ARGUMENT] - ) + it "discards previously defined command line options" do + argv ["--size", "10k", "-v", "arg1", "arg2"] do + @opts.set_options( + ["--size", GetoptLong::REQUIRED_ARGUMENT], + ["--verbose", "-v", GetoptLong::NO_ARGUMENT] + ) - @opts.set_options( - ["-s", "--size", GetoptLong::REQUIRED_ARGUMENT], - ["-v", GetoptLong::NO_ARGUMENT] - ) + @opts.set_options( + ["-s", "--size", GetoptLong::REQUIRED_ARGUMENT], + ["-v", GetoptLong::NO_ARGUMENT] + ) - @opts.get.should == ["-s", "10k"] - @opts.get.should == ["-v", ""] - @opts.get.should == nil - end + @opts.get.should == ["-s", "10k"] + @opts.get.should == ["-v", ""] + @opts.get.should == nil end + end - it "raises an ArgumentError if too many argument flags where given" do - argv [] do - -> { - @opts.set_options(["--size", GetoptLong::NO_ARGUMENT, GetoptLong::REQUIRED_ARGUMENT]) - }.should raise_error(ArgumentError) - end + it "raises an ArgumentError if too many argument flags where given" do + argv [] do + -> { + @opts.set_options(["--size", GetoptLong::NO_ARGUMENT, GetoptLong::REQUIRED_ARGUMENT]) + }.should raise_error(ArgumentError) end + end - it "raises a RuntimeError if processing has already started" do - argv [] do - @opts.get - -> { - @opts.set_options() - }.should raise_error(RuntimeError) - end + it "raises a RuntimeError if processing has already started" do + argv [] do + @opts.get + -> { + @opts.set_options() + }.should raise_error(RuntimeError) end + end - it "raises an ArgumentError if no argument flag was given" do - argv [] do - -> { - @opts.set_options(["--size"]) - }.should raise_error(ArgumentError) - end + it "raises an ArgumentError if no argument flag was given" do + argv [] do + -> { + @opts.set_options(["--size"]) + }.should raise_error(ArgumentError) end + end - it "raises an ArgumentError if one of the given arguments is not an Array" do - argv [] do - -> { - @opts.set_options( - ["--size", GetoptLong::REQUIRED_ARGUMENT], - "test") - }.should raise_error(ArgumentError) - end + it "raises an ArgumentError if one of the given arguments is not an Array" do + argv [] do + -> { + @opts.set_options( + ["--size", GetoptLong::REQUIRED_ARGUMENT], + "test") + }.should raise_error(ArgumentError) end + end - it "raises an ArgumentError if the same option is given twice" do - argv [] do - -> { - @opts.set_options( - ["--size", GetoptLong::NO_ARGUMENT], - ["--size", GetoptLong::OPTIONAL_ARGUMENT]) - }.should raise_error(ArgumentError) + it "raises an ArgumentError if the same option is given twice" do + argv [] do + -> { + @opts.set_options( + ["--size", GetoptLong::NO_ARGUMENT], + ["--size", GetoptLong::OPTIONAL_ARGUMENT]) + }.should raise_error(ArgumentError) - -> { - @opts.set_options( - ["--size", GetoptLong::NO_ARGUMENT], - ["-s", "--size", GetoptLong::OPTIONAL_ARGUMENT]) - }.should raise_error(ArgumentError) - end + -> { + @opts.set_options( + ["--size", GetoptLong::NO_ARGUMENT], + ["-s", "--size", GetoptLong::OPTIONAL_ARGUMENT]) + }.should raise_error(ArgumentError) end + end - it "raises an ArgumentError if the given option is invalid" do - argv [] do - -> { - @opts.set_options(["-size", GetoptLong::NO_ARGUMENT]) - }.should raise_error(ArgumentError) - end + it "raises an ArgumentError if the given option is invalid" do + argv [] do + -> { + @opts.set_options(["-size", GetoptLong::NO_ARGUMENT]) + }.should raise_error(ArgumentError) end end end diff --git a/library/getoptlong/terminate_spec.rb b/library/getoptlong/terminate_spec.rb index f767fcaa0a..a12d1df2ef 100644 --- a/library/getoptlong/terminate_spec.rb +++ b/library/getoptlong/terminate_spec.rb @@ -1,33 +1,30 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' - - describe "GetoptLong#terminate" do - before :each do - @opts = GetoptLong.new( - [ '--size', '-s', GetoptLong::REQUIRED_ARGUMENT ], - [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ], - [ '--query', '-q', GetoptLong::NO_ARGUMENT ], - [ '--check', '--valid', '-c', GetoptLong::NO_ARGUMENT ] - ) - end +describe "GetoptLong#terminate" do + before :each do + @opts = GetoptLong.new( + [ '--size', '-s', GetoptLong::REQUIRED_ARGUMENT ], + [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ], + [ '--query', '-q', GetoptLong::NO_ARGUMENT ], + [ '--check', '--valid', '-c', GetoptLong::NO_ARGUMENT ] + ) + end - it "terminates option processing" do - argv [ "--size", "10k", "-v", "-q", "a.txt", "b.txt" ] do - @opts.get.should == [ "--size", "10k" ] - @opts.terminate - @opts.get.should == nil - end + it "terminates option processing" do + argv [ "--size", "10k", "-v", "-q", "a.txt", "b.txt" ] do + @opts.get.should == [ "--size", "10k" ] + @opts.terminate + @opts.get.should == nil end + end - it "returns self when option processing is terminated" do - @opts.terminate.should == @opts - end + it "returns self when option processing is terminated" do + @opts.terminate.should == @opts + end - it "returns nil when option processing was already terminated" do - @opts.terminate - @opts.terminate.should == nil - end + it "returns nil when option processing was already terminated" do + @opts.terminate + @opts.terminate.should == nil end end diff --git a/library/getoptlong/terminated_spec.rb b/library/getoptlong/terminated_spec.rb index 06c2ce71f4..6108a7f6e9 100644 --- a/library/getoptlong/terminated_spec.rb +++ b/library/getoptlong/terminated_spec.rb @@ -1,20 +1,17 @@ require_relative '../../spec_helper' +require 'getoptlong' -ruby_version_is ""..."3.4" do - require 'getoptlong' +describe "GetoptLong#terminated?" do + it "returns true if option processing has terminated" do + argv [ "--size", "10k" ] do + opts = GetoptLong.new(["--size", GetoptLong::REQUIRED_ARGUMENT]) + opts.should_not.terminated? - describe "GetoptLong#terminated?" do - it "returns true if option processing has terminated" do - argv [ "--size", "10k" ] do - opts = GetoptLong.new(["--size", GetoptLong::REQUIRED_ARGUMENT]) - opts.should_not.terminated? + opts.get.should == ["--size", "10k"] + opts.should_not.terminated? - opts.get.should == ["--size", "10k"] - opts.should_not.terminated? - - opts.get.should == nil - opts.should.terminated? - end + opts.get.should == nil + opts.should.terminated? end end end