power_assert 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94700e701d6e70078cff18ec8db5689ebcb69fc1
-  data.tar.gz: cf854f8bb406169ccf8b22869d77b8320191a07c
+SHA256:
+  metadata.gz: 2a370d0589f6825379578235e06ca2c1d249577582acda601f73d83bdc90220f
+  data.tar.gz: 0ff765413706da6b356e96ee17b6767b6074b8093b9776f65e025d520395fc0b
 SHA512:
-  metadata.gz: 52ee0c7f1fb5ea27e42f64c99160e71d54ab3ca8787f703d173a340c98bccb0a0f5fc322c96c97ec99c0f04f6cabd664e4cae1085653c47e34a25c1de71a49db
-  data.tar.gz: def9341626a182f990d568a67fb8970d004644dfe0d48d89daef2671fa87e18c6f48099594c237130da74e4d762a9f38c9af723f86fd443ebdea19e189505509
+  metadata.gz: 9c3bc4482abf9078cfc429b4ca32865521a11d9bc5ecc5cdaec7d796edd9f99d9146214101d10fe58dfe4438b5499a07e348396ed96e86dae6c6a6aab5fcd6a5
+  data.tar.gz: 8197767a6e6ac199aa599a332254e7fdb40252856eb3a411ac55320af7bf25c4ae58591d3f3017d547aa67436a40ee58dac26bb5688ed627ebbfc65e21986d2c

data/.travis.yml

@@ -3,9 +3,10 @@ language: ruby
 rvm:
   - 2.0.0-p648
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 env:
   - TEST_SYMLINK="no"
@@ -14,8 +15,9 @@ matrix:
   allow_failures:
     - rvm: ruby-head
 before_install:
- - gem update bundler
+  - gem update --system
+  - gem update bundler
 before_script:
- - bundle exec rake before_script
+  - bundle exec rake before_script
 after_script:
- - bundle exec rake after_script
+  - bundle exec rake after_script

data/BSDL

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2017 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2014 Kazuki Tsujimoto
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2017 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2014 Kazuki Tsujimoto
 
 You can redistribute it and/or modify it under either the terms of the
 2-clause BSDL (see the file BSDL), or the conditions below:

data/README.rdoc

@@ -5,6 +5,13 @@ Power Assert for Ruby.
 Power Assert shows each value of variables and method calls in the expression.
 It is useful for testing, providing which value wasn't correct when the condition is not satisfied.
 
+    Failure:
+       assert { 3.times.to_a.include?(3) }
+                  |     |    |
+                  |     |    false
+                  |     [0, 1, 2]
+                  #<Enumerator: 3:times>
+
 == Related Projects
 In general, you don't need to use this library directly.
 Use following test frameworks or extensions instead.

data/Rakefile

@@ -8,8 +8,8 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts = ["-w", "-r#{helper_path}"]
   t.test_files = FileList["test/**/*_test.rb"].exclude do |i|
     begin
-      return false unless defined?(RubyVM)
-      RubyVM::InstructionSequence.compile(open(i).read)
+      next false unless defined?(RubyVM)
+      RubyVM::InstructionSequence.compile(File.read(i))
       false
     rescue SyntaxError
       true

data/lib/power_assert.rb

@@ -1,6 +1,6 @@
 # power_assert.rb
 #
-# Copyright (C) 2014-2017 Kazuki Tsujimoto, All rights reserved.
+# Copyright (C) 2014 Kazuki Tsujimoto
 
 begin
   unless defined?(Byebug)

data/lib/power_assert/context.rb

@@ -5,7 +5,7 @@ require 'power_assert/parser'
 
 module PowerAssert
   class Context
-    Value = Struct.new(:name, :value, :lineno, :column)
+    Value = Struct.new(:name, :value, :lineno, :column, :display_offset)
 
     def initialize(base_caller_length)
       @fired = false
@@ -14,26 +14,30 @@ module PowerAssert
       @return_values = []
       trace_alias_method = PowerAssert.configuration._trace_alias_method
       @trace_return = TracePoint.new(:return, :c_return) do |tp|
-        unless method_id_set
-          next unless Thread.current == @target_thread
-          method_id_set = @parser.method_id_set
-        end
-        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_id_set[method_id]
-        next if tp.event == :c_return and
-                not (@parser.lineno == tp.lineno and @parser.path == tp.path)
-        locs = PowerAssert.app_caller_locations
-        diff = locs.length - base_caller_length
-        if (tp.event == :c_return && diff == 1 || tp.event == :return && diff <= 2) and Thread.current == @target_thread
-          idx = -(base_caller_length + 1)
-          if @parser.path == locs[idx].path and @parser.lineno == locs[idx].lineno
-            val = PowerAssert.configuration.lazy_inspection ?
-              tp.return_value :
-              InspectedValue.new(SafeInspectable.new(tp.return_value).inspect)
-            @return_values << Value[method_id.to_s, val, locs[idx].lineno, nil]
+        begin
+          unless method_id_set
+            next unless Thread.current == @target_thread
+            method_id_set = @parser.method_id_set
+          end
+          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_id_set[method_id]
+          next if tp.event == :c_return and
+                  not (@parser.lineno == tp.lineno and @parser.path == tp.path)
+          locs = PowerAssert.app_caller_locations
+          diff = locs.length - base_caller_length
+          if (tp.event == :c_return && diff == 1 || tp.event == :return && diff <= 2) and Thread.current == @target_thread
+            idx = -(base_caller_length + 1)
+            if @parser.path == locs[idx].path and @parser.lineno == locs[idx].lineno
+              val = PowerAssert.configuration.lazy_inspection ?
+                tp.return_value :
+                InspectedValue.new(SafeInspectable.new(tp.return_value).inspect)
+              @return_values << Value[method_id.to_s, val, locs[idx].lineno, nil]
+            end
           end
+        rescue Exception => e
+          warn "power_assert: [BUG] Failed to trace: #{e.class}: #{e.message}"
         end
       end
     end
@@ -63,21 +67,22 @@ module PowerAssert
       path = detect_path(parser, return_values)
       return line unless path
 
+      c2d = column2display_offset(parser.line)
       return_values, methods_in_path = find_all_identified_calls(return_values, path)
       return_values.zip(methods_in_path) do |i, j|
         unless i.name == j.name
           warn "power_assert: [BUG] Failed to get column: #{i.name}"
           return line
         end
-        i.column = j.column
+        i.display_offset = c2d[j.column]
       end
       refs_in_path = path.find_all {|i| i.type == :ref }
-      ref_values = refs_in_path.map {|i| Value[i.name, parser.binding.eval(i.name), parser.lineno, i.column] }
-      vals = (return_values + ref_values).find_all(&:column).sort_by(&:column).reverse
+      ref_values = refs_in_path.map {|i| Value[i.name, parser.binding.eval(i.name), parser.lineno, i.column, c2d[i.column]] }
+      vals = (return_values + ref_values).find_all(&:display_offset).sort_by(&:display_offset).reverse
       return line if vals.empty?
 
-      fmt = (0..vals[0].column).map do |i|
-        if vals.find {|v| v.column == i }
+      fmt = (0..vals[0].display_offset).map do |i|
+        if vals.find {|v| v.display_offset == i }
           "%<#{i}>s"
         else
           line[i] == "\t" ? "\t" : ' '
@@ -85,12 +90,12 @@ module PowerAssert
       end.join
       lines = []
       lines << line.chomp
-      lines << sprintf(fmt, vals.each_with_object({}) {|v, h| h[v.column.to_s.to_sym] = '|' }).chomp
+      lines << sprintf(fmt, vals.each_with_object({}) {|v, h| h[v.display_offset.to_s.to_sym] = '|' }).chomp
       vals.each do |i|
-        inspected_val = SafeInspectable.new(Formatter.new(i.value, i.column)).inspect
+        inspected_val = SafeInspectable.new(Formatter.new(i.value, i.display_offset)).inspect
         inspected_val.each_line do |l|
           map_to = vals.each_with_object({}) do |j, h|
-            h[j.column.to_s.to_sym] = [l, '|', ' '][i.column <=> j.column]
+            h[j.display_offset.to_s.to_sym] = [l, '|', ' '][i.display_offset <=> j.display_offset]
           end
           lines << encoding_safe_rstrip(sprintf(fmt, map_to))
         end
@@ -142,6 +147,16 @@ module PowerAssert
         str
       end
     end
+
+    def column2display_offset(str)
+      display_offset = 0
+      str.each_char.with_object([]) do |c, r|
+        c.bytesize.times do
+          r << display_offset
+        end
+        display_offset += c.ascii_only? ? 1 : 2 # FIXME
+      end
+    end
   end
   private_constant :Context
 
@@ -163,7 +178,7 @@ module PowerAssert
           path = locs.last.path
           lineno = locs.last.lineno
           if File.exist?(path)
-            line ||= open(path).each_line.drop(lineno - 1).first
+            line ||= File.open(path) {|fp| fp.each_line.drop(lineno - 1).first }
             @parser = Parser.new(line, path, lineno, @assertion_proc.binding, assertion_method.to_s, @assertion_proc)
           end
         end
@@ -194,7 +209,7 @@ module PowerAssert
       path = target_frame.path
       lineno = target_frame.lineno
       if File.exist?(path)
-        line = open(path).each_line.drop(lineno - 1).first
+        line = File.open(path) {|fp| fp.each_line.drop(lineno - 1).first }
         @parser = Parser.new(line, path, lineno, binding)
       else
         @parser = Parser::DUMMY

data/lib/power_assert/parser.rb

@@ -8,7 +8,7 @@ module PowerAssert
 
     def initialize(line, path, lineno, binding, assertion_method_name = nil, assertion_proc = nil)
       @line = line
-      @line_for_parsing = valid_syntax?(line) ? line : slice_expression(line)
+      @line_for_parsing = (valid_syntax?(line) ? line : slice_expression(line)).b
       @path = path
       @lineno = lineno
       @binding = binding
@@ -94,11 +94,12 @@ module PowerAssert
           handle_columnless_ident(extract_idents(sexp[1]), op, extract_idents(sexp[3]))
         end
       when :call
-        with_safe_op = sexp[2] == :"&."
-        if sexp[3] == :call
-          handle_columnless_ident(extract_idents(sexp[1]), :call, [], with_safe_op)
+        _, recv, (op_sym, op_name, _), method = sexp
+        with_safe_op = ((op_sym == :@op and op_name == '&.') or op_sym == :"&.")
+        if method == :call
+          handle_columnless_ident(extract_idents(recv), :call, [], with_safe_op)
         else
-          extract_idents(sexp[1]) + (with_safe_op ? [Branch[extract_idents(sexp[3]), []]] : extract_idents(sexp[3]))
+          extract_idents(recv) + (with_safe_op ? [Branch[extract_idents(method), []]] : extract_idents(method))
         end
       when :array
         sexp[1] ? sexp[1].flat_map {|s| extract_idents(s) } : []

data/lib/power_assert/version.rb

@@ -1,3 +1,3 @@
 module PowerAssert
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Power Assert for Ruby