macaddr-steakknife 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afaccb364887b2c6d698da894708584a7ce28bc6
-  data.tar.gz: e5166ed7ff227a37078a7e76330688d5ba552c27
+  metadata.gz: c57cbf6a8fbd425c5474e8e958b5dcea95802ee7
+  data.tar.gz: 2e56b45828bd7a85a3a9eda3be164dea4a08b349
 SHA512:
-  metadata.gz: 3c890cdf2541f413e94e114d03882991e1f9a2ef8fd705af8670fc7ab7705ec82c77a9ea143c0310fc4061ffbb9f5d575e95e75161cb7be56b62a916b10c199f
-  data.tar.gz: d9588c2d0acf362cc6352e98a8d9d7439f4759740ef622c3f2389e91c0139720fe75fe70384a874cec0a500db4d1a9be80a2cf6e90a80661c2bbce6e1231559e
+  metadata.gz: ce447a031629700c73c79c65c4cd5c55b570eb8c10524dcb9870c8793af458d0d87b780373773fc3e5436127ed34b1d8332b0a5602dd80ca912d1a2c22e6d8b3
+  data.tar.gz: 0fb9a3c0378464c8a98dd6d458b31ce4cf61482bac75b6c275fbc1ed52a75b548cc4ea53f33aa04ca6532f7e91dee4a307238e14a02cf953ab083dd1ede1f617

data/lib/macaddr.rb

@@ -112,15 +112,15 @@ module Mac
       .scan(LOOSE_MAC_REGEX)                              # mac address(es)
   end
 
-  def from_ifconfig
+  def from_cmd(cmd, name_regex, mac_regex=nil)
     name = nil
-    %x{ifconfig}
+    %x{#{cmd}}
       .split(/\n/)
       .collect do |line|
-        if line =~ /\A([^:\s]+):.*\z/
+        if line =~ name_regex
           name = clean($1)
           nil
-        elsif line =~ /(?:ether|HWaddr)\s+/
+        elsif mac_regex.nil? || line =~ mac_regex
           mac = filter_mac(line)
           [name, mac.first] if !name.nil? && !mac.empty?
         end
@@ -128,20 +128,12 @@ module Mac
       .compact
   end
 
+  def from_ifconfig
+    from_cmd('ifconfig', /\A([^:\s]+):.*\z/, /(?:ether|HWaddr)\s+/)
+  end
+
   def from_ipconfig
-    name = nil
-    %x{ipconfig /all}
-      .split(/\n/)
-      .collect do |line|
-        if line =~ /\A[^:]+\s*adapter\s*([^:]+):\z/
-          name = clean($1)
-          nil
-        else
-          mac = filter_mac(line)
-          [name, mac.first] if !name.nil? && !mac.empty?
-        end
-      end
-      .compact
+    from_cmd('ipconfig /all', /\A[^:]+\s*adapter\s*([^:]+):\z/)
   end
  
   def from_getnameinfo

data/lib/macaddr/version.rb

@@ -1,3 +1,3 @@
 module MacAddr
-  VERSION = "1.8.5".freeze
+  VERSION = "1.8.6".freeze
 end

metadata

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