rex-text 0.2.37 → 0.2.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b3c8a4e9870f41cc0c8b6dbb175ab5eb56b9fc188a3cbe2be85ebcf05bd8945
-  data.tar.gz: 5f23d20961036a7886e15b432b332c72ee014837687040cab44b368ee9eac0ff
+  metadata.gz: 6aa8880ab44795dde36fab9173dcfbbe2f2ad0afecb1574dad0620d57f3b7d70
+  data.tar.gz: 404c7abc28c4cde12fe46a1de4a3ceff55b96faf1734d3d913690977e4895f5a
 SHA512:
-  metadata.gz: eb340466122a0875e63c7da7da642892c14b4c9880fc68c167aefd4c49a0617d6c4a3cf39a4ca97d3e60748bc6de19ca0c66976c9b7701a7768dfedf3f5454a2
-  data.tar.gz: a6b14508fa0e30c49c1afd10b170fe9fce99e9112a3dda3073557ffb99abe1ff7d9c467e992dbc4881cba4fba35fe53509b40fc44563119f756c496f2ad91460
+  metadata.gz: d3719c96add95b2694c20572562674e1ba5de06ecab52d43e2e7921b71d790acaf197d416326674c3ae276d9fcffb0cc3dc601ea74be6bd2b3cf67d111df7125
+  data.tar.gz: 4c114558bae64642e567c73a43ca8462cae5df391a469b9017ef18672238dbf04097ace28b6bad24758836f078a6a99f8d098cc43a330f131487fe5281ad8f93

data/.github/workflows/verify.yml

@@ -1,5 +1,21 @@
 name: Verify
 
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
 on:
   push:
     branches:
@@ -10,7 +26,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 40
 
     strategy:
@@ -18,13 +34,21 @@ jobs:
       matrix:
         ruby:
           - 2.7
+          - 3.0
+          - 3.1
+        os:
+          - ubuntu-20.04
+          - ubuntu-latest
+        exclude:
+          - { os: ubuntu-latest, ruby: 2.7 }
+          - { os: ubuntu-latest, ruby: 3.0 }
         test_cmd:
           - bundle exec rspec
 
     env:
       RAILS_ENV: test
 
-    name: Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.37"
+    VERSION = "0.2.40"
   end
 end

data/lib/rex/text/wrapped_table.rb

@@ -183,12 +183,11 @@ class WrappedTable
       raise RuntimeError, 'Invalid number of columns!'
     end
     formatted_fields = fields.map.with_index { |field, idx|
-      # Remove whitespace and ensure String format
-      field = format_table_field(field.to_s.strip, idx)
+      field = format_table_field(field, idx)
 
-      if (colprops[idx]['MaxWidth'] < display_width(field.to_s))
+      if (colprops[idx]['MaxWidth'] < display_width(field))
         old = colprops[idx]['MaxWidth']
-        colprops[idx]['MaxWidth'] = display_width(field.to_s)
+        colprops[idx]['MaxWidth'] = display_width(field)
       end
 
       field
@@ -410,7 +409,7 @@ protected
     values_as_chunks = values.each_with_index.map do |value, idx|
       column_width = optimal_widths[idx]
       value
-        .split('')
+        .chars
         .each_slice(column_width)
         .map(&:join)
     end
@@ -511,13 +510,13 @@ protected
   end
 
   def format_table_field(str, idx)
-    str_cp = str.dup
+    str_cp = str.to_s.encode('UTF-8', invalid: :replace, undef: :replace).strip
 
     colprops[idx]['Formatters'].each do |f|
       str_cp = f.format(str_cp)
     end
 
-    str_cp.dup.force_encoding('UTF-8')
+    str_cp
   end
 
   def style_table_field(str, _idx)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.37
+  version: 0.2.40
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake