sns_utils 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a569b79f304d0060cd3d6c21898000777995042
-  data.tar.gz: b15db537d09f79751fdca09d94474a90e185fb76
+  metadata.gz: 51164a9c017dc73fee16d4748e3a5f51f7216ea1
+  data.tar.gz: 4fa3100cb93b679b09eb73d9c1d33faf8fd2ccfd
 SHA512:
-  metadata.gz: a6f4bb613fd181471772a0a60886d5d09332724a3a1b29c014a0fea132b6273f68456a3233945fb26bffbe836737682e34592ed7784ce01fbae8ed35e4ab9da9
-  data.tar.gz: ca7c31915d5669691554b0d46cd6ae448ffef1dc528274a078dc03a8dd09c89d40b805d962fad3e52e1c3d327faf70da91ac968498255ffb40ff966b9ad82219
+  metadata.gz: 76a58e05f379dc0dec284d1312b8f5f28f22a71ab6ac2006f782bcee6011989f051290840f4410fba6bdc8cb2eafbe9f8e0d4f23e4242051b54cc3bbc62331df
+  data.tar.gz: b300921c8de9956fa5acb06ff3f14a00714f56fec867662b48eafdad5c2410cbd3d22198e02683abc5a60328d02a79047e09427d8d0d1b9bf1a2b64cc30c7404

data/lib/sns_utils/ip_extractor.rb

@@ -6,7 +6,7 @@ module SnsUtils
     IPV4_REGEX = ::SnsUtils::IPv4::REGEX
     IPV6_REGEX = ::SnsUtils::IPv6::REGEX
     MAC_REGEX = ::SnsUtils::MAC::REGEX
-    IP_REGEX = / ((?: ^|\s) (?: #{IPV6_REGEX} | #{IPV4_REGEX} | #{MAC_REGEX}) (?: \s|$)) /xi
+    IP_REGEX = / ((?: ^|\s|[a-zA-Z]) (?: #{IPV6_REGEX} | #{IPV4_REGEX} | #{MAC_REGEX})) /xi
 
     def initialize(argv)
       @file, @options = parse_options(argv)

data/lib/sns_utils/version.rb

@@ -1,3 +1,3 @@
 module SnsUtils
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/edge_cases.log

@@ -0,0 +1,2 @@
+# should match two ips 123.12.12.126-16-2013
+# invalid but should match by truncating last '0' 192.168.1.500

data/spec/fixtures/ipv4_ipv6_mac.log

@@ -1,4 +1,4 @@
-# blah blah blah VALID 0.0.0.0 xxxx<<> 2001:0000:1234:0000:0000:C1C0:ABCD:0876 VALID >>>
-# 3ffe:0b00:0000:0000:0001:0000:0000:000a VALID <<<<<<<<<< INVALID 1.1.1.
+# blah blah blah VALID 0.0.0.0 xxxx<<> VALID 2001:0000:1234:0000:0000:C1C0:ABCD:0876 >>>
+# VALID 3ffe:0b00:0000:0000:0001:0000:0000:000a  <<<<<<<<<< INVALID 1.1.1.
 # blah blah blah VALID 99.1.1.1 xxxx<<> VALID FF02:0000:0000:0000:0000:0000:0000:0001 >>>
-# blah blah blah INVALID a5::91::7 xxxx<<> VALID 00:A0:C9:14:C8:29 >>>
+# blah blah blah INVALID a5.91.7 xxxx<<> VALID 00:A0:C9:14:C8:29 >>>

data/spec/fixtures/ipv4_simple.log

@@ -8,5 +8,4 @@
 # invalid 1.1.1
 # invalid 1
 # invalid 1.1
-# invalid 192.168.1.500
 # invalid 999.1.1.1

data/spec/sns_utils/ip_extractor_spec.rb

@@ -5,8 +5,8 @@ describe SnsUtils::IpExtractor do
     let(:file) { fixture_path("ipv4_simple.log") }
 
     it "finds valid entries" do
-      extractor = SnsUtils::IpExtractor.new([file]).run
-      extractor.ip_addrs.should have(5).entries
+      ipex = SnsUtils::IpExtractor.new([file]).run
+      ipex.ip_addrs.should have(5).entries
     end
   end
 
@@ -14,8 +14,8 @@ describe SnsUtils::IpExtractor do
     let(:file) { fixture_path("ipv6_simple.log") }
 
     it "finds valid entries" do
-      extractor = SnsUtils::IpExtractor.new([file]).run
-      extractor.ip_addrs.should have(61).entries
+      ipex = SnsUtils::IpExtractor.new([file]).run
+      ipex.ip_addrs.should have(92).entries
     end
   end
 
@@ -23,8 +23,8 @@ describe SnsUtils::IpExtractor do
     let(:file) { fixture_path("mac_simple.log") }
 
     it "finds valid entries" do
-      extractor = SnsUtils::IpExtractor.new([file]).run
-      extractor.mac_addrs.should have(2).entries
+      ipex = SnsUtils::IpExtractor.new([file]).run
+      ipex.mac_addrs.should have(2).entries
     end
   end
 
@@ -32,9 +32,10 @@ describe SnsUtils::IpExtractor do
     let(:file) { fixture_path("ipv4_ipv6_mac.log") }
 
     it "finds valid entries" do
-      extractor = SnsUtils::IpExtractor.new([file]).run
-      extractor.ip_addrs.should have(5).entries
-      extractor.mac_addrs.should have(1).entry
+      ipex = SnsUtils::IpExtractor.new([file]).run
+      pp ipex.ip_addrs
+      ipex.ip_addrs.should have(5).entries
+      ipex.mac_addrs.should have(1).entry
     end
   end
 
@@ -50,33 +51,33 @@ describe SnsUtils::IpExtractor do
     end
 
     it "has default IP and MAC threshold" do
-      extractor = SnsUtils::IpExtractor.new([file])
-      extractor.options.mac_threshold.should eql(8)
-      extractor.options.ip_threshold.should eql(10)
+      ipex = SnsUtils::IpExtractor.new([file])
+      ipex.options.mac_threshold.should eql(8)
+      ipex.options.ip_threshold.should eql(10)
     end
 
     it "uses default IP and MAC threshold" do
-      extractor = SnsUtils::IpExtractor.new([file])
-      extractor.run
+      ipex = SnsUtils::IpExtractor.new([file])
+      ipex.run
 
-      extractor.ip_addrs_log.should have(1).entry
-      extractor.mac_addrs_log.should have(1).entry
+      ipex.ip_addrs_log.should have(1).entry
+      ipex.mac_addrs_log.should have(1).entry
     end
 
     it "adjusts default IP and MAC threshold" do
-      extractor = SnsUtils::IpExtractor.new([file, "-i", "5", "-m", "4"])
-      extractor.options.mac_threshold.should eql(4)
-      extractor.options.ip_threshold.should eql(5)
+      ipex = SnsUtils::IpExtractor.new([file, "-i", "5", "-m", "4"])
+      ipex.options.mac_threshold.should eql(4)
+      ipex.options.ip_threshold.should eql(5)
     end
 
     it "uses adjusted IP and MAC threshold" do
-      extractor = SnsUtils::IpExtractor.new([file, "-i", "5", "-m", "5"]).run
-      extractor.ip_addrs_log.should have(2).entries
-      extractor.mac_addrs_log.should have(2).entries
+      ipex = SnsUtils::IpExtractor.new([file, "-i", "5", "-m", "5"]).run
+      ipex.ip_addrs_log.should have(2).entries
+      ipex.mac_addrs_log.should have(2).entries
 
-      extractor = SnsUtils::IpExtractor.new([file, "-i", "11", "-m", "11"]).run
-      extractor.ip_addrs_log.should be_empty
-      extractor.mac_addrs_log.should be_empty
+      ipex = SnsUtils::IpExtractor.new([file, "-i", "11", "-m", "11"]).run
+      ipex.ip_addrs_log.should be_empty
+      ipex.mac_addrs_log.should be_empty
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sns_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sahglie
@@ -90,6 +90,7 @@ files:
 - man/ipex.1.ronn
 - man/ipex.1.txt
 - sns_utils.gemspec
+- spec/fixtures/edge_cases.log
 - spec/fixtures/ipv4_ipv6_mac.log
 - spec/fixtures/ipv4_simple.log
 - spec/fixtures/ipv6_simple.log
@@ -122,6 +123,7 @@ signing_key:
 specification_version: 4
 summary: Find and extract IP and MAC addresses in FILE
 test_files:
+- spec/fixtures/edge_cases.log
 - spec/fixtures/ipv4_ipv6_mac.log
 - spec/fixtures/ipv4_simple.log
 - spec/fixtures/ipv6_simple.log
@@ -129,4 +131,3 @@ test_files:
 - spec/fixtures/thresholds.log
 - spec/sns_utils/ip_extractor_spec.rb
 - spec/spec_helper.rb
-has_rdoc: