auser-poolparty 0.2.35 → 0.2.36

data/Manifest.txt

@@ -37,6 +37,7 @@ bin/server-start-master
 bin/server-start-node
 config/hoe.rb
 config/requirements.rb
+erl_crash.dump
 examples/basic.rb
 examples/plugin_without_plugin_directory.rb
 examples/poolparty.rb
@@ -143,8 +144,8 @@ lib/erlang/messenger/src/pm_node_supervisor.erl
 lib/erlang/messenger/src/pm_packager.erl
 lib/erlang/messenger/src/utils.erl
 lib/erlang/messenger/useful_snippets
-lib/erlang/messenger/utils.beam
 lib/poolparty.rb
+lib/poolparty/aska/aska.rb
 lib/poolparty/base_packages/haproxy.rb
 lib/poolparty/base_packages/heartbeat.rb
 lib/poolparty/base_packages/poolparty.rb
@@ -176,7 +177,6 @@ lib/poolparty/exceptions/UnacceptableCommand.rb
 lib/poolparty/helpers/binary.rb
 lib/poolparty/helpers/console.rb
 lib/poolparty/helpers/display.rb
-lib/poolparty/helpers/messenger.rb
 lib/poolparty/helpers/optioner.rb
 lib/poolparty/helpers/provisioner_base.rb
 lib/poolparty/helpers/provisioners/master.rb
@@ -194,6 +194,7 @@ lib/poolparty/modules/safe_instance.rb
 lib/poolparty/monitors/base_monitor.rb
 lib/poolparty/monitors/monitors/cpu_monitor.rb
 lib/poolparty/monitors/monitors/memory_monitor.rb
+lib/poolparty/net/messenger.rb
 lib/poolparty/net/remote.rb
 lib/poolparty/net/remote_bases/ec2.rb
 lib/poolparty/net/remote_instance.rb
@@ -225,12 +226,6 @@ lib/poolparty/pool/resources/sshkey.rb
 lib/poolparty/pool/resources/symlink.rb
 lib/poolparty/pool/resources/variable.rb
 lib/poolparty/pool/script.rb
-lib/poolparty/pool/tmp/.ppkeys
-lib/poolparty/pool/tmp/happydayz
-lib/poolparty/pool/tmp/install_master.sh
-lib/poolparty/pool/tmp/pool.spec
-lib/poolparty/pool/tmp/poolparty.pp
-lib/poolparty/pool/tmp/tc-instances.list
 lib/poolparty/templates/authkeys
 lib/poolparty/templates/cib.xml
 lib/poolparty/templates/gem
@@ -248,6 +243,7 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
+spec/poolparty/aska/aska_spec.rb
 spec/poolparty/base_packages/haproxy_spec.rb
 spec/poolparty/base_packages/heartbeat_spec.rb
 spec/poolparty/bin/console_spec.rb
@@ -262,7 +258,6 @@ spec/poolparty/core/time_spec.rb
 spec/poolparty/dependency_resolutions/base_spec.rb
 spec/poolparty/helpers/binary_spec.rb
 spec/poolparty/helpers/display_spec.rb
-spec/poolparty/helpers/messenger_spec.rb
 spec/poolparty/helpers/optioner_spec.rb
 spec/poolparty/helpers/provisioner_base_spec.rb
 spec/poolparty/helpers/provisioners/master_spec.rb
@@ -274,6 +269,7 @@ spec/poolparty/modules/file_writer_spec.rb
 spec/poolparty/modules/s3_string_spec.rb
 spec/poolparty/monitors/base_monitor_spec.rb
 spec/poolparty/monitors/monitors/cpu_monitor_spec.rb
+spec/poolparty/net/messenger_spec.rb
 spec/poolparty/net/remote_bases/ec2_spec.rb
 spec/poolparty/net/remote_instance_spec.rb
 spec/poolparty/net/remote_spec.rb

data/bin/cloud-start

@@ -14,7 +14,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 @clouds.each do |name, cloud|
   
-  with_cloud(cloud, {:testing => @testing}) do
+  with_cloud(cloud, {:testing => @testing, :verbose => (o.verbose || false)}) do
     puts header("Starting cloud")
     puts "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
     if list_of_running_instances.size != 1

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

@@ -1,27 +1,35 @@
 -module (pm_client).
 -include_lib("../include/defines.hrl").
--define (SERVER, global:whereis_name(?MODULE)).
 
--export ([init_conn/0, send_cmd/1, reconfigure_cloud/0, get_load/1, get_live_nodes/0]).
+-export ([reconfigure_cloud/0, get_load/1, get_live_nodes/0, start/0]).
+-export ([run_cmd/1, fire_cmd/1]).
 -export ([provision_orphan_running_servers/0]).
 -export ([shutdown/0]).
 % Run commands on the running master process
 % erl -pa ./ebin/ -run pm_client get_load cpu -run init stop -noshell
 
 % Connect to the master
-init_conn() -> net_adm:ping(?MASTER_LOCATION).
+start() -> 
+	pong = net_adm:ping(?MASTER_LOCATION),
+	global:sync().
 % Send the command Cmd to the pm_master process
-send_cmd(Cmd) ->	
-	init_conn(),
-	pm_master:fire_cmd(Cmd).
+run_cmd(Cmd) ->	
+	Out = pm_master:run_cmd(Cmd),
+	io:format("~p", [Out]),
+	Out.
+fire_cmd(Cmd) ->	
+	Out = pm_master:fire_cmd(Cmd),
+	io:format("~p", [Out]),
+	Out.
 % Reconfigure the cloud
-reconfigure_cloud() -> 
-	init_conn(),
-	pm_master:reconfigure_cloud().
+reconfigure_cloud() -> pm_master:reconfigure_cloud().
 % Get the load on the cloud of type Type
 get_load(Type) -> 
-	init_conn(),
-	pm_master:get_load(Type).
+	start(),
+	Load = pm_master:get_load(Type),
+	io:format("~p", [Load]),
+	Load.
+	
 % Check to see if there are servers that are unprovisioned
 % And if there are, log in to them and start their messenger
 % sending the live code on the master to them
@@ -38,10 +46,8 @@ provision_orphan_running_servers() ->
 
 % Get a list of the live nodes
 get_live_nodes() -> 
-	init_conn(),
 	pm_cluster:get_live_nodes().
 % Terminate the cloud messenger
 % This sends a shutdown to the whole cloud
 shutdown() -> 
-	init_conn(),
 	pm_master:shutdown_cloud().

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

@@ -30,8 +30,7 @@ slaves([Host|Hosts]) ->
 	io:format("Erlang node started = [~p]~n", [Node]),
 	slaves(Hosts).
 
-slaves() ->
-	get_live_nodes().
+slaves() ->	get_live_nodes().
 
 erl_system_args()->
 	Shared = case init:get_argument(shared) of
@@ -46,15 +45,17 @@ erl_system_args()->
 
 any_new_servers() ->
 	String = ". /etc/profile && server-list-active -c name",
-	Nodes = lists:map(fun
+	NodesFromActive = lists:map(fun
 		(No) ->
 			erlang:list_to_atom(lists:append([No, "@", No]))
 	end,string:tokens(os:cmd(String), "\n\t")),
-	NewServers = Nodes -- get_live_nodes(),
+	% Nodes -- get_live_nodes(),
+	NewServers = [X || X <- NodesFromActive, (lists:member(X, get_live_nodes()) /= true) ],
 	NewServers.
 	
-% Get the live nodes
+% Get the live nodes that are NOT client nodes
 get_live_nodes() ->
-	nodes().
+	ClientString = "client",
+	[X || X <- nodes(), (erlang:is_atom(regexp:first_match(erlang:atom_to_list(X), ClientString))) ].
 %% Do not forget to start erlang with a command like:
 %% erl -rsh ssh -sname clustmaster

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

@@ -21,7 +21,7 @@
          terminate/2, code_change/3]).
 
 % Client function definitions
--export ([get_load/1, reconfigure_cloud/0, get_live_nodes/0]).
+-export ([get_load/1, reconfigure_cloud/0]).
 -export ([run_cmd/1, fire_cmd/1]).
 -export ([shutdown_cloud/0]).
 
@@ -36,7 +36,6 @@
 get_load(Type) ->
 	% {Loads, _} = pm_cluster:send_call(get_load_for_type, [Type]),
 	{Loads, _} = gen_server:call(?SERVER, {get_load_for_type, [Type]}),
-	io:format("Loads: ~p~n", [Loads]),
 	utils:convert_responses_to_int_list(Loads).
 
 % Send reconfigure tasks to every node
@@ -46,9 +45,6 @@ reconfigure_cloud() ->
 % Fire the given command on all nodes
 run_cmd(Cmd) -> gen_server:call(?SERVER, {run_cmd, Cmd}).
 fire_cmd(Cmd) -> gen_server:call(?SERVER, {fire_cmd, Cmd}).
-
-get_live_nodes() ->
-	nodes().
 	
 % Shutdown
 shutdown_cloud() ->
@@ -87,11 +83,12 @@ init([]) ->
 %%--------------------------------------------------------------------
 % Handle load messages
 handle_call({Type, Args}, _From, _State) ->
-	io:format("Calling ~p with ~p on slaves~n", [Type, Args]),
-	List = rpc:multicall(get_live_nodes(), pm_node, Type, [Args]),
+	Nodes = pm_cluster:get_live_nodes(),
+	List = rpc:multicall(Nodes, pm_node, Type, [Args]),
 	{reply, List, nostate};
 handle_call(Request, _From, State) ->
-	Reply = Reply = rpc:multicall(get_live_nodes(), pm_node, Request, []),
+	Nodes = pm_cluster:get_live_nodes(),
+	Reply = Reply = rpc:multicall(Nodes, pm_node, Request, []),
 	{reply, Reply, State}.
 
 %%--------------------------------------------------------------------

data/lib/poolparty/aska/aska.rb

@@ -0,0 +1,111 @@
+=begin rdoc
+  Aska
+  TODO: Extract this into a proper gem
+=end
+module Aska
+  module ClassMethods
+    def rules(name=:rules, arr=[])
+      returning look_up_rules(name) do |rs|
+        arr.each do |line|
+          next unless line
+          k = line[/(.+)[=\\\<\>](.*)/, 1].gsub(/\s+/, '')
+          v = line[/(.+)[=\\<>](.*)/, 2].gsub(/\s+/, '')
+          m = line[/[=\\<>]/, 0].gsub(/\s+/, '')
+          
+          create_instance_variable(k)
+          rs << {k => [m, v]}
+        end
+        self.send(:define_method, name) do
+          look_up_rules(name)
+        end        
+      end
+    end
+    def create_instance_variable(k)
+      aska_attr_accessors << k.to_sym unless aska_attr_accessors.include?(k.to_sym)
+      attr_reader k.to_sym unless respond_to?("#{k}".to_sym)
+      attr_writer k.to_sym unless respond_to?("#{k}=".to_sym)
+    end
+    def look_up_rules(name)
+      defined_rules[name.to_sym] ||= Rules.new
+    end
+    def are_rules?(name)
+      !look_up_rules(name).empty?
+    end
+    def aska_attr_accessors
+      @aska_attr_accessors ||= Rules.new
+    end
+    def defined_rules
+      @defined_rules ||= {}
+    end
+    def aska_named(name)
+      "#{name}_aska"
+    end
+  end
+  
+  module InstanceMethods
+    def rules
+      @rules ||= self.class.defined_rules
+    end
+    def valid_rules?(name=:rules)
+      self.class.look_up_rules(name).reject {|rule| valid_rule?(rule) }.empty?
+    end
+    def __aska_aska_stuff(m)
+      if respond_to?(m.to_sym)
+        self.send(m.to_sym)
+      else
+        m
+      end
+    end
+    def valid_rule?(rule)
+      rule.each do |key,value|
+        begin
+          # puts "#{aska(key)} #{value[0].to_sym} #{get_var(value[1])} (#{attr_accessor?(value[1])})"
+          return __aska_aska_stuff(key).send(value[0].to_sym, __aska_get_var(value[1]))
+        rescue Exception => e
+          return false
+        end
+      end
+    end
+    # Get the variable from the class
+    # If it's defined as an attr_accessor, we know it has been defined as a rule
+    # Otherwise, if we are passing it as a 
+    def __aska_get_var(name)
+      # attr_accessor?(name) ? aska(name) : 
+      (supported_method?(name) ? name.to_sym : name.to_f)
+    end
+    def __aska_aska(name)
+      self.class.aska_named(name)
+    end
+    def attr_accessor?(name)
+      self.class.aska_attr_accessors.include?(name.to_sym)
+    end
+    def supported_method?(meth)
+      %w(< > == => =<).include?("#{meth}")
+    end
+    
+    def look_up_rules(r);self.class.look_up_rules(r);end
+    def are_rules?(r);self.class.are_rules?(r);end
+    
+    # def method_missing(m, *args, &block)
+    #   if self.class.defined_rules.has_key?(m.to_sym)
+    #     self.class.send(:define_method, m) do
+    #       self.class.look_up_rules(m)
+    #     end
+    #     self.send m
+    #   else
+    #     super
+    #   end
+    # end
+  end
+  
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+  
+  class Rules < Array
+    def to_s
+      self.map {|r| v=r.keys.first;"'#{v} #{r[v][0]} #{r[v][1]}'"}.join(", ")
+    end
+  end
+end

data/lib/poolparty/base_packages/poolparty.rb

@@ -9,24 +9,34 @@ module PoolParty
         
         has_package(:name => "rubygems") do |g|
           # These should be installed automagically by poolparty, but just in case
-          # TODO: Fix the requires method with a helper          
-          g.has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem")
-          g.has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem")
+          # TODO: Fix the requires method with a helper
+          g.has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem")
+          g.has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem")
+          g.has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")])          
+          
+          g.has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem")
+          g.has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge"))
+          g.has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")])
+          
           g.has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem")
-          g.has_gempackage(:name => "xml-simple") do |x|
+          g.has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem") do |x|
             x.has_gempackage(:name => "grempe-amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem")
           end
           
-          has_gempackage(:name => "ParseTree", :download_url => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem") do |pt|
-            pt.has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem")
-            pt.has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem") do |a|
-              a.has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true")
-            end
-            has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
+          has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem")
+          has_gempackage(:name => "ParseTree", :download_url => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", :requires => [get_gempackage("sexp_processor"), get_gempackage("ZenTest")])
             
-            has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty"))
-            has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"))
-          end          
+          has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", :requires => get_gempackage("ParseTree"))
+          
+          has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem")
+
+          has_gempackage(:name => "aska", :download_url => "http://github.com/auser/aska/tree/master%2Fpkg%2Faska-latest.gem?raw=true", :requires => get_gempackage("ruby2ruby"))            
+          has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
+          
+          has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("aska"), get_gempackage("ParseTree")])
+          
+          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty"))
+          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"))
           
         end
                 

data/lib/poolparty/core/array.rb

@@ -24,4 +24,7 @@ class Array
   def to_option_string(ns=[])
     "[ #{map {|e| e.to_option_string }.join(", ")} ]"
   end
+  def respec_string(ns=[])
+    "'#{map {|e| e.to_option_string }.join("', '")}'"
+  end
 end

data/lib/poolparty/core/kernel.rb

@@ -10,10 +10,10 @@ module Kernel
     block.in_context(klass_or_obj).call
   end
   def load_p(dir)
-    Dir["#{dir}/*.rb"].each do |file|
+    Dir["#{dir}/*.rb"].sort.each do |file|
       require "#{file}" if ::FileTest.file?(file)
     end
-    Dir["#{dir}/*"].each do |dir|
+    Dir["#{dir}/*"].sort.each do |dir|
       load_p(dir) if ::FileTest.directory?(dir)
     end
   end

data/lib/poolparty/core/object.rb

@@ -44,6 +44,16 @@ class Object
       "#{self}"
     end
   end
+  def respec_string
+    case self.class
+    when String
+      self.to_option_string
+    when Array
+      self.map {|a| "#{a.respec_string}" }.join(" ")
+    else
+      "'#{self}'"
+    end
+  end
   def block_instance_eval(*args, &block)
     return instance_eval(*args,&block) unless block_given? && !block.arity.zero?
     old_method = (self.class.instance_method(:__) rescue nil)
@@ -63,7 +73,7 @@ class Object
     meta_eval { remove_method name }
   end
   def run_in_context(&block)
-    name="temp_#{self.class}_#{parent.to_s}".to_sym
+    name="temp_#{self.class}_#{respond_to?(:parent) ? parent.to_s : Time.now.to_i}".to_sym
     meta_def name, &block
     self.send name, self
     # self.instance_eval &block if block
@@ -72,4 +82,10 @@ class Object
   def vputs(m="", o=self)
     puts m if o.verbose
   end
+  def vprint(m="", o=self)
+    print m if o.verbose
+  end
+  def unix_hide_string
+    "2>&1 > /dev/null"
+  end
 end

data/lib/poolparty/core/symbol.rb

@@ -1,4 +1,10 @@
 class Symbol
+  # def >(num);"#{self} > #{num}";end
+  # def <(num);"#{self} < #{num}";end
+  # def >=(num);"#{self} >= #{num}";end
+  # def <=(num);"#{self} <= #{num}";end
+  # def ==(num);"#{self} > #{num}";end
+  
   def to_string(pre="")
     "#{pre}#{self.to_s}"
   end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -97,12 +97,8 @@ module PoolParty
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
           
           process_clean_reconfigure_for!(@instance)
-          after_install(@instance)
-          
+          after_install(@instance)          
         end
-        # We have to get the right generated data into the manifest
-        # TODO: Clean this setup
-        @cloud.provisioning_complete
       end
       # Install callbacks
       # Before installation callback
@@ -138,7 +134,7 @@ module PoolParty
         # puppetca --clean #{instance.name}.compute-1.internal; puppetca --clean #{instance.name}.ec2.internal
         # find /etc/puppet/ssl -type f -exec rm {} \;
         command = <<-EOE
-if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/puppetcleaner; fi
+if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi
         EOE
         @cloud.run_command_on(command, @cloud.master) unless testing
       end
@@ -282,7 +278,7 @@ echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sour
 aptitude update -y <<heredoc
 Y
 heredoc
-aptitude autoclean
+aptitude autoclean #{unix_hide_string}
 fi
           "
         else

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

@@ -132,11 +132,13 @@ wget http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem -O rake.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem -O sexp_processor.gem 2>&1
 wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1
 wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1
+wget http://github.com/auser/aska/tree/master%2Fpkg%2Faska-latest.gem?raw=true -O aska.gem 2>&1
 
 #{
-  %w(rake lockfile rubyforge hoe zentest sexp_processor flexmock logging activesupport RubyInline ParseTree ruby2ruby xml-simple poolparty-latest amazon-ec2).map do |dep|
-    "gem install -y --no-ri --no-rdoc #{dep}.gem\n"
-  end
+  %w(rake lockfile rubyforge hoe zentest sexp_processor flexmock logging activesupport 
+      RubyInline ParseTree ruby2ruby xml-simple aska poolparty-latest amazon-ec2).map do |dep|
+    "gem install --ignore-dependencies -y --no-ri --no-rdoc #{dep}.gem"
+  end.join("\n")
 }
 
 # gem install -y --no-ri --no-rdoc  --source http://gems.github.com grempe-amazon-ec2
@@ -147,15 +149,16 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-
       # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
       # rm -rf /etc/puppet/ssl
       def start_puppetmaster
-        <<-EOS        
-puppetmasterd --verbose
+        <<-EOS
+/usr/bin/env puppetcleaner 2>&1 > /dev/null
+puppetmasterd --verbose  2>&1 > /dev/null
         EOS
       end
 
       # puppetd --listen --fqdn #{@instance.name}
       def restart_puppetd
         <<-EOS
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null
         EOS
       end
     end

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

@@ -26,16 +26,15 @@ module PoolParty
       def setup_configs
         <<-EOS          
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
+          rm -rf /etc/puppet/ssl
         EOS
       end
 
       # /etc/init.d/puppetmasterd stop
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
-        <<-EOS
-          /etc/init.d/puppetmaster start
-          /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1
-          # rm -rf /etc/puppet/ssl/*
+        <<-EOS          
+          /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1          
         EOS
       end
       

data/lib/poolparty/monitors/base_monitor.rb

@@ -4,11 +4,26 @@
   TODO: Fill this out
 =end
 module PoolParty
-  module Monitors
+  module Monitors    
+    
+    module ClassMethods
+    end
+    
+    module InstanceMethods
+      def expand_when(*arr)
+        @expand_when ||= ((arr && arr.empty?) ? options[:expand_when] : configure(:expand_when => self.class.send(:rules, :expand_when, arr)))
+      end
+      
+      def contract_when(*arr)
+        @contract_when ||= ((arr && arr.empty?) ? options[:contract_when] : configure(:contract_when => self.class.send(:rules, :contract_when, arr)))
+      end
+    end
     
     def self.register_monitor(*args)
       args.each do |arg|
         (available_monitors << "#{arg}".downcase.to_sym)
+        
+        InstanceMethods.module_eval "def #{arg}; PoolParty::Messenger.messenger_send!(\"get_load #{arg}\"); end"
       end
     end
 
@@ -16,15 +31,27 @@ module PoolParty
       $available_monitors ||= []
     end
     
-    class BaseMonitor
-      
+    class BaseMonitor      
       def self.run
         new.run
       end
-            
+    end
+    
+    def self.included(receiver)
+      receiver.extend                 PoolParty::Monitors::ClassMethods      
+      receiver.send :include,         PoolParty::Monitors::InstanceMethods
+      receiver.send :include,         Aska
     end
     
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/monitors/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/monitors/*.rb"].each {|f| require f}
+
+module PoolParty
+  module Cloud
+    class Cloud
+      include PoolParty::Monitors
+    end
+  end
+end

data/lib/poolparty/{helpers → net}/messenger.rb

@@ -16,7 +16,7 @@ module PoolParty
     end
     
     def self.messenger_send!(cmd="", testing=false)
-      command = Messenger.erl_command("client", "-rsh ssh -noshell -run pm_client #{cmd} -s erlang halt")
+      command = Messenger.erl_command("client", "-s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
       testing ? command : %x[#{command}]
     end
     

data/lib/poolparty/net/remoter.rb

@@ -127,10 +127,11 @@ module PoolParty
       # pending instances and then running the block
       def when_no_pending_instances(&block)
         reset!
+        vputs "Waiting for there to be no pending instances..."
         if list_of_pending_instances.size == 0
           block.call if block
         else
-          vputs "Waiting for there to be no pending instances..."
+          vprint "."
           wait "5.seconds"
           when_no_pending_instances(&block)
         end
@@ -167,11 +168,11 @@ module PoolParty
       end
       # Stub method for the time being to handle expansion of the cloud
       def should_expand_cloud?(force=false)
-        force || false
+        valid_rules?(:expansions) || force || false
       end
       # Stub method for the time being to handle the contraction of the cloud
       def should_contract_cloud?(force=false)
-        force || false
+        valid_rules?(:contractions) || force || false
       end
       # Expand the cloud
       # If we can start a new instance and the load requires us to expand