power_assert 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e75d0a3ce99d4b13a7a459ae5b82ecb25622ced9
-  data.tar.gz: 5cf4b3586a8f34c71a784c61f87f978bc3969d04
+  metadata.gz: 5f750b892c57de72ef8565ce7b74f150d1cb58dd
+  data.tar.gz: 9512911b0c2a348b58015eabfc72c1f2bfd91922
 SHA512:
-  metadata.gz: 3d5ddce14b64265f9ff11e301f36d0ba686fca762370acfd9c8002fe1eb5c31de83f7f53b428877a6867ea06f3f55653b2f2cbff41ec42e3c8b71ea9625d8fbd
-  data.tar.gz: 3ea2c9ed78088200757930e92ef079c8d20aaae02ffaf9ffcb2b940a6eada78811363df8b35a827aa2ded501788805ad02a16c451dfa22bf6732865a2c551e7f
+  metadata.gz: d1e3d4320129a287703f80ffb480a42841adb66146a792f758d14539176b6c6694057efc3ecf24e420c7ed6dda1936806c36eb0a793ffad33761e510025c1de2
+  data.tar.gz: e006193bdbb8abc8f991b35ada079083f3f242effbdef3df2905535b874ac758d93834960d319c87640c9c76d333a77a4d31fc9c02fd8728965dbad4c5298d78

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 rvm:
   - 2.0.0-p648
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
   - ruby-head
 matrix:
   allow_failures:

data/lib/power_assert.rb

@@ -16,19 +16,12 @@ rescue
 end
 
 require 'power_assert/version'
+require 'power_assert/configuration'
 require 'power_assert/enable_tracepoint_events'
 require 'ripper'
 
 module PowerAssert
   class << self
-    def configuration
-      @configuration ||= Configuration[false, false]
-    end
-
-    def configure
-      yield configuration
-    end
-
     def start(assertion_proc_or_source, assertion_method: nil, source_binding: TOPLEVEL_BINDING)
       if respond_to?(:clear_global_method_cache, true)
         clear_global_method_cache
@@ -45,9 +38,6 @@ module PowerAssert
     end
   end
 
-  Configuration = Struct.new(:lazy_inspection, :_trace_alias_method)
-  private_constant :Configuration
-
   module Empty
   end
   private_constant :Empty
@@ -132,9 +122,9 @@ module PowerAssert
       end
       trace_alias_method = PowerAssert.configuration._trace_alias_method
       @trace = TracePoint.new(:return, :c_return) do |tp|
-        method_id = (trace_alias_method &&
-                     tp.event == :return &&
-                     tp.binding.eval('::Kernel.__callee__')) || tp.method_id
+        method_id = SUPPORT_ALIAS_METHOD                      ? tp.callee_id :
+                    trace_alias_method && tp.event == :return ? tp.binding.eval('::Kernel.__callee__') :
+                                                                tp.method_id
         next if method_ids and ! method_ids[method_id]
         next if tp.event == :c_return and
                 not (lineno == tp.lineno and path == tp.path)

data/lib/power_assert/configuration.rb

@@ -0,0 +1,24 @@
+module PowerAssert
+  class << self
+    def configuration
+      @configuration ||= Configuration[false, false, true]
+    end
+
+    def configure
+      yield configuration
+    end
+  end
+
+  SUPPORT_ALIAS_METHOD = TracePoint.public_method_defined?(:callee_id)
+  private_constant :SUPPORT_ALIAS_METHOD
+
+  class Configuration < Struct.new(:lazy_inspection, :_trace_alias_method, :redefinition)
+    def _trace_alias_method=(bool)
+      super
+      if SUPPORT_ALIAS_METHOD
+        warn '_trace_alias_method option is obsolete. You no longer have to set it.'
+      end
+    end
+  end
+  private_constant :Configuration
+end

data/lib/power_assert/enable_tracepoint_events.rb

@@ -1,78 +1,82 @@
+require 'power_assert/configuration'
+
 if defined? RubyVM
-  verbose = $VERBOSE
-  begin
-    $VERBOSE = nil
-    module PowerAssert
-      # set redefined flag
-      basic_classes = [
-        Fixnum, Float, String, Array, Hash, Bignum, Symbol, Time, Regexp
-      ]
+  if PowerAssert.configuration.redefinition
+    verbose = $VERBOSE
+    begin
+      $VERBOSE = nil
+      module PowerAssert
+        # set redefined flag
+        basic_classes = [
+          Fixnum, Float, String, Array, Hash, Bignum, Symbol, Time, Regexp
+        ]
 
-      basic_operators = [
-        :+, :-, :*, :/, :%, :==, :===, :<, :<=, :<<, :[], :[]=,
-        :length, :size, :empty?, :succ, :>, :>=, :!, :!=, :=~, :freeze
-      ]
+        basic_operators = [
+          :+, :-, :*, :/, :%, :==, :===, :<, :<=, :<<, :[], :[]=,
+          :length, :size, :empty?, :succ, :>, :>=, :!, :!=, :=~, :freeze
+        ]
 
-      class Bug11182
-        def fixed?
-          true
+        class Bug11182
+          def fixed?
+            true
+          end
         end
-      end
-      private_constant :Bug11182
+        private_constant :Bug11182
 
-      refine Bug11182 do
-        def fixed?
+        refine Bug11182 do
+          def fixed?
+          end
         end
-      end
 
-      class Bug11182Sub < Bug11182
-        alias _fixed? fixed?
-        protected :_fixed?
-      end
-      private_constant :Bug11182Sub
+        class Bug11182Sub < Bug11182
+          alias _fixed? fixed?
+          protected :_fixed?
+        end
+        private_constant :Bug11182Sub
 
-      if (Bug11182.new.fixed? rescue false)
-        basic_classes.each do |klass|
-          basic_operators.each do |bop|
-            refine(klass) do
-              define_method(bop) {}
+        if (Bug11182.new.fixed? rescue false)
+          basic_classes.each do |klass|
+            basic_operators.each do |bop|
+              refine(klass) do
+                define_method(bop) {}
+              end
             end
           end
-        end
-      else
-        # workaround for https://bugs.ruby-lang.org/issues/11182
-        basic_classes.each do |klass|
-          basic_operators.each do |bop|
-            if klass.public_method_defined?(bop)
-              klass.ancestors.find {|i| i.instance_methods(false).index(bop) }.module_eval do
-                public bop
+        else
+          # workaround for https://bugs.ruby-lang.org/issues/11182
+          basic_classes.each do |klass|
+            basic_operators.each do |bop|
+              if klass.public_method_defined?(bop)
+                klass.ancestors.find {|i| i.instance_methods(false).index(bop) }.module_eval do
+                  public bop
+                end
               end
             end
           end
-        end
 
-        refine Symbol do
-          def ==
+          refine Symbol do
+            def ==
+            end
           end
         end
-      end
 
-      # bypass check_cfunc
-      refine BasicObject do
-        def !
-        end
+        # bypass check_cfunc
+        refine BasicObject do
+          def !
+          end
 
-        def ==
+          def ==
+          end
         end
-      end
 
-      refine Module do
-        def ==
+        refine Module do
+          def ==
+          end
         end
       end
+    ensure
+      $VERBOSE = verbose
     end
-  ensure
-    $VERBOSE = verbose
   end
 
   # disable optimization

data/lib/power_assert/version.rb

@@ -1,3 +1,3 @@
 module PowerAssert
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/test_power_assert.rb

@@ -394,7 +394,7 @@ END
       begin
         PowerAssert.configure do |c|
           c._trace_alias_method = true
-        end
+        end unless PowerAssert.const_get(:SUPPORT_ALIAS_METHOD)
         @o = Class.new do
           def foo
             :foo
@@ -406,7 +406,7 @@ END
       ensure
         PowerAssert.configure do |c|
           c._trace_alias_method = false
-        end
+        end unless PowerAssert.const_get(:SUPPORT_ALIAS_METHOD)
       end
     end
 
@@ -422,11 +422,13 @@ END
     end
 
     t do
-      omit 'alias of cfunc is not supported yet'
+      unless PowerAssert.const_get(:SUPPORT_ALIAS_METHOD)
+        omit 'alias of cfunc is not supported yet'
+      end
       assert_match Regexp.new(<<END.chomp.gsub('|', "\\|")),
         assertion_message { @o.new.alias_of_cfunc }
                             |  |   |
-                            |  |   #<#<Class:.*>:.*>
+                            |  |   "#<#<Class:.*>:.*>"
                             |  #<#<Class:.*>:.*>
                             #<Class:.*>
 END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -73,6 +73,7 @@ files:
 - benchmarks/bm_yhpg.rb
 - benchmarks/helper.rb
 - lib/power_assert.rb
+- lib/power_assert/configuration.rb
 - lib/power_assert/enable_tracepoint_events.rb
 - lib/power_assert/version.rb
 - power_assert.gemspec