xhyve-ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf9777a8a13a4a049b1b2ec2f0529b1aff1b3fa
-  data.tar.gz: 277e88f650d890e5410e7e47212ffdb72e13b04f
+  metadata.gz: ba6d16639d9f006d9eb0ab93ac6d9e0f021fd56b
+  data.tar.gz: 55a094bea177b871630409572dbdc99875a0007d
 SHA512:
-  metadata.gz: a58cbf6ad1c131fdf8da0616b01159460601584366c185c9c3623f5db3fc3be5ecc4975ec994e0192cb19b1066f1015f7a3bfa849b1085caaed02b5eab9138cb
-  data.tar.gz: 4fc91c59c68b9cb603a4560d296e25ae9c72f2a155316a2471a47e4459d2b370c4f567bbcfb0552ccbd209b66dce22d7dfa1a24d1e3248f1581680b66cb8fb02
+  metadata.gz: b03d16d068d6b5201d0d9402d362d0361f2036f2ddc9820eff6351c308439942cd89cae4ca9c1f77d635cf6b0117e5d65224b1df7d92e1cd8e31f88c93238b26
+  data.tar.gz: eade397da6b782fe3fe932f4a30bee66fb6a614d86793ce627c582e4bd3b1e2be84db135c1fece003592f36a81bd125d512034e4236df9723051ddfd65a24024

data/ext/vmnet/extconf.rb

@@ -1,9 +1,9 @@
-require "mkmf"
+require 'mkmf'
 require 'rbconfig'
 
-abort "Only works on OS X" unless RbConfig::CONFIG['host_os'].downcase.include?('darwin')
-abort "missing vmnet.h" unless have_header "uuid.h"
-abort "missing vmnet.h" unless have_header "vmnet/vmnet.h"
-abort "missing vmnet" unless have_framework "vmnet"
+abort 'Only works on OS X' unless RbConfig::CONFIG['host_os'].downcase.include?('darwin')
+abort 'missing vmnet.h' unless have_header 'uuid.h'
+abort 'missing vmnet.h' unless have_header 'vmnet/vmnet.h'
+abort 'missing vmnet' unless have_framework 'vmnet'
 
-create_makefile "vmnet/vmnet"
+create_makefile 'vmnet/vmnet'

data/lib/xhyve/dhcp.rb

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

data/lib/xhyve/guest.rb

@@ -1,75 +1,69 @@
 require 'securerandom'
+require 'pty'
 
 require 'xhyve/dhcp'
 
 module Xhyve
-  BINARY_PATH=File.expand_path('../../../lib/xhyve/vendor/xhyve', __FILE__).freeze
+  BINARY_PATH = File.expand_path('../../../lib/xhyve/vendor/xhyve', __FILE__).freeze
 
+  # An object to represent a guest that we can start and stop
+  # Effectively, it's a command wrapper around xhyve to provide an
+  # object oriented interface to a hypervisor guest
   class Guest
-    PCI_STR = '-s 0:0,hostbridge'
     PCI_BASE = 3
-    NETWORK_STR = "-s #{PCI_BASE-1}:0,virtio-net"
 
-    attr_reader :pid, :uuid
+    attr_reader :pid, :uuid, :mac
 
     def initialize(**opts)
       @kernel = opts.fetch(:kernel)
       @initrd = opts.fetch(:initrd)
       @cmdline = opts.fetch(:cmdline)
-      @blockdevs = [ opts[:blockdevs] || [] ].flatten
+      @blockdevs = [opts[:blockdevs] || []].flatten
       @memory = opts[:memory] || '500M'
-      @processors = opts[:processors] || 1
+      @processors = opts[:processors] || '1'
       @uuid = opts[:uuid] || SecureRandom.uuid
       @serial = opts[:serial] || 'com1'
       @acpi = opts[:acpi] || true
       @sudo = opts[:sudo] || true
       @command = build_command
+      @mac = VMNet.uuid_to_mac(@uuid)
     end
 
     def start
-      @pid = spawn(@command)
+      @r, @w, @pid = PTY.getpty(@command.join(' '))
     end
 
     def stop
-      Process.kill('TERM', @pid) if running?
-    end
-
-    def destroy
-      Process.kill('KILL', @pid) if running?
+      Process.kill('KILL', @pid)
     end
 
     def running?
-      Process.kill(0, @pid)
-    rescue Errno::ESRCH
-      false
+      PTY.check(@pid).nil?
     end
-    
+
     def ip
-      @ip ||= Xhyve::DHCP.get_ip_for_mac(get_mac)
+      @ip ||= Xhyve::DHCP.get_ip_for_mac(@mac)
     end
 
-    def mac
-      @mac ||= VMNet.uuid_to_mac(@uuid)
-    end
+    private
 
-  private
     def build_command
       [
-       "#{"sudo" if @sudo}",
-       "#{BINARY_PATH}",
-       "#{"-A" if @acpi}",
-       "-U #{@uuid}", 
-       "-m #{@memory}",
-       "-c #{@processors}", 
-       "#{PCI_STR}",
-       '-s 31,lpc',
-       "-l #{@serial},stdio",
-       "#{NETWORK_STR}",
-       "#{"#{@blockdevs.each_with_index.map{ |p,i| "-s #{PCI_BASE+i},virtio-blk,#{p}" }.join(' ')}" unless @blockdevs.empty? }",
-       "-f kexec,#{@kernel},#{@initrd},'#{@cmdline}'"
-      ].join(' ')
+        "#{'sudo' if @sudo}",
+        "#{BINARY_PATH}",
+        "#{'-A' if @acpi}",
+        '-U', @uuid,
+        '-m', @memory,
+        '-c', @processors,
+        '-s', '0:0,hostbridge',
+        '-s', '31,lpc',
+        '-l', "#{@serial},stdio",
+        '-s', "#{PCI_BASE - 1}:0,virtio-net",
+        "#{"#{@blockdevs.each_with_index.map { |p, i| "-s #{PCI_BASE + i},virtio-blk,#{p}" }.join(' ')}" unless @blockdevs.empty? }",
+        '-f' "kexec,#{@kernel},#{@initrd},'#{@cmdline}'"
+      ].compact
     end
   end
 
-  #./build/xhyve -U $UUID -m ${MEM}G -c ${PROCS} -s 2:0,virtio-net -s 0:0,hostbridge -s 31,lpc -l com2,stdio -A -f kexec,/Volumes/CDROM\ 1/BOOT/VMLINUZ,/Volumes/CDROM\ 1/BOOT/INITRD,"boot=live root=/dev/ram0 live-media=initramfs earlyprintk=serial console=ttyS1,115200 net.ifnames=0 biosdevname=0"
+  # ./build/xhyve -U $UUID -m ${MEM}G -c ${PROCS} -s 2:0,virtio-net -s 0:0,hostbridge -s 31,lpc -l com2,stdio -A -f kexec,/Volumes/CDROM\ 1/BOOT/VMLINUZ,/Volumes/CDROM\ 1/BOOT/INITRD,"boot=live root=/dev/ram0 live-media=initramfs earlyprintk=serial console=ttyS1,115200 net.ifnames=0 biosdevname=0"
 end

data/lib/xhyve/version.rb

@@ -1,3 +1,4 @@
+# Common Xhyve functionality nampesace
 module Xhyve
-  VERSION='0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhyve-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dale Hamel
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: sshkit
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.8
 description: Provides a means of interacting with xhyve from ruby
 email: dale.hamel@srvthe.net
 executables: []