sns_utils 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51164a9c017dc73fee16d4748e3a5f51f7216ea1
-  data.tar.gz: 4fa3100cb93b679b09eb73d9c1d33faf8fd2ccfd
+  metadata.gz: 620632d0cf549c2f51495c8d91a64c89d6dfeb0f
+  data.tar.gz: 674efcd5281dc6202312988c95c74142978a00c0
 SHA512:
-  metadata.gz: 76a58e05f379dc0dec284d1312b8f5f28f22a71ab6ac2006f782bcee6011989f051290840f4410fba6bdc8cb2eafbe9f8e0d4f23e4242051b54cc3bbc62331df
-  data.tar.gz: b300921c8de9956fa5acb06ff3f14a00714f56fec867662b48eafdad5c2410cbd3d22198e02683abc5a60328d02a79047e09427d8d0d1b9bf1a2b64cc30c7404
+  metadata.gz: 8b5f6de14432d3ec5e97f753eee6cdf4f27e7b29fc89ac5fca1bef70018a76f875da696542bc263a5f2fb77f06a2e1c675c533e62ba8541fb68afcebbdaba366
+  data.tar.gz: bb79f4bc4ede80e832832acdf40447fdbc7c9fb28b8625cf268ce0b347dd87719fd70b5fa14a771cfb8f337cebc8e8420cf4ee8059b05f314fe67eb45c0c93ab

data/lib/sns_utils/ip_extractor.rb

@@ -3,10 +3,11 @@ module SnsUtils
     attr_accessor :file, :options
     attr_accessor :ip_addrs, :ip_addrs_log, :mac_addrs, :mac_addrs_log
 
-    IPV4_REGEX = ::SnsUtils::IPv4::REGEX
-    IPV6_REGEX = ::SnsUtils::IPv6::REGEX
-    MAC_REGEX = ::SnsUtils::MAC::REGEX
-    IP_REGEX = / ((?: ^|\s|[a-zA-Z]) (?: #{IPV6_REGEX} | #{IPV4_REGEX} | #{MAC_REGEX})) /xi
+    IP_REGEX = /
+        #{::SnsUtils::IPv4::REGEX} |
+        #{::SnsUtils::IPv6::REGEX} |
+        #{::SnsUtils::MAC::REGEX}
+    /xi
 
     def initialize(argv)
       @file, @options = parse_options(argv)
@@ -25,12 +26,14 @@ module SnsUtils
 
     def extract_addresses
       File.open(file, 'r').each do |line|
-        line.scan(IP_REGEX).each { |md| log_addr(md[0].to_s.strip!) }
+        line.scan(IP_REGEX).each do |ip|
+          log_addr(ip)
+        end
       end
     end
 
     def log_ip_addrs
-      self.ip_addrs_log  = ip_addrs.select { |_, count| count >= options.ip_threshold }.keys
+      self.ip_addrs_log = ip_addrs.select { |_, count| count >= options.ip_threshold }.keys
       write_file(::SnsUtils.ip_out_file, ip_addrs_log)
     end
 
@@ -57,6 +60,8 @@ module SnsUtils
     rescue IPAddr::InvalidAddressError => e
       mac_addrs[ip] ||= 0
       mac_addrs[ip] += 1
+    rescue IPAddr::AddressFamilyError => e
+      $stderr.puts(e.message)
     end
 
     def parse_options(argv)

data/lib/sns_utils/version.rb

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

data/spec/fixtures/edge_cases.log

@@ -1,2 +1,8 @@
-# should match two ips 123.12.12.126-16-2013
+# should match one ip 123.12.12.126-16-2013
+# should match one ip 6-7-201123.12.12.127
+# should match one ip 6-7-201123.12.12.128-16-2013
 # invalid but should match by truncating last '0' 192.168.1.500
+# invalid but should match by truncating last '5' 192.168.1.555:80
+# ipv4 with port number 192.168.1.51:8080
+# ipv8 with port number # valid 2001:0000:1234:0000:0000:C1C0:ABCD:0876:8080
+# multi-line xyz:1 ip 123.12.12.129-16-2013 2013-1xxxy&& 2001:0000:1234:0000:0000:C1C0:ABCD:0877:8080 9%%%#+ 192.168.1.565:80

data/spec/sns_utils/ip_extractor_spec.rb

@@ -15,7 +15,7 @@ describe SnsUtils::IpExtractor do
 
     it "finds valid entries" do
       ipex = SnsUtils::IpExtractor.new([file]).run
-      ipex.ip_addrs.should have(92).entries
+      ipex.ip_addrs.should have(96).entries
     end
   end
 
@@ -102,3 +102,17 @@ describe SnsUtils::IpExtractor do
     end
   end
 end
+
+
+describe "SnsUtils::IpExtractor" do
+  context "extracting edge cases" do
+    let(:file) { fixture_path("edge_cases.log") }
+
+    it "finds valid entries" do
+      ipex = SnsUtils::IpExtractor.new([file]).run
+
+      pp ipex.ip_addrs
+      ipex.ip_addrs.should have(10).entries
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sns_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - sahglie
@@ -131,3 +131,4 @@ test_files:
 - spec/fixtures/thresholds.log
 - spec/sns_utils/ip_extractor_spec.rb
 - spec/spec_helper.rb
+has_rdoc: