rex-text 0.2.36 → 0.2.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5e7201007a3c09cec5c931c006e00de6d55b0c76f602b7641c25b02c8d6a14
-  data.tar.gz: 445ecf81d92555096f960255bb8a424153f113735d88c02aec6fbaa3508dd250
+  metadata.gz: 6bffdfea7c55e2707e258f7d6dd3dc9afbfe55d798c2c61aa85765d069a98121
+  data.tar.gz: '09908c92febd56164687e8c472bc6aa8e3f4059a5ea28fcb847e48fe89b712ba'
 SHA512:
-  metadata.gz: 9bb526a85fbeeef3a3afd1b1d9b26f3ab5025f27415b13528d96e9bdb61e0362e13f5939fa41b5c9882c118d490d0ca4f7c3c0bd9c56a2e129c7fde0f2c92620
-  data.tar.gz: 9ceb7ea946a1d2156614116c7f5b6d57f0529c464f1432e04c840f242e376f64b8c16c2807e7a9e2b7d45e0395ef1660c1d5c849676e72e83f1d03b0c8b4b81f
+  metadata.gz: b3b7064a20270a251ae0a1f86581c42f9fa9ba96ca231e790545713cf34420492a975c84279b5da7f3f01c20a0889cbad4940b16e2442d0145a3838189d7504c
+  data.tar.gz: 7629d0abf3b69bab460a9d3063d347155a36d2c50ea2b9e9e1baa27db189419e330c3de7de5ef8a00d4e2c743bffc9b4f2b99f508c527ce67f7bb29f17f70ce7

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-16.04
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 40
 
     strategy:
@@ -18,36 +34,30 @@ jobs:
       matrix:
         ruby:
           - 2.7
+          - 3.0
+          - 3.1
+        os:
+          - ubuntu-18.04
+          - ubuntu-22.04
+        exclude:
+          - { os: ubuntu-22.04, ruby: 2.7 }
+          - { os: ubuntu-22.04, 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
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup bundler
-        run: |
-          gem install bundler
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: ${{ matrix.test_cmd }}
         run: |

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.36"
+    VERSION = "0.2.39"
   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.36
+  version: 0.2.39
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake