rex-text 0.2.42 → 0.2.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5316dd362fddbaf996e0a087a07d597caf1161d863dd0db11b21cdeabe6f46ed
-  data.tar.gz: 57a82d23c177b15a6f8f74a2ed6e248a9af0a0c781d173d5bf2f0116f6cd4422
+  metadata.gz: e65388b19aabaf76461efffee8b8b0b5c23265a5eff2f9adee5300a5664210c6
+  data.tar.gz: 4d697d31bf0464783450ff70494bb08f5d00e9186cea660e426e693bc6d025b6
 SHA512:
-  metadata.gz: 1e88f3f3a165d96e27437bc9ccf237bd2d00c7324f4de1a7ba968ef6dda2faa74923fcdf53d4d8f656d6676d083c7cd40228c5cfcbbe3de81de4821984bfdfbb
-  data.tar.gz: c2d1b0e804f3fcb61cbda3cb2340dacc3a9f80d4ba02d531adf9c0f5748d481d9288caf1f6cb63cd6427b3dcb0f6bcb7663444eea6f5644d373c79caaa5c7b95
+  metadata.gz: ef32b2087d8fd1016e69a7584baf2a44999d661d8261468b5e8a462ee42523336b32b5e6dad59b6308b7fdac2b006d848e71bdb3b9c81798c7c70364f0d15ec6
+  data.tar.gz: 14edb8ce455acae1c6caaca90ee259dbc0d29df0b539440f8242c29e919ebc6ad8954d398c00166f74f7bf14b08e9ddb03b0a886e674447cb8b1c98ec30245a4

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-o�,�̵;
�`�:ݗ�WyK8{���G���^� j�v�2yk���k��@-���$����"6������\��s���a��V
+u˧_<)	
��#xg�+'4�%g+?e�-�$����lV7��/�
�C���lT��&�r�K�`�e?��3yf������
+PA�l*���9�r�\a��u��>L�܃�!r�,����'r�@�vv��y���Д
+�_XN�z��$Uk��,~������-��{�u�م(��m-�������O���Ȑ��)�>i{�o	���,I!M��7�"�p���leȣ��+

data/lib/rex/text/hex.rb

@@ -127,51 +127,22 @@ module Rex
     # Converts a string to a hex version with wrapping support
     #
     def self.hexify(str, col = DefaultWrap, line_start = '', line_end = '', buf_start = '', buf_end = '')
-      output	 = buf_start
-      cur	 = 0
-      count	 = 0
-      new_line = true
-
-      # Go through each byte in the string
-      str.each_byte { |byte|
-        count  += 1
-        append	= ''
-
-        # If this is a new line, prepend with the
-        # line start text
-        if (new_line == true)
-          append	 << line_start
-          new_line  = false
-        end
-
-        # Append the hexified version of the byte
-        append << sprintf("\\x%.2x", byte)
-        cur    += append.length
-
-        # If we're about to hit the column or have gone past it,
-        # time to finish up this line
-        if ((cur + line_end.length >= col) or (cur + buf_end.length  >= col))
-          new_line  = true
-          cur	  = 0
+      if col < line_start.length + 4 + line_end.length
+        # raise an exception
+        raise ArgumentError.new('insufficient column width')
+      end
 
-          # If this is the last byte, use the buf_end instead of
-          # line_end
-          if (count == str.length)
-            append << buf_end + "\n"
-          else
-            append << line_end + "\n"
-          end
+      ret = buf_start.dup
+      ret << line_start if ret.end_with?("\n")
+      str.each_char do |char|
+        # "\x##".length is 4, check if we're going over the wrap boundary
+        if (ret.split("\n").last || '').length + 4 + line_end.length > col
+          ret << "#{line_end}\n#{line_start}"
         end
-
-        output << append
-      }
-
-      # If we were in the middle of a line, finish the buffer at this point
-      if (new_line == false)
-        output << buf_end + "\n"
+        ret << "\\x" << char.unpack('H*')[0]
       end
-
-      return output
+      ret << "\n" if ret.split("\n").last.length + buf_end.length > col
+      ret << "#{buf_end}\n"
     end
 
     #

data/lib/rex/text/lang.rb

@@ -29,13 +29,14 @@ module Rex
 
     def self.to_csharp(str, wrap = DefaultWrap, name = "buf")
       ret = "byte[] #{name} = new byte[#{str.length}] {"
-      i = -1;
-      while (i += 1) < str.length
-        ret << "\n" if i%(wrap/4) == 0
-        ret << "0x" << str[i].unpack("H*")[0] << ","
+      str.each_char do |char|
+        # "0x##,".length is 5, check if we're going over the wrap boundary
+        ret << "\n" if ret.split("\n").last.length + 5 > wrap
+        ret << "0x" << char.unpack('H*')[0] << ","
       end
-      ret = ret[0..ret.length-2] #cut off last comma
-      ret << " };\n"
+      ret = ret[0..ret.length - 2] unless str.empty? # cut off last comma
+      ret << "\n" if ret.split("\n").last.length + 2 > wrap
+      ret << "};\n"
     end
 
     #
@@ -43,21 +44,21 @@ module Rex
     #
     def self.to_golang(str, wrap = DefaultWrap, name = "buf")
       ret = "#{name} :=  []byte{"
-      i = -1;
-      while (i += 1) < str.length
-        ret << "\n" if i%(wrap/4) == 0
-        ret << "0x" << str[i].unpack("H*")[0] << ", "
+      str.each_char do |char|
+        # "0x##,".length is 5, check if we're going over the wrap boundary
+        ret << "\n" if ret.split("\n").last.length + 5 > wrap
+        ret << "0x" << char.unpack('H*')[0] << ","
       end
-      ret = ret[0..ret.length-3] #cut off last comma
-      ret << " }\n"
-
+      ret = ret[0..ret.length - 2] unless str.empty? # cut off last comma
+      ret << "\n" if ret.split("\n").last.length + 2 > wrap
+      ret << "};\n"
     end
-    
+
     #
     # Creates a golang style comment
     #
     def self.to_golang_comment(str,  wrap = DefaultWrap)
-      return "/*\n" + wordwrap(str, 0, wrap, '', '') + "*/\n" 
+      return "/*\n" + wordwrap(str, 0, wrap, '', '') + "*/\n"
     end
 
     #
@@ -181,6 +182,5 @@ module Rex
       return wordwrap(str, 0, wrap, '', '# ')
     end
 
-
   end
 end

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.42"
+    VERSION = "0.2.43"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.42
+  version: 0.2.43
 platform: ruby
 authors:
 - Metasploit Hackers