rex-text 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8849750ccde97e100a88b0eb765bfd064cc695be
-  data.tar.gz: 4b0e04c8bbb6fd428e24f640f477b8f4c5b68c81
+  metadata.gz: af387bec6195c86e46f665cf9df0db78cf47d08c
+  data.tar.gz: 03f4a51320429e552c67c8fcab91dfc987ee064b
 SHA512:
-  metadata.gz: fdb6ff6f05b44414fdb15c0d6ecc8624af322f3f116ce27baa89935bfe68bfa26448d2f1dc15569cc197d83d15f44657f042bd526b47dafe8d4785c45b80e8b8
-  data.tar.gz: 0bb8053e1d26cc63bfeb4ef9379303f770c93d615fc903c411b3e6fc6ea543b0d5e1e4cf32716c594cad6f5e0b187f6b114f72ecf6dd2f0fb005651fa7e8350c
+  metadata.gz: 78c9aa4d327088e047ff829ba3212767234f9f4511f380d9e5eccd25d0713743d10c4ec227309e0d505f1bc0d57f3ddac837ae1fc9fdf2b245b86e3a21ccb10d
+  data.tar.gz: 9e43a178354eb9155d0a6cb07961f5ff9c9f913e0fd2736f4512822a216511ff0c5efaa15882bda6e1a7d1d841935f6140c86c5495001b90e17816d09af2d8b8

data/lib/rex/text/table.rb

@@ -184,6 +184,18 @@ class Table
     rows << fields
   end
 
+  def ip_cmp(a, b)
+    begin
+      a = IPAddr.new(a.to_s)
+      b = IPAddr.new(b.to_s)
+      return 1  if a.ipv6? && b.ipv4?
+      return -1 if a.ipv4? && b.ipv6?
+      a <=> b
+    rescue IPAddr::Error
+      nil
+    end
+  end
+
   #
   # Sorts the rows based on the supplied index of sub-arrays
   # If the supplied index is an IPv4 address, handle it differently, but
@@ -199,15 +211,11 @@ class Table
         cmp = 1
       elsif a[index] =~ /^[0-9]+$/ and b[index] =~ /^[0-9]+$/
         cmp = a[index].to_i <=> b[index].to_i
-      elsif a[index].kind_of?(IPAddr) && a[index].kind_of?(IPAddr) && a[index].ipv6? && b[index].ipv4?
-        cmp = 1
-      elsif a[index].kind_of?(IPAddr) && b[index].kind_of?(IPAddr) && a[index].ipv4? && b[index].ipv6?
-        cmp = -1
-      elsif !(a[index].kind_of?(IPAddr) || b[index].kind_of?(IPAddr)) && (valid_ip?(a[index]) && valid_ip?(b[index]))
-        cmp = IPAddr.new(a[index]) <=> IPAddr.new(b[index])
+      elsif (cmp = ip_cmp(a[index], b[index])) != nil
       else
         cmp = a[index] <=> b[index] # assumes otherwise comparable.
       end
+      cmp ||= 0
       order == :forward ? cmp : -cmp
     end
   end

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.11"
+    VERSION = "0.2.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - David 'thelightcosine' Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler