pauper 0.0.4 → 0.0.5

data/lib/dhcpd.rb

@@ -10,6 +10,10 @@ class DHCPD
     parse
   end
 
+  def subnet
+    @preamble.match(/(172\.16\.\d+)\.0/)[1]
+  end
+
   def save
     tmp_path = '.tmp.dhcpd.conf'
     File.open(tmp_path, 'w') do |f|

data/lib/pauper.rb

@@ -51,9 +51,11 @@ class Pauper
     vmx.save
 
     dhcpd = DHCPD.new(DHCPD_CONF_PATH)
+    ip = node_ip(node_config)
+
     dhcpd.config[node_name] = {
       'hardware ethernet' => mac,
-      'fixed-address' => node_config.config[:ip]
+      'fixed-address' => ip
     }
     dhcpd.save
 
@@ -81,13 +83,13 @@ class Pauper
     chef_attribs = {
       :run_list => @pauper_config.config[:default_run_list] + node_config.config[:run_list],
       :ip => {
-        :private => node_config.config[:ip],
+        :private => ip,
         :private_netmask => '255.255.255.0'
       }
     }.merge(@pauper_config.config[:chef_options]).merge(node_config.config[:chef_options])
 
     puts "Uploading Chef files..."
-    Net::SCP.start node_config.config[:ip], @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |scp|
+    Net::SCP.start ip, @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |scp|
       scp.upload! tmp_client_rb_path, "client.rb"
       scp.upload! @pauper_config.config[:validation_key_path], "validation.pem"
       scp.upload! StringIO.new(chef_attribs.to_json), "client-config.json"
@@ -102,7 +104,7 @@ class Pauper
     end
 
     puts "Connecting over SSH..."
-    Net::SSH.start node_config.config[:ip], @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |ssh|
+    Net::SSH.start ip, @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |ssh|
       ssh_exec ssh, "sudo hostname #{node_name}"
       ssh_exec ssh, "sudo mkdir /etc/chef"
 
@@ -166,7 +168,7 @@ class Pauper
     puts "Writing /etc/hosts file..."
     hosts = Hosts.new
     @pauper_config.config[:nodes].each do |node|
-      hosts.config[node.config[:ip]] = node.name
+      hosts.config[node_ip(node)] = node.name
     end
     hosts.save
   end
@@ -194,6 +196,17 @@ class Pauper
 
   private
 
+  def node_ip(node_config)
+    return node_config.config[:ip] if node_config.config[:ip]
+
+    @subnet ||= begin
+      dhcpd = DHCPD.new(DHCPD_CONF_PATH)
+      dhcpd.subnet
+    end
+
+    return @subnet + '.' + node_config.config[:last_octet]
+  end
+
   def cmd(*args)
     puts ["local>", *args].join(" ")
     system *args
@@ -260,7 +273,9 @@ class Pauper
   end
 
   def node_name_to_vmx(node_name)
-    Dir[File.join(node_name_to_vm_path(node_name), '*.vmx')][0]
+    vmxes = Dir[File.join(node_name_to_vm_path(node_name), '*.vmx')]
+    raise "Can't find a vmx file in #{node_name_to_vm_path(node_name)}" unless vmxes[0]
+    vmxes[0]
   end
 
   def node_name_to_vm_path(node_name)
@@ -369,6 +384,10 @@ class Pauper
         @config[:ip] = addr
       end
 
+      def last_octet(octet)
+        @config[:last_octet] = octet.to_s
+      end
+
       def chef_options(options)
         @config[:chef_options] = options
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pauper
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -07:00
-default_executable: 
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +49,11 @@ dependencies:
   name: net-scp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +63,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,7 +90,6 @@ files:
 - lib/pauper.rb
 - lib/vmx.rb
 - README
-has_rdoc: true
 homepage: http://github.com/fastly/Pauper
 licenses: []
 
@@ -92,23 +99,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A semi-sane way to manage a multi-vm dev environment