rex-text 0.2.35 → 0.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e167cd109a980431141c53711f3084f42246a2767f01943602482e6ea9cdb112
-  data.tar.gz: d46dc33e0391b67e74b9e81cfe7c29decdfb69a10b9a87d326d6eea4d2bbdd75
+  metadata.gz: bf931b9b53daa1391f3410fa721235e01375a64f8e7d06919af5f6e69f30b5c0
+  data.tar.gz: ca35cab4eeefe5ef8df4d17cfae63c5c58047b5a56daf402dcff34ce378d923c
 SHA512:
-  metadata.gz: 36f7c56d564b95015ebfdece742292a23cfc098b3035c7423faad8d546fce5126d300e1aea5fc4b3e157c8297f4dd37b717b1170983ba360ff1c2bf755aa1fa8
-  data.tar.gz: b6408300fb191ca0b4fe25142bf6cb16bbad1db30b05b430ffde6e86d0352eaf123c6ef597b645caf4c9693f5628b6cbe2bb56678d185d279b0668e46066a905
+  metadata.gz: eea968a9e08f2f54b666ce99e0cd8767541eb9560d6c2d6f5cee01d005c1c92f72772be0ae9a4807bc1ec82e526d903f1f79df82108c9f742b5269a3d0516489
+  data.tar.gz: 78ac55937b82a2ef55fc4e926b6afd4c9726fbefa63c8699e954499da83f54ebc28443caa985d401d93902e1233e9406d332f06e26eddd80cd7320fb9b064caa

data/.github/workflows/verify.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     strategy:
@@ -29,25 +29,11 @@ jobs:
       - 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/rand.rb

@@ -92,6 +92,15 @@ module Rex
       "tammy", "teresa", "theresa", "tina", "virginia", "wanda"
     ]
 
+    Func_Verb = [
+      "get", "set", "put", "describe", "acquire", "release", "initialize", "free",
+      "init", "find", "list", "create", "destroy"
+    ]
+
+    Func_Subj = [
+      "file", "directory", "dir", "address", "addr", "process", "proc", "user",
+      "privileges", "priv", "attribute", "attr", "mutex", "handle", "type"
+    ]
 
     # Generates a random character.
     def self.rand_char(bad, chars = AllChars)
@@ -278,5 +287,12 @@ module Rex
       end
       rand_base(len,'',*allowed_characters)
     end
+
+    # Generate a random function name
+    def self.rand_func_name
+      verb = rand(9) > 4 ? Func_Verb.sample.capitalize : Func_Verb.sample
+      subj = rand(9) > 4 ? Func_Subj.sample.capitalize : Func_Subj.sample
+      verb + subj
+    end
   end
 end

data/lib/rex/text/version.rb

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