kotovalexarian-likes-github/pry--pry
1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00
Code Releases Activity

Revert "make whereami more consistent [Fixes #383]"

Browse source 
This reverts commit 2e8881f59e.
This commit is contained in:
Conrad Irwin 2012-11-20 13:44:23 -08:00
parent 07137ee5e5
commit 5a240b2d0c
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pry/commands/whereami.rb
View file

@ -22,17 +22,9 @@ class Pry
def setup def setup
@method = Pry::Method.from_binding(target) @method = Pry::Method.from_binding(target)
if internal_binding?(target)
location = _pry_.backtrace.detect do |x|
!x.start_with?(File.expand_path('../../../../lib', __FILE__))
end
@file = location.split(":").first
@line = location.split(":")[1].to_i
else
@file = target.eval('__FILE__') @file = target.eval('__FILE__')
@line = target.eval('__LINE__') @line = target.eval('__LINE__')
end end
end
def options(opt) def options(opt)
opt.on :q, :quiet, "Don't display anything in case of an error" opt.on :q, :quiet, "Don't display anything in case of an error"
@ -54,10 +46,12 @@ class Pry
if opts.quiet? && (internal_binding?(target) || !code?) if opts.quiet? && (internal_binding?(target) || !code?)
return return
elsif internal_binding?(target) elsif internal_binding?(target)
if @file.end_with?("bin/pry") if target_self == TOPLEVEL_BINDING.eval("self")
output.puts "At the top level." output.puts "At the top level."
return else
output.puts "Inside #{Pry.view_clip(target_self)}."
end end
return
end end
set_file_and_dir_locals(@file) set_file_and_dir_locals(@file)