rex-text 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a213d45ce77b442cf80cc9e8c302d705c9f63128
-  data.tar.gz: 739aabf270a14239b68f9bdc3f394eebaa949efc
+  metadata.gz: fac6885e671b050ccbdf774302465ff811fbc570
+  data.tar.gz: 5c2e95fcbe12e42aeb4d6bc992fdc76c942e157a
 SHA512:
-  metadata.gz: cd856ab7b00383f19e189e4da9f55e8b078a6ef1429535b4e6c223ce853dd83bbdd8fb562cb0f7fe295db52de89c538e11fa1b677f0d97a15684271de22671d7
-  data.tar.gz: e77455056b8e1ffa80af71886deae1576a21b8f92bc2450f296dc4430ec6cd5c9a229d03c95fc3cc6cb788aeef5aa9e829103d88116d751bc6046c20b5e1dd33
+  metadata.gz: c0a5db90d2bf08b2764ea395e356183d9f0cf841ad21362564d7d53c00bed7843798f056cc662ca3810d6f54ffdd1870caab2505988a16e7cb932effbc4704e2
+  data.tar.gz: a404a8c91eafda2db0b59ad20e3cce8fd281225af988ab460ea046dc189eb065669d043fdf12fcfd48fee34bb1188bb645f9239fe99846fee99b33fc35e07174

checksums.yaml.gz.sig

@@ -1 +1 @@
-Gg���K��9U�L^S��TY<�X�p?n�n�Ҫ�\�t����:���&Y_�'A�nf)	��E6H�SY�h��zV=�Д�b��"V�������5�W�ɦr��;;���^ T�����7L��i�?Db��Qs�fZ�
+oK���aA�+���a�6:�JG�uh;�/�6��v3r�}�gMJ'����9)s��o*Q�z�lyHA��)�"z8cZ�ZuP

data.tar.gz.sig

@@ -1,2 +1,2 @@
-ZC.���^�m��Py�H�'k��#��%��e��)o,�+�����F��3e)kl�,
-���|a�����X�t�E�˅�@R�S��z���%Zk]z5����܊��b���KE
+F�KĆ���.Q�����0�����D �e�)yl1�<�l�`X����"�e��t�t7
+��-XFL{���

data/lib/rex/text/table.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'ipaddr'
 
 module Rex
 module Text
@@ -196,14 +197,14 @@ class Table
         cmp = -1
       elsif b[index].nil?
         cmp = 1
-      elsif valid_ip?(a[index]) and valid_ip?(b[index])
-        cmp = IPAddr.new(a[index]) <=> IPAddr.new(b[index])
       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])
       else
         cmp = a[index] <=> b[index] # assumes otherwise comparable.
       end

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David 'thelightcosine' Maloney
@@ -85,7 +85,7 @@ cert_chain:
   2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
   QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
   -----END CERTIFICATE-----
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler