auser-poolparty 0.0.9 → 0.1.0

data/lib/poolparty/remoter.rb

@@ -1,6 +1,7 @@
 =begin rdoc
   Handle the remoting aspects of the remote_instances
 =end
+require 'open4'
 module PoolParty
   module Remoter        
     module ClassMethods
@@ -66,10 +67,8 @@ module PoolParty
         run_array_of_tasks arr
       end
       
-      def run_now command
-        unless command.empty?
-          Kernel.system "#{self.class.ssh_string} #{self.ip} #{command.runnable}"
-        end
+      def run_now command        
+        run command unless command.empty?
       end
             
       def ssh_tasks;@ssh_tasks ||= [];end
@@ -107,6 +106,58 @@ module PoolParty
       def set_hosts(c=nil)
       end
       
+      # Nearly Directly from vlad
+      def run command, on=self
+        cmd = [self.class.ssh_string, on.ip].compact
+        result = []
+
+        commander = cmd.join(" ") << " \"#{command.runnable}\""        
+        
+        pid, inn, out, err = Open4::popen4(commander)
+
+        inn.sync   = true
+        streams    = [out, err]
+        out_stream = {
+          out => $stdout,
+          err => $stderr,
+        }
+
+        # Handle process termination ourselves
+        status = nil
+        Thread.start do
+          status = Process.waitpid2(pid).last
+        end
+
+        until streams.empty? do
+          # don't busy loop
+          selected, = select streams, nil, nil, 0.1
+
+          next if selected.nil? or selected.empty?
+
+          selected.each do |stream|
+            if stream.eof? then
+              streams.delete stream if status # we've quit, so no more writing
+              next
+            end
+
+            data = stream.readpartial(1024)
+            out_stream[stream].write data
+
+            if stream == err and data =~ /^Password:/ then
+              inn.puts sudo_password
+              data << "\n"
+              $stderr.write "\n"
+            end
+
+            result << data
+          end
+        end
+
+        PoolParty.message "execution failed with status #{status.exitstatus}: #{cmd.join ' '}" unless status.success?
+
+        result.join
+      end
+      
     end
   
     def self.included(receiver)

data/lib/poolparty/scheduler.rb

@@ -9,28 +9,21 @@ module PoolParty
     end
     # Synchronize the running threaded tasks
     def run
-      unless tasks.empty?
-        self.class.synchronize do
-          tasks.reject!{|a|            
-            begin
-              a.run
-              a.join
-            rescue Exception => e    
-              puts "There was an error in the task: #{e} #{e.backtrace.join("\n")}"
-            end
-            true
-          }
+      unless tasks.empty? && !running?
+        running = true
+        pool = ThreadPool.new(10)
+        tasks.reject! do |task|
+          pool.process {task.call}
         end
+        pool.join() # When all the tasks are done
+        running = false
       end
     end
+    def running?;@running == true;end
+    def running;@running ||= false;end
     # Add a task in a new thread
     def <<(a, *args)
-      thread = Thread.new(a) do |task|
-        Thread.stop rescue ""
-        Thread.current[:callee] = task
-        a.call args
-      end
-      tasks << thread
+      tasks << a
     end
     alias_method :push, :<<
     # In the ThreadSafeInstance
@@ -45,7 +38,7 @@ module PoolParty
     end
     # Add a task to the new threaded block
     def add_task(&blk)
-      _tasker.push proc{blk.call}
+      _tasker.push blk
     end
     # Grab the polling_time
     def interval
@@ -74,16 +67,17 @@ module PoolParty
     end
     # Run the loop and wait the amount of time between running the tasks
     # You can send it daemonize => true and it will daemonize
-    def run_thread_loop(opts={}, &block)
+    def run_thread_loop(opts={}, &blk)
       block = lambda {        
         loop do
           begin
             yield if block_given?
+            add_task { Signal.trap("INT") { exit } }            
             run_thread_list
+            PoolParty.message "Waiting: #{interval}"
             wait interval
-            reset!
           rescue Exception => e
-            puts "There was an error in the run_thread_loop: #{e}"
+            Process.kill("INT", Process.pid)
           end
         end
       }
@@ -94,10 +88,6 @@ module PoolParty
     def run_thread_list      
       run_threads
     end
-    # Reset
-    def reset!
-      cached_variables.each {|cached| cached = nil }
-    end
         
   end
 end

data/lib/poolparty/thread_pool.rb

@@ -0,0 +1,94 @@
+module PoolParty
+  class ThreadPool
+    class Worker
+      def initialize
+        @mutex = Mutex.new
+        @thread = Thread.new do
+          while true
+            sleep 0.001
+            block = get_block
+            if block
+              block.call
+              reset_block
+            end
+          end
+        end
+      end
+
+      def get_block
+        @mutex.synchronize {@block}
+      end
+
+      def set_block(block)
+        @mutex.synchronize do
+          raise RuntimeError, "Thread already busy." if @block
+          @block = block
+        end
+      end
+
+      def reset_block
+        @mutex.synchronize {@block = nil}
+      end
+
+      def busy?
+        @mutex.synchronize {!@block.nil?}
+      end
+    end
+
+    attr_accessor :max_size
+    attr_reader :workers
+
+    def initialize(max_size = 10)
+      @max_size = max_size
+      @workers = []
+      @mutex = Mutex.new
+    end
+
+    def size
+      @mutex.synchronize {@workers.size}
+    end
+
+    def busy?
+      @mutex.synchronize {@workers.any? {|w| w.busy?}}
+    end
+
+    def join
+      sleep 0.01 while busy?
+    end
+
+    def process(&block)
+        while true
+            @mutex.synchronize do
+                worker = find_available_worker 
+                if worker
+                    return worker.set_block(block)
+                end
+            end
+            sleep 0.01
+        end
+    end
+
+    def find_available_worker
+      free_worker || create_worker
+    end
+
+    def wait_for_worker
+      while true
+        worker = find_available_worker
+        return worker if worker
+        sleep 0.01
+      end
+    end
+
+    def free_worker
+      @workers.each {|w| return w unless w.busy?}; nil
+    end
+
+    def create_worker
+      return nil if @workers.size >= @max_size
+      worker = Worker.new
+      @workers << worker
+      worker
+    end
+  end  
+end

data/poolparty.gemspec

@@ -1,21 +1,21 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
   s.cert_chain = nil
-  s.date = %q{2008-06-28}
+  s.date = %q{2008-07-02}
   s.description = %q{Run your entire application off EC2, managed and auto-scaling}
   s.email = %q{ari.lerner@citrusbyte.com}
   s.executables = ["instance", "pool", "poolnotify"]
-  s.extra_rdoc_files = ["CHANGELOG", "README.txt", "bin", "bin/instance", "bin/pool", "bin/poolnotify", "lib", "lib/core", "lib/core/array.rb", "lib/core/exception.rb", "lib/core/float.rb", "lib/core/hash.rb", "lib/core/kernel.rb", "lib/core/module.rb", "lib/core/object.rb", "lib/core/proc.rb", "lib/core/string.rb", "lib/core/time.rb", "lib/modules", "lib/modules/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/file_writer.rb", "lib/modules/safe_instance.rb", "lib/modules/sprinkle_overrides.rb", "lib/modules/vlad_override.rb", "lib/poolparty", "lib/poolparty.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors", "lib/poolparty/monitors.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "lib/poolparty/provider", "lib/poolparty/provider.rb", "lib/poolparty/provider/packages", "lib/poolparty/provider/packages/essential.rb", "lib/poolparty/provider/packages/git.rb", "lib/poolparty/provider/packages/haproxy.rb", "lib/poolparty/provider/packages/heartbeat.rb", "lib/poolparty/provider/packages/monit.rb", "lib/poolparty/provider/packages/rsync.rb", "lib/poolparty/provider/packages/ruby.rb", "lib/poolparty/provider/packages/s3fuse.rb", "lib/poolparty/provider/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.rb", "lib/poolparty/tasks", "lib/poolparty/tasks.rb", "lib/poolparty/tasks/cloud.rake", "lib/poolparty/tasks/development.rake", "lib/poolparty/tasks/ec2.rake", "lib/poolparty/tasks/instance.rake", "lib/poolparty/tasks/package.rake", "lib/poolparty/tasks/plugins.rake", "lib/poolparty/tasks/server.rake", "lib/s3", "lib/s3/s3_object_store_folders.rb"]
-  s.files = ["CHANGELOG", "README.txt", "Rakefile", "assets", "assets/clouds.png", "bin", "bin/instance", "bin/pool", "bin/poolnotify", "config", "config/cloud_master_takeover", "config/create_proxy_ami.sh", "config/haproxy.conf", "config/heartbeat.conf", "config/heartbeat_authkeys.conf", "config/installers", "config/installers/ubuntu_install.sh", "config/monit", "config/monit.conf", "config/monit/haproxy.monit.conf", "config/monit/nginx.monit.conf", "config/nginx.conf", "config/reconfigure_instances_script.sh", "config/sample-config.yml", "config/scp_instances_script.sh", "lib", "lib/core", "lib/core/array.rb", "lib/core/exception.rb", "lib/core/float.rb", "lib/core/hash.rb", "lib/core/kernel.rb", "lib/core/module.rb", "lib/core/object.rb", "lib/core/proc.rb", "lib/core/string.rb", "lib/core/time.rb", "lib/modules", "lib/modules/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/file_writer.rb", "lib/modules/safe_instance.rb", "lib/modules/sprinkle_overrides.rb", "lib/modules/vlad_override.rb", "lib/poolparty", "lib/poolparty.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors", "lib/poolparty/monitors.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "lib/poolparty/provider", "lib/poolparty/provider.rb", "lib/poolparty/provider/packages", "lib/poolparty/provider/packages/essential.rb", "lib/poolparty/provider/packages/git.rb", "lib/poolparty/provider/packages/haproxy.rb", "lib/poolparty/provider/packages/heartbeat.rb", "lib/poolparty/provider/packages/monit.rb", "lib/poolparty/provider/packages/rsync.rb", "lib/poolparty/provider/packages/ruby.rb", "lib/poolparty/provider/packages/s3fuse.rb", "lib/poolparty/provider/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.rb", "lib/poolparty/tasks", "lib/poolparty/tasks.rb", "lib/poolparty/tasks/cloud.rake", "lib/poolparty/tasks/development.rake", "lib/poolparty/tasks/ec2.rake", "lib/poolparty/tasks/instance.rake", "lib/poolparty/tasks/package.rake", "lib/poolparty/tasks/plugins.rake", "lib/poolparty/tasks/server.rake", "lib/s3", "lib/s3/s3_object_store_folders.rb", "spec", "spec/application_spec.rb", "spec/callback_spec.rb", "spec/core_spec.rb", "spec/ec2_wrapper_spec.rb", "spec/file_writer_spec.rb", "spec/files", "spec/files/describe_response", "spec/files/multi_describe_response", "spec/files/remote_desc_response", "spec/helpers", "spec/helpers/ec2_mock.rb", "spec/kernel_spec.rb", "spec/master_spec.rb", "spec/monitors", "spec/monitors/cpu_monitor_spec.rb", "spec/monitors/memory_spec.rb", "spec/monitors/misc_monitor_spec.rb", "spec/monitors/web_spec.rb", "spec/optioner_spec.rb", "spec/plugin_manager_spec.rb", "spec/plugin_spec.rb", "spec/pool_binary_spec.rb", "spec/poolparty_spec.rb", "spec/provider_spec.rb", "spec/remote_instance_spec.rb", "spec/remoter_spec.rb", "spec/remoting_spec.rb", "spec/scheduler_spec.rb", "spec/spec_helper.rb", "spec/string_spec.rb", "poolparty.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "README.txt", "bin", "bin/instance", "bin/pool", "bin/poolnotify", "lib", "lib/core", "lib/core/array.rb", "lib/core/exception.rb", "lib/core/float.rb", "lib/core/hash.rb", "lib/core/kernel.rb", "lib/core/module.rb", "lib/core/object.rb", "lib/core/proc.rb", "lib/core/string.rb", "lib/core/time.rb", "lib/helpers", "lib/helpers/plugin_spec_helper.rb", "lib/modules", "lib/modules/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/file_writer.rb", "lib/modules/safe_instance.rb", "lib/modules/sprinkle_overrides.rb", "lib/modules/vlad_override.rb", "lib/poolparty", "lib/poolparty.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors", "lib/poolparty/monitors.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "lib/poolparty/provider", "lib/poolparty/provider.rb", "lib/poolparty/provider/packages", "lib/poolparty/provider/packages/essential.rb", "lib/poolparty/provider/packages/git.rb", "lib/poolparty/provider/packages/haproxy.rb", "lib/poolparty/provider/packages/heartbeat.rb", "lib/poolparty/provider/packages/monit.rb", "lib/poolparty/provider/packages/rsync.rb", "lib/poolparty/provider/packages/ruby.rb", "lib/poolparty/provider/packages/s3fuse.rb", "lib/poolparty/provider/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.rb", "lib/poolparty/tasks", "lib/poolparty/tasks.rb", "lib/poolparty/tasks/cloud.rake", "lib/poolparty/tasks/development.rake", "lib/poolparty/tasks/ec2.rake", "lib/poolparty/tasks/instance.rake", "lib/poolparty/tasks/plugins.rake", "lib/poolparty/tasks/server.rake", "lib/poolparty/thread_pool.rb", "lib/s3", "lib/s3/s3_object_store_folders.rb"]
+  s.files = ["CHANGELOG", "README.txt", "Rakefile", "assets", "assets/clouds.png", "bin", "bin/instance", "bin/pool", "bin/poolnotify", "config", "config/cloud_master_takeover", "config/create_proxy_ami.sh", "config/haproxy.conf", "config/heartbeat.conf", "config/heartbeat_authkeys.conf", "config/installers", "config/installers/ubuntu_install.sh", "config/monit", "config/monit.conf", "config/monit/haproxy.monit.conf", "config/monit/nginx.monit.conf", "config/nginx.conf", "config/reconfigure_instances_script.sh", "config/sample-config.yml", "config/scp_instances_script.sh", "lib", "lib/core", "lib/core/array.rb", "lib/core/exception.rb", "lib/core/float.rb", "lib/core/hash.rb", "lib/core/kernel.rb", "lib/core/module.rb", "lib/core/object.rb", "lib/core/proc.rb", "lib/core/string.rb", "lib/core/time.rb", "lib/helpers", "lib/helpers/plugin_spec_helper.rb", "lib/modules", "lib/modules/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/file_writer.rb", "lib/modules/safe_instance.rb", "lib/modules/sprinkle_overrides.rb", "lib/modules/vlad_override.rb", "lib/poolparty", "lib/poolparty.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors", "lib/poolparty/monitors.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "lib/poolparty/provider", "lib/poolparty/provider.rb", "lib/poolparty/provider/packages", "lib/poolparty/provider/packages/essential.rb", "lib/poolparty/provider/packages/git.rb", "lib/poolparty/provider/packages/haproxy.rb", "lib/poolparty/provider/packages/heartbeat.rb", "lib/poolparty/provider/packages/monit.rb", "lib/poolparty/provider/packages/rsync.rb", "lib/poolparty/provider/packages/ruby.rb", "lib/poolparty/provider/packages/s3fuse.rb", "lib/poolparty/provider/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.rb", "lib/poolparty/tasks", "lib/poolparty/tasks.rb", "lib/poolparty/tasks/cloud.rake", "lib/poolparty/tasks/development.rake", "lib/poolparty/tasks/ec2.rake", "lib/poolparty/tasks/instance.rake", "lib/poolparty/tasks/plugins.rake", "lib/poolparty/tasks/server.rake", "lib/poolparty/thread_pool.rb", "lib/s3", "lib/s3/s3_object_store_folders.rb", "spec", "spec/application_spec.rb", "spec/callback_spec.rb", "spec/core_spec.rb", "spec/ec2_wrapper_spec.rb", "spec/file_writer_spec.rb", "spec/files", "spec/files/describe_response", "spec/files/multi_describe_response", "spec/files/remote_desc_response", "spec/helpers", "spec/helpers/ec2_mock.rb", "spec/kernel_spec.rb", "spec/master_spec.rb", "spec/monitors", "spec/monitors/cpu_monitor_spec.rb", "spec/monitors/memory_spec.rb", "spec/monitors/misc_monitor_spec.rb", "spec/monitors/web_spec.rb", "spec/optioner_spec.rb", "spec/plugin_manager_spec.rb", "spec/plugin_spec.rb", "spec/pool_binary_spec.rb", "spec/poolparty_spec.rb", "spec/provider_spec.rb", "spec/remote_instance_spec.rb", "spec/remoter_spec.rb", "spec/remoting_spec.rb", "spec/scheduler_spec.rb", "spec/spec_helper.rb", "spec/string_spec.rb", "poolparty.gemspec"]
   s.has_rdoc = true
-  s.homepage = %q{http://blog.citrusbyte.com}
+  s.homepage = %q{http://poolpartyrb.com}
   s.post_install_message = %q{
       
-      Get ready to jump in the pool, you just installed PoolParty! (Updated at 05:15PM, 06/28/08)
+      Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:12PM, 07/02/08)
 
       Please check out the documentation for any questions or check out the google groups at
         http://groups.google.com/group/poolpartyrb
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<crafterm-sprinkle>, [">= 0"])
       s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<aws-s3>, [">= 0"])
       s.add_dependency(%q<amazon-ec2>, [">= 0"])
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<crafterm-sprinkle>, [">= 0"])
       s.add_dependency(%q<SystemTimer>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<aws-s3>, [">= 0"])
@@ -60,5 +62,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<crafterm-sprinkle>, [">= 0"])
     s.add_dependency(%q<SystemTimer>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/spec/application_spec.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Application" do
   before(:each) do
     stub_option_load
+    Application.reset!
   end
   it "should be able to send options in the Application.options" do
     options({:optparse => {:banner => "hi"}})
@@ -39,29 +40,47 @@ describe "Application" do
   it "should show the version as a string" do
     Application.version.class.should == String
   end
-  it "should be able to start instances with the the key access information on the user-data" do
-    Application.launching_user_data.should =~ /:access_key/
-    Application.launching_user_data.should =~ /:secret_access_key/
-  end
-  it "should be able to pull out the access_key from the user data" do
-    Application.local_user_data[:access_key].should == 3.14159
-  end
-  it "should overwrite the default_options when passing in to the instance data" do
-    Application.stub!(:default_options).and_return({:access_key => 42})
-    Application.options.access_key.should == 3.14159
+  describe "User data" do
+    before(:each) do
+      @str = ":access_key: 3.14159\n:secret_access_key: pi"
+      Application.options = nil      
+      Application.stub!(:open).with("http://169.254.169.254/latest/user-data").and_return(@str)
+      @str.stub!(:read).and_return ":access_key: 3.14159\n:secret_access_key: pi"
+      Application.default_options.stub!(:merge!).with({})                                                                                                                                                                                   
+      Application.default_options.stub!(:merge!).with({:access_key => 3.14159, :secret_access_key => "pi"})          
+    end
+    it "should try to load the user data into a yaml hash" do
+      YAML.should_receive(:load).with(":access_key: 3.14159\n:secret_access_key: pi")
+      Application.local_user_data
+    end
+    it "should be able to start instances with the the key access information on the user-data" do
+      Application.launching_user_data.should =~ /:access_key/
+      Application.launching_user_data.should =~ /:secret_access_key/
+    end
+    it "should be able to pull out the access_key from the user data" do
+      Application.local_user_data[:access_key].should == 3.14159
+    end
+    it "should be able tp pull out the secret_access_key from the user-data" do
+      Application.local_user_data[:secret_access_key].should == "pi"
+    end
+    it "should overwrite the default_options when passing in to the instance data" do      
+      Application.stub!(:default_options).and_return({:access_key => 42})
+      Application.local_user_data      
+      Application.options.access_key.should == 3.14159
+    end
   end
   it "should parse and use a config file if it is given for the options" do
-    YAML.should_receive(:load).and_return({:config_file => "config/sample-config.yml"})
+    YAML.should_receive(:load).at_least(1).and_return({:config_file => "config/sample-config.yml"})
     Application.make_options(:config_file => "config/sample-config.yml")
   end
   it "should not read the config file if it is not passed and doesn't exist" do
     File.stub!(:file?).and_return false
-    YAML.should_not_receive(:load)
+    YAML.should_not_receive(:load).with("config/config.yml")
     Application.make_options
   end
   it "should not read the config file if it is passed and doesn't exist" do
     File.stub!(:file?).and_return false
-    YAML.should_not_receive(:load)
+    YAML.should_not_receive(:load).with("config/config.yml")
     Application.make_options(:config_file => "ted")
   end
 end

data/spec/callback_spec.rb

@@ -68,7 +68,7 @@ describe "Multiple callbacks" do
 end
 class OutsideClass
   def self.hello(caller)
-    puts "hello"
+    "hello"
   end
 end
 class TestOutsideClass
@@ -191,4 +191,23 @@ describe "Variables on the plugin callbacker class" do
     BindingClass.new.print
     BindingClass.new.methods.include?("eviloutsideclass").should == true
   end
+end
+class DoubleClass
+  include Callbacks
+  before :print, :hello => "OutsideBindingClass"
+  after :print, :hello => "OutsideBindingClass"
+  
+  def print
+    string
+  end
+  def string
+    @string ||= ""
+  end
+end
+describe "Chaining" do
+  it "should be able to call both a before and an after spec" do
+    @d = DoubleClass.new
+    @d.print
+    @d.string.should == "hellohello"
+  end
 end

data/spec/file_writer_spec.rb

@@ -5,6 +5,7 @@ class TestClass
 end
 describe "FileWriter" do  
   before(:each) do
+    Application.reset!
     @instance = RemoteInstance.new
     @instance.stub!(:name).and_return "node0"
     @instance.stub!(:ip).and_return "127.0.0.1"

data/spec/kernel_spec.rb

@@ -8,4 +8,17 @@ describe "Kernel extensions" do
     @host.should_receive(:sleep).once.and_return true
     @host.wait "10.seconds"
   end
+end
+describe "Object extensions" do
+  before(:each) do
+    @klass = Object.new
+    @klass.instance_eval <<-EOE
+      def hello
+        puts "hello"
+      end
+    EOE
+  end
+  it "should be able to get a list of the defined methods on the object" do
+    @klass.my_methods.should == ["hello"]
+  end
 end

data/spec/master_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/helpers/ec2_mock'
 
 describe "Master" do
   before(:each) do
@@ -86,22 +87,25 @@ describe "Master" do
     it "should be able to get a specific node in the nodes from the master" do
       @master.get_node(2).instance_id.should == "i-5849bc"
     end
+    it "should be able to get the next node" do
+      @master.get_next_node(@instance).instance_id.should == "i-5849bb"
+    end
     it "should be able to build a hosts file" do
       open(@master.build_hosts_file_for(@instance).path).read.should == "127.0.0.1 node0\n127.0.0.1 localhost.localdomain localhost ubuntu\n127.0.0.2 node1\n127.0.0.3 node2"
     end
     it "should be able to build a hosts file for a specific instance" do
-      open(@master.build_hosts_file_for(@instance).path).read.should =~ "127.0.0.1 node0"
+      open(@master.build_hosts_file_for(@instance).path).read.should =~ /127\.0\.0\.1 node0/
     end
     it "should be able to build a haproxy file" do
-      open(@master.build_haproxy_file.path).read.should =~ "server node0 127.0.0.1:#{Application.client_port}"
+      open(@master.build_haproxy_file.path).read.should =~ /server node0 127\.0\.0\.1:#{Application.client_port}/
     end
     it "should be able to reconfigure the instances (working on two files a piece)" do
       @master.should_receive(:remote_configure_instances).and_return true
       @master.stub!(:number_of_unconfigured_nodes).and_return 1
       @master.reconfigure_cloud_when_necessary
     end
-    it "should return the number of unconfigured nodes when asked" do
-      @master.nodes.each {|node| node.stub!(:stack_installed?).and_return(true) unless node.master? }
+    it "should return the number of unconfigured nodes when asked" do      
+      @master.nodes.each {|node| node.stub!(:stack_installed?).and_return(node.master? ? false : true) }
       @master.number_of_unconfigured_nodes.should == 1
     end
     it "should be able to return the size of the cloud" do
@@ -118,39 +122,50 @@ describe "Master" do
       describe "sending configuration files" do
         before(:each) do
           Master.stub!(:new).and_return(@master)
+          @master.stub!(:ssh)
+          @master.stub!(:scp)
+          @master.nodes.each do |node|
+            node.stub!(:ssh)
+            node.stub!(:scp)
+            node.stub!(:stack_installed?).and_return true
+          end
         end
         it "should be able to build a heartbeat resources file for the specific node" do
-          open(Master.build_heartbeat_resources_file_for(@master.nodes.first).path).read.should =~ /node0 127/
+          open(@master.build_heartbeat_resources_file_for(@master.nodes.first).path).read.should == "node0 127.0.0.1\nnode1 127.0.0.2"
         end
         it "should be able to build a heartbeat config file" do
-          open(Master.build_heartbeat_config_file_for(@master.nodes.first).path).read.should =~ /\nnode node0\nnode node1/
+          open(@master.build_heartbeat_config_file_for(@master.nodes.first).path).read.should =~ /\nnode node0\nnode node1/
         end      
         it "should be able to say if heartbeat is necessary with more than 1 server or not" do      
           Master.requires_heartbeat?.should == true
         end
         it "should be able to say that heartbeat is not necessary if there is 1 server" do
-          @master.stub!(:list_of_nonterminated_instances).and_return([
+          @master.stub!(:nodes).and_return([
               {:instance_id => "i-5849ba", :ip => "127.0.0.1", :status => "running"}
             ])
           Master.requires_heartbeat?.should == false
         end
         it "should only install the stack on nodes that don't have it marked locally as installed" do
-          @master.nodes.each {|i| i.should_receive(:stack_installed?).and_return(true)}
+          @master.nodes.each {|i| i.should_receive(:stack_installed?).at_least(1).and_return(true)}
           @master.should_not_receive(:reconfigure_running_instances)
           @master.reconfigure_cloud_when_necessary
         end
         it "should install the stack on all the nodes (because it needs reconfiguring) if there is any node that needs the stack" do
-          @master.nodes.first.should_receive(:stack_installed?).and_return(false)
+          @master.nodes.first.should_receive(:stack_installed?).at_least(1).and_return(false)
           @master.should_receive(:configure_cloud).once.and_return(true)
           @master.reconfigure_cloud_when_necessary
         end
         describe "rsync'ing the files to the instances" do
+          it "should cleanup the tmp directory before sending configuration to the nodes" do
+            @master.should_receive(:cleanup_tmp_directory).once
+            @master.build_and_send_config_files_in_temp_directory
+          end
           it "should receive send_config_files_to_nodes after it builds the config files in the temp directory" do
-            @master.should_receive(:send_config_files_to_nodes).once
+            @master.should_receive(:send_config_files_to_nodes).at_least(1)
             @master.build_and_send_config_files_in_temp_directory
           end
           it "should run_array_of_tasks(scp_tasks)" do
-            @master.should_receive(:run_array_of_tasks).and_return true
+            @master.should_receive(:run_array_of_tasks).at_least(1).and_return true
             @master.build_and_send_config_files_in_temp_directory
           end
           it "should compile a list of files to rsync" do
@@ -184,14 +199,18 @@ describe "Master" do
         before(:each) do
           Application.stub!(:install_on_load?).and_return true
           Sprinkle::Script.stub!(:sprinkle).and_return true
-          @master.stub!(:execute_tasks).and_return true
+          @master.stub!(:ssh).and_return true
+          @master.nodes.each do |node|
+            node.stub!(:run_now).and_return true
+          end
         end
         it "should install on the instances if the application says it should" do        
+          Provider.stub!(:install_userpackages)
           Provider.should_receive(:install_poolparty)
           @master.install_cloud
         end
         it "should execute the remote tasks on all of the instances" do
-          @master.should_receive(:execute_tasks).and_return true
+          @master.should_receive(:ssh).and_return true
           @master.install_cloud
         end
         describe "stubbing installation" do
@@ -244,30 +263,35 @@ describe "Master" do
         @master.should_receive(:request_termination_of_instance).and_return(true)
         @master.terminate_instance_if_load_is_low
       end
+      it "should launch the minimum_instances when the minimum aren't launched"
+      it "should reconfigure the cloud if it's necessary to do so" 
+      it "should try to scale the cloud when monitoring"
+      it "should check the stats of the cloud"
     end
-    describe "expanding and contracting" do      
+    describe "expanding and contracting" do
       it "should be able to say that it should not contract" do            
         @master.stub!(:web).and_return(10.2)
         @master.stub!(:cpu).and_return(0.32)
         
         @master.contract?.should == false
       end
-      it "should be able to say that it should contract" do      
-        @master.stub!(:web).and_return(31.2)
-        @master.stub!(:cpu).and_return(0.05)
-
+      it "should be able to say that it should contract" do
+        @master.should_receive(:cpu).once.and_return(0.05)
+        @master.should_receive(:web).once.and_return(35.2)
+        
         @master.contract?.should == true
       end
       it "should be able to say that it should not expand if it shouldn't expand" do
         @master.stub!(:web).and_return(30.2)
         @master.stub!(:cpu).and_return(0.92)
-
+        
         @master.expand?.should == false
       end
       it "should be able to say that it should expand if it should expand" do
         @master.stub!(:web).and_return(1.2)
         @master.stub!(:cpu).and_return(0.92)
-
+        
+        @master.should_receive(:web).once.and_return(1.2)
         @master.expand?.should == true
       end      
       describe "scaling" do
@@ -313,6 +337,12 @@ describe "Master" do
           File.should_receive(:copy).exactly(3).and_return true
           @master.build_and_send_config_files_in_temp_directory
         end
+        it "should tar the plugin_dir into the tmp directory" do
+          FileUtils.mkdir_p Application.plugin_dir rescue ""
+          
+          Kernel.should_receive(:system).with("tar -czf #{@master.base_tmp_dir}/plugins.tar.gz #{File.basename(Application.plugin_dir)}").and_return true
+          @master.build_and_send_config_files_in_temp_directory
+        end
         describe "get configs" do
           before(:each) do
             @master.stub!(:user_dir).and_return("user")