ridler 0.1.1.beta → 0.1.2.beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YzJhZDczNDY2ZTcxNjQxOTJkNTIyMTJjY2IyZGUyMTJhZmUyOWI4Ng==
4
+ YTBhNzY3N2ZhZDU0OTI3MGZlNDQ1YTM3ZDlhNWVjNGY5NmFkYTkyOQ==
5
5
  data.tar.gz: !binary |-
6
- NDBmODU4ZjlkYmFjOWMzY2ZiMTljNjkzY2FkMGM1NTI4YWE1YTM4OQ==
6
+ MjQ3NmM3ZWM4ZDMzM2IxMGNmNjQ0YjA4ZDAyNmUyMTNkZWI0OTdhNg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NTU0ZTQ3ZGRmNThlNmUyMjMyNjRhMGZiMzYwNTU2ZjlmNmFkMGMzZWYzYjU1
10
- N2Y0ZTYyOGNkMWI4NjBlYTkxNTg1OTkxMjFmNDgzM2UwOGY4ZGFlMTU1Y2Ux
11
- NWE1NGM2NDkwY2I3NzExOThhZTVjOTA2ZTU0YzQ4MDQ3ZWExZGE=
9
+ ZDFjZTVmYjgwNWMzNTNjNDMzOGJjYTUxNWIzNDE0YjU0ZmJhOTg4ZjQ4NGJi
10
+ ZWZkYzkyNTViNDAyZmYwNzAxNzkyYThkOGMyYjlkNGRjN2Q0YTNmNjc5NWE5
11
+ ODJlZGUyYjUxMmE5MDQ3Yjk4NGJmYjhmMTdkOWNkOWVkYjMwZjY=
12
12
  data.tar.gz: !binary |-
13
- OWFiZDQ0ZWZkZThhZGIyMGNjYjAwNmE1YjFiM2Y4YjJkNGViNWMyNzIxZDVj
14
- ODYwMDJiZmY3OGE3MDBhN2FjMjNkYTdiNTc0YWM2NjYwNmE1MDQyZTI0NDU2
15
- MWNlNTdlMmE3MjYzNGZiY2YwNmE3Nzc3ZjMyMDM4YTBkOGE3ZjE=
13
+ ZTljYWJjZDhiOTY4OWJjYmRhMzg2ZTg4Yjc5MTc1M2ViYzY2ZjNiZDdiYzdi
14
+ MGJlYjk1NDRlNjhiYzIyZDY5NTYwOTZhYzYxMzBiMWQ0MWE4OWFjNzY0ZGIw
15
+ OGU1ZGE4M2E3YjYwNGIxZDhkNDgzZGNmNjAyMTU3NmFhMGE4Y2Q=
data/Rakefile CHANGED
@@ -1,3 +1,4 @@
1
+ require 'bundler/setup'
1
2
  require 'rake/testtask'
2
3
 
3
4
  Rake::TestTask.new do |t|
data/lib/ridler.rb CHANGED
@@ -2,5 +2,5 @@ require 'redis'
2
2
  require 'json'
3
3
 
4
4
  module Ridler
5
- VERSION = '0.1.1.beta'
5
+ VERSION = '0.1.2.beta'
6
6
  end
data/lib/ridler/writer.rb CHANGED
@@ -19,14 +19,16 @@ class Ridler::Writer
19
19
  def self.parse( line )
20
20
  result = nil
21
21
 
22
- rmac = /^(.+)\s[-a-z]+\sdhcpd:\s(([A-Z]+)\s.+(..:..:..:..:..:..).+)$/
22
+ rmac = /^(.+)\s[-a-z]+\sdhcpd:\s((DHCP[A-Z]+)\s.+(..:..:..:..:..:..).+)$/
23
23
  data = rmac.match( line )
24
24
 
25
- rip = /^(.+)\s[-a-z]+\sdhcpd:\s(([A-Z]+)\sfrom\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}).+)$/
25
+ rip = /^(.+)\s[-a-z]+\sdhcpd:\s((DHCP[A-Z]+)\sfrom\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\svia.+)$/
26
26
  data = rip.match( line ) unless data
27
27
 
28
- timestamp = DateTime.parse(data[1]).to_time.to_i
29
- result = Struct::Entry.new(data[4], timestamp, data[3], data[2]) if data
28
+ if data
29
+ timestamp = DateTime.parse(data[1]).to_time.to_i
30
+ result = Struct::Entry.new(data[4], timestamp, data[3], data[2]) if data
31
+ end
30
32
 
31
33
  result
32
34
  end
data/test/test_ridler.rb CHANGED
@@ -1,8 +1,8 @@
1
- require 'test/unit'
1
+ require "minitest/autorun"
2
2
  require 'ridler/reader'
3
3
  require 'ridler/writer'
4
4
 
5
- class RidlerTest < Test::Unit::TestCase
5
+ class RidlerTest < MiniTest::Test
6
6
  def setup
7
7
  Ridler::Writer.setup
8
8
 
@@ -13,9 +13,7 @@ class RidlerTest < Test::Unit::TestCase
13
13
 
14
14
  def test_proceed
15
15
  while (line = @fd.gets)
16
- assert_nothing_raised do
17
- Ridler::Writer.proceed(line)
18
- end
16
+ Ridler::Writer.proceed(line)
19
17
  end
20
18
  end
21
19
 
metadata CHANGED
@@ -1,19 +1,22 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ridler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1.beta
4
+ version: 0.1.2.beta
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Kubica
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-15 00:00:00.000000000 Z
11
+ date: 2015-04-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
+ - - ~>
18
+ - !ruby/object:Gem::Version
19
+ version: '10.0'
17
20
  - - ! '>='
18
21
  - !ruby/object:Gem::Version
19
22
  version: 10.0.0
@@ -21,6 +24,9 @@ dependencies:
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '10.0'
24
30
  - - ! '>='
25
31
  - !ruby/object:Gem::Version
26
32
  version: 10.0.0
@@ -28,6 +34,9 @@ dependencies:
28
34
  name: redis
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
37
+ - - ~>
38
+ - !ruby/object:Gem::Version
39
+ version: '3.0'
31
40
  - - ! '>='
32
41
  - !ruby/object:Gem::Version
33
42
  version: 3.0.3
@@ -35,6 +44,9 @@ dependencies:
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
47
+ - - ~>
48
+ - !ruby/object:Gem::Version
49
+ version: '3.0'
38
50
  - - ! '>='
39
51
  - !ruby/object:Gem::Version
40
52
  version: 3.0.3