Allowing passing a block to Warning.clear

lib/warning.rb

@@ -32,11 +32,41 @@ module Processor
 
     # Clear all current ignored warnings, warning processors, and duplicate check cache.
     # Also disables deduplicating warnings if that is currently enabled.
-    def clear
-      synchronize do
-        @ignore.clear
-        @process.clear
-        @dedup = false
+    #
+    # If a block is passed, the values are only cleared within the block and
+    # restored after the block ends.
+    #
+    # Examples:
+    #
+    #   # Clear all values
+    #   Warning.clear
+    #
+    #   # Clear values only within the block.
+    #   Warning.clear do
+    #     ...
+    #   end
+    #   # The values are stored to previous state.
+    def clear(&block)
+      if block
+        begin
+          ignore = @ignore.dup
+          process = @process.dup
+          dedup = @dedup.dup
+          clear
+          yield
+        ensure
+          synchronize do
+            @ignore = ignore
+            @process = process
+            @dedup = dedup
+          end
+        end
+      else
+        synchronize do
+          @ignore.clear
+          @process.clear
+          @dedup = false
+        end
       end
     end
 

test/test_warning.rb

@@ -46,6 +46,92 @@ def teardown
     Warning.clear
   end
 
+  def test_warning_clear_ignore
+    Warning.ignore(/.*/)
+
+    assert_warning '' do
+      Warning.warn 'foo'
+    end
+
+    Warning.clear do
+      assert_warning 'foo' do
+        Warning.warn 'foo'
+      end
+    end
+
+    assert_warning '' do
+      Warning.warn 'foo'
+    end
+
+    Warning.clear
+
+    assert_warning 'foo' do
+      Warning.warn 'foo'
+    end
+  end
+
+  def test_warning_clear_process
+    Warning.process('', /foo/ => :raise)
+
+    e = assert_raises(RuntimeError) do
+      Warning.warn 'foo'
+    end
+    assert_equal('foo', e.message)
+
+    Warning.clear do
+      assert_warning 'foo' do
+        Warning.warn 'foo'
+      end
+    end
+
+    e = assert_raises(RuntimeError) do
+      Warning.warn 'foo'
+    end
+    assert_equal('foo', e.message)
+
+    Warning.clear
+
+    assert_warning 'foo' do
+      Warning.warn 'foo'
+    end
+  end
+
+  def test_warning_clear_dedup
+    Warning.dedup
+
+    assert_warning 'foo' do
+      Warning.warn 'foo'
+    end
+
+    assert_warning '' do
+      Warning.warn 'foo'
+    end
+
+    Warning.clear do
+      assert_warning 'foo' do
+        Warning.warn 'foo'
+      end
+
+      assert_warning 'foo' do
+        Warning.warn 'foo'
+      end
+    end
+
+    assert_warning '' do
+      Warning.warn 'foo'
+    end
+
+    Warning.clear
+
+    assert_warning 'foo' do
+      Warning.warn 'foo'
+    end
+
+    assert_warning 'foo' do
+      Warning.warn 'foo'
+    end
+  end
+
   def test_warning_dedup
     gvar = ->{$test_warning_dedup}