auser-poolparty 0.2.39 → 0.2.40

data/lib/poolparty/base_packages/poolparty.rb

@@ -12,6 +12,7 @@ module PoolParty
         has_package(:name => "erlang")
         has_package(:name => "erlang-dev")
         has_package(:name => "erlang-src")
+        # has_package(:name => "yaws")
         
         has_package(:name => "rubygems") do |g|
           # These should be installed automagically by poolparty, but just in case
@@ -24,10 +25,9 @@ module PoolParty
           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", :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 => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem")
+          has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem")
+          has_gempackage(:name => "grempe-amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple"))
           
           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")])
@@ -45,10 +45,18 @@ module PoolParty
           
         end
         
+        # Cloud panel setup
+        
+        has_directory(:name => "/var/www/cloudpanel")
+        
+        # has_file(:name => "/etc/yaws/conf.d/localhost.conf") do
+        #   template File.join(File.dirname(__FILE__), "..", "templates/yaws.conf")
+        # end
+        
         # Custom run puppet to minimize footprint
         # TODO: Update the offsetted times
         execute_on_master do          
-          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
+          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/15") do
             command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
           end
         end
@@ -62,7 +70,7 @@ module PoolParty
         execute_on_master do
           has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3"})
           # TODO: Update this so it only runs when needed
-          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :ifnot => "ps aux | grep beam | grep node")
+          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :onlyif => "ps aux | grep beam | grep master")
           
           has_remotefile(:name => "/usr/bin/puppetcleaner") do
             mode 744

data/lib/poolparty/config/postlaunchmessage.txt

@@ -0,0 +1,5 @@
+Your cloud is launching
+-----------------------
+Your master's ip address is: :master_ip
+
+Depending on how your cloud is setup, this process may take a while.

data/lib/poolparty/exceptions/LoadRulesException.rb

@@ -0,0 +1,7 @@
+class LoadRulesException < Exception
+  attr_reader :message
+  
+  def initialize(msg="It looks like your rules are malformed")
+    @message = "Load Malformed rule: #{msg}"
+  end
+end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -44,6 +44,10 @@ module PoolParty
       Provisioner::Master.new(cloud).process_clean_reconfigure_for!(instance, testing)
     end
     
+    def self.clear_master_ssl_certs(cloud, testing=false)
+      Provisioner::Master.new(cloud).clear_master_ssl_certs
+    end
+    
     class ProvisionerBase
       
       include Configurable
@@ -138,12 +142,24 @@ module PoolParty
         vputs "Cleaning certs from master: #{instance.name}"
         # puppetca --clean #{instance.name}.compute-1.internal; puppetca --clean #{instance.name}.ec2.internal
         # find /etc/puppet/ssl -type f -exec rm {} \;
-        @cloud.run_command_on("rm -rf /etc/puppet/ssl", instance) unless testing || instance.master?
-        # @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi", @cloud.master) unless testing
-        @cloud.run_command_on("puppetca --clean #{instance.name}.compute-1.internal ; puppetca --clean #{instance.name}.ec2.internal", @cloud.master) unless testing
+        unless testing
+          # @cloud.run_command_on("rm -rf /etc/puppet/ssl", instance) unless instance.master?
+          str = returning String.new do |s|
+            s << "puppetca --clean #{instance.name}.compute-1.internal 2>&1 > /dev/null;"
+            s << "puppetca --clean #{instance.name}.ec2.internal 2>&1 > /dev/null"
+          end
+          @cloud.run_command_on(str, @cloud.master)
+        end
+      end
+      def clear_master_ssl_certs
+        str = returning String.new do |s|
+          s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null;"
+          s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
+        end
+        @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; else #{str}; fi", @cloud.master)
       end
-      def process_reconfigure!(testing=false)        
-        @cloud.run_command_on(RemoteInstance.puppet_runner_command, @instance) unless testing
+      def process_reconfigure!(testing=false)
+        @cloud.run_command_on(PoolParty::Remote::RemoteInstance.puppet_runner_command, @instance) unless testing
       end
       # Tasks that need to be performed everytime we do any
       # remote ssh'ing into any instance
@@ -282,10 +298,10 @@ echo 'Updated already'
 else
 touch /etc/apt/sources.list
 echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
-aptitude update -y <<heredoc
+aptitude update -y #{unix_hide_string} <<heredoc
 Y
 heredoc
-aptitude autoclean #{unix_hide_string}
+aptitude autoclean #{unix_hide_string} 
 fi
           "
         else
@@ -298,7 +314,7 @@ fi
       end
       
       def make_logger_directory
-        "mkdir -p /var/logs/poolparty"
+        "mkdir -p /var/log/poolparty"
       end
       
       def create_poolparty_manifest

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

@@ -34,7 +34,8 @@ module PoolParty
           create_local_node,
           move_templates,
           create_poolparty_manifest,
-          restart_puppetd
+          restart_puppetd,
+          start_puppetmaster
         ]
       end
       
@@ -125,7 +126,12 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O grempe-
       # rm -rf /etc/puppet/ssl
       def start_puppetmaster
         <<-EOS
-puppetmasterd --verbose  2>&1 > /dev/null
+. /etc/profile
+ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
+/etc/init.d/puppetmaster stop
+rm -rf /etc/puppet/ssl
+puppetmasterd --verbose
+/etc/init.d/puppetmaster start
         EOS
       end
 

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

@@ -19,14 +19,14 @@ module PoolParty
         <<-EOE
           if [ -z "$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo "#{master_ip} puppet master" >> /etc/hosts; else echo "host already set"; fi
           cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
-          echo 'DAEMON_OPTS="-w 120 --fqdn #{@instance.name} --server master"' > /etc/default/puppet
         EOE
       end
 
       def setup_configs
         <<-EOS          
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
-          /usr/bin/puppetrerun
+          /etc/init.d/puppetmaster stop
+          # /usr/bin/puppetrerun
         EOS
       end
 
@@ -34,7 +34,8 @@ module PoolParty
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-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
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null &
         EOS
       end
       

data/lib/poolparty/modules/method_missing_sugar.rb

@@ -42,7 +42,7 @@ module PoolParty
         if options.has_key?(m)
           options[m]
         else
-          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options) || parent.options.has_key?(m)) ? nil : parent.send(m, *args, &block)
+          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options) || parent.options.has_key?(m) || !parent.respond_to?(m)) ? nil : parent.send(m, *args, &block)
         end        
       else
         options[m] = 

data/lib/poolparty/monitors/base_monitor.rb

@@ -23,7 +23,7 @@ module PoolParty
       args.each do |arg|
         (available_monitors << "#{arg}".downcase.to_sym)
         
-        InstanceMethods.module_eval "def #{arg}; PoolParty::Messenger.messenger_send!(\"get_load #{arg}\").to_f rescue -1; end"
+        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= PoolParty::Messenger.messenger_send!(\"get_load #{arg}\").to_f rescue -1; end"
       end
     end
 

data/lib/poolparty/net/remoter.rb

@@ -161,7 +161,8 @@ module PoolParty
           vputs ""
           vputs "Provisioning master..."
           hide_output { Provisioner.provision_master(self, testing) }
-          PoolParty::Provisioner.reconfigure_master(self, !testing)
+          PoolParty::Provisioner.clear_master_ssl_certs(self)
+          PoolParty::Provisioner.reconfigure_master(self, testing)
           after_launched
         end        
       end
@@ -186,16 +187,18 @@ module PoolParty
         if can_start_a_new_instance? && should_expand_cloud?(force)
           logger.debug "Expanding the cloud based on load"
           @num = 1
-          @out = request_launch_new_instances(@num)
+          request_launch_new_instances(@num)
           
           reset!
           when_no_pending_instances do
+            reset!
             wait "20.seconds" # Give some time for ssh to startup
             @num_instances = nonmaster_nonterminated_instances.size
-            last_instances = nonmaster_nonterminated_instances[(@num_instances - @num)..(@num_instances)]
+            last_instances = nonmaster_nonterminated_instances[(@num_instances - @num)...(@num_instances)]
             last_instances.each do |inst|
-              vputs "Provisioning #{inst.name} slave"
-              PoolParty::Provisioner.provision_slave(inst, self)              
+              vputs "Provisioning #{inst.name}"
+              cmd = ". /etc/profile && cloud-provision -i #{inst.name.gsub(/node/, '')} #{unix_hide_string} &"
+              Kernel.system cmd
             end
             PoolParty::Provisioner.reconfigure_master(self, force)
             after_launched

data/lib/poolparty/plugins/git.rb

@@ -11,7 +11,7 @@ module PoolParty
         has_package(:name => "git-core")
         has_directory(:name => "#{cwd}")
         
-        has_exec({:name => "git-#{name}", :requires => get_package("git-core"), :requires => get_directory("#{cwd}")}) do          
+        has_exec({:name => "git-#{name}", :requires => get_package("git-core"), :requires => [get_directory("#{cwd}"), get_package("git-core")]}) do          
           command parent.user ? "git clone #{parent.user}@#{parent.source} #{parent.path}" : "git clone #{parent.source} #{parent.to ? parent.to : ""}"
           cwd "#{parent.cwd if parent.cwd}"
           creates "#{::File.join( (parent.cwd ? parent.cwd : cwd), ::File.basename(parent.source, ::File.extname(parent.source)) )}/.git"

data/lib/poolparty/pool/base.rb

@@ -41,8 +41,11 @@ module PoolParty
       def secret_access_key
         ENV["AWS_SECRET_ACCESS_ID"] ? ENV["AWS_SECRET_ACCESS_ID"] : load_keys_from_file[:secret_access_key]
       end
+      def read_keyfile
+        open(get_working_key_file_locations).read
+      end
       def load_keys_from_file
-        @keys ||= get_working_key_file_locations ? YAML::load( open(get_working_key_file_locations).read ) : {}
+        @keys ||= get_working_key_file_locations ? YAML::load( read_keyfile ) : {}
       end
       # Store the keys in a yaml format to give the master access
       # So that the master has access to the files
@@ -80,10 +83,10 @@ module PoolParty
       
       def logger_location
         [
-            "/var/logs/poolparty"
+            "/var/log/poolparty"
         ].select do |dir|
           dir if ::File.directory?(dir) && ::File.readable?(dir)
-        end.first || ::File.join(Dir.pwd, "logs")
+        end.first || ::File.join(Dir.pwd, "log")
       end
       
       def pool_logger_location

data/lib/poolparty/pool/cloud.rb

@@ -30,7 +30,9 @@ module PoolParty
       
       default_options({
         :minimum_instances => 2,
-        :maximum_instances => 4,
+        :maximum_instances => 5,
+        :contract_when => "cpu < 0.15",
+        :expand_when => "cpu > 0.9",
         :access_key => Base.access_key,
         :secret_access_key => Base.secret_access_key,
         :ec2_dir => ENV["EC2_HOME"],
@@ -104,7 +106,7 @@ module PoolParty
       end      
       
       def copy_misc_templates
-        ["namespaceauth.conf"].each do |f|
+        ["namespaceauth.conf", "yaws.conf"].each do |f|
           copy_file_to_storage_directory(::File.join(::File.dirname(__FILE__), "..", "templates", f))
         end
       end

data/lib/poolparty/pool/loggable.rb

@@ -6,13 +6,10 @@ class Loggable
     Logging.init :debug, :info, :warn, :error, :fatal
     
     self.class.loggers << file_logger
-    file_logger.level = :warn
-
-    self.class.loggers << stdout_logger
-    stdout_logger.level = :info
+    file_logger.level = :info
   end
   def file_logger
-    @file_logger ||= Logging.logger( ::File.join(Base.pool_logger_location, "pool_log.log"), logging_opts )
+    @file_logger ||= Logging.logger( Base.pool_logger_location, logging_opts )
   end
   def stdout_logger
     @stdout_logger ||= Logging.logger(STDOUT, logging_opts.merge({:pattern => "%m\n"}))

data/lib/poolparty/templates/yaws.conf

@@ -0,0 +1,19 @@
+# Configuration file for Yaws HTTP daemon
+
+# This config defines virtual server localhost. It is
+# enabled by default. If you want to disable it, remove
+# symlink from /etc/yaws/conf.d/.
+
+# Instead you may edit this file and after that reload
+# yaws configureation using invoke-rc.d yaws reload
+
+# (If you want to use privileged port, run yaws as root,
+# setting YAWS_USER in /etc/default/yaws, or use port
+# redirection, e.g. via iptables.)
+
+<server localhost>
+    port = 8000
+    listen = 0.0.0.0
+    docroot = /var/www/cloudpanel
+    # dir_listings = true
+</server>

data/lib/poolparty/version.rb

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

data/lib/poolparty.rb

@@ -28,13 +28,13 @@ module PoolParty
   include FileWriter
   
   def logger
-    @pool_logger ||= make_new_logger
+    @logger ||= make_new_logger
   end
   
   private
   #:nodoc:#
   def make_new_logger
-    FileUtils.mkdir_p Base.pool_logger_location unless ::File.directory?(Base.pool_logger_location)
+    FileUtils.mkdir_p ::File.dirname(Base.pool_logger_location) unless ::File.directory?(::File.dirname(Base.pool_logger_location))
     Loggable.new
   end
 end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.39
+  version: 0.2.40
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 00:00:00 -07:00
+date: 2008-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ executables:
 - cloud-contract
 - cloud-ensure-provisioning
 - cloud-expand
+- cloud-handle-load
 - cloud-list
 - cloud-maintain
 - cloud-osxcopy
@@ -97,6 +98,7 @@ extra_rdoc_files:
 - PostInstall.txt
 - README.txt
 - lib/erlang/messenger/lib/eunit/examples/tests.txt
+- lib/poolparty/config/postlaunchmessage.txt
 - website/index.txt
 files: 
 - History.txt
@@ -111,6 +113,7 @@ files:
 - bin/cloud-contract
 - bin/cloud-ensure-provisioning
 - bin/cloud-expand
+- bin/cloud-handle-load
 - bin/cloud-list
 - bin/cloud-maintain
 - bin/cloud-osxcopy
@@ -146,21 +149,127 @@ files:
 - generators/poolspec/USAGE
 - generators/poolspec/poolspec_generator.rb
 - generators/poolspec/templates/pool_spec_template.erb
+- lib/erlang/cloudpanel/EMakefile
 - lib/erlang/cloudpanel/Makefile
+- lib/erlang/cloudpanel/cloudpanel.rb
+- lib/erlang/cloudpanel/deps/mochiweb/LICENSE
+- lib/erlang/cloudpanel/deps/mochiweb/Makefile
+- lib/erlang/cloudpanel/deps/mochiweb/README
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt_records.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt_std.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochihex.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochijson.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochijson2.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochinum.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_app.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_charref.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_cookies.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_echo.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_headers.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_html.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_http.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_multipart.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_request.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_response.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_skel.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_socket_server.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_sup.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_util.html
+- lib/erlang/cloudpanel/deps/mochiweb/doc/reloader.html
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt_records.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt_std.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochihex.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochijson.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochijson2.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochinum.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb.app
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_app.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_charref.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_cookies.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_echo.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_headers.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_html.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_http.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_multipart.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_request.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_response.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_skel.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_socket_server.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_sup.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_util.beam
+- lib/erlang/cloudpanel/deps/mochiweb/ebin/reloader.beam
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/Makefile
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/priv/www/index.html
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/Makefile
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.app
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.erl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.hrl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_app.erl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_deps.erl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_sup.erl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_web.erl
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/start-dev.sh
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/start.sh
+- lib/erlang/cloudpanel/deps/mochiweb/priv/skel/support/include.mk
+- lib/erlang/cloudpanel/deps/mochiweb/scripts/new_mochiweb.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/Makefile
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt_records.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt_std.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochihex.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochijson.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochijson2.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochinum.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb.app
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_app.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_charref.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_cookies.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_echo.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_headers.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_html.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_http.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_multipart.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_request.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_response.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_skel.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_socket_server.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_sup.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_util.erl
+- lib/erlang/cloudpanel/deps/mochiweb/src/reloader.erl
+- lib/erlang/cloudpanel/deps/mochiweb/support/include.mk
 - lib/erlang/cloudpanel/doc/cloudpanel.html
 - lib/erlang/cloudpanel/doc/cloudpanel_app.html
 - lib/erlang/cloudpanel/doc/cloudpanel_deps.html
 - lib/erlang/cloudpanel/doc/cloudpanel_sup.html
 - lib/erlang/cloudpanel/doc/cloudpanel_web.html
+- lib/erlang/cloudpanel/doc/string.html
 - lib/erlang/cloudpanel/ebin/cloudpanel.app
 - lib/erlang/cloudpanel/ebin/cloudpanel.beam
 - lib/erlang/cloudpanel/ebin/cloudpanel_app.beam
 - lib/erlang/cloudpanel/ebin/cloudpanel_deps.beam
 - lib/erlang/cloudpanel/ebin/cloudpanel_sup.beam
 - lib/erlang/cloudpanel/ebin/cloudpanel_web.beam
+- lib/erlang/cloudpanel/ebin/string.beam
+- lib/erlang/cloudpanel/ebin/tail_log.beam
+- lib/erlang/cloudpanel/ebin/tailor.beam
+- lib/erlang/cloudpanel/ebin/utils.beam
+- lib/erlang/cloudpanel/ebin/views.beam
+- lib/erlang/cloudpanel/ebin/web_utils.beam
 - lib/erlang/cloudpanel/priv/www/images/bg_content.gif
 - lib/erlang/cloudpanel/priv/www/index.html
 - lib/erlang/cloudpanel/priv/www/javascripts/jquery.js
+- lib/erlang/cloudpanel/priv/www/javascripts/site.js
+- lib/erlang/cloudpanel/priv/www/pages/index.html
+- lib/erlang/cloudpanel/priv/www/pages/tail.html
+- lib/erlang/cloudpanel/priv/www/partials/error.html
+- lib/erlang/cloudpanel/priv/www/partials/footer.html
+- lib/erlang/cloudpanel/priv/www/partials/header.html
+- lib/erlang/cloudpanel/priv/www/partials/menu.html
 - lib/erlang/cloudpanel/priv/www/stylesheets/application.css
 - lib/erlang/cloudpanel/priv/www/stylesheets/classes.css
 - lib/erlang/cloudpanel/priv/www/stylesheets/colors.css
@@ -173,9 +282,15 @@ files:
 - lib/erlang/cloudpanel/src/cloudpanel_deps.erl
 - lib/erlang/cloudpanel/src/cloudpanel_sup.erl
 - lib/erlang/cloudpanel/src/cloudpanel_web.erl
+- lib/erlang/cloudpanel/src/string.erl
+- lib/erlang/cloudpanel/src/tail_log.erl
+- lib/erlang/cloudpanel/src/tailor.erl
+- lib/erlang/cloudpanel/src/utils.erl
+- lib/erlang/cloudpanel/src/views.erl
 - lib/erlang/cloudpanel/start-dev.sh
 - lib/erlang/cloudpanel/start.sh
 - lib/erlang/cloudpanel/support/include.mk
+- lib/erlang/cloudpanel/yaws.conf
 - lib/erlang/messenger/Emakefile
 - lib/erlang/messenger/Makefile
 - lib/erlang/messenger/README
@@ -282,6 +397,7 @@ files:
 - lib/poolparty/base_packages/poolparty.rb
 - lib/poolparty/base_packages/ruby.rb
 - lib/poolparty/config/allowed_commands.yml
+- lib/poolparty/config/postlaunchmessage.txt
 - lib/poolparty/core/array.rb
 - lib/poolparty/core/class.rb
 - lib/poolparty/core/exception.rb
@@ -298,6 +414,7 @@ files:
 - lib/poolparty/core/time.rb
 - lib/poolparty/dependency_resolutions/base.rb
 - lib/poolparty/dependency_resolutions/puppet.rb
+- lib/poolparty/exceptions/LoadRulesException.rb
 - lib/poolparty/exceptions/MasterException.rb
 - lib/poolparty/exceptions/RemoteException.rb
 - lib/poolparty/exceptions/ResourceException.rb
@@ -368,8 +485,10 @@ files:
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/templates/puppetcleaner
 - lib/poolparty/templates/puppetrerun
+- lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
+- log/pool.logs
 - poolparty.gemspec
 - script/destroy
 - script/generate

data/spec/poolparty/aska/aska_spec.rb

@@ -12,6 +12,39 @@ describe "Rules" do
   before(:each) do
     @car = Car.new
   end
+  describe "malformed rules" do
+    it "should not put a malformed rule in the rules" do
+      lambda {
+        @plaster = Class.new do
+          include Aska
+          rules :names, "x runs b"
+        end
+      }.should raise_error()
+    end
+    [
+      "k > 10",
+      "x == 2",
+      "x >= 2",
+      "x <= 4",
+      "y < 10"
+    ].each do |str|
+      eval <<-EOE
+        it "should have the rule #{str} be valid" do
+          (str =~ /(.+)[=\\\<\>](.*)/).nil?.should == false
+        end
+      EOE
+    end
+    [
+      "k running 10",
+      "10 is larger than 2"
+    ].each do |str|
+      eval <<-EOE
+        it "should have the rule #{str} not be valid" do
+          (str =~ /(.+)[=\\\<\>](.*)/).nil?.should == true
+        end
+      EOE
+    end
+  end
   it "should be able to define rules as an array and they should be set as the rules on the class" do
     @car.rules.class.should == Hash
   end

data/spec/poolparty/core/hash_spec.rb

@@ -25,13 +25,13 @@ describe "Hash" do
     @a.to_os.to_hash.should == @a
   end
   it "should not put quotes around integers" do
-    {:a => 10, :b => "q"}.flush_out.should == ["a => 10", "b => 'q'"]
+    {:a => 10, :b => "q"}.flush_out.sort.should == ["a => 10", "b => 'q'"]
   end
   it "should be able to flush out into a string into an array" do
-    @a.flush_out.should == ["a => '10'","b => '20'","c => '30'"]
+    @a.flush_out.sort.should == ["a => '10'","b => '20'","c => '30'"]
   end
   it "should be able to flush out with pre and posts" do
-    @a.flush_out("hi", "ho").should == ["hia => '10'ho","hib => '20'ho","hic => '30'ho"]
+    @a.flush_out("hi", "ho").sort.should == ["hia => '10'ho","hib => '20'ho","hic => '30'ho"]
   end
   describe "select" do
     before(:each) do