net-dhcp 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+*1.1.1
+
+* Replace incorrect equality check with assignment in Message#from_udp_payload to correct behaviour when an unrecognised option or message is encountered [mjtko]
+* Allow callers to disable the debug output emitted in Message#from_udp_payload for unrecognised options or messages [mjtko]
+* Added rake test task [mjtko]
+* Correct test_from_udp_payload test assertion [mjtko]
+* Default to 00:00:00:00:00:00 in Message#initialize if local MAC address can't be read [mjtko]
+
 *1.1.0
 
 * Added BroadcastAddressOption and cleaned up the output for some options to make them more readable [rakshasa]

data/Rakefile

@@ -40,3 +40,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/lib/net-dhcp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module Dhcp
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/net/dhcp/core.rb

@@ -33,7 +33,8 @@ module DHCP
 
     alias == eql?
     
-    def Message.from_udp_payload(data)
+    def Message.from_udp_payload(data, opts={})
+      opts = {:debug => true}.merge(opts)
       values = data.unpack('C4Nn2N4C16C192NC*')
 
       params = {
@@ -74,11 +75,13 @@ module DHCP
         
         # check what is the type of dhcp option
         opt_class = $DHCP_MSG_OPTIONS[p[:type]]
-        if(opt_class.nil?)
-          puts '-------------------- please further investigate!!'
-          puts p[:type]
-          puts '-------------------- /'
-          opt_class == Option
+        if opt_class.nil?
+          if opts[:debug]
+            puts '-------------------- please further investigate!!'
+            puts p[:type]
+            puts '-------------------- /'
+          end
+          opt_class = Option
         end
         if (opt_class == MessageTypeOption)
           msg_class = $DHCP_MSG_CLASSES[p[:payload].first]
@@ -87,11 +90,13 @@ module DHCP
         next_opt = values.shift
       end
       
-      if(msg_class.nil?)
-        puts '-------------------- please further investigate!!'
-        p params[:options]
-        puts '-------------------- /'
-        opt_class == Option
+      if msg_class.nil?
+        if opts[:debug]
+          puts '-------------------- please further investigate!!'
+          p params[:options]
+          puts '-------------------- /'
+        end
+        msg_class = Message
       end
       msg_class.new(params)
     end
@@ -139,6 +144,7 @@ module DHCP
         raise 'chaddr field should be of 16 bytes' unless self.chaddr.size == 16
       else
         mac = `/sbin/ifconfig | grep HWaddr | cut -c39- | head -1`.chomp.strip.gsub(/:/,'')
+        mac = '000000000000' if mac.empty?
         self.chaddr = [mac].pack('H*').unpack('CCCCCC')
         self.chaddr += [0x00]*(16-self.chaddr.size)
       end

data/net-dhcp.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = 'net-dhcp'
   s.version = Net::Dhcp::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = "2011-12-08"
+  s.date = "2012-01-21"
   s.authors = ['daniel martin gomez (etd)', 'syonbori', 'Mark J. Titorenko']
   s.email = 'mark.titorenko@alces-software.com'
   s.homepage = 'http://github.com/mjtko/net-dhcp-ruby'

data/test/{dhcp_test.rb → test_dhcp.rb}

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # dhcp_test.rb
 # 4 de octubre de 2007
 #
@@ -6,7 +7,7 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
 
-require 'dhcp'
+require 'net-dhcp'
 
 class TestDhcp_test < Test::Unit::TestCase
 #  def setup
@@ -63,9 +64,7 @@ class TestDhcp_test < Test::Unit::TestCase
     d1 = DHCP::Discover.new
     d2 = DHCP::Message.from_udp_payload(d1.pack)
     
-    #assert_equal d1, d2, 'udp data is not correctly parsed'
-    puts d1.eql?(d2)
-    puts(d1 == d2)
+    assert d1.eql?(d2), 'udp data is not correctly parsed'
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-dhcp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2012-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70241335055920 !ruby/object:Gem::Requirement
+  requirement: &70354871060620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241335055920
+  version_requirements: *70354871060620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70241335055440 !ruby/object:Gem::Requirement
+  requirement: &70354871060140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241335055440
+  version_requirements: *70354871060140
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &70241335054900 !ruby/object:Gem::Requirement
+  requirement: &70354871059700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241335054900
+  version_requirements: *70354871059700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241335054440 !ruby/object:Gem::Requirement
+  requirement: &70354871059240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241335054440
+  version_requirements: *70354871059240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70241335054000 !ruby/object:Gem::Requirement
+  requirement: &70354871058740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241335054000
+  version_requirements: *70354871058740
 description: The aim of Net::DHCP is to provide a set of classes to low level handle
   the DHCP protocol (rfc2131, rfc2132, etc.). With Net::DHCP you will be able to craft
   custom DHCP packages and have access to all the fields defined for the protocol.
@@ -99,7 +99,7 @@ files:
 - net-dhcp.gemspec
 - spec/net-dhcp_spec.rb
 - spec/spec_helper.rb
-- test/dhcp_test.rb
+- test/test_dhcp.rb
 homepage: http://github.com/mjtko/net-dhcp-ruby
 licenses: []
 post_install_message: 
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2925178242952011714
+      hash: -2659112004771839654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,4 +130,4 @@ summary: set of classes to low level handle the DHCP protocol
 test_files:
 - spec/net-dhcp_spec.rb
 - spec/spec_helper.rb
-- test/dhcp_test.rb
+- test/test_dhcp.rb