macaddr-steakknife 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973f7962c2f381a12ff7a080e3ad9238105c1666
-  data.tar.gz: 654b78b7c8e26698780ec9bb84566ee8adea38d9
+  metadata.gz: 890f0a3e388843c737f822965f48050fa402616e
+  data.tar.gz: 7c09951010eb863022305b80c45a063e0509137d
 SHA512:
-  metadata.gz: ec699f79fe8d226417175b104d7e34a09141ca3d01299d8fe0e360302606aae8cc37f5e117d833aac4637493d589be19e100f8ac61a6172854c81e5111fef346
-  data.tar.gz: 8d7f4a377314bfdb0d150eb1983dd6b84898aa78772a0b02b29539708ad3e8cd5852dbcb8f31a086b30d151a8a130f7b5300915064d7e58410686ed277249e07
+  metadata.gz: 8c32818ecac8fae55ac908bcf37a7d22d96a5c7e16780e045e0d43a815359c48b4005ebf0af96eac9c96f360a1a315f7717a77d6f6e1b36afef26b30e86c2f31
+  data.tar.gz: 7fb572c02cdb14106ea210db640e6bfca0a7a31197bebb0aadcc6dae901fbc1f3695ce29c2a11ac8c802f8651f66fef0d1f2562477cc9661b25494235ad051f9

data/lib/macaddr/version.rb

@@ -1,3 +1,3 @@
 module MacAddr
-  VERSION = "1.8.3".freeze
+  VERSION = "1.8.4".freeze
 end

data/lib/macaddr.rb

@@ -33,44 +33,52 @@ module Mac
  
   # @return [Array<Ifaddr>] Return all interface Ifaddrs
   def ifaddrs
-    return [] if !Socket.respond_to?(:getifaddrs) || INTERFACE_PACKET_FAMILY.nil?
-    Socket.getifaddrs.select { |iface| iface.addr && iface.addr.pfamily == INTERFACE_PACKET_FAMILY }
+    return [] if !Socket.respond_to?(:getifaddrs) || iface_packet_family.nil?
+    Socket.getifaddrs.select { |iface| iface.addr && iface.addr.pfamily == iface_packet_family }
   end
  
   # @return [Hash<String,[String,nil]>]
   #          all interfaces as keys, values are MAC addresses ((if present)
   def iface_macs
     h = iface_macs_raw.map do |k, v|
-      v = nil if v.empty? || v !~ EXACT_MAC_REGEX || v =~ EMPTY_MAC
+      v = nil unless valid_mac? v
       [k, v]
     end
     Hash[h]
   end
 
-  INTERFACE_PACKET_FAMILY = [:PF_LINK, :PF_PACKET].map { |c| Socket.const_defined?(c) && Socket.const_get(c) }.first
   EMPTY_MAC = /00(?:[^\h]?00){5}(?:[^\h]?00){2}?/.freeze
   HWADDR_REGEX = /hwaddr=([\h:]+)/.freeze
   WINDOWS_REGEX = /win(32|dows|ce)|(ms|cyg|bcc)win|mingw32|djgpp/i.freeze
-  WINDOWS = RbConfig::CONFIG["host_os"] =~ WINDOWS_REGEX || RUBY_PLATFORM =~ WINDOWS_REGEX || ENV['OS'] == 'Windows_NT'
   # EUI48 and EUI64
   LOOSE_MAC_REGEX = /\h\h(?:[^\h]\h\h){5}(?:[^\h]\h\h){2}?/.freeze
   EXACT_MAC_REGEX = /\A#{LOOSE_MAC_REGEX}\z/.freeze
 
-
   private
 
+  def valid_mac?(s)
+    !s.nil? && !s.empty? && s =~ EXACT_MAC_REGEX && s != EMPTY_MAC
+  end
+
+  def windows?
+    @windows ||= RbConfig::CONFIG["host_os"] =~ WINDOWS_REGEX || RUBY_PLATFORM =~ WINDOWS_REGEX || ENV['OS'] == 'Windows_NT'
+  end
+
+  def iface_packet_family
+    @iface_packet_family ||= (Socket::PF_LINK if defined? Socket::PF_LINK) || (Socket::PF_PACKET if defined? Socket::PF_PACKET)
+  end
+
   def iface_macs_raw
-    if Socket.const_defined? :PF_LINK
+    if defined? Socket::PF_LINK
       from_getnameinfo
-    elsif Socket.const_defined? :PF_PACKET
+    elsif defined? Socket::PF_PACKET
       from_inspect_sockaddr
-    elsif WINDOWS
+    elsif windows?
       for_windows
     else
       from_ifconfig
     end
   end
-
   
   def for_windows
     from_ipconfig || from_getmac
@@ -140,6 +148,6 @@ module Mac
   def from_inspect_sockaddr
     ifaddrs.map { |iface| mac = iface.addr.inspect_sockaddr[HWADDR_REGEX, 1]; [iface.name, mac] }
   end
-end
+end # Mac
 
 MacAddr = Macaddr = Mac

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaddr-steakknife
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Ara T. Howard