power_p 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99351f52fbfc338960c05304117afb1038431d6
-  data.tar.gz: 612131704d1897368a4c1ea60b238e3d3d505271
+  metadata.gz: 31d7a1bbffb279c980f36c36c6d199ce6daf5a48
+  data.tar.gz: 56a115aa4beb3f7e6619dac609bd4f11c869a935
 SHA512:
-  metadata.gz: 1debce1526ee6533bf883e94ce616bd151fb024ed0a455a020493f96e2d2c740f764256de99253396e915427a57f8fad2e5b113a33a3c4e72c366240a46cfdd9
-  data.tar.gz: 93f599e12bb26a038260f0e9b2fea243dc8a60a3d279dd08dfed2e93e3e00478323de3a94bd631c2278734bbd3e11550d49c97ba6768e46479641520031070bf
+  metadata.gz: dc86ea97496dbea0a7c7a564b7948208fbadac720af496befa220b0a0dc96487b497f7f4121e45b773dcb2f460523a0f444b7de354d77c5d37415b7c7d67ce13
+  data.tar.gz: b830f800b14f6682eedd8f58a9ba8004bc2bdb79e754061247dac45bcf21358c1eb979f875a5466e40abd88e9c27c7fb2f0b09bc5479cb2c6bf86c29a3f35ce0

data/lib/power_p.rb

@@ -4,14 +4,24 @@
 
 require "power_p/version"
 require 'power_assert'
+require 'power_p/core_ext'
+
+module PowerAssert
+  INTERNAL_LIB_DIRS[PowerP] = File.dirname(caller_locations(1, 1).first.path)
+end
 
 module PowerP
   def p(*, &blk)
     if blk
       PowerAssert.start(blk, assertion_method: __callee__) do |pa|
-        val = pa.yield
-        puts pa.message_proc.call
-        val
+        begin
+          val = pa.yield
+          puts pa.message
+          val
+        rescue => e
+          puts pa.message
+          raise e
+        end
       end
     else
       super

data/lib/power_p/core_ext.rb

@@ -0,0 +1,92 @@
+require 'power_assert'
+
+verbose = $VERBOSE
+begin
+  $VERBOSE = nil
+
+  module PowerAssert
+    class << self
+      prepend Module.new {
+        def start(*)
+          super do |ctx|
+            disable_nesting_contexts(ctx) do
+              yield ctx
+            end
+          end
+        end
+
+        private
+
+        BLOCK_CONTEXTS_STACK = Hash.new {|h, thread| h[thread] = [] }
+
+        def disable_nesting_contexts(ctx)
+          BLOCK_CONTEXTS_STACK.delete_if {|th,| ! th.alive? }
+          stack = BLOCK_CONTEXTS_STACK[Thread.current]
+          if stack.last
+            stack.last.disable
+          end
+          stack.push(ctx)
+          yield
+        ensure
+          stack.pop
+          if stack.last
+            stack.last.enable
+          end
+        end
+      }
+    end
+
+    class Parser
+      def method_id_set
+        @method_id_set ||=
+          if @assertion_proc
+            insns = RubyVM::InstructionSequence.of(@assertion_proc).to_a[13]
+            insns.each_with_object({}) do |i, h|
+              if i.kind_of?(Array) and i[1].kind_of?(Hash) and i[1][:mid]
+                h[i[1][:mid]] = true
+              end
+            end
+          else
+            Hash.new(true)
+          end
+      end
+
+      EQ_TRUE = Class.new do
+        def ==(*)
+          true
+        end
+      end.new
+      private_constant :EQ_TRUE
+
+      def lineno
+        EQ_TRUE
+      end
+    end
+
+    class Context
+      def message
+        @message ||= (@return_values.chunk(&:lineno).map.with_index do |(lineno, vals), i|
+            if i == 0
+              parser = @parser
+            else
+              line = open(@parser.path).each_line.drop(lineno - 1).first
+              parser = Parser.new(line, @parser.path, lineno, @parser.binding)
+            end
+            build_assertion_message(parser, vals)
+          end).join("\n").freeze
+      end
+    end
+
+    class BlockContext
+      def enable
+        @trace_return.enable
+      end
+
+      def disable
+        @trace_return.disable
+      end
+    end
+  end
+ensure
+  $VERBOSE = verbose
+end

data/lib/power_p/version.rb

@@ -1,3 +1,3 @@
 module PowerP
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/power_p.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   spec.require_paths    = ['lib']
 
-  spec.add_runtime_dependency 'power_assert'
+  spec.add_runtime_dependency 'power_assert', '>= 1.1.0'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'rake'
   spec.extra_rdoc_files = ['README.rdoc']

data/test/test_power_p.rb

@@ -5,4 +5,11 @@ class TestPowerP < Test::Unit::TestCase
   def test_power_p
     p { 3.times.to_a }
   end
+
+  def test_power_p_multiline
+    p do
+      0.to_s
+      1 == 2
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_p
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +69,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/power_p.rb
+- lib/power_p/core_ext.rb
 - lib/power_p/version.rb
 - power_p.gemspec
 - test/test_power_p.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Extend Kernel#p with power_assert