pauper 0.1.5 → 0.1.6

data/bin/pauper

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'thor'
 require 'pauper'
+require 'vmx'
+require 'dhcpd'
 
 class CLI < Thor
   desc "bootstrap", "Initialize the base image"
@@ -74,16 +76,62 @@ class CLI < Thor
     end
   end
 
+
   desc 'write_hosts', 'Write out a new /etc/hosts file'
   def write_hosts
     pauper = Pauper.new
     pauper.write_hosts
   end
 
-  desc 'write_dhcpd', 'Write out a new dhcpd.conf file'
-  def write_dhcpd
+
+  desc 'setup_osx [VMNAME]', 'Set up things for OS X'
+  def setup_osx(vm_name=nil)
     pauper = Pauper.new
-    pauper.write_dhcpd
+
+    vms = Dir["#{ENV['HOME']}/Documents/Virtual Machines*/#{vm_name}*"]
+    if vms.size > 1
+      puts "I'm not sure which VM I should use!"
+      vms.each do |vm|
+        puts "\t#{File.basename(vm)}"
+      end
+      exit
+    end
+
+    vmx_file = Dir[vms[0] + '/*.vmx'][0]
+    vmx = VMX.new(vmx_file)
+
+    mac = vmx.data['ethernet0.generatedAddress']
+    arpmac = mac.gsub(/0([0-9a-f])/, '\1') # switch it to the format that arp likes
+
+    match = `arp -a | grep #{arpmac}`.match(/\(([0-9.]+)\)/)
+    unless match
+      puts "Could not find any running VM with MAC addr: #{arpmac}"
+      exit
+    end
+
+    ip = match.captures[0]
+
+    # Set up DHCPD
+
+    dhcpd = DHCPD.new('/Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf')
+    unless dhcpd.config['dev'] &&
+        dhcpd.config['dev']['hardware ethernet'] == mac &&
+        dhcpd.config['dev']['fixed-address'] == ip
+
+      puts "Writing correct IP/MAC combo into dhcpd.conf file..."
+      dhcpd.config['dev'] = { 'hardware ethernet' => mac, 'fixed-address' => ip }
+      dhcpd.save
+    end
+
+    # Set up route
+    gateway = `route -n get 10.215.0.0`.match(/gateway: (.*)$/).captures[0]
+    unless gateway == ip
+      puts "Adding route to LXC hosts..."
+      system 'sudo', 'route', 'add', '10.215.0.0/24', ip
+    end
+
+    # Write hosts
+    pauper.write_osx_hosts(ip)
   end
 end
 

data/lib/dhcpd.rb

@@ -14,22 +14,28 @@ class DHCPD
     @preamble.match(/subnet (\d+\.\d+\.\d+)\.0 netmask/)[1]
   end
 
+  def serialize
+    out = @preamble
+    out += BEGIN_PAUPER + "\n"
+
+    @config.each do |host, host_config|
+      out += "host #{host} {\n"
+      host_config.each do |key, value|
+        out += "\t#{key} #{value};\n"
+      end
+      out += "}\n"
+    end
+
+    out += END_PAUPER + "\n"
+    out += @postamble
+
+    out
+  end
+
   def save
     tmp_path = '.tmp.dhcpd.conf'
     File.open(tmp_path, 'w') do |f|
-      f.write @preamble
-      f.puts BEGIN_BUM
-
-      @config.each do |host, host_config|
-        f.puts "host #{host} {"
-        host_config.each do |key, value|
-          f.puts "\t#{key} #{value};"
-        end
-        f.puts "}"
-      end
-
-      f.puts END_BUM
-      f.write @postamble
+      f.write serialize
     end
 
     system 'sudo', 'mv', tmp_path, @conf_path
@@ -41,8 +47,8 @@ class DHCPD
 
   private
 
-  BEGIN_BUM = "#### BEGIN BUM ####"
-  END_BUM = "#### END BUM ####"
+  BEGIN_PAUPER = "#### BEGIN PAUPER ####"
+  END_PAUPER = "#### END PAUPER ####"
 
   def parse
     state = :preamble
@@ -53,7 +59,7 @@ class DHCPD
 
       case state
       when :preamble
-        if line == BEGIN_BUM
+        if line == BEGIN_PAUPER
           state = :outside_host
         else
           @preamble << rawline
@@ -71,7 +77,7 @@ class DHCPD
         if line == '}'
           state = :outside_host
           host = nil
-        elsif line == END_BUM
+        elsif line == END_PAUPER
           state = :postamble
         else
           parts = line.chomp(';').split(' ')

data/lib/pauper.rb

@@ -243,29 +243,16 @@ EOF
     hosts.save(@pauper_config.config[:dev_domain])
   end
 
-  def write_dhcpd
-    puts "Writing dhcpd.conf file..."
-
-    dhcpd = DHCPD.new(DHCPD_CONF_PATH)
-
+  def write_osx_hosts(dev_ip)
+    puts "Writing /etc/hosts file..."
+    hosts = Hosts.new
     @pauper_config.config[:nodes].each do |node|
-      vmx = node_vmx(node.name)
-      mac = vmx.data['ethernet0.address']
-
-      node_config = get_node_config(node.name)
-      ip = node_ip(node_config)
-
-      dhcpd.config[node.name] = {
-        'hardware ethernet' => mac,
-        'fixed-address' => ip
-      }
-      dhcpd.save
+      hosts.config[node_ip(node)] = node.name
     end
-
-    puts "Restarting dhcpd..."
-    dhcpd.restart
+    hosts.config[dev_ip] = 'dev'
+    hosts.save(@pauper_config.config[:dev_domain])
   end
-  
+
   def start_all
     puts "Starting all nodes..."
     @pauper_config.config[:nodes].each { |n| start(n.name) }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-05 00:00:00 -07:00
+date: 2013-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency