poolparty 0.2.18 → 0.2.69

data/bin/cloud-contract

@@ -6,22 +6,12 @@ require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@testing = o.testing
-
-include Remote
-
-begin
-  @cloud = cloud(o.cloudname.downcase.to_sym)
-rescue
-  puts "Cloud name required. Please specify it with -n name"
-  exit(0)
-end
-
-with_cloud(@cloud, {:testing => @testing}) do
-  puts header("Contracting cloud #{name}")
-  puts "#{list_of_running_instances.size} running instances (#{minimum_instances} minimum instances)"
-  puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
-  contract_cloud_if_necessary( !testing )
+o.loaded_clouds.each do |cl|
+  with_cloud(cl) do
+    puts header("Contracting cloud #{name}")
+    puts "#{list_of_running_instances.size} running instances (#{minimum_instances} minimum instances)"
+    puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
+    contract_cloud_if_necessary( !testing )
+  end
 end

data/bin/cloud-ensure-provisioning

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+available_monitors = PoolParty::Monitors.available_monitors
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
+  opts.on('-l', '--no-shell', 'No shell') {optioner.noshell true}
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud) do
+    
+    @nonprovisioned_nodes = list_of_running_instances.map {|a| a.name } - cloud.get_current_nodes
+    # @tp = ThreadPool.new(10)
+    @nonprovisioned_nodes.each do |node|
+      vputs "Provisioning #{node}"
+      next if node == "master"
+      # @tp.process do
+      str = returning Array.new do |s|
+        s << "/usr/sbin/puppetca --clean #{node}.compute-1.internal"
+        s << "/usr/sbin/puppetca --clean #{node}.ec2.internal"
+      end.join(";")
+  
+      node_id = node.gsub(/node/, '')
+      
+      cmd = ". /etc/profile && #{str};cloud-provision -n #{cloud.name} -i #{node_id};#{str}"
+      running_cmd = "ps aux | grep -v grep | grep \"cloud-provision -n #{cloud.name} -i #{node_id};\""
+      
+      vputs "Executing #{cmd}"
+      running = %x[#{running_cmd}]
+      `#{cmd}` if running.chomp.empty?
+    end
+    # @tp.join
+  end  
+  
+end

data/bin/cloud-expand

@@ -4,24 +4,16 @@ require "poolparty"
 require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Expand the cloud on this name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@testing = o.testing
+o.loaded_clouds.each do |cloud|
 
-include Remote
-
-begin
-  @cloud = cloud(o.cloudname.downcase.to_sym)
-rescue
-  puts "Cloud name required. Please specify it with -n name"
-  exit(0)
-end
-
-with_cloud(@cloud, {:testing => @testing}) do
-  puts header("Expanding cloud #{name}")
-  puts "#{list_of_running_instances.size} running instances of #{maximum_instances} possible instances"
-  puts testing ? "Not expanding (test mode)" : "Expanding the cloud"
-  expand_cloud_if_necessary( !testing )
+  with_cloud(cloud) do
+    vputs header("Expanding cloud #{name}")
+    vputs "#{list_of_running_instances.size} running instances of #{maximum_instances} possible instances"
+    vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"
+    expand_cloud_if_necessary( !testing )
+  end
+  
 end

data/bin/cloud-handle-load

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+end
+
+o.loaded_clouds.each do |cloud|
+
+  with_cloud(cloud) do
+    vputs header("Load handling cloud #{name}")
+    vputs "should_expand_cloud: #{should_contract_cloud?}"
+    if should_expand_cloud?
+      vputs "Expanding cloud based on load"
+      logger.debug "Expanding cloud based on load"
+      logger.debug rules_values
+      expand_cloud_if_necessary
+    elsif should_contract_cloud?
+      vputs "Contracting cloud based on load"
+      logger.debug rules_values
+      contract_cloud_if_necessary
+    end
+  end
+
+end

data/bin/cloud-list

@@ -2,23 +2,17 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)')    { |o| optioner.location o }
   opts.on('-r', '--remote', 'Remote listing')    { optioner.location "remote" }
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:location => @location}) do
+  with_cloud(cloud) do
     puts header("Listing cloud #{name}")
     puts subheader("Active instances")
     puts list_of_running_instances.map{|a| a.to_s}.join("\n")

data/bin/cloud-maintain

@@ -8,29 +8,23 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@location = o.location ? o.location : "remote"
+o.loaded_clouds.each do |cloud|
 
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-
-@clouds.each do |name, cloud|
-
-  with_cloud(cloud, {:location => @location, :testing => o.testing}) do
-    logger.info header("Maintaining cloud #{name}")
+  with_cloud(cloud) do
+    vputs header("Maintaining cloud #{name}")
+    logger.warn "Maintaining cloud"
+    logger.warn rules_values
     if !minimum_number_of_instances_are_running?
-      logger.warn "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
-      logger.warn "Launching new instance"
-      expand_cloud_if_necessary( !testing )
-    elsif !maximum_number_of_instances_are_not_running?
-      logger.warn "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
-      logger.warn "Shutting down non-master instance"
+      vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
+      vputs "Launching new instance"
+      launch_minimum_number_of_instances
+    elsif maximum_number_of_instances_are_running?
+      vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
+      vputs "Shutting down non-master instance"
       contract_cloud_if_necessary( !testing )
-    else
-      logger.info "Cloud is maintained"
     end    
+    vputs "Cloud is maintained"
   end  
 
 end

data/bin/cloud-osxcopy

@@ -2,18 +2,12 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Copy the master ip for this cloud')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud, {:location => @location}) do
     Kernel.system "echo #{master.ip.chomp} | pbcopy"

data/bin/cloud-provision

@@ -2,34 +2,33 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slave|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-p', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
+  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_number i }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@provision_class = o.provision_class || "all"
-
-include Remote
+o.loaded_clouds.each do |cloud|
 
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
+  with_cloud(cloud) do
 
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class}) do
+    instance_num = instance_number.to_i if instance_number
     
-    provisioning_in_progress
-    
-    if provision_class == "slave" || provision_class == "all"
-      Provisioner.provision_slaves(self, testing)
-    end
-    if provision_class == "master" || provision_class == "all"
-      Provisioner.provision_master(self, testing)
+    if instance_num
+      @instance = get_instance_by_number( instance_num )
+      instance_num == 0 ? Provisioner.provision_master(self, testing) : Provisioner.provision_slave(@instance, self, testing)
+      Provisioner.process_clean_reconfigure_for!(@instance, self, testing)
+    else
+      if provision_slave
+        vputs "Provisioning slaves"
+        Provisioner.provision_slaves(self, testing)
+      else
+        vputs "Provisioning master"
+        (verbose || testing) ? Provisioner.provision_master(self, testing) : hide_output { Provisioner.provision_master(self, testing) }
+      end
     end
     
-    provisioning_complete
+  end
 
-    clear_base_directory unless testing
-  end    
 end

data/bin/cloud-refresh

@@ -6,21 +6,12 @@ require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@provision_class = o.provision_class || "all"
-
-include Remote
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
-
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing}) do
-    cmd = <<-EOE
-puppetrun --host #{list_of_node_names.join(", --host ")}
-    EOE
-    run_command_on(cmd.runnable, master)
+  with_cloud(cloud) do
+    vputs "Calling reconfigure_cloud!('force_reconfig') on #{master.ip}"
+    reconfigure_cloud!("force_reconfig")
   end
   
 end

data/bin/cloud-run

@@ -11,9 +11,8 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-c command', '--command command', 'Command to run on the instance')    { |c| optioner.command c }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
 @cmd = o.command if (o.command)
-@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
 
-instance = @cloud.run_command_on_instance_number( @cmd, o.num.to_i || 0 ) if @cloud
+o.loaded_clouds.each do |cl|
+  @cloud.run_command_on_instance_number( @cmd, o.num.to_i || 0 ) if @cloud
+end

data/bin/cloud-ssh

@@ -2,12 +2,13 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
   opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.num i }
 end
 load_pool(o.spec || Binary.get_existing_spec_location)
 
-@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
+@cloud = o.loaded_clouds.first
 
-instance = @cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud
+@cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud

data/bin/cloud-start

@@ -2,32 +2,29 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|  
-  opts.on('-c cloudname', '--cloud name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-d', '--daemonize', 'Daemonize starting the cloud')    { optioner.daemon true }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@testing = o.testing
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
-
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:testing => @testing}) do
-    puts header("Starting cloud")
-    puts "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
-    if (minimum_instances - list_of_running_instances.size) > 0
+o.loaded_clouds.each do |cloud|
+  with_cloud(cloud) do
+    vputs header("Starting cloud #{name}")
+    vputs "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
+    # if list_of_running_instances.size <= 1
       puts "Starting the master instance"    
-      if testing
-        puts("\tNot launching while in testing mode")
-      else
-        provisioning_in_progress
-        launch_and_configure_master!
-        provisioning_complete
-      end
+      # if testing
+      #   puts("\tNot launching while in testing mode")
+      # else
+        vputs "Launching and configuring the master"
+        daemon ? daemonize {launch_and_configure_master!} : launch_and_configure_master!
+      # end
+    # end
+    when_no_pending_instances do
+      puts open(::File.join(File.dirname(__FILE__), "..", "lib", "poolparty", "config", "postlaunchmessage.txt")).read ^ {:master_ip => master.ip.chomp}
+      clear_base_directory unless testing
     end
-    clear_base_directory unless testing
   end
   
 end

data/bin/cloud-stats

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Stats for cloud name')    { |c| optioner.cloudname c }
+end
+
+o.loaded_clouds.each do |cloud|
+
+  with_cloud(cloud) do
+    puts header("#{name.to_s.capitalize} cloud stats")
+    run_command_on(". /etc/profile && server-show-stats", master)
+  end
+
+end

data/bin/cloud-terminate

@@ -2,17 +2,14 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slaves|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Terminate the cloud of this name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class}) do
+  with_cloud(cloud) do
     
     list_of_running_instances.each do |inst|
       puts "Shutting down #{inst.instance_id}"

data/bin/messenger-get-current-nodes

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Stats for cloud name')    { |c| optioner.cloudname c }
+end
+
+o.loaded_clouds.each do |cloud|
+  # @nodes = cloud.messenger_send!("get_current_nodes")
+  # @nodes = @nodes.split(" ").map {|a| a.split(/@/)[-1] }
+  puts cloud.get_current_nodes.join(" ")
+end

data/bin/pool

@@ -3,19 +3,19 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-# Get the git-style program action
-# o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-#   opts.on('-n [name]','--name [name]', 'Binary to run')    { |o| optioner.name o }
-# end
+name = ARGV.select {|arg| arg if Binary.available_binaries_for("pool").include?(arg) }.first
+# If the options include -h and they don't include a valid command, then we can just pass the 
+# original options back, but if they do contain a binary, we don't want -h getting through to 
+# these options, so we'll strip it if it's included
+DUP_ARG = ARGV.dup
+new_args = DUP_ARG.map {|arg| DUP_ARG.delete(arg) unless help_array.include?(arg) || Binary.available_binaries_for("pool").include?(arg) }
+new_args = new_args.reject {|arg| Binary.available_binaries_for("pool").include?(arg) }.empty? ? ARGV : (name ? (help_array.each {|arg| DUP_ARG.delete(arg)}; DUP_ARG) : DUP_ARG)
 
-name = ARGV.shift
+# Let's make sure if no command is passed in that we show the help message
+new_args.push("-h") unless name
 
-# If there was no program action given
-if !name || name == "-h" || name == "--help"
-  puts "Usage: pool <specfile> <action> <options>"
-  puts "Pool actions:"
-  puts Binary.list_binaries_for("pool")
-  exit
+o = PoolParty::Optioner.new(new_args, {:extra_help => "\nPool actions\n#{Binary.list_binaries_for("pool")}\n\n", :abstract => true}) do |opts, optioner|  
+  opts.on('-n poolname', '--name name', 'Address this pool')    { |c| optioner.poolname c }
 end
 
 program_name = "#{File.basename($0)}-#{name}"
@@ -27,5 +27,5 @@ command_line = "#{program_location}"
 if Binary.available_binaries_for("pool").include?(name)
   system command_line, *ARGV
 else
-  puts "Unknown poolparty binary: #{program_name}"
+  puts "Unknown poolparty binary: #{name}"
 end

data/bin/pool-describe

@@ -4,6 +4,5 @@ require "poolparty"
 require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV)
-load_pool(o.spec || Binary.get_existing_spec_location)
 
 puts pool_describe

data/bin/{pool-spec → pool-generate}

@@ -14,4 +14,5 @@ source = RubiGen::PathSource.new(:application,
   File.join(File.dirname(__FILE__), "../generators"))
 RubiGen::Base.reset_sources
 RubiGen::Base.append_sources source
+ARGV.reject! {|a| a == "generate" }
 RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'poolspec')

data/bin/pool-init

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rubigen'
+
+# First, let's generate the spec
+if %w(-V --version).include? ARGV.first
+  require 'poolspec/version'
+  puts "#{File.basename($0)} #{Poolspec::VERSION::STRING}"
+  exit(0)
+end
+
+name = ARGV.first
+
+puts "Creating pool named #{name}"
+`pool generate #{name}`
+
+# Now add the keypairs for the pool based on the default pool name and cloud name
+
+@pool = load_pool(self.spec || Binary.get_existing_spec_location)
+@clouds = [@pool.cloud("#{name}_app")]
+
+@clouds.each do |cloud|  
+  with_cloud(cloud) do
+    vputs header("Creating keypair for #{name}")
+    create_keypair unless testing
+  end  
+end

data/bin/pool-list

@@ -2,27 +2,29 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)')    { |o| optioner.location o }
   opts.on('-r', '--remote', 'Remote listing')    { optioner.location "remote" }
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for pool name')    { |p| optioner.poolname p }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@pools = o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools
 
-@pools.each do |name, pool|
-  with_pool(pool, {:location => @location}) do
+o.loaded_pools.each do |pool|
+  with_pool(pool) do
     puts header("Listing pool #{name}")
     clouds.each do |name, cloud|
-      puts subheader("Cloud: #{name}")
-      out = location == "remote" ? cloud.list_from_remote({:cache => true}).map{|a| a.to_s} : cloud.list_from_local.map{|a| a.to_s}
-      puts out
+      puts subheader("Cloud: #{name} (#{cloud.keypair})")
+      with_cloud(cloud) do
+        puts header("Listing cloud #{name}")
+        puts subheader("Active instances")
+        puts list_of_running_instances.map{|a| a.to_s}.join("\n")
+        puts ""
+        if list_of_pending_instances.size > 0
+          puts subheader("Pending instances")
+          puts list_of_pending_instances.map{|a| a.to_s}.join("\n")
+        end
+      end
     end
   end
 end

data/bin/pool-start

@@ -2,29 +2,23 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|  
   opts.on('-p poolname', '--pool name', 'Start pool by this name')    { |p| optioner.poolname p }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@testing = o.testing
-
-include Remote
-
-@pools = o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools
-
-@pools.each do |name, pl|
+o.loaded_pools.each do |pl|
   
-  with_pool(pl, {:testing => @testing}) do
+  with_pool(pl) do
+    puts subheader("Pool: #{pl.name}")
     
-    puts header("Starting pool")
-    clouds.each do |name, cloud|
-      puts subheader("Cloud: #{name}")
-      puts "#{cloud.list_of_running_instances.size} running instances (#{cloud.minimum_instances} - #{cloud.maximum_instances})"
-      if (cloud.minimum_instances - cloud.list_of_running_instances.size) > 0
-        puts "Starting #{cloud.minimum_instances - cloud.list_of_running_instances.size} instances (from #{cloud.keypair})"
-        testing ? puts("\tNot launching while in testing mode") : cloud.launch_minimum_number_of_instances
+    pool_clouds.each do |cl|
+      vputs subheader("Cloud: #{cl.name}")
+      
+      cl.launch_and_configure_master!
+      when_no_pending_instances do
+        puts open(::File.join(File.dirname(__FILE__), "..", "lib", "poolparty", "config", "postlaunchmessage.txt")).read ^ {:master_ip => cl.master.ip.chomp}
+        clear_base_directory unless testing
       end
     end
   end

data/bin/server-build-messenger

@@ -3,18 +3,25 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger") )
+root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger/ebin") )
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+end
 
 INCLUDE = "include"
-ERLC_FLAGS = "-I#{INCLUDE} +warn_unused_vars +warn_unused_import"
+ERLC_FLAGS = "-I#{INCLUDE}"
 @version = "0.1"
 
+# erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell
+# erlc -pa ./ebin -o ebin ./src/*.erl
+# erl -pa ./ebin -s pm_packager start -s init stop
 cmd =<<-EOE
   cd #{root_dir}
-  rm ebin/*
-  erlc -pa ./ebin -W #{ERLC_FLAGS} -o ebin ./src/*.erl
-  erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell
-  erl -pa ./ebin -s pm_packager start -s init stop
+  rake recompile
+  rake build_boot_scripts
 EOE
 
+vputs "** Building messenger **", o
+vputs "Running command #{cmd.runnable}", o
+
 out = %x[#{cmd.runnable}]