auser-poolparty 1.2.11 → 1.2.12

data/README.txt

@@ -63,4 +63,5 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 11
+:patch: 12
 :major: 1

data/examples/metavirt_cloud.rb

@@ -5,7 +5,7 @@ require "poolparty"
 pool :multiverse do
   
   cloud :front do
-    instances 1
+    instances 2..4
     keypair 'multiverse_front'
     has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
     using :metavirt do

data/lib/poolparty/core/array.rb

@@ -7,6 +7,18 @@ class Array
     map {|a| a.to_os }
   end
   
+  def histogram
+    out = {}
+    map do |ele|
+      if out.has_key?(ele)
+        out[ele] += 1
+      else
+        out.merge!(ele => 1)
+      end
+    end
+    out
+  end
+  
   def collect_with_index &block
     self.enum_for(:each_with_index).collect &block
   end

data/lib/poolparty/modules/searchable_paths.rb

@@ -47,7 +47,7 @@ module PoolParty
       # * /etc/poolparty
       # * /var/poolparty
       def default_paths
-        [
+        @default_searchable_paths ||= [
           Dir.pwd,
           PoolParty::Default.poolparty_home_path,
           PoolParty::Default.base_keypair_path,
@@ -58,6 +58,11 @@ module PoolParty
         ]
       end
 
+      def add_searchable_path(path)
+        default_paths # instantiate @default_searchable_paths
+        @default_searchable_paths << path
+      end
+
       # returns the full set of valid searchable paths, given the options
       def searchable_paths
         return @paths_override if @paths_override && @paths_override.size > 0

data/lib/poolparty/modules/user_helpers.rb

@@ -12,7 +12,7 @@ module PoolParty
   # Add to the suitcase files below the clouds.rb base directory
   def pack_user_directory(dirname)
     begin
-      ::Suitcase::Zipper.add("#{::File.dirname($pool_specfile)}/#{dirname}", "etc")
+      ::Suitcase::Zipper.add("#{::File.dirname($pool_specfile)}/#{dirname}", "/etc/poolparty")
     rescue Exception => e
       vputs "Error packing user directory #{dirname}: #{e}"
     end    

data/lib/poolparty/monitors/base_monitor.rb

@@ -12,15 +12,24 @@ module Monitors
   end
   
   class BaseMonitor
+    attr_reader :log_file, :log_file_path, :last_cloud_loaded_time
     
     def self.inherited(subclass)
       unless Monitors.available.include?(subclass)
-        Monitors.available << subclass
+        Monitors.available << subclass unless subclass.to_s =~ /MonitorDaemon/
       end
     end
     
     def initialize(env=nil)
       @env=env
+      log_filename = "poolparty_monitor.log"
+      @log_file_path = "/var/log/poolparty/#{log_filename}"
+      
+      unless ::File.file?(log_file_path)
+        ::FileUtils.mkdir_p ::File.dirname(log_file_path) unless ::File.directory?(::File.dirname(log_file_path))
+        ::File.open(log_file_path, 'a+') {|f| f << "------ #{Time.now} ------"}
+        log_file_path
+      end
     end
     
     def env(env=@env)
@@ -38,6 +47,22 @@ module Monitors
       
     end
     
+    # Load the cloud
+    # Reload the cloud if necessary after 60 seconds
+    # of cache time
+    def  my_cloud
+      @my_cloud = nil if last_cloud_loaded_time && last_cloud_loaded_time > 60
+      @my_cloud ||= begin
+        require '/etc/poolparty/clouds.rb'
+        name = open("/etc/poolparty/cloud_name").read
+        last_cloud_loaded_time = Time.now.to_i
+        clouds[name.chomp.to_sym]
+      rescue Exception => e
+        JSON.parse( open('/etc/poolparty/clouds.json' ).read )
+      end
+    end
+    
+    
     def before_close_callbacks
       @before_close_callbacks ||= []
     end
@@ -45,5 +70,28 @@ module Monitors
       @after_close_callbacks ||= []
     end
     
+    def log(msg)
+      log_file.flush
+      log_file << "[INFO] - #{Time.now} -- #{msg}\n"
+    end
+    
+    private
+        
+    def log_file
+      if @logfile
+        @logfile
+      else
+        begin
+          ::FileUtils.mkdir_p ::File.dirname(log_file_path) unless ::File.directory?(::File.dirname(log_file_path))
+          @logfile ||= ::File.open(log_file_path, 'a+')
+        rescue Exception => e
+          puts "ERROR: #{e.inspect}"
+          @logfile = $stdout
+        end
+        
+      end
+    end
+    
+    
   end
 end

data/lib/poolparty/monitors/monitor_daemon.rb

@@ -1,9 +1,11 @@
 require "open-uri"
+require "json"
+require "#{::File.dirname(__FILE__)}/base_monitor"
 
 module PoolParty
-  class MonitorDaemon
+  class MonitorDaemon < Monitors::BaseMonitor
     
-    attr_reader :should_daemonize, :pid_file, :log_file_path, :sleep_time
+    attr_reader :should_daemonize, :pid_file, :sleep_time
     
     def self.run(o={})
       new(o).run
@@ -12,23 +14,32 @@ module PoolParty
     def initialize(o={})
       @should_daemonize = o.delete(:daemonize)
       @pid_file = o.delete(:daemonize) || "/tmp/poolparty_monitor.pid"
-      temp_log_file_path = o.delete(:log_file_path) || "poolparty_monitor.log"
-      @log_file_path = temp_log_file_path
-      
-      unless ::File.file?(temp_log_file_path)
-        ::FileUtils.mkdir_p ::File.dirname(temp_log_file_path) unless ::File.directory?(::File.dirname(temp_log_file_path))
-        ::File.open(temp_log_file_path, 'a+')
-        temp_log_file_path
-      end
-      @sleep_time = o.delete(:sleep_time) || 5
+      @sleep_time = o.delete(:sleep_time) || 20
+            
+      super
     end
     
     def pass_the_baton
-      %w(Memory neighborhood elections).each do |monitor|
-        out = open("http://localhost:8642/#{monitor}").read
-        log "#{monitor} / #{out.inspect}"        
+      # Handle stats
+      my_nominations = JSON.parse(open("http://localhost:8642/stats/get_nominations").read)
+      unless my_nominations.empty?
+        running_nodes = my_cloud.nodes(:status => "running")
+        nominations = []
+        running_nodes.each do |node|
+          timeout(10) do
+            log "Checking with #{node.internal_ip} for nominations: #{open("http://#{node.internal_ip}:8642/stats/get_nominations").read}"
+            nominations << begin
+              JSON.parse(open("http://#{node.internal_ip}:8642/stats/nominations").read) || "none"
+            rescue
+              log "Error when connecting to #{node.internal_ip}: #{e.inspect}"
+              "none"
+            end            
+          end
+        end
+        log "Sending #{nominations.flatten.to_json} to #{server["/elections"].inspect}"
+        # put to "http://localhost:8642/elections/handle_election", data => nominations.to_json
+        server["/elections"].put(nominations.flatten.to_json)
       end
-      sleep sleep_time
     end
     
     def run      
@@ -37,7 +48,14 @@ module PoolParty
         daemonize
       else
         log "Starting MonitorDaemon"
-        loop {pass_the_baton}        
+        loop {          
+          begin
+            pass_the_baton
+          rescue Exception => e
+            log "There was an error with pass_the_baton: #{e}"
+          end
+          sleep sleep_time
+        }
       end
     end
     
@@ -71,29 +89,7 @@ module PoolParty
 
       Process.detach(pid)
     end
-    
-    def log(msg)
-      log_file.flush
-      log_file << "[INFO] - #{Time.now} -- #{msg}\n"
-    end
-    
-    private
-    
-    def log_file
-      if @logfile
-        @logfile
-      else
-        begin
-          ::FileUtils.mkdir_p ::File.dirname(log_file_path) unless ::File.directory?(::File.dirname(log_file_path))
-          @logfile ||= ::File.open(log_file_path, 'a+')
-        rescue Exception => e
-          puts "ERROR: #{e.inspect}"
-          @logfile = $stdout
-        end
         
-      end
-    end
-    
     def pid
       @pid ||= File.file?(pid_file) ? open(pid_file).read.to_i : nil
     end
@@ -132,7 +128,7 @@ module PoolParty
       puts "process not found!"
       nil
     end
-    
+        
     protected
     def remove_pid_file
       File.delete(pid_file) if pid_file && File.exists?(pid_file)
@@ -153,7 +149,20 @@ module PoolParty
         end
       end
     end
-
+    
+    def server
+      if @server
+        @server
+      else
+        opts = { :content_type  =>'application/json', 
+                 :accept        => 'application/json',
+                 :host          => 'http://localhost',
+                 :port          => '8642'
+                }
+        @uri = "#{opts.delete(:host)}:#{opts.delete(:port)}"
+        @server = RestClient::Resource.new( @uri, opts)
+      end
+    end
     
   end
 end

data/lib/poolparty/monitors/monitor_rack.rb

@@ -45,7 +45,11 @@ module Monitors
       begin
         path_array= path_map(env['REQUEST_PATH']) || []
         verb = env['REQUEST_METHOD'].downcase
-        @response.write map_to_method(path_array, verb).to_json
+        
+        new_body = map_to_method(path_array, verb)
+        new_body = new_body.to_json unless (!path_array || path_array.empty? || path_array[0].nil?)
+        
+        @response.write new_body
         setup_callbacks
         
       # rescue Exception=>e

data/lib/poolparty/monitors/monitors/cloud_monitor.rb

@@ -0,0 +1,34 @@
+=begin rdoc
+  Cloud monitor just is a test monitor to hold cloud info
+=end
+
+module Monitors
+  
+  class Cloud < BaseMonitor
+    
+    def get(_unused=nil)
+      <<-EOE
+        #{my_cloud.name}
+        #{my_cloud.minimum_instances}..#{my_cloud.maximum_instances}
+      EOE
+    end
+    
+    def nominations(_unused=nil)
+      running_nodes = my_cloud.nodes(:status => "running")
+      nominations = []
+      running_nodes.each do |node|
+        timeout(10) do
+          log "Checking with #{node.internal_ip} for nominations: #{open("http://#{node.internal_ip}:8642/stats/get_nominations").read}"
+          nominations << begin
+            JSON.parse(open("http://#{node.internal_ip}:8642/stats/nominations").read) || "none"
+          rescue
+            log "Error when connecting to #{node.internal_ip}: #{e.inspect}"
+            "none"
+          end
+        end
+      end.histogram
+    end
+    
+  end
+  
+end

data/lib/poolparty/monitors/monitors/elections_monitor.rb

@@ -1,11 +1,28 @@
 module Monitors
   class Elections < BaseMonitor
     
+    # these are the rules that define the 
+    # elected actions
+    def self.candidates
+      {
+        :expand => :contract,
+        :contract => :expand,
+        :configure => nil,
+        :none => nil
+      }
+    end
+    
     def get(data=nil)
       'hello'
     end
     
-    def count_ballots(candidates={:expand => 0, :contract => 0}, ballots={})
+    def put(data=nil)
+      elections = JSON.parse(data)
+      log "Received #{elections.histogram.inspect} in Elections Monitor"
+      handle_election(elections.histogram)
+    end
+        
+    def count_ballots(ballots={}, candidates={:expand => 0, :contract => 0})
       # Ballots look like:
       # {host => ["contract"]}
       # Count the number of nominations for each candidate action
@@ -20,29 +37,39 @@ module Monitors
     end
     
     # Handle the elections
-    def handle_election(ballots={})
-      count_votes(ballots)
+    # ballots: {"contract" => 1, "expand" => 4}
+    def handle_election(ballots={})      
       # Expand the cloud if 50+% of the votes are for expansion
       # Contract the cloud if 51+% of the votes are for contraction
-      # Check to make sure an elected action is not already in progress
-      if (candidates[:expand] - candidates[:contract])/stats.keys.size > 0.5
-        %x[server-cloud-elections expand] unless elected_action == "expand"
-        @elected_action = "expand"
-      elsif (candidates[:contract] - candidates[:expand])/stats.keys.size > 0.5
-        %x[server-cloud-elections contract] unless elected_action == "contract"
-        @elected_action = "contract"
+      # Check to make sure an elected action is not already in progress      
+      log "handle_election: #{ballots.inspect}"
+      ballots.symbolize_keys!
+      total_votes = ballots.inject(0) {|total, arr| total += arr[1] }
+            
+      ballots.each do |ballot, pro_votes|        
+        contra = self.class.candidates[ballot]
+        con_votes = ballots[contra] || 0
+        
+        if (pro_votes - con_votes)/total_votes > 0.5
+          return run_elected_action(ballot)
+        end
       end
-      
-      reload_data!
-      stats[my_ip]["elected_action"] = @elected_action if @elected_action
-      log << "#{Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
-      stats.to_json
     end
-
-    def  my_cloud
-      require '/etc/poolparty/clouds.rb'
-      name = open("/etc/poolparty/cloudname").read
-      clouds[name.to_sym]
+    
+    def run_elected_action(ballot)
+      log "Electing #{ballot}"
+      case ballot
+      when :expand
+        my_cloud.running_action = :expanding
+        my_cloud.launch_instance!(:cloud_name => my_cloud.name)
+        my_cloud.running_action = nil
+      when :contract        
+        my_cloud.running_action = :contracting
+        my_cloud.terminate_youngest_instance!
+        my_cloud.running_action = nil
+      else
+        "none"
+      end
     end
   
   end

data/lib/poolparty/monitors/monitors/stats_monitor.rb

@@ -26,7 +26,6 @@ module Monitors
         })        
       end
       make_aska_rules(@cloud["options"]["rules"])
-      log << "#{::Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
     end
         
     def get(data=nil)
@@ -36,7 +35,6 @@ module Monitors
         else
           stats[request.params[0].to_sym] ||= self.send(request.params[0])
           stats[request.params[0].to_sym]
-          log << "#{::Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
           stats.to_json
         end
       rescue Exception => e
@@ -44,11 +42,16 @@ module Monitors
       end
     end
     
+    #alias to allow access thru http route GET /stats/nominations
+    def get_nominations(_nodes=[])
+      nominations
+    end
+    
     def put(data)
       if d = JSON.parse(request.params)
         hsh = d.reject {|ip, _node| ip == my_ip }
         stats.merge!(hsh)
-        handle_election
+        # handle_election
       else
         "boom"
       end
@@ -57,21 +60,6 @@ module Monitors
     
     protected
     
-    def log(log_file_path="/var/log/poolparty/stats_monitor.log")
-      if @logfile
-        @logfile
-      else
-        begin
-          ::File.file? log_file_path
-          ::FileUtils.mkdir_p ::File.dirname(log_file_path) unless ::File.directory?(::File.dirname(log_file_path))
-          @logfile ||= ::File.open(log_file_path, 'a+')
-        rescue Exception => e
-          @log_file = $stdout
-        end
-        
-      end
-    end
-    
     # Handle the elections
     def handle_election
       # Ballots look like:
@@ -96,7 +84,7 @@ module Monitors
 
       reload_data!
       stats[my_ip]["elected_action"] = @elected_action if @elected_action
-      log << "#{Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
+      log "#{Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
       stats.to_json
     end
 
@@ -128,9 +116,7 @@ module Monitors
     end
 
     def instances(_n=nil)
-      # res = PoolParty::Neighborhoods.load_default.instances
-      res ||= %x[server-list-active internal_ip].split("\t")
-      res
+      my_cloud.nodes(:status => "running")
     end
 
     def can_expand?(_n=nil)
@@ -142,45 +128,50 @@ module Monitors
     end
 
     def min_instances(_n=nil)
-      (@cloud["options"]["minimum_instances"] || PoolParty::Default.minimum_instances).to_i
+      (my_cloud.minimum_instances || PoolParty::Default.minimum_instances).to_i
     end
 
     def max_instances(_n=nil)
-      (@cloud["options"]["maximum_instances"] || PoolParty::Default.maximum_instances).to_i
+      (my_cloud.maximum_instances || PoolParty::Default.maximum_instances).to_i
     end
 
     def nominations(_n=nil)
       # return ['expand'] if instances.size<min_instances
       load = stats[my_ip]["load"] ||= self.send(:load)
-      stats[my_ip]["nominations"] ||= rules.collect do |k,cld_rules|
+      nominations = if my_cloud.running_action
+        ["none"]
+      else
+        collect_nominations
+      end
+      # Hackity hack hack
+      nominations << "expand" if my_cloud.nodes(:status => "running").size < min_instances
+      nominations << "contract" if my_cloud.nodes(:status => "running").size > max_instances
+      stats[my_ip]["nominations"] = nominations #TODO: Deprecate
+      nominations
+    end
+    
+    def collect_nominations
+      nominations = rules.collect do |k,cld_rules|
         t = cld_rules.collect do |r|
           # If the comparison works
           if self.send(r.key.to_sym).to_f.send(r.comparison, r.var.to_f)
             # if we are facing an expansion rule
             if k =~ /expand/
               k if can_expand?
-              neigborhood.each do |i|
-                RestClient.put "#{i.ip}/elections", stats.to_json, :content_type => 'text/x-json'
-              end
             # if we are facing a contraction rule
             elsif k =~ /contract/
               k if can_contract?
             else
               k
             end
-          end
+          end        
         end.compact
-      end.flatten.compact
+      end.flatten.compact      
     end
     
     def neighborhood
       @neighborhood ||= clouds[open('/etc/poolparty/cloud_name').read].nodes
     end
-
-    #alias to allow access thru http route GET /stats/nominations
-    def get_nominations(_nodes=[])
-      nominations.to_json
-    end
     
     def get_hello(_n=nil)
       'hi there'

data/lib/poolparty/net/remoter_base.rb

@@ -191,6 +191,10 @@ module PoolParty
       def self.launch_instance!(o={}, &block)
         new(o, &block).launch_instance!
       end
+      
+      def terminate_youngest_instance!(o={})
+        terminate_instance!(:instance_id => nodes(:status => "running").last.instance_id)
+      end
 
       # Called after an instance is launched
       def after_launch_instance(instance=nil)

data/lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb

@@ -25,6 +25,10 @@ module PoolParty
         }
       end
       
+      def instance_id
+        vmx_file
+      end
+      
       def status
         ping_port(ip, 22, 1) ? "running" : "terminated"
       end

data/lib/poolparty/plugins/apache2/php5.rb

@@ -29,7 +29,7 @@ module PoolParty
 
       def extras(*names)
         names.each do |name|
-         has_package(:name => "php5-#{name}", :requires => get_package("php5"))
+         has_package(:name => "php5-#{name}")
         end
       end
 

data/lib/poolparty/plugins/sshkey.rb

@@ -27,6 +27,7 @@ The sshkey resource specifies an ssh key that should be distributed on all the n
       
       dsl_methods(:key,
                   :keypath,
+                  :content,
                   :name)
 
       default_options(:type => 'rsa', :mode => "600")
@@ -39,7 +40,7 @@ The sshkey resource specifies an ssh key that should be distributed on all the n
 
       def loaded(opts={}, &block)
         has_directory(::File.dirname(opts[:name]))
-        has_file(:name => opts[:name], :content => self.key, :mode => opts[:mode])
+        has_file(:name => opts[:name], :content => opts[:content], :mode => opts[:mode])
       end
 
       

data/lib/poolparty/poolparty/cloud.rb

@@ -21,7 +21,7 @@ module PoolParty
     
     class Cloud < PoolParty::PoolPartyBaseClass
       attr_reader :templates, :cloud_name, :remote_base
-      attr_accessor :started_instance
+      attr_accessor :started_instance, :running_action
       
       # Default set of options. Most take the Default options from the default class
       default_options(

data/lib/poolparty/poolparty/pool.rb

@@ -51,6 +51,7 @@ module PoolParty
         #%w(monitors plugins verifiers).each do |lib|
         #  Dir[File.join(::File.dirname(::File.basename(filename)), lib, '*')].each{|f| require f }
         # end
+        call_before_all_loaded(pool_specfile || filename)
         o = File.open(filename, 'r') do |f|
           instance_eval f.read, (pool_specfile || filename)
         end
@@ -58,7 +59,15 @@ module PoolParty
         o
       end
       
-      # callback
+      # callbacks
+      def self.call_before_all_loaded(filepath)
+        # Load the plugins
+        $:.unshift(::File.dirname(filepath))
+        Dir["#{::File.dirname(filepath)}/plugins/*"].each do |plugin_path|
+          $:.unshift(plugin_path)
+        end
+      end
+      
       def after_all_loaded(&block)
         @after_all_loaded ||= block
       end

data/lib/poolparty/provision/boot_strapper.rb

@@ -134,24 +134,20 @@ module PoolParty
         
         commands << [
           "mkdir -p /etc/poolparty",
+          "echo #{cloud.name} > /etc/poolparty/cloud_name",
+          "echo #{cloud.pool.name}>/etc/poolparty/pool_name",
           "mkdir -p /var/log/poolparty",
           "groupadd -f poolparty",
           # "useradd poolparty  --home-dir /var/poolparty  --groups poolparty  --create-home",
-          'cd /var/poolparty/dependencies',
-          "cp /var/poolparty/dependencies/etc/poolparty/gemrc_template /etc/poolparty",          
+          "cd /var/poolparty/dependencies && cp /var/poolparty/dependencies/etc/poolparty/gemrc_template /etc/poolparty",
           "#{installer} update",
           "#{installer} install -y ruby ruby1.8-dev irb libopenssl-ruby1.8 build-essential wget",  #optional, but nice to have
-          "tar -zxvf packages/rubygems-1.3.4.tgz",
-          "cd rubygems-1.3.4",
-          "ruby setup.rb --no-ri --no-rdoc",
-          "ln -sfv /usr/bin/gem1.8 /usr/bin/gem", #TODO: check if this is really needed
-          "cd ../ && rm -rf rubygems-1.3.1*",
+          "tar -zxvf packages/rubygems-1.3.4.tgz && cd rubygems-1.3.4 && ruby setup.rb --no-ri --no-rdoc && ln -sfv /usr/bin/gem1.8 /usr/bin/gem && cd ../ && rm -rf rubygems-1.3.1*",
           "gem source --add http://gems.github.com",
-          "gem sources -a http://gems.opscode.com",
+          "gem source -a http://gems.opscode.com",
           "cd /var/poolparty/dependencies/gems/",
           "gem install --no-rdoc --no-ri *.gem",
-          "cd /var/poolparty/dependencies",
-          "cp /var/poolparty/dependencies/etc/poolparty/* /etc/poolparty/",
+          "cd /var/poolparty/dependencies && cp /var/poolparty/dependencies/etc/poolparty/* /etc/poolparty/",
           'touch /var/poolparty/POOLPARTY.PROGRESS',
           "mkdir -p /root/.ssh",
           "cp /var/poolparty/dependencies/keys/* /root/.ssh/",
@@ -160,7 +156,7 @@ module PoolParty
           "mkdir -p /var/log/poolparty/",
           "echo '-- Starting monitor_rack --'",
           # NOTE: if someone has an old version of thin/rack on their system, this will fail silently and never finish bootstrapping
-          "thin -R /etc/poolparty/monitor.ru -p 8642 --pid /var/run/stats_monitor.pid --daemon -l /var/log/poolparty/monitor.log start 2>/dev/null",
+          "ps aux | grep thin | grep -v grep | awk '{print $2}' | xargs kill -9; thin -R /etc/poolparty/monitor.ru -p 8642 --pid /var/run/stats_monitor.pid --daemon -l /var/log/poolparty/monitor.log start 2>/dev/null",
           "tail -n 20 /var/log/poolparty/monitor.log",
           'echo "bootstrap" >> /var/poolparty/POOLPARTY.PROGRESS']
         commands << self.class.class_commands unless self.class.class_commands.empty?

data/lib/poolparty/provision/dr_configure.rb

@@ -97,6 +97,8 @@ module PoolParty
        commands << [
          'chmod 644 /var/poolparty/dr_configure/clouds.json',
          'chmod 644 /var/poolparty/dr_configure/clouds.rb',
+         "cp -R /var/poolparty/dr_configure/etc/poolparty/* /etc/poolparty/",
+         # TODO: slightly redundant
          'cp /var/poolparty/dr_configure/clouds.json /etc/poolparty',
          'cp /var/poolparty/dr_configure/clouds.rb /etc/poolparty',
          # 'server-manage-election', #ensures that the monitor gets some data
@@ -107,6 +109,8 @@ module PoolParty
      end
      
      def pack_up_and_ship_off_suitcase
+       ::Suitcase::Zipper.add(::File.dirname(pool_specfile), "/etc/poolparty")
+       
        ::Suitcase::Zipper.build_dir!("#{cloud.tmp_path}/dr_configure")
        rsync "#{cloud.tmp_path}/dr_configure/", "/var/poolparty/dr_configure/", ['-a --stats']
      end

data/lib/poolparty/templates/monitor.ru

@@ -17,7 +17,7 @@ app = Rack::Builder.new do
   # Dumb daemon for now
   begin
     PoolParty::MonitorDaemon.run  :daemonize => true, 
-                                  :sleep_time => 10, 
+                                  :sleep_time => 20, 
                                   :log_file_path => "/var/log/poolparty/monitor_daemon.log"
 
   rescue Exception => e

data/spec/poolparty/poolparty/key_spec.rb

@@ -25,7 +25,7 @@ describe "Key" do
     before(:each) do
       @keypair = "sshkey_test"      
       Dir.stub!(:pwd).and_return "#{::File.dirname(__FILE__)}/test_plugins"
-      
+      Key.add_searchable_path("#{::File.dirname(__FILE__)}/test_plugins")
       @key = Key.new(@keypair)
     end
     it "should search in known locations for the key" do

data/tasks/spec.rake

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 
 task :default  => [:spec, :test, :cleanup_test]
 desc "Update vendor directory and run tests"
-task :ci => ["poolparty:vendor:setup", "poolparty:vendor:update", :spec, :test]
+task :ci => ["pp:vendor:setup", "pp:vendor:update", :spec, :test]
 
 task :cleanup_test do
   ::FileUtils.rm_rf "/tmp/poolparty"

data/test/poolparty/core/array_test.rb

@@ -18,4 +18,15 @@ class TestWrappingArray < Test::Unit::TestCase
     end
   end
   
+  context "histogram" do
+    should "provide a histogram" do
+      out = %w(tart q a b a a b c).histogram
+      assert_equal 1, out["tart"]
+      assert_equal 3, out["a"]
+      assert_equal 2, out["b"]
+      assert_equal 1, out["c"]
+    end
+  end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,6 +165,7 @@ files:
 - lib/poolparty/monitors/monitor_rack.rb
 - lib/poolparty/monitors/monitors
 - lib/poolparty/monitors/monitors/clock_monitor.rb
+- lib/poolparty/monitors/monitors/cloud_monitor.rb
 - lib/poolparty/monitors/monitors/elections_monitor.rb
 - lib/poolparty/monitors/monitors/favicon_monitor.rb
 - lib/poolparty/monitors/monitors/load_monitor.rb