hive-runner 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd0c2fca702b7f737a3219facc7ec6b76fdc7f96
-  data.tar.gz: 5ff8b54a89014cb4b75f2b6c415bbb0330b825c7
+  metadata.gz: 55e51a2e63a369604683a34ee74662fa61d40be6
+  data.tar.gz: c84a6365d382d09fd5b65455ab2e9ad1edd30f5d
 SHA512:
-  metadata.gz: a69c0768dfa7deb80fe97d9c63f7021a789564c89cbc01514bc9cdeef12ea45d69f069b509014c20de82b2b0d913928264871b3c7852a128e602f037de365b61
-  data.tar.gz: b57388c0378668580f1d8b31bc4e11fd99a9ca31049591c6645a4e83c7cb4bda2644ab924052cb98fa741afc7f948cb100745859d030583736232a2416f95fee
+  metadata.gz: 34826fc6647770fc07e2c1a5d54c87a6da1ced54dba570d0ba8ff446b6232e1005b9aa44efb6c50aa9b5b8d4b8345dd0f2b7c8b81b3319d041c848015d64c1e4
+  data.tar.gz: a76541f4f0b1d922c13e941875b53281fad16ef30f19458455ad3c8ad0a56fdb159bd495f684c2455917ab8b29bdc7c267bcd702749f3ea146c20417152cbea8

data/lib/hive.rb

@@ -68,7 +68,7 @@ module Hive
         hostname: Hive.hostname,
         version: Gem::Specification.find_by_name('hive-runner').version.to_s,
         runner_plugins: Hash[Gem::Specification.all.select{ |g| g.name =~ /hive-runner-/ }.map { |p| [p.name, p.version.to_s] }],
-        macs: [Hive.mac_address],
+        macs: Mac.addrs,
         ips: [Hive.ip_address],
         brand: Hive.config.brand? ? Hive.config.brand : 'BBC',
         model: Hive.config.model? ? Hive.config.model : 'Hive',
@@ -101,11 +101,6 @@ module Hive
     ip.ip_address
   end
 
-  # Get the MAC address of the Hive
-  def self.mac_address
-    Mac.addr
-  end
-
   # Get the hostname of the Hive
   def self.hostname
     Socket.gethostname.split('.').first

data/lib/macaddr.rb

@@ -0,0 +1,103 @@
+# Copied on 26 May 2016 directly from https://github.com/tsilen/macaddr, which
+# is a fork of the official source of the Gem at
+# https://github.com/ahoward/macaddr but with a fix to get a full list of all
+# MAC addresses.
+# License is given as "same as ruby's" (sic).
+
+##
+# Cross platform MAC address determination.
+#
+# To return the first MAC address on the system:
+#
+#   Mac.address
+#
+# To return an array of all MAC addresses:
+#
+#   Mac.addresses
+
+begin
+  require 'rubygems'
+rescue LoadError
+  nil
+end
+
+require 'socket'
+
+module Mac
+  VERSION = '1.7.1'
+
+  def Mac.version
+    ::Mac::VERSION
+  end
+
+  def Mac.dependencies
+    {
+    }
+  end
+
+  def Mac.description
+    'cross platform mac address determination for ruby'
+  end
+
+
+  class << self
+
+    ##
+    # Accessor for the system's first MAC address, requires a call to #address
+    # first
+
+    attr_accessor "mac_address"
+
+    ##
+    # Discovers and returns the system's MAC addresses.  Returns the first
+    # MAC address, and includes an accessor #list for the remaining addresses:
+    #
+    #   Mac.addr # => first address
+    #   Mac.addrs # => all addresses
+
+    def address
+      @mac_address ||= addresses.first
+    end
+
+    def addresses
+      @mac_addresses ||= from_getifaddrs || []
+    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:
+
+    ##
+    # Shorter aliases for #address and #addresses
+
+    alias_method "addr", "address"
+    alias_method "addrs", "addresses"
+
+    private
+
+    def from_getifaddrs
+      return unless Socket.respond_to? :getifaddrs
+
+      interfaces = Socket.getifaddrs.select do |addr|
+        addr.addr && addr.addr.pfamily == INTERFACE_PACKET_FAMILY
+      end
+
+      if Socket.const_defined? :PF_LINK then
+        interfaces.map do |addr|
+          addr.addr.getnameinfo
+        end.flatten.select do |m|
+          !m.empty?
+        end
+      elsif Socket.const_defined? :PF_PACKET then
+        interfaces.map do |addr|
+          addr.addr.inspect_sockaddr[/hwaddr=([\h:]+)/, 1]
+        end.select do |mac_addr|
+          mac_addr != '00:00:00:00:00:00'
+        end
+      end
+    end
+
+  end
+end
+
+MacAddr = Macaddr = Mac

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: macaddr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +262,7 @@ files:
 - lib/hive/results.rb
 - lib/hive/worker.rb
 - lib/hive/worker/shell.rb
+- lib/macaddr.rb
 - scripts/hive-script-helper.sh
 homepage: https://github.com/bbc/hive-runner
 licenses: