xhyve-ruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58005c60cc515f17ef119f259d4115b8b0638bd8
-  data.tar.gz: 20672ceda7b0184432661e0d13f04fdfd84be7af
+  metadata.gz: e54769a85f5ba636185ecd3427169c3d178f1018
+  data.tar.gz: 47b1630f45eb6d9f22517ea0454f73955bfeb98f
 SHA512:
-  metadata.gz: d4b28c161598fbc12b3a2b1f8b457fb5902c31f3a6bdf3b76e4244a82e8809ef234eef842ce5db99c910f3ec7c4b04b5fa75dff9f173d225db67867dd88300dc
-  data.tar.gz: e22a918fede16e4b4a327f800bb6eb67ce2784b535bc3d877004281a7f39a39e81ad2432f45f840244131a102a649b6f36bc4fb31edd3f103de3f41e773a2cd5
+  metadata.gz: 315700aa265cd579a93f6f5677500e42479fe35654706753905c607507f3111e531c110807bae5ad2c067959c0398e9b3a5a4b3eabb5df020f45c04764198792
+  data.tar.gz: 0365bc91ad1b18be2025fb620cfa7e9e6ef4233e27d5bf41e2abeb9462f7ce44c1049650468b17925d526fda068e988b370a116fb7fcf759384429ab1818f24f

data/lib/xhyve/dhcp.rb

@@ -1,29 +1,41 @@
 module Xhyve
   # Parse DHCP leases file for a MAC address, and get its ip.
   module DHCP
+    extend self
     LEASES_FILE = '/var/db/dhcpd_leases'
     WAIT_TIME = 1
     MAX_ATTEMPTS = 60
 
-    def self.get_ip_for_mac(mac)
-      attempts = 0
-      max_attempts = ENV.key?('MAX_IP_WAIT') ? ENV['MAX_IP_WAIT'].to_i : MAX_ATTEMPTS
-      while attempts < max_attempts
-        attempts += 1
+    def get_ip_for_mac(mac)
+      max = ENV.key?('MAX_IP_WAIT') ? ENV['MAX_IP_WAIT'].to_i : nil
+      ip = wait_for(max: max) do
         ip = parse_lease_file_for_mac(mac)
-        return ip if ip
-        sleep(WAIT_TIME)
       end
     end
 
-    def self.parse_lease_file_for_mac(mac)
+    def parse_lease_file_for_mac(mac)
       lease_file = (ENV['LEASES_FILE'] || LEASES_FILE)
-      contents = File.read(lease_file)
+      contents = wait_for do
+        File.read(lease_file) if File.exists?(lease_file)
+      end
       pattern = contents.match(/ip_address=(\S+)\n\thw_address=\d+,#{mac}/)
       if pattern
         addrs = pattern.captures
         addrs.first if addrs
       end
     end
+
+  private
+
+    def wait_for(max: nil)
+      attempts = 0
+      max ||= MAX_ATTEMPTS
+      while attempts < max
+        attempts += 1
+        result = yield
+        return result if result
+        sleep(WAIT_TIME)
+      end
+    end
   end
 end

data/lib/xhyve/version.rb

@@ -1,4 +1,4 @@
 # Common Xhyve functionality nampesace
 module Xhyve
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhyve-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dale Hamel