macaddr 1.6.7 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmNhMTdlYWU3ZGFhNmVlNDQ4Y2IzMDU2NjFhODY4YTZjNWIyMWE4ZA==
+    ZjkzYjEyMDE0ZTU3YzI2MmRlNDFiOWRmNzMwOGE2YWNmY2JhMTVhZg==
   data.tar.gz: !binary |-
-    ODljYjgwOGFlOWU5Y2FiZjk4MzA4ZWUzYjhlMGI2OTU5ZGMwMDczYw==
+    NDY2ZTVhMmI5MWI0NzRhYzUyNGY1MTRiODA2MTI3ZWJlMzY5NjQ1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWJhYTZiMjYxZTE5ZWZlNzUyOWVjZTFjZjRkMWZmNDEyODU0NDNkZTRmODY5
-    MDgzZDk1NTVkODIwOTE2YzllZTYxMDI2ZjQzMmU0Nzc2NDMyYzJlN2I2Mjk0
-    OTMyYTE4ZTljOGUxNGNhYTQyNDhkNzQwYmI5ZWIwNWYzYWMxNTg=
+    MTEzMTNhMjViOWRhYjQ0ZDBjNDI5N2ZhNDM5NmQ3NmFmNDg1YTcyOWFmYjIy
+    ZTc0YmFhYTU5MjIyNGI1NjIyOWRjOTdkNmY3ODlhOGFiNWRmYzcyZjJlNWEw
+    MDI5MGRhZGRhYjhhYzU3OTY3ODI3NTljOGE5Zjk5YTkxYmRiYjY=
   data.tar.gz: !binary |-
-    NmY1NjlmYTBmYTYyMDJiYWQ0NTczMzZlZmVjNmE3ZjliZTI3YjBlNDBjNDVm
-    ODkyZDU4NDkwYzllMDRhMjgxMTI2MTM4YmM3Y2JmNDY0MWNkZTg1MzkzMTVi
-    Y2NhNWU2YTRjN2JlNGZlODE2MTNhNDNlNzdhNWNjMjI3NWU4ZmQ=
+    NmM4YjBjOGI0ZmJiMGUwNjI2ZDA2YThmYWVkZDZmMjI0ZmRjZTMxMDM4MmVm
+    MTM2YmM1NjQ3ZjdlYmE5NjM2ZDI3ZjUwYWM1YWY1NDVjN2Y3NzUwMzA3YmY2
+    MDdjMjRmYzVmY2QzOTk1ZTYyNjA0Mzc1MDI3MmFlOWI5OWE5MzM=

data/lib/macaddr.rb

@@ -21,9 +21,10 @@ rescue LoadError
 end
 
 require 'systemu'
+require 'socket'
 
 module Mac
-  VERSION = '1.6.7'
+  VERSION = '1.7.0'
 
   def Mac.version
     ::Mac::VERSION
@@ -57,6 +58,10 @@ module Mac
 
     def address
       return @mac_address if defined? @mac_address and @mac_address
+
+      @mac_address = from_getifaddrs
+      return @mac_address if @mac_address
+
       cmds = '/sbin/ifconfig', '/bin/ifconfig', 'ifconfig', 'ipconfig /all', 'cat /sys/class/net/*/address'
 
       output = nil
@@ -70,6 +75,21 @@ module Mac
       @mac_address = parse(output)
     end
 
+    def from_getifaddrs
+      return unless Socket.respond_to? :getifaddrs
+
+      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?
+        end
+
+      @mac_address = mac if mac
+    end
+
     def parse(output)
       lines = output.split(/\n/)
 

data/macaddr.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "macaddr"
-  spec.version = "1.6.7"
+  spec.version = "1.7.0"
   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.6.7
+  version: 1.7.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu