mac_addresses 0.0.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ece96d157476727f2e33bae51953a10c7ea54341fe22d725ff74a768bcb1f75
-  data.tar.gz: faee1e34e0ddd21050254c5b14247e56c36a50a94f6594e39f42c181a12e0d8b
+  metadata.gz: 176bda0f3853e9afa4bb6ee460b2022ad4a0802ca8b9e98b9b373fe4e3ec63af
+  data.tar.gz: 432de641cc9582674578844391c15174e6ed7ef7be46e1494ab9c240f797ca31
 SHA512:
-  metadata.gz: c2070d6473e8936b59e0599b65b21f04ea45625284f23cd9fdc16e426ee22c5106443ba7e48356e40317b54756ed9feba9e959b153f165fb947fd59f3988a2e5
-  data.tar.gz: e58ee4bf62eddecec81c5a9cb2cf9cd4f9698a91e45a00eb024664e8cce707b0dff9e245e0792d909ca667a1167e1289d659763030f64c05b24b5bb5b103e1fa
+  metadata.gz: 1def1d0cebcd8e2fc833975b6fc06568f48fc653f0cc3247ab3ff29e62d199a54128bb575f4b3d3c6235ef1abc266dda47ed02a841dc32fcf4c3b32511fb8090
+  data.tar.gz: 78cf3ce777df188d59994e581bf937db87bccb13215764f2dc4b258659688e85147a681296c4135120a5adcce8067501611f8dd0880394a5c077edf88aaaadde

data/lib/mac_addresses.rb

@@ -14,14 +14,20 @@
 #   MacAddresses.list
 
 require 'socket'
+require_relative 'mac_addresses/exceptions'
 
 module MacAddresses
 
   COMMANDS = '/sbin/ifconfig', '/bin/ifconfig', 'ifconfig', 'ipconfig /all', 'cat /sys/class/net/*/address'
-  ADDRESS_REGEXP = %r/(?:[^:\-]|\A)(?:[0-9A-F][0-9A-F][:\-]){5}[0-9A-F][0-9A-F](?:[^:\-]|\Z)/io
-  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
+  ADDRESS_REGEXP = /([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})/
+  NOT_VALID_MACS = ['00:00:00:00:00:00']
+  PROTOCOL_FAMILIES = 'PF_LINK', 'PF_PACKET'
+  fam = PROTOCOL_FAMILIES.find { |fam| Socket.const_defined?(fam) }
+  if fam
+    PROTOCOL_FAMILY = Socket.const_get fam
+  else
+    raise Exceptions::ProtocolFamilyNotFound, PROTOCOL_FAMILIES
+  end
 
   class << self
 
@@ -32,7 +38,6 @@ module MacAddresses
     ##
     # Discovers and returns the system's MAC addresses.
     #   MacAddresses.fetch
-
     def fetch
       @addresses = from_getifaddrs
       return @addresses if @addresses
@@ -46,7 +51,9 @@ module MacAddresses
         break # break as soon as we successfully parse a command output
       end
 
-      raise "None of #{ COMMANDS.join ', ' } succeeded returning MAC addresses info" unless success
+      unless success
+        raise Exceptions::NoneOfCommandsSuccessful, COMMANDS
+      end
 
       @addresses
     end
@@ -56,29 +63,18 @@ module MacAddresses
 
       interfaces = Socket.getifaddrs.select do |addr|
         addr.addr &&  # Some VPN ifcs don't have an addr - ignore them
-          addr.addr.pfamily == INTERFACE_PACKET_FAMILY
+          addr.addr.pfamily == MacAddresses::PROTOCOL_FAMILY
       end
 
-      macs = if Socket.const_defined? :PF_LINK
-               interfaces.map do |addr|
-                 addr.addr.getnameinfo
-               end.map do |m,|
-                 m if (m && !m.empty?)
-               end.compact
-             elsif Socket.const_defined? :PF_PACKET
-               interfaces.map do |addr|
-                 addr.addr.inspect_sockaddr[/hwaddr=([\h:]+)/, 1]
-               end.map do |mac_addr|
-                 mac_addr != '00:00:00:00:00:00'
-               end
-             end
-      macs
+      interfaces.inject([]) do |found, iface|
+        macs = parse iface.addr.inspect_sockaddr
+        found << macs.select { |mac| mac != '00:00:00:00:00:00' }
+      end.flatten
     end
 
-    def parse(output)
-      candidates = output.scan(ADDRESS_REGEXP).map &:strip
-      raise 'No mac address candidates' unless candidates.any?
-      candidates
+    # Scans a string and returns an Array of found MACs
+    def parse(string)
+      string.scan(ADDRESS_REGEXP).flatten
     end
   end
 end

data/lib/mac_addresses/exceptions.rb

@@ -0,0 +1,18 @@
+module MacAddresses
+  module Exceptions
+
+    class NoneOfCommandsSuccessful < StandardError
+      def initialize(commands, message = nil)
+        message = message || "None of #{ commands.join(', ') } succeeded returning MAC addresses info"
+        super(message)
+      end
+    end
+
+    class ProtocolFamilyNotFound < StandardError
+      def initialize(families, msg = nil)
+        message = message || "Socket protocol family not found: tried with #{families.join ', '}"
+        super(message)
+      end
+    end
+  end
+end

data/lib/mac_addresses/version.rb

@@ -1,3 +1,3 @@
 module MacAddresses
-  VERSION = '0.0.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_addresses
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -33,6 +33,7 @@ files:
 - LICENSE
 - README.md
 - lib/mac_addresses.rb
+- lib/mac_addresses/exceptions.rb
 - lib/mac_addresses/version.rb
 homepage: https://github.com/FancyPixel/mac_addresses
 licenses: