pry-nav 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60380e147933ae1e2ba3ecef2259bec48e90cef46f1fa5c28e4272e3c92b87c2
-  data.tar.gz: 645b2e7372f791a6d8f907025a9884ac4f8b2e9d2f9c165118c99cca48a5a946
+  metadata.gz: 342150dc2c72e13894b2e824b2e0d3104fdd7bfb345e081b509da4cc865e2533
+  data.tar.gz: 2b94f22aba1710e1202af420e59521f634202e7c327f67f9a358b16c18fb0d98
 SHA512:
-  metadata.gz: c494dfb85a667aa37007e22088085e73444cb08a3525d1f87c129cca087ab8e79851a4cb9791cb5855064b3f50baa88d0186df6c208cbf0fad69e533618bafd1
-  data.tar.gz: 6ee2450ed59686be5522dd78b9b4da811106e4235a79952e48603c49eca9fd089f93c1b29bff2522243f7caba20c77ee204f1c41855534328065fc9c71eb0118
+  metadata.gz: edc7473c442feaf082961bf7be9bb341692e9c47ee1128cbcab90c12b3c394121ad40974a6d84f07ca4cf0926d6f50661a9cfa2b2eba0b194d22bc0820edac21
+  data.tar.gz: b3aef7a0f36f115d35ee932f53c5547a98b94ee43637a36f164a996a675465435c514fe824799778dd1f1274f7bf3ebbf4c509e3d404cdbaf910a5df0b2a971f

data/.github/workflows/main.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push,pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0', 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/bundle

data/.ruby-version

@@ -0,0 +1 @@
+2.7.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.0
+
+* Drop support for ruby < 2.1.
+* Support Pry 0.14
+* Adding tests
+* Fix warning on ruby 2.7
+
 ## 0.3.0 (2019-04-16)
 
 * Fix circular require warning.

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in pry-nav.gemspec
 gemspec
+
+gem "test-unit"
+
+gem "pry", "~> 0.14.1"
+gem "pry-remote"

data/README.md

@@ -1,10 +1,10 @@
-### Using MRI? We recommend [**pry-byebug**][pry-byebug] instead!
+### Using MRI? We recommend [**break**][break] or [**pry-byebug**][pry-byebug] instead!
 
-# pry-nav
+# pry-nav [![Ruby](https://github.com/nixme/pry-nav/actions/workflows/main.yml/badge.svg)](https://github.com/nixme/pry-nav/actions/workflows/main.yml)
 
 _A simple execution control add-on for [Pry][pry]._
 
-Compatible with MRI >= 1.8.7, ![JRuby](https://raw.githubusercontent.com/jruby/collateral/master/logos/PNGs/logo-with-type/full-color/jruby-logo-logo-with-type-small.png) >= 9.1.3.0.
+Compatible with MRI >= 2.1.0, JRuby >= 9.1.3.0.
 
 Teaches [Pry][pry] about `step`, `next`, and `continue` to create a simple
 debugger.
@@ -55,6 +55,7 @@ penalty.
 * Benjamin R. Haskell ([@benizi](https://github.com/benizi))
 * Jason R. Clark ([@jasonrclark](https://github.com/jasonrclark))
 * Ivo Anjo ([@ivoanjo](https://github.com/ivoanjo))
+* Michael Bianco ([@iloveitaly](https://github.com/iloveitaly))
 
 Patches and bug reports are welcome. Just send a [pull request][pullrequests] or
 file an [issue][issues]. [Project changelog][changelog].
@@ -74,3 +75,4 @@ file an [issue][issues]. [Project changelog][changelog].
 [Mon-Ouie]:       https://github.com/Mon-Ouie
 [pry_debug]:      https://github.com/Mon-Ouie/pry_debug
 [pry-byebug]:     https://github.com/deivid-rodriguez/pry-byebug
+[break]:          https://github.com/gsamokovarov/break

data/Rakefile

@@ -1,2 +1,10 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task :default => :test
+
+Rake::TestTask.new(:test) do |task|
+  task.libs << 'test'
+  task.test_files = FileList['test/*_test.rb']
+  task.verbose = true
+end

data/lib/pry-nav/commands.rb

@@ -19,11 +19,12 @@ module PryNav
 
     helpers do
       def breakout_navigation(action, times)
-        _pry_.binding_stack.clear     # Clear the binding stack.
-        throw :breakout_nav, {        # Break out of the REPL loop and
-          :action => action,          #   signal the tracer.
-          :times =>  times
-        }
+        pry_instance.binding_stack.clear     # Clear the binding stack.
+        throw(
+          :breakout_nav,              # Break out of the REPL loop and
+          action: action,             #   signal the tracer.
+          times: times,
+        )
       end
 
       # Ensures that a command is executed in a local file context.

data/lib/pry-nav/pry_ext.rb

@@ -2,7 +2,7 @@ require 'pry' unless defined? Pry
 require 'pry-nav/tracer'
 
 class << Pry
-  alias_method :start_without_pry_nav, :start
+  alias start_without_pry_nav start
 
   def start_with_pry_nav(target = TOPLEVEL_BINDING, options = {})
     old_options = options.reject { |k, _| k == :pry_remote }
@@ -18,5 +18,5 @@ class << Pry
     end
   end
 
-  alias_method :start, :start_with_pry_nav
+  alias start start_with_pry_nav
 end

data/lib/pry-nav/pry_remote_ext.rb

@@ -14,20 +14,21 @@ module PryRemote
       end
 
       setup
-      Pry.start @object, {
-        :input  => client.input_proxy,
-        :output => client.output,
-        :pry_remote => true
-      }
+      Pry.start(
+        @object,
+        input: client.input_proxy,
+        output: client.output,
+        pry_remote: true,
+      )
     end
 
     # Override to reset our saved global current server session.
-    alias_method :teardown_without_pry_nav, :teardown
+    alias teardown_without_pry_nav teardown
     def teardown_with_pry_nav
       teardown_without_pry_nav
       PryNav.current_remote_server = nil
     end
-    alias_method :teardown, :teardown_with_pry_nav
+    alias teardown teardown_with_pry_nav
   end
 end
 
@@ -36,7 +37,5 @@ end
 # PryNav::Tracer#run doesn't have a chance to cleanup.
 at_exit do
   set_trace_func nil
-  if PryNav.current_remote_server
-    PryNav.current_remote_server.teardown
-  end
+  PryNav.current_remote_server.teardown if PryNav.current_remote_server
 end

data/lib/pry-nav/tracer.rb

@@ -2,18 +2,16 @@ require 'pry' unless defined? Pry
 
 module PryNav
   class Tracer
-    def initialize(pry_start_options = {}, &block)
+    def initialize(pry_start_options = {})
       @step_in_lines = -1                      # Break after this many lines
       @frames_when_stepping = nil              # Only break at this frame level
       @frames = 0                              # Traced stack frame level
       @pry_start_options = pry_start_options   # Options to use for Pry.start
     end
 
-    def run(&block)
+    def run
       # For performance, disable any tracers while in the console.
-      # Unfortunately doesn't work in 1.9.2 because of
-      # http://redmine.ruby-lang.org/issues/3921. Works fine in 1.8.7 and 1.9.3.
-      stop unless RUBY_VERSION == '1.9.2'
+      stop
 
       return_value = nil
       command = catch(:breakout_nav) do      # Coordinates with PryNav::Commands
@@ -25,7 +23,6 @@ module PryNav
       if process_command(command)
         start
       else
-        stop if RUBY_VERSION == '1.9.2'
         if @pry_start_options[:pry_remote] && PryNav.current_remote_server
           PryNav.current_remote_server.teardown
         end
@@ -60,10 +57,9 @@ module PryNav
       end
     end
 
+    private
 
-   private
-
-    def tracer(event, file, line, id, binding, klass)
+    def tracer(event, file, _line, _id, binding, _klass)
       # Ignore traces inside pry-nav code
       return if file && TRACE_IGNORE_FILES.include?(File.expand_path(file))
 
@@ -81,7 +77,7 @@ module PryNav
         end
 
         # Break on this line?
-        Pry.start(binding, @pry_start_options) if @step_in_lines == 0
+        Pry.start(binding, @pry_start_options) if @step_in_lines.zero?
 
       when 'call', 'class'
         @frames += 1         # Track entering a frame

data/lib/pry-nav/version.rb

@@ -1,3 +1,3 @@
 module PryNav
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

data/lib/pry-nav.rb

@@ -14,7 +14,12 @@ module PryNav
   # Checks that a binding is in a local file context. Extracted from
   # https://github.com/pry/pry/blob/master/lib/pry/default_commands/context.rb
   def check_file_context(target)
-    file = target.eval('__FILE__')
+    file = if target.respond_to?(:source_location)
+      target.source_location.first
+    else
+      target.eval('__FILE__')
+    end
+
     file == Pry.eval_path || (file !~ /(\(.*\))|<.*>/ && file != '' && file != '-e')
   end
 

data/pry-nav.gemspec

@@ -12,13 +12,12 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Simple execution navigation for Pry.'
   gem.description   = "Turn Pry into a primitive debugger. Adds 'step' and 'next' commands to control execution."
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  # Dependencies
-  gem.required_ruby_version = '>= 1.8.7'
-  gem.add_runtime_dependency 'pry', '>= 0.9.10', '< 0.13.0'
-  gem.add_development_dependency 'pry-remote', '~> 0.1.6'
+  gem.required_ruby_version = '>= 2.1.0'
+  gem.add_runtime_dependency 'pry', '>= 0.9.10', '< 0.15'
+  gem.add_development_dependency 'rake'
 end

data/test/pry_nav_test.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require ::File.expand_path("test_helper", __dir__)
+
+class PryNavTest < Test::Unit::TestCase
+  # removing color makes string matching easier
+  def setup
+    Pry.color = false
+  end
+
+  # lifted from:
+  # https://github.com/pry/pry-stack_explorer/blob/e3e6bd202e092712900f0d5f239ee21ab2f32b2b/test/support/io_utils.rb
+  def with_pry_output_captured(new_in, new_out = StringIO.new)
+    old_in = Pry.input
+    old_out = Pry.output
+
+    # direct stdout so we can test against `puts` in the method we defined above
+    old_stdout = $stdout
+    $stdout = new_out
+
+    Pry.input = new_in
+    Pry.output = new_out
+
+    begin
+      yield
+    ensure
+      Pry.input = old_in
+      Pry.output = old_out
+      $stdout = old_stdout
+    end
+
+    new_out
+  end
+
+  # `step` will step into the frames, while `next` keeps the debugging execution within the frame
+  def test_step
+    o = NavSample.new
+
+    r = with_pry_output_captured(
+      InputTester.new(
+        "step",
+
+        "step",
+        "step",
+
+        "continue"
+      )
+    ){ o.nested_bind_with_call }
+
+    # initial binding display
+    assert(r.string.include?("def nested_bind_with_call"))
+
+    # after two steps, we are in the second frame, let's make sure we get there
+    assert(r.string.include?("def nested_bind_call"))
+
+    assert(/nested_puts\n/ =~ r.string)
+    assert(/root_puts\n/ =~ r.string)
+  end
+
+  def test_next
+    o = NavSample.new
+
+    r = with_pry_output_captured(
+      InputTester.new(
+        "next",
+        "next",
+        "next",
+        "continue"
+      )
+    ){ o.nested_bind_with_call }
+
+    assert(r.string.include?("def nested_bind_with_call"))
+    refute(r.string.include?("def nested_bind_call"))
+
+    assert(/nested_puts\n/ =~ r.string)
+    assert(/root_puts\n/ =~ r.string)
+  end
+
+  def test_continue
+    o = NavSample.new
+
+    r = with_pry_output_captured(
+      InputTester.new(
+        "continue",
+      )
+    ){ o.nested_bind_with_call }
+
+    assert(r.string.include?("def nested_bind_with_call"))
+    refute(r.string.include?("def nested_bind_call"))
+
+    assert(/nested_puts\n/ =~ r.string)
+    assert(/root_puts\n/ =~ r.string)
+  end
+
+  def test_file_context
+    assert(PryNav.check_file_context(binding))
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,39 @@
+require 'bundler/setup'
+require 'test/unit'
+
+# lets make sure it works will all of the pry extensions
+Bundler.require
+
+class NavSample
+  def nested_bind_with_call
+    Pry.start(binding)
+    nested_bind_call
+    puts "root_puts"
+  end
+
+  def nested_bind_call
+    puts "nested_puts"
+  end
+end
+
+# lifted from:
+# https://github.com/pry/pry-stack_explorer/blob/e3e6bd202e092712900f0d5f239ee21ab2f32b2b/test/support/input_tester.rb
+
+class InputTester
+  def initialize(*actions)
+    if actions.last.is_a?(Hash) && actions.last.keys == [:history]
+      @hist = actions.pop[:history]
+    end
+
+    @orig_actions = actions.dup
+    @actions = actions
+  end
+
+  def readline(*)
+    @actions.shift.tap{ |line| @hist << line if @hist }
+  end
+
+  def rewind
+    @actions = @orig_actions.dup
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-nav
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gopal Patel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -19,7 +19,7 @@ dependencies:
         version: 0.9.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: 0.9.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: pry-remote
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0'
 description: Turn Pry into a primitive debugger. Adds 'step' and 'next' commands to
   control execution.
 email: nixme@stillhope.com
@@ -51,7 +51,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -65,11 +67,13 @@ files:
 - lib/pry-nav/tracer.rb
 - lib/pry-nav/version.rb
 - pry-nav.gemspec
+- test/pry_nav_test.rb
+- test/test_helper.rb
 homepage: https://github.com/nixme/pry-nav
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,15 +81,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Simple execution navigation for Pry.
-test_files: []
+test_files:
+- test/pry_nav_test.rb
+- test/test_helper.rb