auser-poolparty 0.2.15 → 0.2.16

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

@@ -1,33 +1,40 @@
-% Supervisor for the poolparty_messenger server
-% 
-% Ari Lerner
-% CitrusByte
+% This supervisor is responsible for monitoring the 
+% client service
 
 -module (pm_node_supervisor).
--behaviour (supervisor).
+-behaviour(supervisor).
+
+-export([start/0, start_in_shell_for_testing/0, start_link/1, init/1]).
 
 -ifdef(EUNIT).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
 
--define (SERVER, ?MODULE).
+start() ->
+	spawn(fun() ->
+			supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = [])
+		end).
 
--export ([start_link/0, init/1]).
+start_in_shell_for_testing() ->
+	{ok, Pid} = supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = []),
+	unlink(Pid).
 
-start_link() ->
-	io:format("Starting load_supervisor...~n"),
-	supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+start_link(Args) ->
+	supervisor:start_link({local, ?MODULE}, ?MODULE, Args).
 
 init([]) ->
 	RestartStrategy = one_for_one,
 	MaxRestarts = 3, % 1000
 	MaxTimeBetRestarts = 30, % 3600
-	
+
 	SupFlags = {RestartStrategy, MaxRestarts, MaxTimeBetRestarts},
-  
+
 	LoadServers = [
-		{load_server, {load_server, start_link, []}, permanent, 5000, worker, [load_server, load_client]}
+		{pm_node1,
+			{pm_node, start_link, []}, 
+			permanent, 5000, worker, 
+			[pm_node]
+		}
 	],
-							
+
 	{ok, {SupFlags, LoadServers}}.
-							

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

@@ -0,0 +1,45 @@
+-module (utils).
+-compile(export_all).
+
+-ifdef(EUNIT).
+-include_lib("eunit/include/eunit.hrl").
+-endif.
+
+% Turn a list from
+% [{"0.66"}, {"0.32"}, []] -> [0.66, 0.32]
+convert_responses_to_int_list(L) ->
+	Sum = lists:foldr( fun(Int, Sum) -> Int + Sum end, 0, [erlang:list_to_float(F) || {F} <- L] ),
+	average_for_list(Sum, L).
+
+% Start a timer to fire off Fun after Time number of milliseconds
+start_timer(Time, Fun) -> 
+	register(clock, spawn(fun() -> tick_timer(Time, Fun) end)). 
+
+stop_timer() -> clock ! stop. 
+
+tick_timer(Time, Fun) -> 
+	receive 
+		stop -> 
+			void 
+	after Time -> 
+		Fun(), 
+		tick_timer(Time, Fun) 
+end. 
+
+
+% Private
+% Get the average of the list
+average_for_list(Num, L) ->
+	case length(L) of
+		0 ->
+			0;
+		_ ->
+			Num / length(L)
+	end.
+
+% Recompiles the boot scripts
+recompile_scripts(Vers) ->
+	systools:make_script("pm_node_rel-"++Vers, [local]),
+	systools:make_script("pm_master_rel-"++Vers, [local]).
+
+% Tests

data/lib/poolparty/base_packages/ruby.rb

@@ -12,7 +12,7 @@ module PoolParty
         has_package(:name => "ruby1.8-dev")
         has_package(:name => "ruby1.8")        
         
-        has_line_in_file("export PATH=$PATH:/var/lib/gems/1.8/bin/", "/etc/profile")
+        has_line_in_file("export PATH=$PATH:/var/lib/gems/1.8/bin:/sbin", "/etc/profile")
         
         # exec(:name => "update-rubygems") do
         #   command "gem update --system"

data/lib/poolparty/helpers/console.rb

@@ -7,8 +7,9 @@ module PoolParty
     
     # Load a file that contains a pool into memory
     def load_pool(filename)
-      unless filename && ::File.file?(filename)
-        puts "Could not load pool"
+      filename = filename.chomp
+      unless filename && ::File.readable?(filename)
+        puts "Could not load pool: #{filename}"
         exit
       else
         PoolParty::Script.inflate(open(filename).read, File.dirname(filename))

data/lib/poolparty/helpers/optioner.rb

@@ -9,7 +9,7 @@ module PoolParty
     include MethodMissingSugar
         
     def initialize(args=[], opts={}, &block)
-      @arguments = args
+      @arguments = parse_args(args)
       @parse_options = opts[:parse_options] ? opts[:parse_options] : true
       
       set_default_options
@@ -17,6 +17,10 @@ module PoolParty
       self
     end
     
+    def parse_args(argv, safe=[])
+      argv
+    end
+    
     def parent
       self
     end
@@ -47,7 +51,7 @@ module PoolParty
         exit
       end
       
-      opts.parse!(@arguments)
+      opts.parse(@arguments.dup)
       
       process_options      
       output_options if verbose

data/lib/poolparty/helpers/provisioner_base.rb

@@ -71,7 +71,7 @@ module PoolParty
         setup_runner(@cloud)
         
         unless testing
-          logger.debug "Logging on to #{@instance.ip}"
+          puts "Logging on to #{@instance.ip}" if verbose
           @cloud.prepare_reconfiguration
           @cloud.rsync_storage_files_to(@instance)
           
@@ -95,6 +95,7 @@ module PoolParty
         setup_runner(@cloud)        
         
         unless testing
+          puts "Logging on to #{@instance.ip}" if verbose
           @cloud.rsync_storage_files_to(@instance)
 
           cmd = "cd #{Base.remote_storage_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
@@ -181,7 +182,7 @@ module PoolParty
       # Package installers for general *nix operating systems
       def self.installers
         @installers ||= {
-          :ubuntu => "apt-get install -y",
+          :ubuntu => "aptitude install -y",
           :fedora => "yum install",
           :gentoo => "emerge"
         }
@@ -230,7 +231,8 @@ module PoolParty
           "          
           touch /etc/apt/sources.list
           echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
-          apt-get update --fix-missing -y
+          aptitude update -y
+          aptitude autoclean
           "
         else
           "# No system upgrade needed"

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

@@ -19,6 +19,7 @@ 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
 
@@ -32,7 +33,9 @@ module PoolParty
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
+          ps aux | grep "puppetmasterd" | awk '{print $2}' | xargs kill
           rm -rf /etc/puppet/ssl*
+          puppetd --test  2>&1 &
         EOS
       end
       

data/lib/poolparty/modules/resourcing_dsl.rb

@@ -42,6 +42,10 @@ module PoolParty
     end
     # Give us a template to work with on the resource
     # Make sure this template is moved to the tmp directory as well
+    # 
+    # TODO: Change this method to store the template files for later
+    # copying to prevent unnecessary copying and tons of directories
+    # everywhere
     def template(file, opts={})
       raise TemplateNotFound.new("no template given") unless file
       raise TemplateNotFound.new("template cannot be found #{file}") unless ::File.file?(file)

data/lib/poolparty/net/remote_instance.rb

@@ -66,7 +66,7 @@ module PoolParty
       
       # Commands for the servers
       def puppet_runner_command
-        ". /etc/profile && puppetd --onetime --no-daemonize --logdest syslog --server master > /dev/null 2>&1"
+        ". /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1"
       end
     end
     

data/lib/poolparty/net/remoter.rb

@@ -152,7 +152,7 @@ module PoolParty
         request_launch_new_instances(1) if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         
         when_no_pending_instances do
-          wait "10.seconds"
+          wait "20.seconds"
           hide_output { Provisioner.provision_master(self, testing) }
         end
         
@@ -180,8 +180,10 @@ module PoolParty
           
           reset!
           when_no_pending_instances do
-            @ri = list_of_running_instances.last
-            PoolParty::Provisioner.provision_slave(@ri, self, !force)
+            wait "20.seconds" # Give some time for ssh to startup
+            PoolParty::Provisioner.provision_slaves(self)
+            PoolParty::Provisioner.configure_master(self, testing)
+            # prepare_reconfiguration
           end
         end
       end
@@ -216,11 +218,16 @@ module PoolParty
         ssh_into( get_instance_by_number( num || 0 ) )
       end
       
+      # Run command on the instance by the number
+      def run_command_on_instance_number(cmd="ls -l", num=0)
+        run_command_on(cmd, get_instance_by_number( num || 0 ) )
+      end
+      
       # Prepare reconfiguration on the master
       # TODO: Fix the killall
       def prepare_reconfiguration
         unless @prepared
-          cmd = "killall ruby && rm -rf /etc/puppet/ssl/*; puppetmasterd --verbose; puppetd --test"
+          cmd = "killall ruby && rm -rf /etc/puppet/ssl/*; puppetmasterd --verbose; puppetd --test --no-daemonize 2>&1 &"
           run_command_on(cmd, master)
           @prepared = true
         end

data/lib/poolparty/plugins/git.rb

@@ -4,23 +4,17 @@ module PoolParty
     virtual_resource(:git) do
       
       def loaded(opts={}, parent=self)
-        install_git
+        has_git_repos
       end
-      
-      def install_git
-        has_package(:name => "git-core") do
-          has_git_repos
-        end
-      end
-      
+            
       def has_git_repos
         exec({:name => "git-#{name}"}) 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"
+          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"
           
           exec(:name => "update-#{name}") do
-            cwd ::File.dirname(@parent.creates)
+            cwd ::File.dirname(parent.creates)
             command "git pull"
           end
           

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.15"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-20}
+  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", "server-get-load", "server-list-active", "server-rerun"]
+  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-fire-cmd", "server-get-load", "server-list-active", "server-rerun", "server-start-master", "server-start-node"]
   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", "bin/server-get-load", "bin/server-list-active", "bin/server-rerun", "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/messenger/Makefile", "lib/erlang/messenger/README", "lib/erlang/messenger/Rakefile", "lib/erlang/messenger/control", "lib/erlang/messenger/ebin/erl_crash.dump", "lib/erlang/messenger/ebin/load_app.beam", "lib/erlang/messenger/ebin/pm_cluster.beam", "lib/erlang/messenger/ebin/pm_master.beam", "lib/erlang/messenger/ebin/pm_master_supervisor.beam", "lib/erlang/messenger/ebin/pm_node.beam", "lib/erlang/messenger/ebin/pm_node_supervisor.beam", "lib/erlang/messenger/ebin/tmp/templates/apache2.conf", "lib/erlang/messenger/ebin/tmp/templates/base.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/browser_fixes.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/mime-minimal.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/virtual_host.conf.erb", "lib/erlang/messenger/lib/load_app.app", "lib/erlang/messenger/src/load_app.erl", "lib/erlang/messenger/src/pm_cluster.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/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/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/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/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/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/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.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-fire-cmd", "bin/server-get-load", "bin/server-list-active", "bin/server-rerun", "bin/server-start-master", "bin/server-start-node", "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/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/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/utils.beam", "lib/erlang/messenger/logs/pool_log.log", "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/utils.erl", "lib/erlang/messenger/tmp/templates/apache2.conf", "lib/erlang/messenger/tmp/templates/base.conf.erb", "lib/erlang/messenger/tmp/templates/browser_fixes.conf.erb", "lib/erlang/messenger/tmp/templates/mime-minimal.conf.erb", "lib/erlang/messenger/tmp/templates/virtual_host.conf.erb", "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/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/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/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/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/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!

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/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

@@ -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.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/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/pool/resources/gem_spec.rb

@@ -36,7 +36,6 @@ describe "Gem" do
       @gem.version.should == "2.2.0"
     end
     it "should not take the version of the parent on the child" do
-      puts @gem.to_string
       @gem2.version.should == nil
     end
   end

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.15</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.16</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>