poolparty 0.2.6 → 0.2.18

data/lib/poolparty/templates/ha.cf

@@ -1,10 +1,19 @@
-# Haproxy conf
+# Heartbeat
 keepalive 2 # Time inbetween heartbeats
 deadtime 32 # wait 32 seconds before declaring dead
 warntime 16 # issue a warning halfway through
 initdead 60 # Don't boot instances between 60 seconds of each other
-auto_failback on
+logfacility daemon         # Log to syslog as facility "daemon"
+auto_failback off
 use_logd yes
+bcast eth0
 crm on
+logfile /var/log/ha.log
 
-node <%= ha_nodenames.join(" ") %>
+<% ha_node_ips.chomp.split(/\t/).each_with_index do |ip,index| -%>
+  <% if $hostname != ha_nodenames.chomp.split(/\t/)[index] -%>
+  ucast eth0 <%= ip %>
+  <% end %>
+<% end %>
+
+node <%= ha_nodenames %>

data/lib/poolparty/templates/haproxy.conf

@@ -30,7 +30,7 @@ defaults
 
 listen <%= name_haproxy %> 
     bind 0.0.0.0:<%= ports_haproxy.join(",0.0.0.0:") %>
-    <% node_ips_haproxy.each_with_index do |ip, index| -%>
     cookie POOLPARTYPARTY
-    server node<%= index %> <%= ip %>:<%= forwarding_port %> weight 1 check cookie
-  <% end -%>
+    <%- node_ips_haproxy.chomp.split(/\t/).each_with_index do |ip, index| -%>    
+    server <%= index == 0 ? "master" : "node#{index}" %> <%= ip %>:<%= forwarding_port %> weight 1 check cookie
+    <%- end -%>

data/lib/poolparty/templates/haresources

@@ -0,0 +1,3 @@
+<% ha_nodenames.each_with_index do |name, index| -%>
+<%= name -%>       <%= ha_node_ips[index] -%>/eth0:0
+<% end %>

data/lib/poolparty/templates/poolparty.monitor

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Based on puppet High Availability recipe
+# 
+# http://reductivelabs.com/trac/puppet/wiki/Recipes/HighAvailability
+# Modified for PoolParty
+# 
+exitstatus=0
+processid=`ps aux | grep puppetmasterd | awk '{print $2}'`
+
+if [ -z $processid ] || test `netstat -apn | grep "${processid}/ruby" | wc -l` -eq 0  ; then
+  exitstatus=1
+fi
+
+exit $exitstatus

data/lib/poolparty/templates/puppet.conf

@@ -1,12 +1,11 @@
 [main]
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
-  templatepath = /var/lib/puppet/templates
- 
-[puppetd]
-  localconfig = $vardir/localconfig
   pluginsync=false
   factsync=false
+ 
+[puppetd]
+  localconfig = $vardir/localconfig      
   report=true
   server=master
 

data/lib/poolparty/version.rb

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

data/lib/poolparty.rb

@@ -1,11 +1,14 @@
 require 'rubygems'
 
 # Load required gems
-require 'active_support'
-require 'open4'
-require "ftools"
-require "logging"
-require "ruby2ruby"
+%w(activesupport open4 ftools logging ruby2ruby).each do |lib|
+  begin
+    require lib
+  rescue Exception => e
+    puts "Could not find library #{lib}: #{e}"
+  end
+  
+end
 
 # Use active supports auto load mechanism
 ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
@@ -13,7 +16,7 @@ ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
 ## Load PoolParty
 require "#{File.dirname(__FILE__)}/poolparty/version"
 
-%w(core modules exceptions net).each do |dir|
+%w(core modules exceptions dependency_resolutions monitors net).each do |dir|
   Dir[File.dirname(__FILE__) + "/poolparty/#{dir}/**.rb"].each do |file|
     require file
   end

data/poolparty.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.6"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-14}
+  s.date = %q{2008-10-23}
   s.description = %q{Self-healing, auto-scaling cloud computing tool}
   s.email = ["ari.lerner@citrusbyte.com"]
-  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/pool-start-monitor", "config/hoe.rb", "config/requirements.rb", "examples/basic.rb", "examples/plugin_without_plugin_directory.rb", "examples/poolparty.rb", "examples/with_apache_plugin.rb", "generators/poolspec/USAGE", "generators/poolspec/poolspec_generator.rb", "generators/poolspec/templates/pool_spec_template.erb", "lib/erlang/eb_server.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "lib/poolparty/helpers/optioner.rb", "lib/poolparty/helpers/provisioner_base.rb", "lib/poolparty/helpers/provisioners/master.rb", "lib/poolparty/helpers/provisioners/slave.rb", "lib/poolparty/modules/cloud_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/net/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/gem_package.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "lib/poolparty/pool/resources/sshkey.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/fileserver.conf", "lib/poolparty/templates/gem", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/helpers/provisioner_base_spec.rb", "spec/poolparty/helpers/provisioners/master_spec.rb", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/modules/tmp/willy/nilly.rb", "spec/poolparty/net/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/code.css", "website/stylesheets/screen.css", "website/template.html.erb"]
+  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-run", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "server-build-messenger", "server-fire-cmd", "server-get-load", "server-list-active", "server-list-responding", "server-rerun", "server-start-master", "server-start-node"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "lib/erlang/messenger/lib/eunit/examples/tests.txt", "website/index.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-run", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/server-build-messenger", "bin/server-fire-cmd", "bin/server-get-load", "bin/server-list-active", "bin/server-list-responding", "bin/server-rerun", "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", "examples/with_apache_plugin.rb", "generators/poolspec/USAGE", "generators/poolspec/poolspec_generator.rb", "generators/poolspec/templates/pool_spec_template.erb", "lib/erlang/messenger/Emakefile", "lib/erlang/messenger/Makefile", "lib/erlang/messenger/README", "lib/erlang/messenger/Rakefile", "lib/erlang/messenger/control", "lib/erlang/messenger/ebin/master.app", "lib/erlang/messenger/ebin/master_app.beam", "lib/erlang/messenger/ebin/node.app", "lib/erlang/messenger/ebin/node_app.beam", "lib/erlang/messenger/ebin/packager.app", "lib/erlang/messenger/ebin/pm_client.beam", "lib/erlang/messenger/ebin/pm_cluster.beam", "lib/erlang/messenger/ebin/pm_event_handler.beam", "lib/erlang/messenger/ebin/pm_master.beam", "lib/erlang/messenger/ebin/pm_master_rel-0.1.rel", "lib/erlang/messenger/ebin/pm_master_supervisor.beam", "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/utils.beam", "lib/erlang/messenger/lib/eunit/AUTHORS", "lib/erlang/messenger/lib/eunit/CHANGELOG", "lib/erlang/messenger/lib/eunit/COPYING", "lib/erlang/messenger/lib/eunit/Makefile", "lib/erlang/messenger/lib/eunit/NOTES", "lib/erlang/messenger/lib/eunit/README", "lib/erlang/messenger/lib/eunit/doc/edoc-info", "lib/erlang/messenger/lib/eunit/doc/erlang.png", "lib/erlang/messenger/lib/eunit/doc/eunit.html", "lib/erlang/messenger/lib/eunit/doc/index.html", "lib/erlang/messenger/lib/eunit/doc/modules-frame.html", "lib/erlang/messenger/lib/eunit/doc/overview-summary.html", "lib/erlang/messenger/lib/eunit/doc/overview.edoc", "lib/erlang/messenger/lib/eunit/doc/packages-frame.html", "lib/erlang/messenger/lib/eunit/doc/stylesheet.css", "lib/erlang/messenger/lib/eunit/ebin/autoload.beam", "lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit.app", "lib/erlang/messenger/lib/eunit/ebin/eunit.appup", "lib/erlang/messenger/lib/eunit/ebin/eunit.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam", "lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam", "lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl", "lib/erlang/messenger/lib/eunit/examples/fib.erl", "lib/erlang/messenger/lib/eunit/examples/tests.txt", "lib/erlang/messenger/lib/eunit/include/eunit.hrl", "lib/erlang/messenger/lib/eunit/src/Makefile", "lib/erlang/messenger/lib/eunit/src/autoload.erl", "lib/erlang/messenger/lib/eunit/src/code_monitor.erl", "lib/erlang/messenger/lib/eunit/src/eunit.app.src", "lib/erlang/messenger/lib/eunit/src/eunit.appup.src", "lib/erlang/messenger/lib/eunit/src/eunit.erl", "lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl", "lib/erlang/messenger/lib/eunit/src/eunit_data.erl", "lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl", "lib/erlang/messenger/lib/eunit/src/eunit_lib.erl", "lib/erlang/messenger/lib/eunit/src/eunit_proc.erl", "lib/erlang/messenger/lib/eunit/src/eunit_serial.erl", "lib/erlang/messenger/lib/eunit/src/eunit_server.erl", "lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl", "lib/erlang/messenger/lib/eunit/src/eunit_test.erl", "lib/erlang/messenger/lib/eunit/src/eunit_tests.erl", "lib/erlang/messenger/lib/eunit/src/eunit_tty.erl", "lib/erlang/messenger/lib/eunit/src/file_monitor.erl", "lib/erlang/messenger/lib/eunit/sys.config", "lib/erlang/messenger/lib/eunit/vsn.mk", "lib/erlang/messenger/pm_master_rel-0.1.boot", "lib/erlang/messenger/pm_master_rel-0.1.script", "lib/erlang/messenger/pm_node_rel-0.1.boot", "lib/erlang/messenger/pm_node_rel-0.1.script", "lib/erlang/messenger/src/master_app.erl", "lib/erlang/messenger/src/node_app.erl", "lib/erlang/messenger/src/pm_client.erl", "lib/erlang/messenger/src/pm_cluster.erl", "lib/erlang/messenger/src/pm_event_handler.erl", "lib/erlang/messenger/src/pm_master.erl", "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/utils.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/config/allowed_commands.yml", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/dependency_resolutions/base.rb", "lib/poolparty/dependency_resolutions/puppet.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "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", "lib/poolparty/helpers/provisioners/slave.rb", "lib/poolparty/modules/cloud_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/resourcing_dsl.rb", "lib/poolparty/modules/s3_string.rb", "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/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "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/fileserver.conf", "lib/poolparty/templates/gem", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/haresources", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/poolparty.monitor", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "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", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "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/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/symlink_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/code.css", "website/stylesheets/screen.css", "website/template.html.erb"]
   s.has_rdoc = true
   s.homepage = %q{http://poolparty.rubyforge.org}
   s.post_install_message = %q{Get ready to jump in the pool, you just installed poolpartyrb!
@@ -21,8 +21,9 @@ To get started, run the generator:
 Please check out the documentation for any questions or check out the google groups at
   http://groups.google.com/group/poolpartyrb
 
+Tutorials are at http://poolpartyrb.com
 
-Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!
+Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
 
 For more information, check http://PoolPartyrb.com
 On IRC: 

data/setup.rb

@@ -1363,7 +1363,7 @@ class Installer
 
   def install_dir_conf(rel)
     # FIXME: should not remove current config files
-    # (rename previous file to .old/.org)
+    # (rename preious file to .old/.org)
     install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
   end
 
@@ -1542,12 +1542,12 @@ class Installer
 
     dir = File.basename(rel)
     Dir.mkdir dir unless File.dir?(dir)
-    prevdir = Dir.pwd
+    predir = Dir.pwd
     Dir.chdir dir
     $stderr.puts '---> ' + rel if verbose?
     @currdir = rel
     yield
-    Dir.chdir prevdir
+    Dir.chdir predir
     $stderr.puts '<--- ' + rel if verbose?
     @currdir = File.dirname(rel)
   end

data/spec/poolparty/bin/console_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../lib/poolparty/helpers/console'
 
 describe "Console" do
   before(:each) do
-    ::File.stub!(:file?).with("pop").and_return true
+    ::File.stub!(:readable?).with("pop").and_return true
   end
   describe "load_pool" do
     before(:each) do

data/spec/poolparty/core/array_spec.rb

@@ -23,4 +23,9 @@ describe "Array" do
       @array.to_os
     end
   end
+  describe "to_option_string" do
+    it "should map the to_option_strings in an array of strings" do
+      ["hi", "be"].to_option_string.should == "[ 'hi', 'be' ]"
+    end
+  end
 end

data/spec/poolparty/core/hash_spec.rb

@@ -30,7 +30,7 @@ describe "Hash" do
   it "should be able to flush out into a string into an array" do
     @a.flush_out.should == ["a => '10'","b => '20'","c => '30'"]
   end
-  it "should be able to flush out with prev and posts" do
+  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"]
   end
   describe "select" do
@@ -60,4 +60,22 @@ describe "Hash" do
       }.should_not raise_error
     end
   end
+  describe "append" do
+    before(:each) do
+      @hash = {:game => "token", :required => "for_play"}
+    end
+    it "should not destroy an option salready on the hash" do
+      @hash.append(:required => "to_play")[:game].should == "token"
+    end
+    it "should change the entry to an array if it already exists" do
+      @hash.append(:game => "coin")[:game].class.should == Array
+    end
+    it "should append the other hash's key to the end of the array" do
+      @hash.append(:game => "coin")[:game][-1].should == "coin"
+    end
+    it "should change the hash with the append(bang) option" do
+      @hash.append!(:game => "coin")
+      @hash[:game][-1].should == "coin"
+    end
+  end
 end

data/spec/poolparty/core/string_spec.rb

@@ -129,6 +129,19 @@ listen web_proxy 127.0.0.1:3000
     it "should return File['/etc/apache2/conf.d/base.conf'] as a string" do
       'File["/etc/apache2/conf.d/base.conf"]'.to_option_string.should == "File[\"/etc/apache2/conf.d/base.conf\"]"
     end
+    it "should turn a resource into a requires file" do
+      @cloud = cloud :app do
+        file(:name => "franke")
+      end
+      @file = @cloud.resource(:file).first
+      @file.to_option_string.should == "File['franke']"
+    end
+    it "should turn a function into a string without quotes" do
+      "active_nodes()".to_option_string.should == "active_nodes()"
+    end
+    it "should turna function into a string outsid ethe quotes with a parameter" do
+      "active_nodes(10)".to_option_string.should == "active_nodes(10)"
+    end
   end
   describe "sanitize" do
     it "should remove the periods from the string" do

data/spec/poolparty/dependency_resolutions/base_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Resolution spec" do
+  before(:each) do
+    @base = Class.new
+    @base.extend(DependencyResolutions::Base)
+  end
+  %w(to_s to_string).each do |meth|
+    eval "it 'should have the method #{meth} defined' do; @base.respond_to?(:#{meth}).should == true; end"
+  end
+end

data/spec/poolparty/helpers/messenger_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+setup_cl
+
+include PoolParty::Messenger
+
+describe "Messenger" do
+  it "should have the method messenger_send!" do
+    Messenger.respond_to?(:messenger_send!).should == true
+  end
+  it "should call send_cmd on the client" do
+    Messenger.messenger_send!('send_cmd ["echo hi"]', true).should =~ /-run pm_client send_cmd/
+  end
+end

data/spec/poolparty/helpers/optioner_spec.rb

@@ -31,8 +31,9 @@ describe "Option Parser" do
     end
   end
   it "should be able to take a block and set some options on the block" do
-    o = PoolParty::Optioner.new(["-w"], {}) do |opts, optioner|
+    o = PoolParty::Optioner.new(["-w"]) do |opts, optioner|
       opts.on('-w', '--wee')    { optioner.wee "wee" }
+      opts.on('-t t', '--teatime tea')    { optioner.tea "time" }
     end
     o.wee.should == "wee"
   end

data/spec/poolparty/helpers/provisioner_base_spec.rb

@@ -52,7 +52,7 @@ describe "ProvisionerBase" do
     ProvisionerBase.installers[:ubuntu].should_not be_nil
   end
   it "should be able to fetch the ubuntu installer with the helper method installer" do
-    ProvisionerBase.new(@remote_instance,@cloud, "ubuntu").installer_for.should == "apt-get install -y "
+    ProvisionerBase.new(@remote_instance,@cloud, "ubuntu").installer_for.should == "aptitude install -y "
   end
   it "should be able to fetch the fedora installer with the helper method installer" do
     ProvisionerBase.new(@remote_instance,@cloud, "fedora").installer_for.should == "yum install "

data/spec/poolparty/helpers/provisioners/master_spec.rb

@@ -18,7 +18,7 @@ describe "Master provisioner" do
       @master.stub!(:cloud).and_return @cloud
     end
     it "should call install_puppet_master" do
-      @master.should_receive(:install_puppet_master)
+      @master.should_receive(:install_puppet)
     end
     it "should call create_local_hosts_entry" do
       @master.should_receive(:create_local_hosts_entry)
@@ -37,7 +37,7 @@ describe "Master provisioner" do
     end
   end
   it "should return install_puppet_master as apt-get install puppet factor" do
-    @master.install_puppet_master.should =~ /apt-get install -y puppet puppetmaster/
+    @master.install_puppet.should =~ /install -y puppet puppetmaster/
   end
   it "should return setup basic structure" do
     @master.setup_basic_structure.should =~ /puppetmasterd --mkusers/

data/spec/poolparty/helpers/provisioners/slave_spec.rb

@@ -16,13 +16,13 @@ describe "Slave provisioner" do
   end
   describe "install_tasks" do
     it "should call install_puppet_slave" do
-      @slave.should_receive(:install_puppet_master)
+      @slave.should_receive(:install_puppet)
     end
     after do
       @slave.install
     end
   end
-  it "should return install_puppet as apt-get install puppet factor" do
-    @slave.setup_puppet.should =~ /puppetd/
+  it "should return setup_puppet with the master" do
+    @slave.setup_puppet.should =~ /master/
   end
 end

data/spec/poolparty/modules/file_writer_spec.rb

@@ -43,6 +43,15 @@ describe "FileWriter" do
       @test.write_to_file_in_storage_directory(@filepath, "STRING TO WRITE")
     end
   end
+  describe "trying to copy the same file" do
+    before(:each) do
+      @filepath = @path
+    end
+    it "should not try to copy a file if they are the same file" do
+      FileUtils.should_not_receive(:cp)
+      @test.copy_file_to_storage_directory(@filepath)
+    end
+  end
   after(:all) do
     ::File.unlink @path if ::File.file? @path
   end

data/spec/poolparty/monitors/base_monitor_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+include PoolParty::Monitors
+
+describe "Monitors" do
+  it "should have a list of available monitors" do
+    PoolParty::Monitors.available_monitors.empty?.should == false
+  end
+  it "should register a module and append it to the available monitors" do
+    size = PoolParty::Monitors.available_monitors.size
+    PoolParty::Monitors.register_monitor :fake
+    size.should == PoolParty::Monitors.available_monitors.size - 1
+  end
+end
+describe "BaseMonitor" do
+  it "should have the singleton method run defined" do
+    BaseMonitor.respond_to?(:run).should == true
+  end
+end

data/spec/poolparty/monitors/monitors/cpu_monitor_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+include PoolParty::Monitors
+
+describe "CpuMonitor" do
+  before(:each) do
+    @mon = CpuMonitor.new
+    CpuMonitor.stub!(:new).and_return @mon
+  end
+  it "should have the singleton method run defined" do
+    CpuMonitor.respond_to?(:run).should == true
+  end
+  it "should call the method new" do
+    CpuMonitor.should_receive(:new).and_return @mon
+    CpuMonitor.run
+  end
+end

data/spec/poolparty/net/remote_instance_spec.rb

@@ -65,6 +65,11 @@ describe "Remote Instance" do
       @ri.responding.should_not be_nil
       @ri.responding?.should == true
     end
-    
+    it "should have the puppet_runner_command" do
+      @ri.respond_to?(:puppet_runner_command).should == true
+    end
+    it "should return the puppet_runner_command with puppetd" do
+      @ri.puppet_runner_command.should =~ /puppetd/
+    end
   end
 end

data/spec/poolparty/net/remote_spec.rb

@@ -190,51 +190,60 @@ describe "Remote" do
     end
     describe "should_contract_cloud?" do
     end
-    describe "expand_cloud_if_necessary" do
+    describe "expansions" do
       before(:each) do
-        stub_list_from_remote_for(@tc)
-        @tc.stub!(:request_launch_new_instances).and_return true
-        @tc.stub!(:can_start_a_new_instance).and_return true
-        @tc.stub!(:list_of_pending_instances).and_return []
-        @tc.stub!(:prepare_to_configuration).and_return true
-        @tc.stub!(:build_and_store_new_config_file).and_return true
+        @tc.stub!(:copy_ssh_app).and_return true
+        @tc.stub!(:prepare_reconfiguration).and_return "full"
+        PoolParty::Provisioner.stub!(:configure_master).and_return true
+        @tc.stub!(:wait).and_return true
       end
-      it "should receive can_start_a_new_instance?" do
-        @tc.should_receive(:can_start_a_new_instance?).once
-      end
-      it "should see if we should expand the cloud" do
-        @tc.should_receive(:should_expand_cloud?).once.and_return false
-      end
-      it "should call request_launch_new_instances if we should_expand_cloud?" do
-        @tc.should_receive(:should_expand_cloud?).once.and_return true
-        @tc.should_receive(:request_launch_new_instances).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
-      end
-      it "should call a new slave provisioner" do
-        @tc.stub!(:should_expand_cloud?).once.and_return true
-        @tc.stub!(:request_launch_new_instances).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
-        PoolParty::Provisioner.should_receive(:provision_slave).and_return true
-      end
-      after(:each) do
-        @tc.expand_cloud_if_necessary
-      end
-    end
-    describe "contract_cloud_if_necessary" do
-      before(:each) do
-        @tc.stub!(:request_termination_of_non_master_instance).and_return true
-        @tc.stub!(:can_shutdown_an_instance?).and_return true
-      end
-      it "should receive can_shutdown_an_instance?" do
-        @tc.should_receive(:can_shutdown_an_instance?).once
-      end
-      it "should see if we should contract the cloud" do
-        @tc.should_receive(:should_contract_cloud?).once.and_return false
-      end
-      it "should call request_termination_of_non_master_instance if we should_contract_cloud?" do
-        @tc.should_receive(:should_contract_cloud?).once.and_return true
-        @tc.should_receive(:request_termination_of_non_master_instance).once.and_return true        
+      describe "expand_cloud_if_necessary" do
+        before(:each) do
+          stub_list_from_remote_for(@tc)
+          @tc.stub!(:request_launch_new_instances).and_return true
+          @tc.stub!(:can_start_a_new_instance).and_return true
+          @tc.stub!(:list_of_pending_instances).and_return []
+          @tc.stub!(:prepare_to_configuration).and_return true
+          @tc.stub!(:build_and_store_new_config_file).and_return true          
+          PoolParty::Provisioner.stub!(:provision_slaves).and_return true        
+        end
+        it "should receive can_start_a_new_instance?" do
+          @tc.should_receive(:can_start_a_new_instance?).once
+        end
+        it "should see if we should expand the cloud" do
+          @tc.should_receive(:should_expand_cloud?).once.and_return false
+        end
+        it "should call request_launch_new_instances if we should_expand_cloud?" do
+          @tc.should_receive(:should_expand_cloud?).once.and_return true
+          @tc.should_receive(:request_launch_new_instances).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
+        end
+        it "should call a new slave provisioner" do
+          @tc.stub!(:should_expand_cloud?).once.and_return true
+          PoolParty::Provisioner.should_receive(:provision_slaves).and_return true
+        end
+        after(:each) do
+          @tc.expand_cloud_if_necessary
+        end
       end
-      after(:each) do
-        @tc.contract_cloud_if_necessary
+      describe "contract_cloud_if_necessary" do
+        before(:each) do
+          @tc.stub!(:request_termination_of_non_master_instance).and_return true
+          @tc.stub!(:can_shutdown_an_instance?).and_return true
+          @tc.stub!(:wait).and_return true
+        end
+        it "should receive can_shutdown_an_instance?" do
+          @tc.should_receive(:can_shutdown_an_instance?).once
+        end
+        it "should see if we should contract the cloud" do
+          @tc.should_receive(:should_contract_cloud?).once.and_return false
+        end
+        it "should call request_termination_of_non_master_instance if we should_contract_cloud?" do
+          @tc.should_receive(:should_contract_cloud?).once.and_return true
+          @tc.should_receive(:request_termination_of_non_master_instance).once.and_return true
+        end
+        after(:each) do
+          @tc.contract_cloud_if_necessary
+        end
       end
     end
     describe "rsync_storage_files_to" do

data/spec/poolparty/net/remoter_spec.rb

@@ -48,7 +48,7 @@ describe "Remoter" do
       @tc.rsync_command.should == "rsync --delete -azP --exclude cache -e '#{@tc.ssh_string}'"
     end
     it "should be able to rsync storage commands" do
-      @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Dir.pwd}/tmp 192.168.0.22:/var/poolparty"
+      @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Base.storage_directory}/ 192.168.0.22:/var/poolparty"
     end
   end
   describe "launch_and_configure_master!" do
@@ -188,4 +188,5 @@ describe "Remoter" do
       end
     end
   end
+
 end

data/spec/poolparty/plugins/git_spec.rb

@@ -8,7 +8,7 @@ describe "Remote Instance" do
     @tc = TestClass.new
   end
   it "should be a string" do
-    @tc.has_git(:name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /file \{/
+    @tc.has_git(:name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec \{/
   end
   it "should included the flushed out options" do
     @tc.has_git({:name => "git.git", :source => "git://source.git", :user => "finger"}).to_string.should =~ /finger@git:/
@@ -27,7 +27,7 @@ describe "Remote Instance" do
       end
     end
     it "should have the path set within the resource" do
-      @tc.resource(:git).first.to_string.should =~ /file \{/
+      @tc.resource(:git).first.to_string.should =~ /exec \{/
     end
   end
 end