auser-poolparty 0.2.78 → 0.2.79

data/Manifest.txt

@@ -16,6 +16,7 @@ bin/cloud-maintain
 bin/cloud-osxcopy
 bin/cloud-provision
 bin/cloud-refresh
+bin/cloud-rsync
 bin/cloud-run
 bin/cloud-ssh
 bin/cloud-start
@@ -81,6 +82,7 @@ lib/erlang/messenger/ebin/pm_node.beam
 lib/erlang/messenger/ebin/pm_node_rel-0.1.rel
 lib/erlang/messenger/ebin/pm_node_supervisor.beam
 lib/erlang/messenger/ebin/pm_packager.beam
+lib/erlang/messenger/ebin/pm_spawner.beam
 lib/erlang/messenger/ebin/pm_strings.beam
 lib/erlang/messenger/ebin/utils.beam
 lib/erlang/messenger/include/defines.hrl
@@ -160,6 +162,7 @@ lib/erlang/messenger/src/pm_master_supervisor.erl
 lib/erlang/messenger/src/pm_node.erl
 lib/erlang/messenger/src/pm_node_supervisor.erl
 lib/erlang/messenger/src/pm_packager.erl
+lib/erlang/messenger/src/pm_spawner.erl
 lib/erlang/messenger/src/pm_strings.erl
 lib/erlang/messenger/src/utils.erl
 lib/erlang/messenger/useful_snippets
@@ -391,7 +394,6 @@ test/test_generator_helper.rb
 test/test_helper.rb
 test/test_pool_spec_generator.rb
 test/test_poolparty.rb
-website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js
 website/stylesheets/code.css

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:46 12/06/08)
 
 To get started, run the generator:
 

data/bin/cloud-maintain

@@ -22,7 +22,7 @@ o.loaded_clouds.each do |cloud|
     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 )
+      contract_cloud_if_necessary( testing ? true : false )
     end    
     vputs "Cloud is maintained"
   end  

data/bin/cloud-rsync

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV, {:extra_help => "\nUsage: cloud [options] rsync source target\n\n"}) 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
+
+@instance_number = (o.num || 0 ).to_i
+
+if o.unflagged_args.length > 1
+  @target = o.unflagged_args.pop
+  @source = o.unflagged_args.pop  
+else
+  @source = o.unflagged_args.pop
+  @target = ''
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud, {:source=>@source, :target=>@target, :instance_number=>@instance_number }) do
+    puts header("rsyncing")
+    rsync_to source, target, instance_number
+  end
+  
+end

data/lib/erlang/messenger/src/pm_node.erl

@@ -133,7 +133,7 @@ init(Args) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call({run_command, Cmd}, _From, State) ->
-	Reply = os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\""),
+	Reply = os:cmd(Cmd),
 	{reply, Reply, State};
 handle_call({update_load, Type, Load}, _From, State) ->
 	{Type, NewState} = store_load_for_type(Type, Load, State),
@@ -197,5 +197,4 @@ code_change(_OldVsn, State, _Extra) ->
   {ok, State}.
 
 % Private
-server_location() ->
-	global:whereis_name(node()).
+server_location() -> global:whereis_name(node()).

data/lib/erlang/messenger/src/pm_spawner.erl

@@ -0,0 +1,213 @@
+% 
+%  pm_spawner.erl
+%  Spawn a process in this gen_server remotely
+%  	and hear back from it when it's got stuff to say
+%  
+%  Created by Ari Lerner on 2008-12-05.
+%  Copyright 2008 CitrusByte. All rights reserved.
+% 
+-module (pm_spawner).
+-behaviour(gen_server).
+
+-include_lib("../include/defines.hrl").
+
+%% API
+-export([start_link/0]).
+-export ([run_command/1, run_command/2, check_command/1]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
+
+-record(state, { 
+		processes = ?DICT:new() % Array of the output
+	}).
+-define(SERVER, ?MODULE).
+
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start_link() -> gen_server:start_link({global, ?MODULE}, ?MODULE, [], []).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([]) ->
+	% process_flag(trap_exit, true),
+  {ok, #state{
+		processes = ?DICT:new()
+	}}.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call({run_command, Cmds}, _From, State) ->
+	{ok, NewState} = run_command(Cmds, State),
+	?TRACE("storing into state from call", [Cmds, NewState]),
+	{reply, ok, NewState};
+handle_call({check_command, Cmd}, _From, State) ->
+	AtomCommand = erlang:list_to_atom(Cmd),
+	?TRACE("is_key for ", [AtomCommand, ?DICT:is_key(AtomCommand, State#state.processes)]),
+	case ?DICT:is_key(AtomCommand, State#state.processes) of
+		false -> 
+			Reply = nil,
+			NewState = State;
+		true ->
+			Pid = ?DICT:fetch(AtomCommand, State#state.processes),
+			case erlang:is_pid(Pid) of
+				true ->
+					Pid ! {self(), collect},
+					receive
+						{command_response, OutFromCommand} -> 					
+							Reply = OutFromCommand,
+							NewState = State#state{processes = ?DICT:store(AtomCommand, OutFromCommand, State#state.processes)};
+						Msg ->
+							NewState = State,
+							Reply = Msg
+					after 
+						1000 -> 
+							Pid ! {self(), collect},
+							NewState = State,
+							Reply = "no output"
+					end;
+				false ->
+					NewState = State,
+					Reply = Pid
+			end
+	end,
+	{reply, Reply, NewState};
+handle_call(_Request, _From, State) ->
+	Reply = ok,
+	{reply, Reply, State}.
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast({run_command, Cmd}, State) ->
+	{ok, NewState} = run_command(Cmd, State),
+	{noreply, NewState};
+handle_cast(_Msg, State) ->
+  {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: handle_info(Info, State) -> {noreply, State} |
+%%                                       {noreply, State, Timeout} |
+%%                                       {stop, Reason, State}
+%% Description: Handling all non call/cast messages
+%%--------------------------------------------------------------------
+handle_info(_Info, State) ->
+  {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% Function: terminate(Reason, State) -> void()
+%% Description: This function is called by a gen_server when it is about to
+%% terminate. It should be the opposite of Module:init/1 and do any necessary
+%% cleaning up. When it returns, the gen_server terminates with Reason.
+%% The return value is ignored.
+%%--------------------------------------------------------------------
+terminate(_Reason, _State) ->
+  ok.
+
+%%--------------------------------------------------------------------
+%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
+%% Description: Convert process state when code is changed
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+  {ok, State}.
+
+% Quick helper for running commands
+run_command(Cmd) -> gen_server:call(server_location(), {run_command, Cmd}).
+check_command(Cmd) -> 
+	Command = lists:flatten(io_lib:format("~s", [Cmd])),
+	gen_server:call(server_location(), {check_command, Command}).
+
+% Run the command, start up the 
+run_command(Cmd, State) ->
+	Command = lists:flatten(io_lib:format("~s", [Cmd])),
+	AtomCommand = erlang:list_to_atom(Command),
+	Pid = spawn(fun() -> spawn_command(Command) end),
+	Storage = Pid,
+	?TRACE("storing into state", [AtomCommand]),
+	NewState = State#state{processes = ?DICT:store(AtomCommand, Storage, State#state.processes)},
+	{ok, NewState}.
+
+spawn_command(Command) ->
+	Port = erlang:open_port({spawn, Command}, [stream, exit_status, stderr_to_stdout, use_stdio]),
+	ResponsePid = response_reader(Port),
+	spawn_command_loop(Command, Port, ResponsePid).
+	
+spawn_command_loop(Command, Port, Responses) ->
+	receive
+		{Pid, collect} ->
+			case erlang:is_pid(Responses) of
+				true ->
+					io:format("There is no output on your command yet, try again in a few seconds ~p~n", [Responses]),
+					spawn_command_loop(Command, Port, Responses);
+				false ->
+					Pid ! {command_response, Responses}
+			end;
+		{exit_status, _} -> 
+			spawn_command_loop(Command, Port, Responses);
+		{done, Port, Response} ->			
+			?TRACE("Received done message", Response),
+			spawn_command_loop(Command, Port, Response);
+	  {Port, {exit_status, 0}} ->			
+			?TRACE("Received exit_status", [Port]),
+			Responses ! {Port, {exit_status, 0, self()}},
+			receive
+				{ok, Resp} ->
+					?TRACE("Received ok back", [Resp]),
+					spawn_command_loop(Command, Port, Resp)
+			end;
+		Mes ->
+			?TRACE("received message", [Mes]),
+			Responses ! Mes,
+			spawn_command_loop(Command, Port, Responses)
+	end.
+
+response_reader(Port) -> 
+	ResponsePid = spawn(fun() -> response_reader_loop(Port, []) end),
+	ResponsePid.
+	
+response_reader_loop(Port, Acc) ->
+	receive
+		{Port, {data, Bin}} ->
+			?TRACE("received data", [Bin]),
+			response_reader_loop(Port, [Bin|Acc]);
+    {Port, {exit_status, 0, Pid}} ->			
+      catch erlang:port_close(Port),
+      Response = lists:flatten(lists:reverse(Acc)),
+			?TRACE("received exit_status", [Response, Port]),
+			Pid ! {ok, Response};
+    {Port, {exit_status, _}} ->
+      catch erlang:port_close(Port),
+      Output = lists:flatten(lists:reverse(Acc)),
+			{error, Output};
+		{Pid, get_data} ->
+			?TRACE("get_data for", [Pid, Acc]),
+			Pid ! {data, Port, Acc},			
+			response_reader_loop(Port, Acc);
+		{_, collect} ->
+			response_reader_loop(Port, Acc);
+		Mes ->
+			io:format("Unexpected message in response_reader_loop ~p~n", [Mes]),
+			response_reader_loop(Port, Acc)
+	end.
+
+server_location() -> global:whereis_name(?SERVER).

data/lib/poolparty/base_packages/poolparty.rb

@@ -72,6 +72,7 @@ module PoolParty
           mode 744
           template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
         end
+        
         has_remotefile(:name => "/usr/bin/puppetcleaner") do
           mode 744
           template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
@@ -80,10 +81,10 @@ module PoolParty
         execute_on_master do
           has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
           
-          has_cron(:name => "master puppetd runner", :user => Base.user, :minute => "*/15") do
-            requires get_gempackage("poolparty")
-            command(PoolParty::Remote::RemoteInstance.puppet_runner_command)
-          end
+          # has_cron(:name => "master puppetd runner", :user => Base.user, :minute => "*/15") do
+          #   requires get_gempackage("poolparty")
+          #   command(PoolParty::Remote::RemoteInstance.puppet_runner_command)
+          # end
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty")
             command(". /etc/profile && cloud-handle-load -n #{cloud.name}")

data/lib/poolparty/core/kernel.rb

@@ -24,14 +24,21 @@ module Kernel
   ensure
     $-v = saved_verbosity
   end
+
+  #redirect stdout and stderr to /dev/null and reopen after block
   def hide_output
     begin
       old_stdout = STDOUT.dup
+      old_stderr = STDERR.dup
       STDOUT.reopen(File.open((PLATFORM =~ /mswin/ ? "NUL" : "/dev/null"), 'w'))
+      STDERR.reopen(File.open((PLATFORM =~ /mswin/ ? "NUL" : "/dev/null"), 'w'))
       yield if block_given?
     ensure
       STDOUT.flush
       STDOUT.reopen(old_stdout)
+      STDERR.flush
+      STDERR.reopen(old_stderr)
     end
   end
+
 end

data/lib/poolparty/helpers/optioner.rb

@@ -9,9 +9,12 @@ module PoolParty
   class Optioner
     include Configurable
     include MethodMissingSugar
-        
-    def initialize(args=[], opts={}, &block)
-      @arguments = parse_args(args)      
+    
+    
+    def initialize(args=[], opts={}, &block)      
+      boolean_args << opts[:boolean_args] if opts.has_key?(:boolean_args)
+
+      @arguments = parse_args(args)
       @extra_help = opts.has_key?(:extra_help) ? opts[:extra_help] : ""
       @abstract = opts.has_key?(:abstract) ? opts[:abstract] : false
       @load_pools = opts.has_key?(:load_pools) ? opts[:load_pools] : !@abstract
@@ -22,16 +25,43 @@ module PoolParty
       set_default_options
       self
     end
-    
     def daemonizeable
       @opts.on('-d', '--daemonize', 'Daemonize starting the cloud')    { self.daemon true }
     end
     def cloudnames
       @opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| self.cloudname c }
+    end 
+    def unflagged_args
+      @unflagged_args ||= []
+    end
+    def flagged_args
+      @flagged_args ||= []
+    end
+    def boolean_args
+      @boolean_args ||= ['-V', '-h', '-t', '-v']
     end
     
-    def parse_args(argv, safe=[])
-      argv
+    # Break ARGV into 2 arrays, one for flagged options one for unflagged
+    # For example the "command -v -i 1 five six -x"
+    # becomes ['-v', '-i', 1, '-x'] and ['five', 'six']
+    # Boolean options, such as -v, must be specified in the optioner definition
+    def parse_args(args=[])
+      i=0
+      while i < args.length
+        if boolean_args.include?(args[i])
+          flagged_args << args[i]
+        else
+          if args[i][0].chr == "-"
+            flagged_args << args[i]
+            flagged_args << args[i+1] if (args[i+1] and !args[i+1].nil?)
+            i+=1
+          else
+            unflagged_args << args[i]
+          end
+        end
+        i+=1
+      end
+      args
     end
     
     def parent

data/lib/poolparty/helpers/provisioner_base.rb

@@ -356,6 +356,9 @@ fi
           
           cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrerun /usr/bin/puppetrerun
           chmod +x /usr/bin/puppetrerun
+          
+          cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetcleaner /usr/bin/puppetcleaner
+          chmod +x /usr/bin/puppetcleaner
         EOS
       end
     end

data/lib/poolparty/helpers/provisioners/master.rb

@@ -24,7 +24,6 @@ module PoolParty
           setup_fileserver,
           setup_autosigning,
           install_poolparty,
-          setup_poolparty,
           restart_puppetmaster,
           run_first_time,
           create_local_node,
@@ -35,6 +34,7 @@ module PoolParty
         [
           create_local_node,
           move_templates,
+          setup_poolparty,
           create_poolparty_manifest,
           restart_puppetd
         ]
@@ -91,7 +91,7 @@ echo "*" > /etc/puppet/autosign.conf
         <<-EOS
 echo "Setting the poolparty configuration"
 cp #{Base.remote_storage_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
-cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
+mv #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/
         EOS
       end
             
@@ -180,9 +180,11 @@ cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolpa
       end
             
       def restart_puppetd
+        # /usr/bin/puppetrerun
         <<-EOS
 echo "Running puppet manifest"
-/usr/bin/puppetrerun
+/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+/usr/bin/puppetcleaner master
         EOS
       end
     end

data/lib/poolparty/modules/cloud_dsl.rb

@@ -5,8 +5,8 @@ module PoolParty
       ebs_volume_id id
       ebs_volume_mount_point loc
       ebs_volume_device "/dev/#{id.sanitize}"
-      
-      has_mount(:name => loc, :device => ebs_volume_device, :requires => get_directory(loc))
+            
+      has_mount(:name => loc, :device => ebs_volume_device, :onlyif => "test -d #{loc}")
       has_directory(:name => loc)
     end
     

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -23,11 +23,17 @@ module PoolParty
       self.run_in_context @stored_block if @stored_block
     end
     
-    # Set instances with a range
-    def instances(arg)
-      if arg.is_a?(Range)
+    # Set instances with a range or a number
+    def instances(arg)      
+      case arg
+      when Range
         minimum_instances arg.first
         maximum_instances arg.last
+      when Fixnum
+        minimum_instances arg
+        maximum_instances arg
+      else
+        raise SpecException.new("Don't know how to handle instances cloud input #{arg}")
       end
     end
     

data/lib/poolparty/net/remote.rb

@@ -8,8 +8,8 @@ module PoolParty
     
     def using(t)
       @cloud = self
-      if available_bases.include?(t.to_sym)
-        unless using_remoter? || t.nil?
+      if t && available_bases.include?(t.to_sym)
+        unless using_remoter?
           self.class.send :attr_reader, :remote_base
           self.class.send :attr_reader, :parent_cloud
           mod = "#{t}".preserved_module_constant

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -117,8 +117,8 @@ begin
       
       def before_configuration_tasks
         if has_cert_and_key?
-          copy_file_to_storage_directory(pub_key)
-          copy_file_to_storage_directory(private_key)
+          # copy_file_to_storage_directory(pub_key)
+          # copy_file_to_storage_directory(private_key)
         end
       end
       def has_cert_and_key?
@@ -140,8 +140,8 @@ begin
       def custom_install_tasks_for(o)
         arr = if has_cert_and_key?
           [ 
-            "mv #{::File.basename(pub_key)} #{Base.base_config_directory}/ssl/public_keys/#{o.name}.pem", 
-            "mv #{::File.basename(private_key)} #{Base.base_config_directory}/ssl/private_keys/#{o.name}.pem"
+            # "mv #{::File.basename(pub_key)} #{Base.base_config_directory}/ssl/public_keys/#{o.name}.pem", 
+            # "mv #{::File.basename(private_key)} #{Base.base_config_directory}/ssl/private_keys/#{o.name}.pem"
           ]
           else 
             []

data/lib/poolparty/net/remoter.rb

@@ -7,9 +7,14 @@ require File.dirname(__FILE__) + "/../helpers/provisioner_base"
 module PoolParty
   module Remote
     module Remoter
-      def rsync_storage_files_to_command(remote_instance)        
+      def rsync_storage_files_to_command(remote_instance)
+        #TODO: rsync_to_command("#{Base.storage_directory}/", Base.remote_storage_path, remote_storage_path) if remote_instance
         "#{rsync_command} #{Base.storage_directory}/ #{remote_instance.ip}:#{Base.remote_storage_path}" if remote_instance
       end
+      # rsync a file to a node.  By default to the master node.
+      def rsync_to_command(source, target=source, remote_instance=master)
+        "#{rsync_command} #{source} #{remote_instance.ip}:#{target}"
+      end
       def run_command_on_command(cmd="ls -l", remote_instance=nil)
         vputs "Running #{cmd} on #{remote_instance.name == %x[hostname].chomp ? "self (master)" : "#{remote_instance.name}"}"
         remote_instance.name == %x[hostname].chomp ? %x[#{cmd}] : "#{ssh_command(remote_instance)} '#{cmd}'"
@@ -40,6 +45,13 @@ module PoolParty
       def remote_rsync_command
         "rsync -azP --exclude cache -e '#{remote_ssh_string}'"
       end
+      
+      
+      # def scp_command(source, dest=target, remote_instance=master)
+      #   #TODO: check if source is Directory and add -r if it is
+      #   "scp #{source} #{remote_instance.ip}:#{dest} #{ssh_array.join(' ')}"
+      # end
+      
       # Get the names of the nodes. Mainly used for puppet templating
       def list_of_node_names(options={})
         list_of_running_instances.collect {|ri| ri.name }
@@ -71,10 +83,22 @@ module PoolParty
       def minimum_number_of_instances_are_running?
         list_of_running_instances.size >= minimum_instances.to_i
       end
+      # Are the minimum number of instances NOT running?
+      def minimum_number_of_instances_are_not_running?
+        !(minimum_number_of_instances_are_running?)
+      end
       # Can we shutdown an instance?
       def can_shutdown_an_instance?
         list_of_running_instances.size > minimum_instances.to_i
       end
+      # Are too few instances running?
+      def are_too_few_instances_running?
+        list_of_running_instances.size < minimum_instances.to_i
+      end
+      # Are there more instances than allowed?
+      def are_too_many_instances_running?
+        list_of_running_instances.size > maximum_instances.to_i
+      end
       # Request to launch a number of instances
       def request_launch_new_instances(num=1)
         out = []
@@ -204,11 +228,17 @@ module PoolParty
       end
       # Stub method for the time being to handle expansion of the cloud
       def should_expand_cloud?(force=false)
-        valid_rules?(:expand_when) || force || false
+        (are_too_few_instances_running? || are_expansion_rules_valid? ) || force || false
+      end
+      def are_expansion_rules_valid?
+        valid_rules?(:expand_when)
       end
       # Stub method for the time being to handle the contraction of the cloud
       def should_contract_cloud?(force=false)
-        valid_rules?(:contract_when) || force || false
+        (are_too_many_instances_running? || are_contraction_rules_valid?) || force || false
+      end
+      def are_contraction_rules_valid?
+        valid_rules?(:contract_when)
       end
       # Expand the cloud
       # If we can start a new instance and the load requires us to expand
@@ -233,12 +263,10 @@ module PoolParty
       # If we can shutdown an instnace and the load allows us to contract
       # the cloud, then we should request_termination_of_non_master_instance
       def contract_cloud_if_necessary(force=false)
-        if can_shutdown_an_instance?          
-          if should_contract_cloud?(force)
-            vputs "Shrinking the cloud by 1"
-            before_shutdown
-            request_termination_of_non_master_instance
-          end
+        if can_shutdown_an_instance? && should_contract_cloud?(force)
+          vputs "Shrinking the cloud by 1"
+          before_shutdown
+          request_termination_of_non_master_instance
         end
       end
       
@@ -254,6 +282,13 @@ module PoolParty
       def before_shutdown
       end
       
+      # Rsync a file or directory to a node.  Rsync to master by default
+      def rsync_to(source, target=source, num=0)
+        str = "#{rsync_to_command(source, target, get_instance_by_number( num ))}"
+        vputs "Running: #{str}"
+        verbose ?  Kernel.system(str) : hide_output {Kernel.system str}
+      end
+      
       # Rsync command to the instance
       def rsync_storage_files_to(instance=nil)
         hide_output {Kernel.system "#{rsync_storage_files_to_command(instance)}" if instance}

data/lib/poolparty/templates/puppetrerun

@@ -7,9 +7,15 @@ if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server mast
   echo "Clearing old certs"
   HN=`hostname`
   if [[ $HN == "master" ]]; then
-      ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
-      /etc/init.d/puppetmaster start && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      rm /etc/poolparty/ssl/ca/signed/$HN*
+      if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ]; then
+        echo "Run successfully" && exit 0
+        else
+        /etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
+        /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      fi
     else
-      rm -rf /etc/poolparty/ssl/*;/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      rm /etc/poolparty/ssl/ca/signed/$HN*
+      /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
   fi
 fi

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 78
+    TINY  = 79
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.78
+  version: 0.2.79
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ executables:
 - cloud-osxcopy
 - cloud-provision
 - cloud-refresh
+- cloud-rsync
 - cloud-run
 - cloud-ssh
 - cloud-start
@@ -127,6 +128,7 @@ files:
 - bin/cloud-osxcopy
 - bin/cloud-provision
 - bin/cloud-refresh
+- bin/cloud-rsync
 - bin/cloud-run
 - bin/cloud-ssh
 - bin/cloud-start
@@ -192,6 +194,7 @@ files:
 - lib/erlang/messenger/ebin/pm_node_rel-0.1.rel
 - lib/erlang/messenger/ebin/pm_node_supervisor.beam
 - lib/erlang/messenger/ebin/pm_packager.beam
+- lib/erlang/messenger/ebin/pm_spawner.beam
 - lib/erlang/messenger/ebin/pm_strings.beam
 - lib/erlang/messenger/ebin/utils.beam
 - lib/erlang/messenger/include/defines.hrl
@@ -271,6 +274,7 @@ files:
 - lib/erlang/messenger/src/pm_node.erl
 - lib/erlang/messenger/src/pm_node_supervisor.erl
 - lib/erlang/messenger/src/pm_packager.erl
+- lib/erlang/messenger/src/pm_spawner.erl
 - lib/erlang/messenger/src/pm_strings.erl
 - lib/erlang/messenger/src/utils.erl
 - lib/erlang/messenger/useful_snippets
@@ -502,7 +506,6 @@ files:
 - test/test_helper.rb
 - test/test_pool_spec_generator.rb
 - test/test_poolparty.rb
-- website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/code.css
@@ -511,7 +514,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:46 12/06/08)
   
   To get started, run the generator:
   

data/spec/poolparty/aska/aska_spec.rb

@@ -114,9 +114,4 @@ describe "Rules" do
     @car.y = 5    
     @car.valid_rules?(:names).should == true
   end
-  it "should have the rules in an array of hashes" do
-    @car.names.each do |n|
-      
-    end
-  end
 end

data/spec/poolparty/bin/console_spec.rb

@@ -1,5 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../../../lib/poolparty/helpers/console'
+require File.dirname(__FILE__) + '/../../../lib/poolparty/helpers/binary'
+
+reset!
 
 describe "Console" do
   before(:each) do

data/spec/poolparty/helpers/optioner_spec.rb

@@ -27,6 +27,20 @@ describe "Option Parser" do
       end
     end
   end
+  
+  describe "parse_args" do
+    before(:each) do
+      @op = PoolParty::Optioner.new(%w( -v -i 1 five six -x), {:abstract => true, :parse_options => false})
+    end
+    it "should have an array of default boolean args" do
+      @op.boolean_args.sort.should == ['-V', '-h', '-t', '-v']
+    end
+    it "should split ARGV into flagged and unflagged arg arrays" do
+      @op.unflagged_args.sort.sort.should ==  ["five", "six"]
+      @op.flagged_args.should == ["-v", "-i", "1", "-x"]
+    end
+  end
+  
   it "should be able to take a block and set some options on the block" do
     PoolParty::Optioner.new(["-w"], {:abstract => false, :load_pools => false}) do |opts, optioner|
       opts.on('-w', '--wee')    { optioner.wee "wee" }

data/spec/poolparty/modules/cloud_resourcer_spec.rb

@@ -35,6 +35,11 @@ describe "CloudResourcer" do
     @tc.instances 4..10
     @tc.minimum_instances.should == 4
   end
+  it "should be able to accept a Fixnum and set the minimum_instances and maximum_instances" do
+    @tc.instances 1
+    @tc.minimum_instances.should == 1
+    @tc.maximum_instances.should == 1
+  end
   it "should set the max to the maximum instances to the last" do
     @tc.instances 4..10
     @tc.maximum_instances.should == 10

data/spec/poolparty/net/remote_spec.rb

@@ -10,17 +10,6 @@ module Hype
   end
   register_remote_base :Hype
 end
-class TestClass
-  include Remote
-  include RemoterBase
-  
-  def keypair
-    "fake_keypair"
-  end
-  def verbose
-    false
-  end
-end
 
 describe "Remote" do
   before(:each) do
@@ -32,6 +21,9 @@ describe "Remote" do
     @tc.respond_to?(:using).should == true
   end
   it "should include the module with using" do
+    @tc.instance_eval do
+      @remote_base = nil
+    end
     @tc.should_receive(:extend).with("Hype".preserved_module_constant).once
     @tc.using :hype
   end
@@ -59,6 +51,9 @@ describe "Remote" do
       @tc.using :hype
     end
     it "should only include the remote class once" do
+      @tc.instance_eval do
+        @remote_base = nil
+      end
       @tc.should_receive(:extend).with(Hype).once
       @tc.using :hype
       @tc.using :hype
@@ -191,10 +186,6 @@ describe "Remote" do
         @tc.request_termination_of_non_master_instance
       end
     end
-    describe "should_expand_cloud?" do
-    end
-    describe "should_contract_cloud?" do
-    end
     describe "expansions" do
       before(:each) do
         setup

data/spec/poolparty/net/remoter_base_spec.rb

@@ -1,9 +1,12 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-include Remote
+class TestRemoteClass
+  include CloudResourcer
+  include PoolParty::Remote
 
-class TestRemoter
-  include RemoterBase  
+  def keypair
+    "fake_keypair"
+  end
 end
 
 describe "RemoterBase" do
@@ -12,7 +15,7 @@ describe "RemoterBase" do
   end
   describe "methods" do
     before(:each) do
-      @tr = TestRemoter.new      
+      @tr = TestRemoteClass.new
     end
     %w(launch_new_instance! terminate_instance describe_instance instances_list).each do |method|
       eval <<-EOE
@@ -22,7 +25,7 @@ describe "RemoterBase" do
         it "should not raise an exception if #{method} is defined as a method" do
           lambda {
             @tr.instance_eval do
-              def #{method}                
+              def #{method}      
               end
             end
             @tr.#{method}
@@ -32,6 +35,7 @@ describe "RemoterBase" do
     end
     describe "lists" do
       before(:each) do
+        @tr = TestClass.new
         stub_list_of_instances_for(@tr)
       end
       it "should gather a list of the running instances" do
@@ -47,7 +51,7 @@ describe "RemoterBase" do
         @tr.list_of_nonterminated_instances.map {|a| a.name }.should == ["master", "node1", "node3"]
       end
       it "should return a list of remote instances" do
-        @tr.remote_instances_list.first.class.should == RemoteInstance
+        @tr.remote_instances_list.first.class.should == PoolParty::Remote::RemoteInstance
       end
       describe "by keypairs" do
         it "should be able to grab all the alist keypairs" do
@@ -74,6 +78,7 @@ describe "RemoterBase" do
       before(:each) do
         @master = Object.new
         @master.stub!(:ip).and_return "192.68.0.1"
+        @tr = TestClass.new
         @tr.stub!(:master).and_return @master
       end
       it "should have the method custom_install_tasks" do;@tr.respond_to?(:custom_install_tasks_for).should == true;end

data/spec/poolparty/net/remoter_spec.rb

@@ -1,21 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-include PoolParty::Remote
-
-def valid_rules?(*args)
-  false
-end
-
-class TestClass
-  include CloudResourcer
-  include Remote
-  using :ec2
-  attr_accessor :parent
-    
-  def keypair
-    "fake_keypair"
-  end
-end
 describe "Remoter" do
   before(:each) do
     setup
@@ -92,5 +76,31 @@ describe "Remoter" do
       @tc.launch_and_configure_master!
     end
   end
+  describe "expansions and contractions" do
+    before(:each) do
+      @tc = TestClass.new
+      stub_list_from_remote_for @tc # sets the list of instances to 2
+    end
+    describe "are_too_few_instances_running?" do
+      it "should be false if the number of running instances is larger than the minimum instances" do
+        @tc.stub!(:minimum_instances).and_return 1
+        @tc.are_too_few_instances_running?.should == false
+      end
+      it "should be true if the number of running instances is smaller than the minimum instances" do
+        @tc.stub!(:minimum_instances).and_return 5
+        @tc.are_too_few_instances_running?.should == true
+      end
+    end
+    describe "are_too_many_instances_running?" do
+      it "should be true if the number of running instances is larger than the maximum instances" do
+        @tc.stub!(:maximum_instances).and_return 1
+        @tc.are_too_many_instances_running?.should == true
+      end
+      it "should be false if the number of running instances is smaller than the maximum instances" do
+        @tc.stub!(:maximum_instances).and_return 5
+        @tc.are_too_many_instances_running?.should == false
+      end
+    end
+  end
 
 end

data/spec/poolparty/pool/pool_spec.rb

@@ -25,7 +25,7 @@ describe "Pool" do
       @pool.respond_to?(:cloud).should == true
     end
     it "should evaluate the block when creating a new pool" do
-      Proc.should_receive(:new).once
+      Proc.should_receive(:new).at_least(1)
       Pool.new(:test) do
         Proc.new {puts "hi"}
       end

data/spec/poolparty/spec_helper.rb

@@ -16,6 +16,22 @@ ENV["POOL_SPEC"] = nil
 include PoolParty
 extend PoolParty
 
+def are_too_many_instances_running?  
+end
+def are_too_few_instances_running?
+end
+
+class TestClass < PoolParty::Cloud::Cloud
+  include CloudResourcer
+  attr_accessor :parent
+  def initialize(&block)
+    super :test_cloud, nil, &block
+  end
+  def keypair
+    "fake_keypair"
+  end
+end
+
 def setup
   PoolParty::Messenger.stub!(:messenger_send!).and_return false
 end

data/tasks/spec.rake

@@ -4,14 +4,13 @@ require 'spec/rake/spectask'
 task :default  => :spec
 
 Spec::Rake::SpecTask.new(:spec) do |t|
-  t.warning = 
-    t.rcov = false
+  t.warning = t.rcov = false
   t.spec_files = Dir["spec/**/*_spec.rb"]
 end
 
 Spec::Rake::SpecTask.new(:spec_v) do |t|
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'gems*,spec*']
+  t.rcov_opts = ['--exclude', 'gems*,spec*,website*,test*']
   t.ruby_opts = []
   t.spec_files = Dir["spec/**/*_spec.rb"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.78
+  version: 0.2.79
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ executables:
 - cloud-osxcopy
 - cloud-provision
 - cloud-refresh
+- cloud-rsync
 - cloud-run
 - cloud-ssh
 - cloud-start
@@ -127,6 +128,7 @@ files:
 - bin/cloud-osxcopy
 - bin/cloud-provision
 - bin/cloud-refresh
+- bin/cloud-rsync
 - bin/cloud-run
 - bin/cloud-ssh
 - bin/cloud-start
@@ -192,6 +194,7 @@ files:
 - lib/erlang/messenger/ebin/pm_node_rel-0.1.rel
 - lib/erlang/messenger/ebin/pm_node_supervisor.beam
 - lib/erlang/messenger/ebin/pm_packager.beam
+- lib/erlang/messenger/ebin/pm_spawner.beam
 - lib/erlang/messenger/ebin/pm_strings.beam
 - lib/erlang/messenger/ebin/utils.beam
 - lib/erlang/messenger/include/defines.hrl
@@ -271,6 +274,7 @@ files:
 - lib/erlang/messenger/src/pm_node.erl
 - lib/erlang/messenger/src/pm_node_supervisor.erl
 - lib/erlang/messenger/src/pm_packager.erl
+- lib/erlang/messenger/src/pm_spawner.erl
 - lib/erlang/messenger/src/pm_strings.erl
 - lib/erlang/messenger/src/utils.erl
 - lib/erlang/messenger/useful_snippets
@@ -502,7 +506,6 @@ files:
 - test/test_helper.rb
 - test/test_pool_spec_generator.rb
 - test/test_poolparty.rb
-- website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/code.css
@@ -511,7 +514,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:46 12/06/08)
   
   To get started, run the generator:
   

data/website/index.html

@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      PoolParty
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-  <link href="stylesheets/code.css" media="screen" rel="stylesheet" type="text/css" />
-<style>
-
-</style>
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-
-    <h1>PoolParty</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
-      <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.76</a>
-    </div>
-    <h1>&#8216;Easy cloud computing&#8217;</h1>
-<h2>What</h2>
-<p>A self-healing, load-balanced cloud computing solution. Combined with the power of <a href="http://reductivelabs.com/trac/puppet/">Puppet</a>, the <a href="http://www.linux-ha.org/">High Availability</a> project, ruby and erlang, PoolParty makes it easy and fun to set up your cloud! Currently, you can use it with ec2, but it&#8217;s not tied to any particular service. You can use PoolParty to manage and monitor your home network!</p>
-<h2>Installing</h2>
-<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="punct">--</span><span class="ident">source</span> <span class="ident">http</span><span class="punct">:/</span><span class="regex"></span><span class="punct">/</span><span class="ident">gems</span><span class="punct">.</span><span class="ident">github</span><span class="punct">.</span><span class="ident">com</span> <span class="ident">auser</span><span class="punct">-</span><span class="ident">poolparty</span></pre></p>
-<h2>The basics</h2>
-<h2>Demonstration of usage</h2>
-<pre>
-cloud spec [name]
-</pre>
-<p>This will create a basic spec for you in the spec directory. Then, write your spec file. There are examples in the repos as well as the one below:</p>
-<p><pre class='syntax'>
-  <span class="comment"># Basic poolparty template with apache plugin</span>
-  <span class="ident">require</span> <span class="punct">&quot;</span><span class="string">poolparty-apache2-plugin</span><span class="punct">&quot;</span>
-
-  <span class="ident">pool</span> <span class="symbol">:app</span> <span class="keyword">do</span>
-
-    <span class="ident">instances</span> <span class="number">2</span><span class="punct">..</span><span class="number">5</span>
-    <span class="ident">port</span> <span class="number">80</span>
-    <span class="ident">ami</span> <span class="punct">&quot;</span><span class="string">ami-1cd73375</span><span class="punct">&quot;</span> <span class="comment"># Alestic Ubuntu AMI</span>
-
-    <span class="ident">cloud</span> <span class="symbol">:app</span> <span class="keyword">do</span>
-
-      <span class="ident">apache</span> <span class="keyword">do</span>
-        <span class="ident">installed_as_worker</span>      
-
-        <span class="ident">has_virtualhost</span> <span class="keyword">do</span>
-
-          <span class="ident">name</span> <span class="punct">&quot;</span><span class="string">poolpartyrb.com</span><span class="punct">&quot;</span>
-          <span class="ident">listen</span><span class="punct">(&quot;</span><span class="string">8080</span><span class="punct">&quot;)</span>
-          <span class="ident">virtual_host_entry</span> <span class="punct">::</span><span class="constant">File</span><span class="punct">.</span><span class="ident">join</span><span class="punct">(</span><span class="constant">File</span><span class="punct">.</span><span class="ident">dirname</span><span class="punct">(</span><span class="constant">__FILE__</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">templates</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">virtual_host.conf.erb</span><span class="punct">&quot;)</span>
-
-          <span class="ident">has_git</span><span class="punct">(</span><span class="symbol">:name</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">poolpartyrepos</span><span class="punct">&quot;,</span> <span class="symbol">:source</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">git://github.com/auser/xnot.org.git</span><span class="punct">&quot;,</span> <span class="symbol">:path</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">/var/www/xnot.org/public</span><span class="punct">&quot;)</span>
-
-        <span class="keyword">end</span>
-      <span class="keyword">end</span>
-
-    <span class="keyword">end</span>
-
-  <span class="keyword">end</span>
-</pre></p>
-<h2>Forum</h2>
-<p><a href="http://groups.google.com/group/poolpartyrb">http://groups.google.com/group/PoolPartyRb</a></p>
-<h2>How to submit patches</h2>
-<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-<p>The trunk repository is <code>http://github.com/auser/poolparty</code> for anonymous access.</p>
-<p>You can fetch the source from either:</p>
-<ul>
-	<li>github: <a href="http://github.com/auser/PoolParty/tree/master">http://github.com/auser/PoolParty/tree/master</a></li>
-</ul>
-<pre>git clone git://github.com/auser/poolparty.git</pre>
-<h3>Build and test instructions</h3>
-<p><pre class='syntax'>cd PoolParty
-rake spec
-rake install_gem</pre></p>
-<h2>License</h2>
-<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
-<h2>Contact</h2>
-<p>Comments are welcome. Send an email to <a href="mailto:ari.lerner@citrusbyte.com">Ari Lerner</a> email via the <a href="http://groups.google.com/group/PoolParty">forum</a></p>
-    <p class="coda">
-      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 15th October 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>
-</div>
-
-<!-- insert site tracking codes here, like Google Urchin -->
-
-</body>
-</html>