ridler 0.1.1.beta → 0.1.2.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJhZDczNDY2ZTcxNjQxOTJkNTIyMTJjY2IyZGUyMTJhZmUyOWI4Ng==
+    YTBhNzY3N2ZhZDU0OTI3MGZlNDQ1YTM3ZDlhNWVjNGY5NmFkYTkyOQ==
   data.tar.gz: !binary |-
-    NDBmODU4ZjlkYmFjOWMzY2ZiMTljNjkzY2FkMGM1NTI4YWE1YTM4OQ==
+    MjQ3NmM3ZWM4ZDMzM2IxMGNmNjQ0YjA4ZDAyNmUyMTNkZWI0OTdhNg==
 SHA512:
   metadata.gz: !binary |-
-    NTU0ZTQ3ZGRmNThlNmUyMjMyNjRhMGZiMzYwNTU2ZjlmNmFkMGMzZWYzYjU1
-    N2Y0ZTYyOGNkMWI4NjBlYTkxNTg1OTkxMjFmNDgzM2UwOGY4ZGFlMTU1Y2Ux
-    NWE1NGM2NDkwY2I3NzExOThhZTVjOTA2ZTU0YzQ4MDQ3ZWExZGE=
+    ZDFjZTVmYjgwNWMzNTNjNDMzOGJjYTUxNWIzNDE0YjU0ZmJhOTg4ZjQ4NGJi
+    ZWZkYzkyNTViNDAyZmYwNzAxNzkyYThkOGMyYjlkNGRjN2Q0YTNmNjc5NWE5
+    ODJlZGUyYjUxMmE5MDQ3Yjk4NGJmYjhmMTdkOWNkOWVkYjMwZjY=
   data.tar.gz: !binary |-
-    OWFiZDQ0ZWZkZThhZGIyMGNjYjAwNmE1YjFiM2Y4YjJkNGViNWMyNzIxZDVj
-    ODYwMDJiZmY3OGE3MDBhN2FjMjNkYTdiNTc0YWM2NjYwNmE1MDQyZTI0NDU2
-    MWNlNTdlMmE3MjYzNGZiY2YwNmE3Nzc3ZjMyMDM4YTBkOGE3ZjE=
+    ZTljYWJjZDhiOTY4OWJjYmRhMzg2ZTg4Yjc5MTc1M2ViYzY2ZjNiZDdiYzdi
+    MGJlYjk1NDRlNjhiYzIyZDY5NTYwOTZhYzYxMzBiMWQ0MWE4OWFjNzY0ZGIw
+    OGU1ZGE4M2E3YjYwNGIxZDhkNDgzZGNmNjAyMTU3NmFhMGE4Y2Q=

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|

data/lib/ridler.rb

@@ -2,5 +2,5 @@ require 'redis'
 require 'json'
 
 module Ridler
-  VERSION = '0.1.1.beta'
+  VERSION = '0.1.2.beta'
 end

data/lib/ridler/writer.rb

@@ -19,14 +19,16 @@ class Ridler::Writer
   def self.parse( line )
     result = nil
 
-    rmac = /^(.+)\s[-a-z]+\sdhcpd:\s(([A-Z]+)\s.+(..:..:..:..:..:..).+)$/
+    rmac = /^(.+)\s[-a-z]+\sdhcpd:\s((DHCP[A-Z]+)\s.+(..:..:..:..:..:..).+)$/
     data = rmac.match( line )
 
-    rip = /^(.+)\s[-a-z]+\sdhcpd:\s(([A-Z]+)\sfrom\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}).+)$/        
+    rip = /^(.+)\s[-a-z]+\sdhcpd:\s((DHCP[A-Z]+)\sfrom\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\svia.+)$/
     data = rip.match( line ) unless data
     
-    timestamp = DateTime.parse(data[1]).to_time.to_i
-    result = Struct::Entry.new(data[4], timestamp, data[3], data[2]) if data
+    if data
+      timestamp = DateTime.parse(data[1]).to_time.to_i
+      result = Struct::Entry.new(data[4], timestamp, data[3], data[2]) if data
+    end
 
     result
   end

data/test/test_ridler.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require "minitest/autorun"
 require 'ridler/reader'
 require 'ridler/writer'
 
-class RidlerTest < Test::Unit::TestCase  
+class RidlerTest < MiniTest::Test
   def setup
     Ridler::Writer.setup
 
@@ -13,9 +13,7 @@ class RidlerTest < Test::Unit::TestCase
 
   def test_proceed
     while (line = @fd.gets)
-      assert_nothing_raised do
-        Ridler::Writer.proceed(line)
-      end
+      Ridler::Writer.proceed(line)
     end
   end
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ridler
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta
+  version: 0.1.2.beta
 platform: ruby
 authors:
 - Adam Kubica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
@@ -28,6 +34,9 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.3