auser-poolparty 0.1.0 → 0.1.1

data/lib/poolparty/provider.rb

@@ -1,2 +1,86 @@
-$:.unshift(File.dirname(__FILE__))
-require "provider/provider"
+module PoolParty
+  class Provider
+    include Sprinkle
+        
+    def install_poolparty
+      PoolParty.message "Installing required poolparty paraphernalia"
+      load_packages
+      user_packages.map {|blk| blk.call if blk }
+
+      policy :poolparty, :roles => :app do
+        requires :git
+        requires :ruby
+        requires :heartbeat
+        requires :haproxy
+        requires :s3fs
+        requires :rsync
+        requires :required_gems
+        
+        PoolParty::Provider.user_install_packages.each do |req|
+          requires req.to_sym
+        end
+      end
+      
+      set_start_with_sprinkle
+      @deployment.process if @deployment
+    end
+        
+    def self.define_custom_package name=:userpackages, &block
+      (user_install_packages << name).uniq!
+      user_packages << block
+    end
+    
+    def user_packages
+      self.class.user_packages
+    end
+    
+    def user_install_packages
+      self.class.user_install_packages
+    end
+    
+    def self.user_packages
+      @user_packages ||= []
+    end
+    
+    def self.user_install_packages
+      @load_strings ||= []
+    end
+    
+    def load_packages
+      Dir["#{File.expand_path(File.dirname(__FILE__))}/provider/*"].each do |f| 
+        load f
+      end
+    end
+    
+    def set_start_with_sprinkle
+      deployment do
+        delivery :vlad do
+          set :user, "#{Application.username}"
+          
+          Master.cloud_ips.each do |ip|
+            role :app, "#{Application.username}@#{ip}"
+          end
+        end
+  
+        source do
+          prefix   '/usr/local'
+          archives '/root/sources'
+          builds   '/root/builds'
+        end    
+      end
+      
+    end
+            
+    class << self
+      require "sprinkle"
+            
+      def install_poolparty
+        singleton.install_poolparty
+      end
+      def singleton
+        @singleton ||= new
+      end
+    end
+    
+  end
+end

data/lib/poolparty/remote_instance.rb

@@ -67,42 +67,42 @@ module PoolParty
         ssh("monit #{cmd} all")
       end
     end
-    def configure_tasks
+    def configure_tasks(quiet=true)
       {
+        :setup_pems => setup_pems,
         :move_hostfile => change_hostname,
         :config_master => configure_master,
         :move_config_file => move_config_file,
-        :set_hostname => change_hostname,
         :mount_s3_drive => mount_s3_drive,
-        :update_plugins => update_plugin_string,
-        :configure_monit => configure_monit,
+        :update_plugins => update_plugin_string,        
         :configure_authkeys => configure_authkeys,
         :configure_resource_d => configure_resource_d,
         :configure_haproxy => setup_haproxy,
         :configure_heartbeat => configure_heartbeat,
         :user_tasks => user_tasks
-      }
+      }#.map {|k,v| {k.to_sym => v.nice_runnable(quiet)} }.inject({}) {|a,s| s.merge(a) }
     end
     def user_tasks
       @@user_tasks ||= []
     end
     def move_config_file
       <<-EOC
-        mv #{remote_base_tmp_dir}/config.yml ~/.config
+        #{if_exists "config.yml", "mv #{remote_base_tmp_dir}/config.yml ~/.config"}
         mkdir -p ~/.ec2
-        mv #{remote_base_tmp_dir}/keypair ~/.ec2/id_rsa-#{Application.keypair}
+        #{if_exists "keypair", "mv #{remote_base_tmp_dir}/keypair ~/.ec2/#{Application.keypair_name}"}        
       EOC
     end
-    def configure_heartbeat
-      <<-EOC
+    def configure_heartbeat      
+      cmd=<<-EOC
         mv #{remote_base_tmp_dir}/ha.cf /etc/ha.d/ha.cf
         /etc/init.d/heartbeat start
       EOC
+      Master.requires_heartbeat? ? cmd : ""
     end    
     def configure_authkeys
       <<-EOC
         mkdir -p /etc/ha.d
-        mv #{remote_base_tmp_dir}/authkeys /etc/ha.d/
+        #{if_exists "authkeys", "mv #{remote_base_tmp_dir}/authkeys /etc/ha.d/"}
       EOC
     end
     
@@ -118,25 +118,32 @@ module PoolParty
     
     def configure_resource_d
       <<-EOC
-        mkdir -p /etc/ha.d/resource.d
-        mv #{remote_base_tmp_dir}/cloud_master_takeover /etc/ha.d/resource.d
-        mv #{remote_base_tmp_dir}/resource.d/* /etc/ha.d/resource.d
+        mkdir -p /etc/ha.d/resource.d/
+        #{if_exists "cloud_master_takeover", "mv #{remote_base_tmp_dir}/cloud_master_takeover /etc/ha.d/resource.d"}
+        #{if_dir_exists "resource.d/", "mv #{remote_base_tmp_dir}/resource.d/* /etc/ha.d/resource.d"}
       EOC
     end
     
-    def configure_monit
+    # def configure_monit
+    #   <<-EOC
+    #     mv #{remote_base_tmp_dir}/monitrc /etc/monit/monitrc
+    #     mkdir -p /etc/monit.d/
+    #     mv #{remote_base_tmp_dir}/monit.d/* /etc/monit.d/
+    #     chown #{Application.username} /etc/monit/monitrc
+    #     chmod 700 /etc/monit/monitrc
+    #   EOC
+    # end
+    
+    def setup_pems
       <<-EOC
-        mv #{remote_base_tmp_dir}/monitrc /etc/monit/monitrc
-        mkdir -p /etc/monit.d/
-        mv #{remote_base_tmp_dir}/monit.d/* /etc/monit.d/
-        chown #{Application.username} /etc/monit/monitrc
-        chmod 700 /etc/monit/monitrc
+        #{if_exists "cert.pem", "mv #{remote_base_tmp_dir}/cert-*.pem #{Application.keypair_path}/cert-CLOUD.pem"}
+        #{if_exists "pk.pem", "mv #{remote_base_tmp_dir}/pk-*.pem #{Application.keypair_path}/pk-CLOUD.pem"}
       EOC
     end
     
     def change_hostname
       <<-EOC
-        mv #{remote_base_tmp_dir}/#{name}-hosts /etc/hosts
+        #{if_exists "#{name}-hosts", "mv #{remote_base_tmp_dir}/#{name}-hosts /etc/hosts"}
         hostname -v #{name}
       EOC
     end
@@ -184,7 +191,14 @@ module PoolParty
     end
     def update_plugin_string
       dir = File.basename(Application.plugin_dir)
-      "if [[ -f plugins.tar.gz ]]; then mkdir -p #{dir} && tar -zxf plugins.tar.gz -C #{dir}; fi"
+      
+      if_exists "plugins.tar.gz", "mkdir -p #{dir} && tar -zxf #{remote_base_tmp_dir}/plugins.tar.gz -C #{dir}"
+    end
+    def if_exists(file, dothis)
+      "if [ -f #{remote_base_tmp_dir}/#{file} ]; then #{dothis}; fi"
+    end
+    def if_dir_exists(dir, dothis)
+      "if [ -d #{remote_base_tmp_dir}/#{dir} ]; then #{dothis}; fi"
     end
     # Is this the master and if not, is the master running?
     def is_not_master_and_master_is_not_running?

data/lib/poolparty/remoter.rb

@@ -6,7 +6,10 @@ module PoolParty
   module Remoter        
     module ClassMethods
       def ssh_string
-        "ssh -i #{Application.keypair_path} -o StrictHostKeyChecking=no -l #{Application.username}"
+        (["ssh"] << ssh_array).join(" ")
+      end
+      def ssh_array
+        ["-o StrictHostKeyChecking=no", "-l '#{Application.username}'", "-i '#{Application.keypair_path}'"]
       end
       def rsync_string
         "rsync --delete -azP -e '#{ssh_string}' "

data/lib/poolparty/remoting.rb

@@ -36,6 +36,7 @@ module PoolParty
     end
     # list of keypairs for the current AWS access key and secret key
     def cloud_keypairs
+      get_instances_description.each {|a| a[:keypair] = "no-keypair" unless a[:keypair] } # Get rid of the instances not launched with a keypair
       instances = get_instances_description.sort{|x,y| x[:keypair] <=> y[:keypair]}
       keypair = nil
       instances.map {|a| keypair != a[:keypair] ? (keypair = a[:keypair]; keypair) : nil }.compact
@@ -104,7 +105,7 @@ module PoolParty
     end
     # Request termination of all instances regardless of their state (includes pending instances)
     def request_termination_of_all_instances
-      get_instances_description.each {|a| terminate_instance!(a[:instance_id])}
+      list_of_instances.each {|a| terminate_instance!(a[:instance_id])}
     end
     # Terminate instance by id
     def request_termination_of_instance(id)

data/lib/poolparty/tasks/cloud.rake

@@ -28,7 +28,7 @@ namespace(:cloud) do
   # List the cloud
   desc "List cloud"
   task :list => :init do
-    PoolParty::Master.new.list
+    puts PoolParty::Master.new.list
   end
   # Shutdown the cloud
   desc "Shutdown the entire cloud"

data/lib/poolparty/tasks/development.rake

@@ -1,35 +1,70 @@
 namespace(:dev) do
-  task :init do
+  task :initialize do
     setup_application
     run "mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2")      
   end
   # Setup a basic development environment for the user 
   desc "Setup development environment specify the config_file"
-  task :setup => [:init] do
+  task :setup => [:initialize, :setup_keypair] do    
+    certloc = "#{Application.ec2_dir}/#{Application.keypair}/cert-*.pem 2>/dev/null"
+    pkloc = "#{Application.ec2_dir}/#{Application.keypair}/pk-*.pem 2>/dev/null"
+    unless `ls #{certloc}`.length > 1 && `ls #{pkloc}`.length > 1
+      puts <<-EOM
+Make sure you run rake dev:setup_pemkeys before you run this command
+
+I cannot continue until your keys are setup. 
+exiting...
+      EOM
+      exit
+    end
     keyfilename = ".#{Application.keypair}_pool_keys"
     run <<-EOR
-      echo 'export AWS_ACCESS_KEY_ID=\"#{Application.access_key}\"' > $HOME/#{keyfilename}
-      echo 'export AWS_SECRET_ACCESS_ID=\"#{Application.secret_access_key}\"' >> $HOME/#{keyfilename}
+      echo 'export AWS_ACCESS_KEY=\"#{Application.access_key}\"' > $HOME/#{keyfilename}
+      echo 'export AWS_SECRET_ACCESS=\"#{Application.secret_access_key}\"' >> $HOME/#{keyfilename}
       echo 'export EC2_HOME=\"#{Application.ec2_dir}\"' >> $HOME/#{keyfilename}
       echo 'export KEYPAIR_NAME=\"#{Application.keypair}\"' >> $HOME/#{keyfilename}
-      echo 'export CONFIG_FILE=\"#{Application.config_file}\"' >> $HOME/#{keyfilename}
       echo 'export EC2_PRIVATE_KEY=`ls ~/.ec2/#{Application.keypair}/pk-*.pem`;' >> $HOME/#{keyfilename}
       echo 'export EC2_CERT=`ls ~/.ec2/#{Application.keypair}/cert-*.pem`;' >> $HOME/#{keyfilename}
-      source $HOME/#{keyfilename}
     EOR
+    puts <<-EOM
+To work on this cloud, source the file like: 
+  
+  source #{Application.ec2_dir}/#{keyfilename}
+  
+    EOM
   end
-  desc "Generate a keypair"
-  task :setup_keypair => :init do
+  desc "Generate a new keypair"
+  task :setup_keypair => [:initialize] do
     unless File.file?(Application.keypair_path)
-      Application.keypair = "cloud"
-      run <<-EOR
-        ec2-add-keypair cloud > #{Application.keypair_path}
-        chmod 600 #{Application.keypair_path}
+      Application.keypair ||= "cloud"
+      puts "-- setting up keypair named #{Application.keypair}"
+      run <<-EOR        
+        chmod 600 #{Application.keypair_path} 2>/dev/null
+        mkdir ~/.ec2/#{Application.keypair} 2>/dev/null
+        ec2-add-keypair #{Application.keypair} > #{Application.keypair_path}
       EOR
     end
   end
+  desc "Setup pem keys"
+  task :setup_pemkeys => [:initialize] do    
+    puts "Setting up stubbed pem keys in ~/.ec2/#{Application.keypair}"
+    run <<-EOR
+      mkdir -p ~/.ec2/#{Application.keypair} 2>/dev/null
+      echo 'UPDATE ME' > #{Application.ec2_dir}/#{Application.keypair}/cert-UPDATEME.pem
+      echo 'UPDATE ME' > #{Application.ec2_dir}/#{Application.keypair}/pk-UPDATEME.pem
+    EOR
+    puts "Don't forget to replace your ~/.ec2/#{Application.keypair}/*.pem keys with the real amazon keys"
+  end
+  desc "initialize setup"
+  task :init => [:setup_pemkeys]
+  
+  desc "Just an argv test"
+  task :test => :initialize do
+    puts "---- Testing ----"
+    puts PoolParty.options(ARGV.dup)
+  end
   desc "Authorize base ports for application"
-  task :authorize_ports => :init do
+  task :authorize_ports => :initialize do
     run <<-EOR
       ec2-authorize -p 22 default
       ec2-authorize -p 80 default

data/lib/poolparty/tasks.rb

@@ -11,19 +11,37 @@ module PoolParty
     def define_tasks
       # Run the command on the local system
       def run(cmd)
-        system(cmd.runnable)
+        Kernel.system(cmd.runnable)
       end
       # Basic setup action
       def setup_application
-        PoolParty.options({:config_file => (ENV["CONFIG_FILE"] || ENV["config"]) })
+        @options ||= PoolParty.options(ARGV.dup)
       end
       
       # Require the poolparty specific tasks
-      Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |t| load t }
-      
-      Dir["#{PoolParty.plugin_dir}/*/Rakefile"].each {|t| load "#{t}" }
+      compiled_rakefile
       
+      desc "Reload the static variables"
+      task :reload do
+        reload!
+      end
       true
-    end    
+    end
+    
+    def reload!
+      @compiled_rakefile = nil
+    end
+    
+    def compiled_rakefile
+      rake_str = []
+      
+      Dir["#{File.expand_path(File.dirname(__FILE__))}/tasks/*.rake"].each { |t| rake_str << open(t).read }
+      plugin_rakefiles
+      
+      @compiled_rakefile ||= eval(rake_str.join("\n")) # Not ideal
+    end
+    def plugin_rakefiles
+      Dir["#{PoolParty.plugin_dir}/*/Rakefile"].each {|t| load t }
+    end
   end
 end

data/lib/poolparty.rb

@@ -10,7 +10,11 @@ require 'rubygems'
 require "aws/s3"
 require "EC2"
 require "aska"
-require 'sprinkle'
+begin
+  require 'crafterm-sprinkle'
+rescue LoadError
+  require "sprinkle"
+end
 require "pp"
 require "tempfile"
 
@@ -44,7 +48,7 @@ module PoolParty
   class Version #:nodoc:
     @major = 0
     @minor = 1
-    @tiny  = 0
+    @tiny  = 1
 
     def self.string
       [@major, @minor, @tiny].join('.')
@@ -95,7 +99,7 @@ module PoolParty
   def registered_monitor?(name); registered_monitors.include?(name); end
   def registered_monitors; @@registered_monitors ||= [];end
   
-  def load
+  def load_app
     load_monitors
     load_plugins
   end  
@@ -112,7 +116,7 @@ module PoolParty
     @@installed_plugins = nil
   end
   def plugin_dir
-    "#{user_dir}/vendor"
+    "#{user_dir}/plugins"
   end
   def read_config_file(filename)
     return {} unless filename

data/poolparty.gemspec

@@ -1,21 +1,21 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-07-02}
+  s.date = %q{2008-07-19}
   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/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.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/essential.rb", "lib/poolparty/provider/git.rb", "lib/poolparty/provider/haproxy.rb", "lib/poolparty/provider/heartbeat.rb", "lib/poolparty/provider/rsync.rb", "lib/poolparty/provider/ruby.rb", "lib/poolparty/provider/s3fuse.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/essential.rb", "lib/poolparty/provider/git.rb", "lib/poolparty/provider/haproxy.rb", "lib/poolparty/provider/heartbeat.rb", "lib/poolparty/provider/rsync.rb", "lib/poolparty/provider/ruby.rb", "lib/poolparty/provider/s3fuse.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", "plugins", "spec", "spec/files", "spec/files/describe_response", "spec/files/multi_describe_response", "spec/files/remote_desc_response", "spec/helpers", "spec/helpers/ec2_mock.rb", "spec/lib", "spec/lib/application_spec.rb", "spec/lib/callback_spec.rb", "spec/lib/core_spec.rb", "spec/lib/ec2_wrapper_spec.rb", "spec/lib/file_writer_spec.rb", "spec/lib/kernel_spec.rb", "spec/lib/master_spec.rb", "spec/lib/optioner_spec.rb", "spec/lib/plugin_manager_spec.rb", "spec/lib/plugin_spec.rb", "spec/lib/pool_binary_spec.rb", "spec/lib/poolparty_spec.rb", "spec/lib/provider_spec.rb", "spec/lib/remote_instance_spec.rb", "spec/lib/remoter_spec.rb", "spec/lib/remoting_spec.rb", "spec/lib/scheduler_spec.rb", "spec/lib/string_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/spec_helper.rb", "poolparty.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://poolpartyrb.com}
   s.post_install_message = %q{
       
-      Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:12PM, 07/02/08)
+      Get ready to jump in the pool, you just installed PoolParty! (Updated at 05:57PM, 07/19/08)
 
       Please check out the documentation for any questions or check out the google groups at
         http://groups.google.com/group/poolpartyrb
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
 
       For more information, check http://poolpartyrb.com
       On IRC: 
-        irc.freenode.net
-        #poolpartyrb
+        irc.freenode.net / #poolpartyrb
+        
       *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
     }
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Poolparty", "--main", "README.txt"]
@@ -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_runtime_dependency(%q<open4>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<aws-s3>, [">= 0"])
@@ -53,6 +54,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<open4>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
@@ -62,6 +64,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<open4>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/spec/helpers/ec2_mock.rb

@@ -2,9 +2,9 @@ module PoolParty
   class Master
     def launch_new_instance!
       letter = ("a".."z").to_a[instances.size] # For unique instance_ids
-      h = {:instance_id => "i-58ba56#{letter}", :ip => "ip-127-0-0-1.aws.amazonaws.com", :status => "pending", :launching_time => Time.now }
+      h = {:instance_id => "i-58ba56#{letter}", :ip => "ip-127-0-0-1.aws.amazonaws.com", :status => "pending", :keypair => "alist", :launching_time => Time.now }
       instances << h      
-      Thread.new {wait 0.1;h[:status] = "running"} # Simulate the startup time
+      Thread.new {wait 0.01;h[:status] = "running"} # Simulate the startup time
       return h
     end
     # Shutdown the instance by instance_id
@@ -43,5 +43,8 @@ module PoolParty
     def scp(s,d,o={})
       "true"
     end
+    def run(s)
+      "true"
+    end
   end
 end

data/spec/{application_spec.rb → lib/application_spec.rb}

@@ -1,12 +1,16 @@
-require File.dirname(__FILE__) + '/spec_helper'
+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"}})
+  describe "command line options" do
+    it "should destroy the default options with the commandline options" do
+      ARGV << ["-k", "testappkeypair"]
+      ARGV.should_receive(:dup).and_return ARGV
+      PoolParty.options.keypair.should == "testappkeypair"      
+    end
   end
   it "should have the root_dir defined" do
     PoolParty.root_dir.should_not be_nil
@@ -29,10 +33,17 @@ describe "Application" do
     Application.stub!(:environment).and_return("production")
     Application.production?.should == true
   end
-  it "should be able to say it's keypair path is in the $HOME/ directory" do
-    Application.stub!(:ec2_dir).and_return("~/.ec2")
-    Application.stub!(:keypair).and_return("poolparty")
-    Application.keypair_path.should == "~/.ec2/id_rsa-poolparty"
+  describe "keypair" do
+    before(:each) do
+      Application.stub!(:ec2_dir).and_return("~/.ec2")
+      Application.stub!(:keypair).and_return("poolparty")
+    end
+    it "should be able to say it's keypair path is in the $HOME/ directory" do      
+      Application.keypair_path.should == "~/.ec2/id_rsa-poolparty"
+    end
+    it "should be able to say the keypair is of the structure id_rsa-keyname" do
+      Application.keypair_name.should == "id_rsa-poolparty"
+    end
   end
   it "should be able to show the version of the gem" do
     Application.version.should_not be_nil
@@ -46,8 +57,16 @@ describe "Application" do
       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"})          
+      # Application.default_options.stub!(:merge!).with({})                                                                                                                                                                                   
+      # Application.default_options.stub!(:merge!).with({:access_key => 3.14159, :secret_access_key => "pi"})
+    end
+    describe "added data keypair_path" do
+      before(:each) do
+        @str.stub!(:read).and_return ":access_key: 3.14159\n:secret_access_key: pi\n:keypair_path: hopscotch"
+      end
+      it "should use the options keypair_path if it exists" do
+        Application.keypair_path.should == "hopscotch"
+      end
     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")
@@ -73,6 +92,20 @@ describe "Application" do
     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
+  describe "config file" do
+    before(:each) do
+      @str = ":access_key: 3.14159\n:secret_access_key: pi"
+      Application.options = nil
+      @str.stub!(:read).and_return ":access_key: 3.14159\n:secret_access_key: pi"
+      Application.make_options
+    end
+    it "should read the config file and use the options in the config file if it exists" do      
+      Application.access_key.should == 3.14159
+    end
+    it "should set the secret_access_key if the config file exists" do
+      Application.secret_access_key.should == "pi"
+    end
+  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).with("config/config.yml")

data/spec/{callback_spec.rb → lib/callback_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 class TestCallbacks
   include Callbacks

data/spec/{core_spec.rb → lib/core_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Hash" do
   it "should preserve the contents of the original hash when safe_merge'ing" do
@@ -14,11 +14,13 @@ describe "Hash" do
   end
 end
 describe "String" do
-  it "should be able to convert a big string with \n to a runnable string" do
-    str =<<-EOS
+  before(:each) do
+    @str =<<-EOS
       echo 'hi'
       puts 'hi'
     EOS
-    str.runnable.should == "echo 'hi' &&       puts 'hi'"
+  end
+  it "should be able to convert a big string with \n to a runnable string" do
+    @str.runnable.should == "echo 'hi' &&       puts 'hi'"
   end
 end

data/spec/{ec2_wrapper_spec.rb → lib/ec2_wrapper_spec.rb}

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/helpers/ec2_mock"
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../helpers/ec2_mock"
 
 class EC2Test
   include Ec2Wrapper
@@ -14,7 +14,7 @@ class EC2Test
     @resp3 = EC2::Response.parse(:xml => read_file("remote_desc_response"))
   end
   def read_file(name)
-    open("#{File.dirname(__FILE__)}/files/#{name}").read
+    open("#{File.dirname(__FILE__)}/../files/#{name}").read
   end
 end
 describe "EC2ResponseObject" do