macaddr 1.7.0 → 1.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjkzYjEyMDE0ZTU3YzI2MmRlNDFiOWRmNzMwOGE2YWNmY2JhMTVhZg==
+    NjZlZWVhMzVkOWY2YzdiMWJjZDNhNzRmYmMxOWFhYzMxODkyY2RiYg==
   data.tar.gz: !binary |-
-    NDY2ZTVhMmI5MWI0NzRhYzUyNGY1MTRiODA2MTI3ZWJlMzY5NjQ1Yg==
+    M2E5ODVkNDgwNWMyMzM4Zjc2MTA5OTI5OGI4NTgyYWZiZDdiYjk2Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTEzMTNhMjViOWRhYjQ0ZDBjNDI5N2ZhNDM5NmQ3NmFmNDg1YTcyOWFmYjIy
-    ZTc0YmFhYTU5MjIyNGI1NjIyOWRjOTdkNmY3ODlhOGFiNWRmYzcyZjJlNWEw
-    MDI5MGRhZGRhYjhhYzU3OTY3ODI3NTljOGE5Zjk5YTkxYmRiYjY=
+    Y2VjYzUxZmQ1NGI0ZDc2MzA3ZGZkNDYyNDcxMmUxMDM1ZDU2NDYwN2JmMjli
+    ZmI0ODFhMDFjMmRhOGU2OWFjMjdmNmM1YWJmOGUzZjBjM2MwMzdlZGE1MDEw
+    YzczY2FkZmU3MTk5ZDg5OTgyNzJjOTZhYzVhMjEzMDA2OTI5MjU=
   data.tar.gz: !binary |-
-    NmM4YjBjOGI0ZmJiMGUwNjI2ZDA2YThmYWVkZDZmMjI0ZmRjZTMxMDM4MmVm
-    MTM2YmM1NjQ3ZjdlYmE5NjM2ZDI3ZjUwYWM1YWY1NDVjN2Y3NzUwMzA3YmY2
-    MDdjMjRmYzVmY2QzOTk1ZTYyNjA0Mzc1MDI3MmFlOWI5OWE5MzM=
+    Y2ZkOGEzZTYyZTRjMzg2Y2IxM2IxYTcyNGY3OTNjNmQ4MmE1NmY3NDkwZjk4
+    ODAwYWE4MTgwZWU4ZDk3NmViMzhjMjVjMGIwYzA3Y2ZiZjE4ZmNkMGIwMzFj
+    YjBlMzFhMWRiNzA4ZDYwMDQ4MTIxNGZjZjU4NzRjODhkMjhhNzg=

data/lib/macaddr.rb

@@ -24,7 +24,7 @@ require 'systemu'
 require 'socket'
 
 module Mac
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 
   def Mac.version
     ::Mac::VERSION
@@ -75,16 +75,30 @@ module Mac
       @mac_address = parse(output)
     end
 
+    link   = Socket::PF_LINK   if Socket.const_defined? :PF_LINK
+    packet = Socket::PF_PACKET if Socket.const_defined? :PF_PACKET
+    INTERFACE_PACKET_FAMILY = link || packet # :nodoc:
+
     def from_getifaddrs
       return unless Socket.respond_to? :getifaddrs
 
+      interfaces = Socket.getifaddrs.select do |addr|
+        addr.addr.pfamily == INTERFACE_PACKET_FAMILY
+      end
+
       mac, =
-        Socket.getifaddrs.select do |addr|
-          addr.addr.pfamily == Socket::PF_LINK
-        end.map do |addr|
-          addr.addr.getnameinfo
-        end.find do |m,|
-          !m.empty?
+        if Socket.const_defined? :PF_LINK then
+          interfaces.map do |addr|
+            addr.addr.getnameinfo
+          end.find do |m,|
+            !m.empty?
+          end
+        elsif Socket.const_defined? :PF_PACKET then
+          interfaces.map do |addr|
+            addr.addr.inspect_sockaddr[/hwaddr=([\h:]+)/, 1]
+          end.find do |mac_addr|
+            mac_addr != '00:00:00:00:00:00'
+          end
         end
 
       @mac_address = mac if mac

data/macaddr.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "macaddr"
-  spec.version = "1.7.0"
+  spec.version = "1.7.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "macaddr"
   spec.description = "cross platform mac address determination for ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaddr
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu