pry-moves 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aaa7e6d0742a28752f1a53e912f875e7e17f23c9
-  data.tar.gz: c1e6965e00da047cb46f923315bbf31f27a46e3e
+SHA256:
+  metadata.gz: 5c8495d3cd82bfbcb6772aa7c5ba21c06aa5528a5fe9bc064589b5291ddaf2e1
+  data.tar.gz: afe2e3ff6c378e2ea61c7bb21ea6814f68f64b31216f576868808ad6c41a6da2
 SHA512:
-  metadata.gz: 1b0f21d7213ed5df54c332166a4d5fd6a200b017bdf9a757a75958bcbb4e9d6288436c1e44ececb194be14313f7d01f4fdf5150fb541cfcd3a3d0d3a2a2a1e0b
-  data.tar.gz: 78416e115156abcd6e5417ed1f8f0f648ae79db5173cd71b7933a35e05ec5ece09d817859cbf6ee5b465194a8304dee636fa9a6eca113937287520d522c95710
+  metadata.gz: d7ecf92cbc18b7c6e8c1c245d10b9112c264b44a4c7617aa928bcc9a8b2f36f8b61728806b9483e65c2aa8fc5f9d1f13374c4614d92a360a9cec52102ab80166
+  data.tar.gz: 7da0796248828d36db8fcd305e95a28f7d3e1a517178d2e587785b9998fb42d33058f62a1e7d5fa890da965deaaab6a1c21af92366fbb673809100c28f4985c2

data/Gemfile.lock

@@ -1,39 +1,38 @@
 PATH
   remote: .
   specs:
-    pry-moves (0.1.7)
+    pry-moves (0.1.8)
       binding_of_caller (~> 0.7)
-      pry (>= 0.9.10, < 0.11.0)
+      pry (>= 0.9.10, < 0.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.1)
+    coderay (1.1.2)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    method_source (0.8.2)
-    pry (0.10.4)
+    method_source (0.9.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     slop (3.6.0)
 
 PLATFORMS

data/README.md

@@ -19,7 +19,8 @@ _An execution control add-on for [Pry][pry]._
 * `c` - **continue**
 * `bt` - show latest 5 lines from backtrace
   * `bt 10` - latest 10 lines
-  * `bt all` - full backtrace
+  * `bt full` - full backtrace
+  * `bt +` - full backtrace with hidden frames. Aliases: `bt hidden` `bt vapid` `bt all`
   * `bt > foo` - write backtrace to file `log/backtrace_foo.log`
 * `up`/`down`/`top`/`bottom` - move over call stack
   * `up +` - move up, including vapid frames (block callers, hidden frames)
@@ -111,6 +112,10 @@ Please note that debugging functionality is implemented through
 bundle exec rspec
 ```
 
+## ToDo
+
+* `iterate` - steps in into child sub-block - should skip
+
 ## Contributors
 
 * Gopal Patel ([@nixme](https://github.com/nixme))

data/lib/pry-moves/backtrace.rb

@@ -44,7 +44,7 @@ class PryMoves::Backtrace
 
   def build
     result = []
-    show_vapid = @lines_count == 'all'
+    show_vapid = %w(+ all hidden vapid).include? @lines_count
     stack = stack_bindings(show_vapid)
               .reverse.reject do |binding|
                 binding.eval('__FILE__').match self.class::filter

data/lib/pry-moves/commands.rb

@@ -46,6 +46,7 @@ module PryMoves
     end
 
     block_command '!', 'exit' do
+      PryMoves.unlock
       Pry.config.exit_requested = true
       run '!!!'
     end

data/lib/pry-moves/pry_ext.rb

@@ -24,7 +24,8 @@ Binding.class_eval do
 
   def pry
     unless Pry.config.disable_breakpoints
-      PryMoves.synchronize_threads
+      PryMoves.synchronize_threads ||
+        return # Don't start binding.pry when semaphore locked by current thread
       pry_forced
     end
   end

data/lib/pry-moves/pry_wrapper.rb

@@ -58,7 +58,6 @@ class PryWrapper
       end
 
       Thread.current[:pry_moves_debug] = true
-      #@command[:binding].eval 'puts "###########"'
       tracer = start_tracing
       begin
         @command[:binding].eval @command[:param]

data/lib/pry-moves/trace_commands.rb

@@ -2,7 +2,7 @@ module PryMoves::TraceCommands
 
   private
 
-  def trace_step(event, file, line, binding_)
+  def trace_step(event, file, line, method, binding_)
     return unless event == 'line'
 
     if @step_in_everywhere
@@ -33,7 +33,7 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_next(event, file, line, binding_)
+  def trace_next(event, file, line, method, binding_)
     traced_method_exit = (@recursion_level < 0 and %w(line call).include? event)
     if traced_method_exit
       # Set new traced method, because we left previous one
@@ -45,17 +45,22 @@ module PryMoves::TraceCommands
       within_current_method?(file, line)
 
       if event == 'line'
-        return (
-        not @stay_at_frame or
-          @stay_at_frame == frame_digest(binding_.of_caller(3))
-        )
+        if @stay_at_frame
+          return (
+            @stay_at_frame == frame_digest(binding_.of_caller(3)) or
+            @c_stack_level < 0
+          )
+        else
+          return true
+        end
       end
 
-      exit_from_method if event == 'return' and before_end?(line)
+       exit_from_method if event == 'return' and
+         method != :to_s and before_end?(line)
     end
   end
 
-  def trace_finish(event, file, line, binding_)
+  def trace_finish(event, file, line, method, binding_)
     return unless event == 'line'
     if @recursion_level < 0 or @method_to_finish != @method
       if redirect_step_into?(binding_)
@@ -73,7 +78,7 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_debug(event, file, line, binding_)
+  def trace_debug(event, file, line, method, binding_)
     return unless event == 'line'
     if @first_line_skipped
       true
@@ -83,7 +88,7 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_iterate(event, file, line, binding_)
+  def trace_iterate(event, file, line, method, binding_)
     return exit_from_method if event == 'return' and
       within_current_method?(file, line)
 

data/lib/pry-moves/tracer.rb

@@ -71,6 +71,8 @@ class Tracer
 
   def set_traced_method(binding)
     @recursion_level = 0
+    @c_stack_level = 0
+    @stay_at_frame = nil # reset tracked digest
 
     method = binding.eval 'method(__method__) if __method__'
     if method
@@ -97,13 +99,13 @@ class Tracer
   end
 
   def tracing_func(event, file, line, id, binding_, klass)
-    #printf "#{trace_obj}: %8s %s:%-2d %10s %8s rec:#{@recursion_level}\n", event, file, line, id, klass
+    #printf ": %8s %s:%-2d %10s %8s rec:#{@recursion_level} st:#{@c_stack_level}\n", event, file, line, id, klass
 
     # Ignore traces inside pry-moves code
     return if file && TRACE_IGNORE_FILES.include?(File.expand_path(file))
 
     catch (:skip) do
-      if send "trace_#{@action}", event, file, line, binding_
+      if send "trace_#{@action}", event, file, line, id, binding_
         stop_tracing
         Pry.start(binding_, @pry_start_options)
 
@@ -113,6 +115,9 @@ class Tracer
         delta = event == 'call' ? 1 : -1
         #puts "recursion #{event}: #{delta}; changed: #{@recursion_level} => #{@recursion_level + delta}"
         @recursion_level += delta
+      elsif %w(c-call c-return).include?(event)
+        delta = event == 'c-call' ? 1 : -1
+        @c_stack_level += delta
       end
     end
   end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/pry-moves.rb

@@ -34,6 +34,10 @@ module PryMoves
     @semaphore ||= Mutex.new
   end
 
+  def locked?
+    semaphore.locked?
+  end
+
   def lock
     semaphore.lock unless semaphore.locked?
   end
@@ -47,13 +51,10 @@ module PryMoves
   end
 
   def synchronize_threads
-    return if Thread.current[:pry_moves_debug]
+    return true if Thread.current[:pry_moves_debug]
 
-    semaphore.synchronize {}
-  rescue ThreadError => e
-    puts e.backtrace.reverse
-    puts e
-    raise e
+    semaphore.synchronize {} rescue return
+    true
   end
 
   # Reference to currently running pry-remote server. Used by the tracer.

data/playground/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pry-moves (0.1.7)
+    pry-moves (0.1.8)
       binding_of_caller (~> 0.7)
       pry (>= 0.9.10, < 0.11.0)
 

data/playground/sand.rb

@@ -1,84 +1,23 @@
 require 'pry-moves'
 require './tracer.rb'
+require './playground.rb'
 
-
-def fi(param)
-  a = 2 + 1
-  puts param
+def debug?(something)
+  puts something
 end
 
-class A
-
-  def initialize
-    puts :xuilo
-  end
-
-  def aa
-    puts 'aa: step 1'
-    puts 'aa: step 2'
-  end
-
-  def bb
-    debug_redirect = :aa
-    hide_from_stack = true
-    puts 'bb: step 1'
-    puts 'bb: step 2'
-    aa
-  end
-
-  def cc
-    koko = :love
-    binding.pry
-    bb
-    (2..4).each do |i|
-      puts i
-    end
-    puts :two
-  end
-  alias cc_al cc
-
+def sentence
+  :opa
 end
 
-def fff
-  binding.pry # stop in native_block
-  #2.times do |i|
-  iterator do |i|
-    dummy = 1 # inside block
-    return
-    dummy = 2
-  end
-  puts :ss
-  :after_block # after block
-end
 
-def iterator
-  2.times do |i|
-    dummy = :pre_yield # pre_yield
-    yield i
-    :post_yield # post_yield
-  end
-end
+def aaa
+  puts :ok
+  "rule#{1}"
+  binding.pry if debug? "rule#{1}"
+  puts :ok
 
-def ff
-  fff
-  puts :aaa
 end
 
-ff
-
-puts :prepare
-
-A.new.cc_al
-A.new.cc_al
-
-
-bb = 1
-
-exit
-
-pp = 123 if debucher?
-binding.pry if debucher?
-
 binding.pry
-
-puts :ok
+aaa

data/pry-moves.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.required_ruby_version = '>= 1.8.7'
-  gem.add_runtime_dependency 'pry', '>= 0.9.10', '< 0.11.0'
+  gem.add_runtime_dependency 'pry', '>= 0.10.4', '< 0.12.0'
   gem.add_runtime_dependency 'binding_of_caller', '~> 0.7'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Debugger for ruby