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

ommands/ls/formatter,helpers/table: pass local Pry config

Browse source 
Replaces #1713
(Pry local config The following methods take a third required argument, an
instance of Pry)

This fulfills queries to `_pry_.config` in:

* Pry::Helpers.tablify
* Pry::Helpers.tablify_to_screen_width
* Pry::Helpers.tablify_or_one_line

Unlike #1713 this PR doesn't introduce any breaking changes thanks to the
default parameter value trick, *except* the `Table#new` signature.

Overall, this brings the code in line with how the rest of Pry works.
This commit is contained in:
Kyrylo Silin 2018-10-16 05:19:16 +08:00
parent e5d01bb4d3
commit ba200c8e34
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pry/commands/ls/formatter.rb
View file

@ -28,7 +28,7 @@ class Pry
return '' if body.compact.empty? return '' if body.compact.empty?
fancy_heading = Pry::Helpers::Text.bold(color(:heading, heading)) fancy_heading = Pry::Helpers::Text.bold(color(:heading, heading))
Pry::Helpers.tablify_or_one_line(fancy_heading, body) Pry::Helpers.tablify_or_one_line(fancy_heading, body, @_pry_.config)
end end
def format_value(value) def format_value(value)

20
lib/pry/helpers/table.rb
View file

@ -1,27 +1,28 @@
class Pry class Pry
module Helpers module Helpers
def self.tablify_or_one_line(heading, things) def self.tablify_or_one_line(heading, things, config = Pry.config)
plain_heading = Pry::Helpers::Text.strip_color(heading) plain_heading = Pry::Helpers::Text.strip_color(heading)
attempt = Table.new(things, column_count: things.size) attempt = Table.new(things, column_count: things.size)
if attempt.fits_on_line?(Terminal.width! - plain_heading.size - 2) if attempt.fits_on_line?(Terminal.width! - plain_heading.size - 2)
"#{heading}: #{attempt}\n" "#{heading}: #{attempt}\n"
else else
"#{heading}: \n#{tablify_to_screen_width(things, indent: ' ')}\n" "#{heading}: \n#{tablify_to_screen_width(things, { indent: ' ' }, config)}\n"
end end
end end
def self.tablify_to_screen_width(things, options = {}) def self.tablify_to_screen_width(things, options, config = Pry.config)
options ||= {}
things = things.compact things = things.compact
if indent = options[:indent] if indent = options[:indent]
usable_width = Terminal.width! - indent.size usable_width = Terminal.width! - indent.size
tablify(things, usable_width).to_s.gsub(/^/, indent) tablify(things, usable_width, config).to_s.gsub(/^/, indent)
else else
tablify(things, Terminal.width!).to_s tablify(things, Terminal.width!, config).to_s
end end
end end
def self.tablify(things, line_length) def self.tablify(things, line_length, config = Pry.config)
table = Table.new(things, column_count: things.size) table = Table.new(things, { column_count: things.size }, config)
table.column_count -= 1 until 1 == table.column_count or table.column_count -= 1 until 1 == table.column_count or
table.fits_on_line?(line_length) table.fits_on_line?(line_length)
table table
@ -29,8 +30,9 @@ class Pry
class Table class Table
attr_reader :items, :column_count attr_reader :items, :column_count
def initialize items, args = {} def initialize(items, args, config = Pry.config)
@column_count = args[:column_count] @column_count = args[:column_count]
@config = config
self.items = items self.items = items
end end
@ -49,7 +51,7 @@ class Pry
item.sub! e, _recall_color_for(e) if :color_on == style item.sub! e, _recall_color_for(e) if :color_on == style
padded << item padded << item
end end
padded.join(Pry.config.ls.separator) padded.join(@config.ls.separator)
end end
end end