mirror of
https://github.com/pry/pry.git
synced 2022-11-09 12:35:05 -05:00
Be more liberal with stagger_out and fall to Pry.out then $stdout.
Signed-off-by: Jordon Bedwell <jordon@envygeeks.com>
This commit is contained in:
parent
3d8b82a812
commit
b9b8fd6d60
1 changed files with 15 additions and 3 deletions
|
@ -126,15 +126,27 @@ class Pry
|
||||||
# Try to use `less` for paging, if it fails then use
|
# Try to use `less` for paging, if it fails then use
|
||||||
# simple_pager. Also do not page if Pry.pager is falsey
|
# simple_pager. Also do not page if Pry.pager is falsey
|
||||||
# FIXME! Another JRuby hack
|
# FIXME! Another JRuby hack
|
||||||
def stagger_output(text, output=output())
|
def stagger_output(text, out = nil)
|
||||||
|
out || = case
|
||||||
|
when respond_to?(:output)
|
||||||
|
# Mixin.
|
||||||
|
output
|
||||||
|
when Pry.respond_to?(:output)
|
||||||
|
# Parent.
|
||||||
|
Pry.output
|
||||||
|
else
|
||||||
|
# Sys.
|
||||||
|
$stdout
|
||||||
|
end
|
||||||
|
|
||||||
if text.lines.count < page_size || !Pry.pager
|
if text.lines.count < page_size || !Pry.pager
|
||||||
output.puts text
|
out.puts text
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
# FIXME! Another JRuby hack
|
# FIXME! Another JRuby hack
|
||||||
if jruby?
|
if jruby?
|
||||||
simple_pager(text, output)
|
simple_pager(text, out)
|
||||||
else
|
else
|
||||||
lesspipe { |less| less.puts text }
|
lesspipe { |less| less.puts text }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue