mirror of
https://github.com/pry/pry.git
synced 2022-11-09 12:35:05 -05:00
free show-source from the horror of module_introspection_helpers.rb and method_options.rb
show-doc and edit and a variety of other commands can also be updated to use the new Pry::CodeObject API
This commit is contained in:
parent
d1222396e3
commit
47d30a139c
2 changed files with 59 additions and 114 deletions
|
@ -1,6 +1,5 @@
|
|||
class Pry
|
||||
Pry::Commands.create_command "show-source" do
|
||||
include Pry::Helpers::ModuleIntrospectionHelpers
|
||||
extend Pry::Helpers::BaseHelpers
|
||||
|
||||
group 'Introspection'
|
||||
|
@ -30,7 +29,6 @@ class Pry
|
|||
end
|
||||
|
||||
def options(opt)
|
||||
# method_options(opt)
|
||||
opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors.", :as => :count
|
||||
opt.on :l, "line-numbers", "Show line numbers."
|
||||
opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)."
|
||||
|
@ -43,98 +41,49 @@ class Pry
|
|||
o = Pry::CodeObject.lookup(obj_name, target, _pry_, :super => opts[:super])
|
||||
raise Pry::CommandError, "Couldn't locate #{obj_name}!" if !o
|
||||
|
||||
result = ""
|
||||
result << header(o)
|
||||
result << Code.new(o.source).with_line_numbers(use_line_numbers?).to_s
|
||||
stagger_output result
|
||||
end
|
||||
|
||||
def header(code_object)
|
||||
file_name, line_num = code_object.source_file, code_object.source_line
|
||||
|
||||
h = ""
|
||||
h << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} "
|
||||
|
||||
if code_object.is_a?(::Method) || code_object.is_a?(::UnboundMethod)
|
||||
if code_object.source_type == :c
|
||||
h << "(C Method):\n"
|
||||
else
|
||||
h << "@ line #{line_num}:\n"
|
||||
end
|
||||
|
||||
h << "#{text.bold("Owner:")} #{code_object.owner || "N/A"}\n"
|
||||
h << "#{text.bold("Visibility:")} #{code_object.visibility}"
|
||||
end
|
||||
|
||||
h << "\n#{Pry::Helpers::Text.bold('Number of lines:')} #{code_object.source.lines.count}\n\n"
|
||||
end
|
||||
|
||||
def process_sourcable_object
|
||||
name = args.first
|
||||
object = target.eval(name)
|
||||
|
||||
file_name, line = object.source_location
|
||||
|
||||
source = Pry::Code.from_file(file_name).expression_at(line)
|
||||
code = Pry::Code.new(source).with_line_numbers(use_line_numbers?).to_s
|
||||
|
||||
result = ""
|
||||
result << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line}:\n"
|
||||
result << "#{Pry::Helpers::Text.bold('Number of lines:')} #{code.lines.count}\n\n"
|
||||
result << code
|
||||
result << "\n"
|
||||
end
|
||||
|
||||
def process_method
|
||||
raise CommandError, "Could not find method source" unless method_object.source
|
||||
|
||||
code = ""
|
||||
code << make_header(method_object)
|
||||
code << "#{text.bold("Owner:")} #{method_object.owner || "N/A"}\n"
|
||||
code << "#{text.bold("Visibility:")} #{method_object.visibility}\n"
|
||||
code << "\n"
|
||||
|
||||
code << Code.from_method(method_object, start_line).
|
||||
with_line_numbers(use_line_numbers?).to_s
|
||||
end
|
||||
|
||||
def process_module
|
||||
raise Pry::CommandError, "No documentation found." if module_object.nil?
|
||||
if opts.present?(:all)
|
||||
all_modules
|
||||
if opts[:a]
|
||||
result = all_modules(o)
|
||||
else
|
||||
normal_module
|
||||
end
|
||||
end
|
||||
|
||||
def normal_module
|
||||
file_name = line = code = nil
|
||||
attempt do |rank|
|
||||
file_name, line = module_object.candidate(rank).source_location
|
||||
set_file_and_dir_locals(file_name)
|
||||
code = Code.from_module(module_object, module_start_line(module_object, rank), rank).
|
||||
result = header(o)
|
||||
result << Code.new(o.source, start_line_for(o)).
|
||||
with_line_numbers(use_line_numbers?).to_s
|
||||
end
|
||||
|
||||
result = ""
|
||||
result << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line}:\n"
|
||||
result << "#{Pry::Helpers::Text.bold('Number of lines:')} #{code.lines.count}\n\n"
|
||||
result << code
|
||||
stagger_output result
|
||||
end
|
||||
|
||||
def all_modules
|
||||
mod = module_object
|
||||
# we need this helper as some Pry::Method objects can wrap Procs
|
||||
# @return [Boolean]
|
||||
def real_method_object?(code_object)
|
||||
code_object.is_a?(::Method) || code_object.is_a?(::UnboundMethod)
|
||||
end
|
||||
|
||||
result = ""
|
||||
result << "Found #{mod.number_of_candidates} candidates for `#{mod.name}` definition:\n"
|
||||
# Generate a header (meta-data information) for all the code
|
||||
# object types: methods, modules, commands, procs...
|
||||
def header(code_object)
|
||||
file_name, line_num = code_object.source_file, code_object.source_line
|
||||
h = "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} "
|
||||
if real_method_object?(code_object) && code_object.source_type == :c
|
||||
h << "(C Method):"
|
||||
else
|
||||
h << "@ line #{line_num}:"
|
||||
end
|
||||
|
||||
if real_method_object?(code_object)
|
||||
h << "\n#{text.bold("Owner:")} #{code_object.owner || "N/A"}\n"
|
||||
h << "#{text.bold("Visibility:")} #{code_object.visibility}"
|
||||
end
|
||||
h << "\n#{Pry::Helpers::Text.bold('Number of lines:')} #{code_object.source.lines.count}\n\n"
|
||||
end
|
||||
|
||||
def all_modules(mod)
|
||||
result = "Found #{mod.number_of_candidates} candidates for `#{mod.name}` definition:\n"
|
||||
mod.number_of_candidates.times do |v|
|
||||
candidate = mod.candidate(v)
|
||||
begin
|
||||
result << "\nCandidate #{v+1}/#{mod.number_of_candidates}: #{candidate.file} @ line #{candidate.line}:\n"
|
||||
code = Code.from_module(mod, module_start_line(mod, v), v).
|
||||
with_line_numbers(use_line_numbers?).to_s
|
||||
result << "Number of lines: #{code.lines.count}\n\n"
|
||||
result << code
|
||||
code = Code.from_module(mod, start_line_for(candidate), v).with_line_numbers(use_line_numbers?).to_s
|
||||
result << "Number of lines: #{code.lines.count}\n\n" << code
|
||||
rescue Pry::RescuableException
|
||||
result << "\nNo code found.\n"
|
||||
next
|
||||
|
@ -143,34 +92,17 @@ class Pry
|
|||
result
|
||||
end
|
||||
|
||||
def process_command
|
||||
name = args.join(" ").gsub(/\"/,"")
|
||||
command = find_command(name)
|
||||
|
||||
file_name, line = command.source_location
|
||||
set_file_and_dir_locals(file_name)
|
||||
|
||||
code = Pry::Code.new(command.source, line).with_line_numbers(use_line_numbers?).to_s
|
||||
|
||||
result = ""
|
||||
result << "\n#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{line}:\n"
|
||||
result << "#{Pry::Helpers::Text.bold('Number of lines:')} #{code.lines.count}\n\n"
|
||||
result << "\n"
|
||||
|
||||
result << code
|
||||
def start_line_for(code_object)
|
||||
if opts.present?(:'base-one')
|
||||
1
|
||||
else
|
||||
code_object.source_line || 1
|
||||
end
|
||||
end
|
||||
|
||||
def use_line_numbers?
|
||||
opts.present?(:b) || opts.present?(:l)
|
||||
end
|
||||
|
||||
def start_line
|
||||
if opts.present?(:'base-one')
|
||||
1
|
||||
else
|
||||
method_object.source_line || 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Pry::Commands.alias_command "show-method", "show-source"
|
||||
|
|
|
@ -170,6 +170,17 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
|
|||
t.eval('show-source Test::A#yup').should =~ /define_method\(:yup\)/
|
||||
end
|
||||
end
|
||||
|
||||
it "should output the source of a command defined inside Pry" do
|
||||
command_definition = %{
|
||||
Pry.commands.command "hubba-hubba" do
|
||||
puts "that's what she said!"
|
||||
end
|
||||
}
|
||||
out = pry_eval(command_definition, 'show-source hubba-hubba')
|
||||
out.should =~ /what she said/
|
||||
Pry.commands.delete "hubba-hubba"
|
||||
end
|
||||
end
|
||||
|
||||
describe "on sourcable objects" do
|
||||
|
@ -514,11 +525,13 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
|
|||
Object.remove_const(:BabyDuck)
|
||||
end
|
||||
|
||||
it 'should return source for first valid module' do
|
||||
out = pry_eval('show-source BabyDuck::Muesli')
|
||||
out.should =~ /def d; end/
|
||||
out.should.not =~ /def a; end/
|
||||
end
|
||||
# TODO: !!! This is a bad spec, should not be expected behaviour?!?!
|
||||
#
|
||||
# it 'should return source for first valid module' do
|
||||
# out = pry_eval('show-source BabyDuck::Muesli')
|
||||
# out.should =~ /def d; end/
|
||||
# out.should.not =~ /def a; end/
|
||||
# end
|
||||
|
||||
end
|
||||
end
|
||||
|
@ -544,15 +557,15 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
|
|||
end
|
||||
|
||||
it "should output source of commands using special characters" do
|
||||
@set.command "!", "Clear the input buffer" do; end
|
||||
@set.command "!%$", "I gots the yellow fever" do; end
|
||||
|
||||
pry_eval('show-source !').should =~ /Clear the input buffer/
|
||||
pry_eval('show-source !%$').should =~ /yellow fever/
|
||||
end
|
||||
|
||||
it 'should show source for a command with spaces in its name' do
|
||||
@set.command "foo bar", :body_of_foo_bar do; end
|
||||
|
||||
pry_eval('show-source "foo bar"').should =~ /:body_of_foo_bar/
|
||||
pry_eval('show-source foo bar').should =~ /:body_of_foo_bar/
|
||||
end
|
||||
|
||||
it 'should show source for a command by listing name' do
|
||||
|
|
Loading…
Reference in a new issue