macaddr 1.2.1 → 1.3.0

data/lib/macaddr.rb

@@ -23,7 +23,7 @@ end
 require 'systemu'
 
 module Mac
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   def Mac.version
     ::Mac::VERSION
@@ -58,25 +58,30 @@ module Mac
 
       null = test(?e, '/dev/null') ? '/dev/null' : 'NUL'
 
-      lines = nil
+      output = nil
       cmds.each do |cmd|
         status, stdout, stderr = systemu(cmd) rescue next
         next unless stdout and stdout.size > 0
-        lines = stdout.split(/\n/) and break
+        output = stdout and break
       end
-      raise "all of #{ cmds.join ' ' } failed" unless lines
+      raise "all of #{ cmds.join ' ' } failed" unless output
 
-      candidates = lines.select{|line| line =~ re}
+      @mac_address = parse(output)
+    end
+
+    def parse(output)
+      lines = output.split(/\n/)
+
+      candidates = lines.select{|line| line =~ RE}
       raise 'no mac address candidates' unless candidates.first
-      candidates.map!{|c| c[re].strip}
+      candidates.map!{|c| c[RE].strip}
 
       maddr = candidates.first
       raise 'no mac address found' unless maddr
 
       maddr.strip!
       maddr.instance_eval{ @list = candidates; def list() @list end }
-
-      @mac_address = maddr
+      maddr
     end
 
     ##
@@ -84,6 +89,8 @@ module Mac
 
     alias_method "addr", "address"
   end
+
+  RE = %r/(?:[^:\-]|\A)(?:[0-9A-F][0-9A-F][:\-]){5}[0-9A-F][0-9A-F](?:[^:\-]|\Z)/io
 end
 
-Macaddr = Mac
+MacAddr = Macaddr = Mac

data/macaddr.gemspec

@@ -3,13 +3,23 @@
 
 Gem::Specification::new do |spec|
   spec.name = "macaddr"
-  spec.version = "1.2.1"
+  spec.version = "1.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "macaddr"
   spec.description = "description: macaddr kicks the ass"
 
   spec.files =
-["LICENSE", "README", "Rakefile", "lib", "lib/macaddr.rb", "macaddr.gemspec"]
+["LICENSE",
+ "README",
+ "Rakefile",
+ "lib",
+ "lib/macaddr.rb",
+ "macaddr.gemspec",
+ "test",
+ "test/data",
+ "test/data/c8:bc:c8:9b:28:b1",
+ "test/mac_test.rb",
+ "test/testing.rb"]
 
   spec.executables = []
   

data/test/data/c8:bc:c8:9b:28:b1

@@ -0,0 +1,39 @@
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+	inet6 ::1 prefixlen 128 
+	inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+	inet 127.0.0.1 netmask 0xff000000 
+	inet6 fdb1:49bc:790c:b10:cabc:c8ff:fe9b:28b1 prefixlen 128 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether c8:bc:c8:9b:28:b1 
+	media: autoselect (none)
+	status: inactive
+en1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether c8:bc:c8:dc:c9:44 
+	inet 10.0.1.7 netmask 0xffffff00 broadcast 10.0.1.255
+	media: autoselect
+	status: active
+en2: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 0b:0b:0b:0b:0b:0b 
+	inet6 fe80::cabc:c8ff:fe9b:28b1%en2 prefixlen 64 scopeid 0x6 
+	inet 169.254.67.37 netmask 0xffff0000 broadcast 169.254.255.255
+	media: autoselect (10baseT/UTP <full-duplex>)
+	status: active
+fw0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 4078
+	lladdr 78:ca:39:ff:fe:37:4f:44 
+	media: autoselect <full-duplex>
+	status: inactive
+vmnet1: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:50:56:c0:00:01 
+	inet 172.16.139.1 netmask 0xffffff00 broadcast 172.16.139.255
+vmnet8: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether 00:50:56:c0:00:08 
+	inet 192.168.33.1 netmask 0xffffff00 broadcast 192.168.33.255
+en4: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+	ether c8:bc:c8:dc:ba:8a 
+	media: autoselect
+	status: inactive
+utun0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1500
+	inet6 fe80::cabc:c8ff:fe9b:28b1%utun0 prefixlen 64 scopeid 0x9 
+	inet6 fd00:6587:52d7:f8f2:cabc:c8ff:fe9b:28b1 prefixlen 64 

data/test/mac_test.rb

@@ -0,0 +1,37 @@
+Testing Mac do
+  $data.each do |basename, output|
+    testing "#{ basename } output" do
+      expected = basename
+
+      macaddr = assert{ Mac.parse(output) }
+
+      assert{ macaddr.is_a?(String) }
+      assert{ macaddr =~ Mac::RE }
+      assert{ macaddr.list.is_a?(Array) }
+      assert{ macaddr == expected }
+    end
+  end
+
+
+  testing ".addr" do
+    assert{ Mac.addr }
+  end
+end
+
+
+BEGIN {
+  $testdir = File.dirname(File.expand_path(__FILE__))
+  $rootdir = File.dirname($testdir)
+  $libdir = File.join($rootdir, 'lib')
+  require File.join($libdir, 'macaddr')
+  require File.join($testdir, 'testing')
+
+  $datadir = File.join($testdir, 'data')
+  $data = {}
+  glob = File.join($datadir, '**/**')
+  Dir.glob(glob) do |entry|
+    key = File.basename(entry)
+    val = IO.read(entry)
+    $data[key] = val
+  end
+}

data/test/testing.rb

@@ -0,0 +1,146 @@
+require 'test/unit'
+
+testdir = File.expand_path(File.dirname(__FILE__))
+rootdir = File.dirname(testdir)
+libdir = File.join(rootdir, 'lib')
+
+STDOUT.sync = true
+
+$:.unshift(testdir) unless $:.include?(testdir)
+$:.unshift(libdir) unless $:.include?(libdir)
+$:.unshift(rootdir) unless $:.include?(rootdir)
+
+def Testing(*args, &block)
+  Class.new(Test::Unit::TestCase) do
+
+  ## class methods
+  #
+    class << self
+      def context(*args, &block)
+        @context = args unless args.empty?
+        block.call(*@context) if block
+        @context
+      end
+
+      def slug_for(*args)
+        string = [@context, args].flatten.compact.join('-')
+        words = string.to_s.scan(%r/\w+/)
+        words.map!{|word| word.gsub %r/[^0-9a-zA-Z_-]/, ''}
+        words.delete_if{|word| word.nil? or word.strip.empty?}
+        words.join('-').downcase
+      end
+
+      def name() const_get(:Name) end
+
+      def testno()
+        '%05d' % (@testno ||= 0)
+      ensure
+        @testno += 1
+      end
+
+      def testing(*args, &block)
+        method = ["test", testno, slug_for(*args)].delete_if{|part| part.empty?}.join('_')
+        define_method("test_#{ testno }_#{ slug_for(*args) }", &block)
+      end
+
+      def setup(&block)
+        define_method(:setup, &block) if block
+      end
+
+      def teardown(&block)
+        define_method(:teardown, &block) if block
+      end
+
+      def prepare(&block)
+        @prepare ||= []
+        @prepare.push(block) if block
+        @prepare
+      end
+
+      def cleanup(&block)
+        @cleanup ||= []
+        @cleanup.push(block) if block
+        @cleanup
+      end
+    end
+
+  ## configure the subclass!
+  #
+    const_set(:Testno, '0')
+    slug = slug_for(*args).gsub(%r/-/,'_')
+    name = ['TESTING', '%03d' % const_get(:Testno), slug].delete_if{|part| part.empty?}.join('_')
+    name = name.upcase!
+    const_set(:Name, name)
+    const_set(:Missing, Object.new.freeze)
+
+  ## instance methods
+  #
+    alias_method('__assert__', 'assert')
+
+    def assert(*args, &block)
+      if args.size == 1 and args.first.is_a?(Hash)
+        options = args.first
+        expected = getopt(:expected, options){ missing }
+        actual = getopt(:actual, options){ missing }
+        if expected == missing and actual == missing
+          actual, expected, *ignored = options.to_a.flatten
+        end
+        expected = expected.call() if expected.respond_to?(:call)
+        actual = actual.call() if actual.respond_to?(:call)
+        assert_equal(expected, actual)
+      end
+
+      if block
+        label = "assert(#{ args.join(' ') })"
+        result = nil
+        assert_nothing_raised{ result = block.call }
+        __assert__(result, label)
+        result
+      else
+        result = args.shift
+        label = "assert(#{ args.join(' ') })"
+        __assert__(result, label)
+        result
+      end
+    end
+
+    def missing
+      self.class.const_get(:Missing)
+    end
+
+    def getopt(opt, hash, options = nil, &block)
+      [opt.to_s, opt.to_s.to_sym].each do |key|
+        return hash[key] if hash.has_key?(key)
+      end
+      default =
+        if block
+          block.call
+        else
+          options.is_a?(Hash) ? options[:default] : nil
+        end
+      return default
+    end
+
+    def subclass_of exception
+      class << exception
+        def ==(other) super or self > other end
+      end
+      exception
+    end
+
+  ##
+  #
+    module_eval(&block)
+
+    self.setup()
+    self.prepare.each{|b| b.call()}
+
+    at_exit{ 
+      self.teardown()
+      self.cleanup.each{|b| b.call()}
+    }
+
+
+    self
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: macaddr
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -48,6 +48,9 @@ files:
 - Rakefile
 - lib/macaddr.rb
 - macaddr.gemspec
+- test/data/c8:bc:c8:9b:28:b1
+- test/mac_test.rb
+- test/testing.rb
 has_rdoc: true
 homepage: https://github.com/ahoward/macaddr
 licenses: []