Remove more 2.5 guards with remove_old_guards.rb 2.5.[1-9]

Author: eregon

core/exception/full_message_spec.rb

@@ -12,44 +12,42 @@
     full_message.should include "b.rb:2"
   end
 
-  ruby_version_is "2.5.1" do
-    it "supports :highlight option and adds escape sequences to highlight some strings" do
-      e = RuntimeError.new("Some runtime error")
+  it "supports :highlight option and adds escape sequences to highlight some strings" do
+    e = RuntimeError.new("Some runtime error")
 
-      full_message = e.full_message(highlight: true, order: :bottom)
-      full_message.should include "\e[1mTraceback\e[m (most recent call last)"
-      full_message.should include "\e[1mSome runtime error (\e[1;4mRuntimeError\e[m\e[1m)"
+    full_message = e.full_message(highlight: true, order: :bottom)
+    full_message.should include "\e[1mTraceback\e[m (most recent call last)"
+    full_message.should include "\e[1mSome runtime error (\e[1;4mRuntimeError\e[m\e[1m)"
 
-      full_message = e.full_message(highlight: false, order: :bottom)
-      full_message.should include "Traceback (most recent call last)"
-      full_message.should include "Some runtime error (RuntimeError)"
-    end
+    full_message = e.full_message(highlight: false, order: :bottom)
+    full_message.should include "Traceback (most recent call last)"
+    full_message.should include "Some runtime error (RuntimeError)"
+  end
 
-    it "supports :order option and places the error message and the backtrace at the top or the bottom" do
-      e = RuntimeError.new("Some runtime error")
-      e.set_backtrace(["a.rb:1", "b.rb:2"])
+  it "supports :order option and places the error message and the backtrace at the top or the bottom" do
+    e = RuntimeError.new("Some runtime error")
+    e.set_backtrace(["a.rb:1", "b.rb:2"])
 
-      e.full_message(order: :top,    highlight: false).should =~ /a.rb:1.*b.rb:2/m
-      e.full_message(order: :bottom, highlight: false).should =~ /b.rb:2.*a.rb:1/m
-    end
+    e.full_message(order: :top,    highlight: false).should =~ /a.rb:1.*b.rb:2/m
+    e.full_message(order: :bottom, highlight: false).should =~ /b.rb:2.*a.rb:1/m
+  end
 
-    it "shows the caller if the exception has no backtrace" do
-      e = RuntimeError.new("Some runtime error")
-      e.backtrace.should == nil
-      full_message = e.full_message(highlight: false, order: :top)
-      full_message.should include("#{__FILE__}:#{__LINE__-1}:in `")
-      full_message.should include("': Some runtime error (RuntimeError)\n")
-    end
+  it "shows the caller if the exception has no backtrace" do
+    e = RuntimeError.new("Some runtime error")
+    e.backtrace.should == nil
+    full_message = e.full_message(highlight: false, order: :top)
+    full_message.should include("#{__FILE__}:#{__LINE__-1}:in `")
+    full_message.should include("': Some runtime error (RuntimeError)\n")
+  end
 
-    it "shows the exception class at the end of the first line of the message when the message contains multiple lines" do
-      begin
-        line = __LINE__; raise "first line\nsecond line"
-      rescue => e
-        full_message = e.full_message(highlight: false, order: :top).lines
-        full_message[0].should include("#{__FILE__}:#{line}:in `")
-        full_message[0].should include(": first line (RuntimeError)\n")
-        full_message[1].should == "second line\n"
-      end
+  it "shows the exception class at the end of the first line of the message when the message contains multiple lines" do
+    begin
+      line = __LINE__; raise "first line\nsecond line"
+    rescue => e
+      full_message = e.full_message(highlight: false, order: :top).lines
+      full_message[0].should include("#{__FILE__}:#{line}:in `")
+      full_message[0].should include(": first line (RuntimeError)\n")
+      full_message[1].should == "second line\n"
     end
   end
 

core/hash/transform_keys_spec.rb

@@ -60,28 +60,9 @@
   end
 
   # https://bugs.ruby-lang.org/issues/14380
-  ruby_version_is ""..."2.5.1" do
-    it "does not prevent conflicts between new keys and old ones" do
-      @hash.transform_keys!(&:succ)
-      @hash.should == { e: 1 }
-    end
-  end
-
-  ruby_version_is "2.5.1" do
-    it "prevents conflicts between new keys and old ones" do
-      @hash.transform_keys!(&:succ)
-      @hash.should == { b: 1, c: 2, d: 3, e: 4 }
-    end
-  end
-
-  ruby_version_is ""..."2.5.1" do
-    it "partially modifies the contents if we broke from the block" do
-      @hash.transform_keys! do |v|
-        break if v == :c
-        v.succ
-      end
-      @hash.should == { c: 1, d: 4 }
-    end
+  it "prevents conflicts between new keys and old ones" do
+    @hash.transform_keys!(&:succ)
+    @hash.should == { b: 1, c: 2, d: 3, e: 4 }
   end
 
   ruby_version_is "2.5.1"..."3.0.2" do # https://bugs.ruby-lang.org/issues/17735

security/cve_2019_8321_spec.rb

@@ -3,20 +3,18 @@
 require 'rubygems'
 require 'rubygems/user_interaction'
 
-ruby_version_is "2.5.5" do
-  describe "CVE-2019-8321 is resisted by" do
-    it "sanitising verbose messages" do
-      ui = Class.new {
-        include Gem::UserInteraction
-      }.new
-      ui.should_receive(:say).with(".]2;nyan.")
-      verbose_before = Gem.configuration.verbose
-      begin
-        Gem.configuration.verbose = :really_verbose
-        ui.verbose("\e]2;nyan\a")
-      ensure
-        Gem.configuration.verbose = verbose_before
-      end
+describe "CVE-2019-8321 is resisted by" do
+  it "sanitising verbose messages" do
+    ui = Class.new {
+      include Gem::UserInteraction
+    }.new
+    ui.should_receive(:say).with(".]2;nyan.")
+    verbose_before = Gem.configuration.verbose
+    begin
+      Gem.configuration.verbose = :really_verbose
+      ui.verbose("\e]2;nyan\a")
+    ensure
+      Gem.configuration.verbose = verbose_before
     end
   end
 end

security/cve_2019_8322_spec.rb

@@ -5,19 +5,17 @@
 require 'rubygems/safe_yaml'
 require 'rubygems/commands/owner_command'
 
-ruby_version_is "2.5.5" do
-  describe "CVE-2019-8322 is resisted by" do
-    it "sanitising owner names" do
-      command = Gem::Commands::OwnerCommand.new
-      def command.rubygems_api_request(*args)
-        Struct.new(:body).new("---\n- email: \"\e]2;nyan\a\"\n  handle: handle\n  id: id\n")
-      end
-      def command.with_response(response)
-        yield response
-      end
-      command.should_receive(:say).with("Owners for gem: name")
-      command.should_receive(:say).with("- .]2;nyan.")
-      command.show_owners "name"
+describe "CVE-2019-8322 is resisted by" do
+  it "sanitising owner names" do
+    command = Gem::Commands::OwnerCommand.new
+    def command.rubygems_api_request(*args)
+      Struct.new(:body).new("---\n- email: \"\e]2;nyan\a\"\n  handle: handle\n  id: id\n")
     end
+    def command.with_response(response)
+      yield response
+    end
+    command.should_receive(:say).with("Owners for gem: name")
+    command.should_receive(:say).with("- .]2;nyan.")
+    command.show_owners "name"
   end
 end

security/cve_2019_8323_spec.rb

@@ -5,34 +5,32 @@
 require 'rubygems'
 require 'rubygems/gemcutter_utilities'
 
-ruby_version_is "2.5.5" do
-  describe "CVE-2019-8323 is resisted by" do
-    describe "sanitising the body" do
-      it "for success codes" do
-        cutter = Class.new {
-          include Gem::GemcutterUtilities
-        }.new
-        response = Net::HTTPSuccess.new(nil, nil, nil)
-        def response.body
-          "\e]2;nyan\a"
-        end
-        cutter.should_receive(:say).with(".]2;nyan.")
-        cutter.with_response response
+describe "CVE-2019-8323 is resisted by" do
+  describe "sanitising the body" do
+    it "for success codes" do
+      cutter = Class.new {
+        include Gem::GemcutterUtilities
+      }.new
+      response = Net::HTTPSuccess.new(nil, nil, nil)
+      def response.body
+        "\e]2;nyan\a"
       end
+      cutter.should_receive(:say).with(".]2;nyan.")
+      cutter.with_response response
+    end
 
-      it "for error codes" do
-        cutter = Class.new {
-          include Gem::GemcutterUtilities
-        }.new
-        def cutter.terminate_interaction(n)
-        end
-        response = Net::HTTPNotFound.new(nil, nil, nil)
-        def response.body
-          "\e]2;nyan\a"
-        end
-        cutter.should_receive(:say).with(".]2;nyan.")
-        cutter.with_response response
+    it "for error codes" do
+      cutter = Class.new {
+        include Gem::GemcutterUtilities
+      }.new
+      def cutter.terminate_interaction(n)
+      end
+      response = Net::HTTPNotFound.new(nil, nil, nil)
+      def response.body
+        "\e]2;nyan\a"
       end
+      cutter.should_receive(:say).with(".]2;nyan.")
+      cutter.with_response response
     end
   end
 end

security/cve_2019_8325_spec.rb

@@ -3,37 +3,35 @@
 require 'rubygems'
 require 'rubygems/command_manager'
 
-ruby_version_is "2.5.5" do
-  platform_is_not :darwin do # frequent timeout/hang on macOS
-    describe "CVE-2019-8325 is resisted by" do
-      describe "sanitising error message components" do
-        it "for the 'while executing' message" do
-          manager = Gem::CommandManager.new
-          def manager.process_args(args, build_args)
-            raise StandardError, "\e]2;nyan\a"
-          end
-          def manager.terminate_interaction(n)
-          end
-          manager.should_receive(:alert_error).with("While executing gem ... (StandardError)\n    .]2;nyan.")
-          manager.run nil, nil
+platform_is_not :darwin do # frequent timeout/hang on macOS
+  describe "CVE-2019-8325 is resisted by" do
+    describe "sanitising error message components" do
+      it "for the 'while executing' message" do
+        manager = Gem::CommandManager.new
+        def manager.process_args(args, build_args)
+          raise StandardError, "\e]2;nyan\a"
         end
+        def manager.terminate_interaction(n)
+        end
+        manager.should_receive(:alert_error).with("While executing gem ... (StandardError)\n    .]2;nyan.")
+        manager.run nil, nil
+      end
 
-        it "for the 'invalid option' message" do
-          manager = Gem::CommandManager.new
-          def manager.terminate_interaction(n)
-          end
-          manager.should_receive(:alert_error).with("Invalid option: --.]2;nyan.. See 'gem --help'.")
-          manager.process_args ["--\e]2;nyan\a"], nil
+      it "for the 'invalid option' message" do
+        manager = Gem::CommandManager.new
+        def manager.terminate_interaction(n)
         end
+        manager.should_receive(:alert_error).with("Invalid option: --.]2;nyan.. See 'gem --help'.")
+        manager.process_args ["--\e]2;nyan\a"], nil
+      end
 
-        it "for the 'loading command' message" do
-          manager = Gem::CommandManager.new
-          def manager.require(x)
-            raise 'foo'
-          end
-          manager.should_receive(:alert_error).with("Loading command: .]2;nyan. (RuntimeError)\n\tfoo")
-          manager.send :load_and_instantiate, "\e]2;nyan\a"
+      it "for the 'loading command' message" do
+        manager = Gem::CommandManager.new
+        def manager.require(x)
+          raise 'foo'
         end
+        manager.should_receive(:alert_error).with("Loading command: .]2;nyan. (RuntimeError)\n\tfoo")
+        manager.send :load_and_instantiate, "\e]2;nyan\a"
       end
     end
   end