structured_warnings 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 82e448e3265ea35dd71196fb6f3adbc6b629cbb5
-  data.tar.gz: 5ed838c91e79e3d459f10d2cb9c7b596f03b5d98
+SHA256:
+  metadata.gz: 9d6ae32c5d463eb0efeba1057728863feb4d4dcbce402934626f3423efb545b6
+  data.tar.gz: a9f5fd53fa29a245d0190a27d4743225ea02af03fdcd04865d14625a3c9bfdc4
 SHA512:
-  metadata.gz: c784e0acb8c6aa8840ba44a36f5fdd090d7a46d178b4701fc97f1c6203d0f0de41f8d90a8579a53a7064a4df9146a314a936b6c6d290c892d3022840bce58282
-  data.tar.gz: f816ed5e9f249359c9c8108ba65c978140f9c2cef49f7d70202b26537ba4ced18ad1699c76ee9954ea8771bde64da59e98a08f34deee41766b06f76328a836df
+  metadata.gz: 3e0245fce924551f6881319642edba0685abe1a16b4e572b8532789c4188b9a529a9fd629125c10e27e0dbccc7bee1caef394fd690775e62de0769763d112d98
+  data.tar.gz: 6625b90aca3e9c0245608bdb3b81c4fb882c9f564a40abc29aaa598909e93a08ac2a99bdd4921284561c9253125f0d68e3191d92a3fb81068b36d30c246570d6

data/README.md

@@ -1,9 +1,5 @@
 # StructuredWarnings
 
-> **Disclaimer:** This is an experimental reimplementation of structured
-> warnings, based on Ruby 2.4's new warning module. This is not yet ready for
-> prime time.
-
 This is an implementation of Daniel Berger's [proposal of structured warnings
 for Ruby](https://web.archive.org/web/20140328021259/http://www.oreillynet.com/ruby/blog/2008/02/structured_warnings_now.html).
 They provide dynamic suppression and activation, as well as, an inheritance

data/lib/structured_warnings/test/warner.rb

@@ -5,7 +5,7 @@ class StructuredWarnings::Test::Warner < StructuredWarnings::Warner
   # Overrides the public interface of StructuredWarnings::Warner. This
   # method always returns nil to avoid warnings on stdout during assert_warn
   # and assert_no_warn blocks.
-  def format(warning, message, call_stack)
+  def format(warning, message, options, call_stack)
     given_warnings << warning.new(message)
     nil
   end

data/lib/structured_warnings/version.rb

@@ -1,3 +1,3 @@
 module StructuredWarnings
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/structured_warnings/warner.rb

@@ -5,11 +5,15 @@
 class StructuredWarnings::Warner
   #  Warner.new.format(StructuredWarning::DeprecationWarning, "more info..", caller)
   #     # => "demo.rb:5 : more info.. (StructuredWarning::DeprecationWarning)"
-  def format(warning, message, stack)
+  def format(warning, message, options, stack)
     frame = stack.shift
     # This file contains the backwards compatibility code for Ruby 2.3 and
     # lower, let's skip it
     frame = stack.shift if frame.include? 'lib/structured_warnings/kernel.rb'
-    "#{frame} : #{message} (#{warning})"
+
+    # Handle introduced uplevel introduced in Ruby 2.5
+    frame = stack.shift(options[:uplevel]).last if options[:uplevel]
+
+    "#{frame}: #{message} (#{warning})\n"
   end
 end

data/lib/structured_warnings/warning.rb

@@ -46,23 +46,24 @@ module StructuredWarnings::Warning
       warning = first.class
       message = first.message
 
-    else
-      warning =
-        if caller.shift.include? 'lib/structured_warnings/kernel.rb'
-          StructuredWarnings::StandardWarning
-        else
-          StructuredWarnings::BuiltInWarning
-        end
+    elsif caller.shift.include? 'lib/structured_warnings/kernel.rb'
+      warning = StructuredWarnings::StandardWarning
       message = first.to_s
+
+    else
+      warning = StructuredWarnings::BuiltInWarning
+      message = first.to_s.split(':', 4).last[1..-2]
     end
 
+    options = args.first.is_a?(Hash) ? args.shift : {}
+
     # If args is not empty, user passed an incompatible set of arguments.
     # Maybe somebody else is overriding warn as well and knows, what to do.
     # Better do nothing in this case. See #5
     return super unless args.empty?
 
     if warning.active?
-      output = StructuredWarnings.warner.format(warning, message, caller(1))
+      output = StructuredWarnings.warner.format(warning, message, options, caller(1))
       super(output) unless output.nil? or output.to_s.empty?
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: structured_warnings
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gregor Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides structured warnings for Ruby, using an exception-like interface