Merge pull request #49 from joallard/proposed-v0-5-0

Fixes for Ruby 2.6/2.7 and Pry 0.13

Author: banister

.gitignore

@@ -5,3 +5,4 @@ Makefile
 doc/
 pkg/
 .yardoc/
+Gemfile.lock

.travis.yml

@@ -7,13 +7,8 @@ before_install:
   - gem update --system
 
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.6.6
+  - 2.7.1
   - ruby-head
 
 matrix:

CHANGELOG

@@ -0,0 +1,9 @@
+## v0.5.0 (X May 2020)
+* Should fix most deprecation warnings as of release
+* Require Pry 0.13
+* Fix Pry#_pry_ => #pry_instance deprecation
+
+## v0.4.10 (X May 2020)
+* Require Ruby 2.6
+* Fix broken `show-stack` in Pry 0.13+
+* Fix Binding.source_location deprecations

Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

README.md

@@ -33,7 +33,7 @@ After installing `pry-stack_explorer`, just start Pry as normal (typically via a
 
 Example:
 --------
-Here we run the following ruby script: 
+Here we run the following ruby script:
 ```Ruby
 require 'pry-stack_explorer'
 
@@ -62,6 +62,13 @@ Limitations
 * First release, so may have teething problems.
 * Limited to Rubinius, and MRI 1.9.2+ at this stage.
 
+Compatible versions
+-------------------
+* v0.5: Ruby 2.6+, Pry 0.13+
+* v0.4.10: Ruby 2.6+, Pry 0.12+
+* v0.4.9.3: Ruby 2.5 and older
+
+
 Contact
 -------
 

Rakefile

@@ -33,12 +33,12 @@ end
 
 desc "run pry with plugin enabled"
 task :pry do
-  exec("pry -rubygems -I#{direc}/lib/ -r #{direc}/lib/#{PROJECT_NAME}")
+  exec("pry -I#{direc}/lib/ -r #{direc}/lib/#{PROJECT_NAME}")
 end
 
 desc "Run example"
 task :example do
-  sh "ruby -rubygems -I#{direc}/lib/ #{direc}/examples/example.rb "
+  sh "ruby -I#{direc}/lib/ #{direc}/examples/example.rb "
 end
 
 desc "Run example2"
@@ -61,7 +61,7 @@ task :default => :test
 
 desc "run tests"
 task :test do
-  sh "bacon -Itest -rubygems -a -q"
+  sh "bacon -Itest -a -q"
 end
 
 desc "generate gemspec"

lib/pry-stack_explorer.rb

@@ -127,9 +127,9 @@ def bindings_equal?(b1, b2)
 # monkey-patch the whereami command to show some frame information,
 # useful for navigating stack.
 Pry.config.hooks.add_hook(:before_whereami, :stack_explorer) do
-  if PryStackExplorer.frame_manager(_pry_) && !internal_binding?(target)
-    bindings      = PryStackExplorer.frame_manager(_pry_).bindings
-    binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
+  if PryStackExplorer.frame_manager(pry_instance) && !internal_binding?(target)
+    bindings      = PryStackExplorer.frame_manager(pry_instance).bindings
+    binding_index = PryStackExplorer.frame_manager(pry_instance).binding_index
 
     output.puts "\n"
     output.puts "#{Pry::Helpers::Text.bold('Frame number:')} #{binding_index}/#{bindings.size - 1}"

lib/pry-stack_explorer/commands.rb

@@ -5,13 +5,13 @@ module FrameHelpers
     # @return [PryStackExplorer::FrameManager] The active frame manager for
     #   the current `Pry` instance.
     def frame_manager
-      PryStackExplorer.frame_manager(_pry_)
+      PryStackExplorer.frame_manager(pry_instance)
     end
 
     # @return [Array<PryStackExplorer::FrameManager>] All the frame
     #   managers for the current `Pry` instance.
     def frame_managers
-      PryStackExplorer.frame_managers(_pry_)
+      PryStackExplorer.frame_managers(pry_instance)
     end
 
     # @return [Boolean] Whether there is a context to return to once
@@ -55,7 +55,7 @@ def frame_info(b, verbose = false)
       sig = meth_obj ? "<#{signature_with_owner(meth_obj)}>" : ""
 
       self_clipped = "#{Pry.view_clip(b_self)}"
-      path = "@ #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
+      path = '@ ' + b.source_location.join(':')
 
       if !verbose
         "#{type} #{desc} #{sig}"
@@ -292,7 +292,7 @@ def process
           output.puts "No caller stack available!"
         else
           content = ""
-          content << "\n#{text.bold("Showing all accessible frames in stack (#{frame_manager.bindings.size} in total):")}\n--\n"
+          content << "\n#{bold("Showing all accessible frames in stack (#{frame_manager.bindings.size} in total):")}\n--\n"
 
           base_frame_index, frames = selected_stack_frames
           frames.each_with_index do |b, index|

lib/pry-stack_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryStackExplorer
-  VERSION = '0.4.9.3'
+  VERSION = '0.5.0'
 end

lib/pry-stack_explorer/when_started_hook.rb

@@ -60,7 +60,7 @@ def remove_internal_frames(bindings)
 
     # remove pry-nav / pry-debugger / pry-byebug frames
     def remove_debugger_frames(bindings)
-      bindings.drop_while { |b| b.eval("__FILE__") =~ /pry-(?:nav|debugger|byebug)/ }
+      bindings.drop_while { |b| b.source_location[0] =~ /pry-(?:nav|debugger|byebug)/ }
     end
 
     # binding.pry frame