rex-text 0.2.55 → 0.2.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e00ee9046e2a52f102878c9ea126bcabd3661792f19310ec690c0289c510dc
-  data.tar.gz: e64b49f60c7a15cd7388271edb509f33a378388fc525735b034c650b981ce04d
+  metadata.gz: 228e101f378142e65d4e105177e035ebd678f1d70a0b7bbc6c8cea5a150f3594
+  data.tar.gz: 591ad72b7e3f1fadf4323c7092be9aff494d669311c7b628374009308d97d376
 SHA512:
-  metadata.gz: 82ce47b42310e3e198398cbfc980c086d37d9f1ef75ef3f0ddf5b70cdcca525d25aab581d4ed416864ac652b44e810c50f97cc65c476a1a4b2e3734a211ede9b
-  data.tar.gz: 314d8d29e0829444f34a958ae1ce6141586e00e30c3118e8aed1cb41e5ff73bd8db5e0513b2f069e29b36e2515ab9015dbad4820ddbccc45f4daf753af6e16d9
+  metadata.gz: e0d08ee5c96d5d0b7b6ba85fb01f18da3bc59e24bb34734f15130fc4d3db0ea14e4fe507e67dee157f3cebe17b30428420acac6020927f9478415c8cb807cba6
+  data.tar.gz: cb322c6675fbb09555e4cd1c3a3aac91bc56d6558e106057ff9731ac0e53d810549f2a319d3a7cd31541348b827bdbbb72e38fb5a918e7ac30db2c7d5a23335d

data/lib/rex/text/table.rb

@@ -21,21 +21,13 @@ class Table
   # To enforce all tables to be wrapped to the terminal's current width, call `Table.wrap_tables!`
   # before invoking `Table.new` as normal.
   def self.new(*args, &block)
-    if wrap_table?(args)
-      table_options = args.first
-      return ::Rex::Text::WrappedTable.new(table_options)
-    end
-    return super(*args, &block)
-  end
-
-  def self.wrap_table?(args)
-    return false unless wrapped_tables?
+    return super(*args, &block) unless wrap_table?(args)
 
     table_options = args.first
-    if table_options&.key?('WordWrap')
-      return table_options['WordWrap']
-    end
+    ::Rex::Text::WrappedTable.new(table_options)
+  end
 
+  def self.wrap_table?(args)
     wrapped_tables?
   end
 

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.55"
+    VERSION = "0.2.56"
   end
 end

data/lib/rex/text/wrapped_table.rb

@@ -72,6 +72,7 @@ class WrappedTable
     self.rows     = []
 
     self.width    = opts['Width']   || ::IO.console&.winsize&.[](1) || ::BigDecimal::INFINITY
+    self.word_wrap = opts.fetch('WordWrap', true)
     self.indent   = opts['Indent']  || 0
     self.cellpad  = opts['CellPad'] || 2
     self.prefix   = opts['Prefix']  || ''
@@ -87,6 +88,7 @@ class WrappedTable
       self.colprops[idx] = {}
       self.colprops[idx]['Width'] = nil
       self.colprops[idx]['WordWrap'] = true
+      self.colprops[idx]['Strip'] = true
       self.colprops[idx]['Stylers'] = []
       self.colprops[idx]['Formatters'] = []
       self.colprops[idx]['ColumnStylers'] = []
@@ -328,7 +330,7 @@ class WrappedTable
 
   attr_accessor :header, :headeri # :nodoc:
   attr_accessor :columns, :rows, :colprops # :nodoc:
-  attr_accessor :width, :indent, :cellpad # :nodoc:
+  attr_accessor :width, :word_wrap, :indent, :cellpad # :nodoc:
   attr_accessor :prefix, :postfix # :nodoc:
   attr_accessor :sort_index, :sort_order, :scterm # :nodoc:
 
@@ -478,6 +480,8 @@ protected
   # @param [Array<String>] values
   # @param [Integer] optimal_widths
   def chunk_values(values, optimal_widths)
+    return values.map { |value| [value] } unless word_wrap
+
     # First split long strings into an array of chunks, where each chunk size is the calculated column width
     values_as_chunks = values.each_with_index.map do |value, idx|
       color_state = {}
@@ -586,6 +590,8 @@ protected
       end
     end
 
+    return display_width_metadata.map { |metadata| metadata[:max_display_width] } unless word_wrap
+
     # Calculate the sizes set by the user
     user_influenced_column_widths = colprops.map do |colprop|
       if colprop['Width']
@@ -647,7 +653,8 @@ protected
   end
 
   def format_table_field(str, idx)
-    str_cp = str.to_s.encode('UTF-8', invalid: :replace, undef: :replace).strip
+    str_cp = str.to_s.encode('UTF-8', invalid: :replace, undef: :replace)
+    str_cp = str_cp.strip if colprops[idx]['Strip']
 
     colprops[idx]['Formatters'].each do |f|
       str_cp = f.format(str_cp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.55
+  version: 0.2.56
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake