Refined "Drop support for ruby 2.4 from ruby/spec"

By using spec/mspec/tool/remove_old_guards.rb.

Author: nobu

command_line/dash_l_spec.rb

@@ -14,7 +14,7 @@
   it "chomps last line based on $/" do
     ruby_exe('BEGIN { $/ = "ones\n" }; puts $_', options: "-W0 -n -l", escape: true,
              args: " < #{@names}").should ==
-      "alice j\nbob field\njames grey\n"
+        "alice j\nbob field\njames grey\n"
   end
 
   it "sets $\\ to the value of $/" do

core/dir/shared/glob.rb

@@ -296,10 +296,10 @@
       @mock_dir = File.expand_path tmp('dir_glob_mock')
 
       %w[
-          a/b/x
-          a/b/c/y
-          a/b/c/d/z
-        ].each do |path|
+        a/b/x
+        a/b/c/y
+        a/b/c/d/z
+      ].each do |path|
         file = File.join @mock_dir, path
         mkdir_p File.dirname(file)
         touch file

core/file/utime_spec.rb

@@ -3,7 +3,7 @@
 describe "File.utime" do
 
   before :all do
-    @time_is_float = /mswin|mingw/ =~ RUBY_PLATFORM && RUBY_VERSION >= '2.5'
+    @time_is_float = /mswin|mingw/ =~ RUBY_PLATFORM
   end
 
   before :each do

core/integer/pow_spec.rb

@@ -23,8 +23,8 @@
     end
 
     it "handles sign like #divmod does" do
-      2.pow(5,  12).should ==  8
-      2.pow(5, -12).should == -4
+       2.pow(5,  12).should ==  8
+       2.pow(5, -12).should == -4
       -2.pow(5,  12).should ==  4
       -2.pow(5, -12).should == -8
     end

core/integer/shared/arithmetic_coerce.rb

@@ -1,5 +1,25 @@
 require_relative '../fixtures/classes'
 
+describe :integer_arithmetic_coerce_rescue, shared: true do
+  it "rescues exception (StandardError and subclasses) raised in other#coerce and raises TypeError" do
+    b = mock("numeric with failed #coerce")
+    b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
+
+    # e.g. 1 + b
+    -> { 1.send(@method, b) }.should raise_error(TypeError, /MockObject can't be coerced into Integer/)
+  end
+
+  it "does not rescue Exception and StandardError siblings raised in other#coerce" do
+    [Exception, NoMemoryError].each do |exception|
+      b = mock("numeric with failed #coerce")
+      b.should_receive(:coerce).and_raise(exception)
+
+      # e.g. 1 + b
+      -> { 1.send(@method, b) }.should raise_error(exception)
+    end
+  end
+end
+
 describe :integer_arithmetic_coerce_not_rescue, shared: true do
   it "does not rescue exception raised in other#coerce" do
     b = mock("numeric with failed #coerce")

language/ensure_spec.rb

@@ -259,72 +259,72 @@ class EnsureInClassExample
   it "is executed when an exception is raised in it's corresponding begin block" do
     -> {
       eval(<<-ruby).call
-          lambda do
-            ScratchPad << :begin
-            raise EnsureSpec::Error
-          ensure
-            ScratchPad << :ensure
-          end
-        ruby
+        lambda do
+          ScratchPad << :begin
+          raise EnsureSpec::Error
+        ensure
+          ScratchPad << :ensure
+        end
+      ruby
     }.should raise_error(EnsureSpec::Error)
 
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
   it "is executed when an exception is raised and rescued in it's corresponding begin block" do
     eval(<<-ruby).call
-        lambda do
-          ScratchPad << :begin
-          raise "An exception occurred!"
-        rescue
-          ScratchPad << :rescue
-        ensure
-          ScratchPad << :ensure
-        end
-      ruby
+      lambda do
+        ScratchPad << :begin
+        raise "An exception occurred!"
+      rescue
+        ScratchPad << :rescue
+      ensure
+        ScratchPad << :ensure
+      end
+    ruby
 
     ScratchPad.recorded.should == [:begin, :rescue, :ensure]
   end
 
   it "is executed even when a symbol is thrown in it's corresponding begin block" do
     catch(:symbol) do
       eval(<<-ruby).call
-          lambda do
-            ScratchPad << :begin
-            throw(:symbol)
-          rescue
-            ScratchPad << :rescue
-          ensure
-            ScratchPad << :ensure
-          end
-        ruby
-    end
-
-    ScratchPad.recorded.should == [:begin, :ensure]
-  end
-
-  it "is executed when nothing is raised or thrown in it's corresponding begin block" do
-    eval(<<-ruby).call
         lambda do
           ScratchPad << :begin
+          throw(:symbol)
         rescue
           ScratchPad << :rescue
         ensure
           ScratchPad << :ensure
         end
       ruby
+    end
+
+    ScratchPad.recorded.should == [:begin, :ensure]
+  end
+
+  it "is executed when nothing is raised or thrown in it's corresponding begin block" do
+    eval(<<-ruby).call
+      lambda do
+        ScratchPad << :begin
+      rescue
+        ScratchPad << :rescue
+      ensure
+        ScratchPad << :ensure
+      end
+    ruby
 
     ScratchPad.recorded.should == [:begin, :ensure]
   end
 
   it "has no return value" do
     result = eval(<<-ruby).call
-        lambda do
-          :begin
-        ensure
-          :ensure
-        end
-      ruby
+      lambda do
+        :begin
+      ensure
+        :ensure
+      end
+    ruby
 
     result.should == :begin
   end

language/rescue_spec.rb

@@ -437,12 +437,12 @@ class RescueInClassExample
 
   it "allows rescue in 'do end' block" do
     lambda = eval <<-ruby
-        lambda do
-          raise SpecificExampleException
-        rescue SpecificExampleException
-          ScratchPad << :caught
-        end.call
-      ruby
+      lambda do
+        raise SpecificExampleException
+      rescue SpecificExampleException
+        ScratchPad << :caught
+      end.call
+    ruby
 
     ScratchPad.recorded.should == [:caught]
   end