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

Make hist command just use _pry_.eval

Browse source
This commit is contained in:
Conrad Irwin 2012-12-28 06:44:04 -08:00
parent b8999b0afc
commit a61277d89b
2 changed files with 31 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pry/commands/hist.rb
View file

@ -111,10 +111,9 @@ class Pry
# further.
check_for_juxtaposed_replay(replay_sequence)
_pry_.input_stack.push _pry_.input
_pry_.input = StringIO.new(replay_sequence)
# eval_string << "#{@history.raw}\n"
# run "show-input" unless _pry_.complete_expression?(eval_string)
replay_sequence.lines.each do |line|
_pry_.eval line
end
end
# Checks +replay_sequence+ for the presence of neighboring replay calls.

65
spec/commands/hist_spec.rb
View file

@ -32,7 +32,7 @@ describe "hist" do
@t.push_binding o
@t.eval 'hist --replay -1'
@t.next_input.should == "@z = 30\n"
o.instance_variable_get(:@z).should == 30
end
it 'should replay a range of history correctly (range of items)' do
@ -42,8 +42,7 @@ describe "hist" do
@t.push_binding o
@t.eval 'hist --replay 0..2'
@t.next_input.should == "@x = 10\n@y = 20\n"
@t.eval('[@x, @y]').should == [10, 20]
end
# this is to prevent a regression where input redirection is
@ -52,12 +51,10 @@ describe "hist" do
o = Object.new
@hist.push "cd 1"
@hist.push "cd 2"
redirect_pry_io(InputTester.new("hist --replay 0..2", "Pad.stack = _pry_.binding_stack.dup", "exit-all")) do
o.pry
end
o = Pad.stack[-2..-1].map { |v| v.eval('self') }
o.should == [1, 2]
Pad.clear
@t.eval("hist --replay 0..2")
stack = @t.eval("Pad.stack = _pry_.binding_stack.dup")
stack.map{ |b| b.eval("self") }.should == [TOPLEVEL_BINDING.eval("self"), 1, 2]
end
it 'should grep for correct lines in history' do
@ -139,43 +136,37 @@ describe "hist" do
end
it "should store a call with `--replay` flag" do
redirect_pry_io(InputTester.new(":banzai", "hist --replay 1",
"hist", "exit-all"), @str_output) do
Pry.start
end
@str_output.string.should =~ /hist --replay 1/
@t.eval ":banzai"
@t.eval "hist --replay 1"
@t.eval("hist").should =~ /hist --replay 1/
end
it "should not contain lines produced by `--replay` flag" do
redirect_pry_io(InputTester.new(":banzai", ":geronimo", ":huzzah",
"hist --replay 1..3", "hist",
"exit-all"), @str_output) do
Pry.start
end
@t.eval ":banzai"
@t.eval ":geronimo"
@t.eval ":huzzah"
@t.eval("hist --replay 1..3")
@str_output.string.each_line.to_a.reject { |line| line.start_with?("=>") }.size.should == 4
@str_output.string.each_line.to_a.last.should =~ /hist --replay 1\.\.3/
@str_output.string.each_line.to_a[-2].should =~ /:huzzah/
output = @t.eval("hist")
output.should == "1: :banzai\n2: :geronimo\n3: :huzzah\n4: hist --replay 1..3\n"
end
it "should raise CommandError when index of `--replay` points out to another `hist --replay`" do
redirect_pry_io(InputTester.new(":banzai", "hist --replay 1",
"hist --replay 2", "exit-all"), @str_output) do
Pry.start
end
@str_output.string.should =~ /Replay index 2 points out to another replay call: `hist --replay 1`/
@t.eval ":banzai"
@t.eval "hist --replay 1"
lambda do
@t.eval "hist --replay 2"
end.should.raise(Pry::CommandError, /Replay index 4 points out to another replay call: `hist --replay 1`/)
end
it "should disallow execution of `--replay <i>` when CommandError raised" do
redirect_pry_io(InputTester.new("a = 0", "a += 1", "hist --replay 2",
"hist --replay 3", "'a is ' + a.to_s",
"hist", "exit-all"), @str_output) do
Pry.start
end
@str_output.string.each_line.to_a.reject { |line| line !~ /\A\d/ }.size.should == 5
@str_output.string.should =~ /a is 2/
@t.eval "a = 0"
@t.eval "a += 1"
@t.eval "hist --replay 2"
lambda{
@t.eval "hist --replay 3"
}.should.raise(Pry::CommandError)
@t.eval("a").should == 2
@t.eval("hist").lines.to_a.size.should == 5
end
end