auser-poolparty 0.0.8 → 0.0.9

data/lib/poolparty/remoter.rb

@@ -7,32 +7,44 @@ module PoolParty
       def ssh_string
         "ssh -i #{Application.keypair_path} -o StrictHostKeyChecking=no -l #{Application.username}"
       end
+      def rsync_string
+        "rsync --delete -azP -e '#{ssh_string}' "
+      end
     end
     
     module InstanceMethods      
       include Callbacks
       include Scheduler
       
-      def scp local, remote, opts={}
-        data = open(local).read
-        begin
-          
-          cmd = "rsync --delete -azP -e '#{self.class.ssh_string} -l #{Application.username} -i #{Application.keypair_path}' "
-          
-          if opts[:dir]
-            ssh("mkdir -p #{opts[:dir]}")
+      def rsync_tasks local, remote
+        reset!
+        returning scp_tasks do |tasks|
+          target_hosts.each do |ip|
+            tasks << "#{self.class.rsync_string} #{local} #{ip}:#{remote}"
           end
-          
-          if opts[:single]
-            scp_tasks << "#{cmd} #{local} #{Application.username}@#{opts[:single]}:#{remote}"
-          else
-            target_hosts.each do |ip|
-              scp_tasks << "#{cmd} #{local} #{Application.username}@#{ip}:#{remote}"
-            end
+        end
+      end
+      
+      def remote_command_tasks commands
+        reset!
+        commands = commands.join ' && ' if commands.is_a? Array
+        
+        returning ssh_tasks do |tasks|
+          target_hosts.each do |ip|
+            ssh_tasks << "#{self.class.ssh_string} #{ip} '#{commands}'"
           end
-          
-        rescue Exception => e        
-        end      
+        end
+      end
+      
+      def scp local, remote, opts={}          
+        cmd = self.class.rsync_string
+        arr = []
+        
+        target_hosts.each do |ip|
+          arr << "#{cmd} #{local} #{ip}:#{remote}"
+        end          
+        
+        run_array_of_tasks(arr)
       end
 
       def single_scp local, remote, opts={}
@@ -41,30 +53,27 @@ module PoolParty
 
       def ssh command="", opts={}, &block
         cmd = self.class.ssh_string
+        arr = []
+        
         if command.empty?
-          system("#{cmd} #{Application.username}@#{self.ip}")
+          system("#{cmd} #{self.ip}") if self.class == RemoteInstance
         else
-          if opts[:single]
-            ssh_tasks << "#{cmd} #{Application.username}@#{self.ip} '#{command.runnable}'"
-          else
-            target_hosts.each do |ip|
-              ssh_tasks << "#{cmd} #{Application.username}@#{ip} '#{command.runnable}'"
-            end
+          target_hosts.each do |ip|
+            arr << "#{cmd} #{ip} '#{command.runnable}'"
           end
         end
+                
+        run_array_of_tasks arr
       end
       
-      def run_now command=""
-        system("#{self.class.ssh_string} #{Application.username}@#{self.ip} #{command.runnable}")
-      end
-      
-      def install *names
-        names.each {|name| install_tasks << name }
+      def run_now command
+        unless command.empty?
+          Kernel.system "#{self.class.ssh_string} #{self.ip} #{command.runnable}"
+        end
       end
-      
+            
       def ssh_tasks;@ssh_tasks ||= [];end
       def scp_tasks;@scp_tasks ||= [];end
-      def install_tasks;@install_tasks ||= [];end
             
       def reset!
         @ssh_tasks = @scp_tasks = nil
@@ -80,8 +89,6 @@ module PoolParty
         
         run_array_of_tasks(scp_tasks)
         run_array_of_tasks(ssh_tasks)
-        
-        PoolParty.message "running #{ssh_tasks.size} tasks"
       end
       
       def target_hosts
@@ -89,8 +96,12 @@ module PoolParty
       end
       
       def run_array_of_tasks(task_list)
-        add_task {`#{task_list.join(" && ")}`}
-        run_thread_list
+        unless task_list.size == 0
+          task_list.each do |task|
+            add_task {Kernel.system("#{task}")}
+          end
+          run_thread_list
+        end
       end
       
       def set_hosts(c=nil)

data/lib/poolparty/remoting.rb

@@ -9,36 +9,60 @@ module PoolParty
     # == GENERAL METHODS    
     # == LISTING
     # List all the running instances associated with this account
-    def list_of_running_instances
-      list_of_nonterminated_instances.select {|a| a[:status] =~ /running/}
+    def list_of_running_instances(list = list_of_nonterminated_instances)
+      list.select {|a| a[:status] =~ /running/}
     end
     # Get a list of the pending instances
-    def list_of_pending_instances
-      list_of_nonterminated_instances.select {|a| a[:status] =~ /pending/}
+    def list_of_pending_instances(list = list_of_nonterminated_instances)
+      list.select {|a| a[:status] =~ /pending/}
     end
     # list of shutting down instances
-    def list_of_terminating_instances
-      list_of_nonterminated_instances.select {|a| a[:status] =~ /shutting/}
+    def list_of_terminating_instances(list = list_of_nonterminated_instances)
+      list.select {|a| a[:status] =~ /shutting/}
     end
     # list all the nonterminated instances
-    def list_of_nonterminated_instances
-      list_of_instances.reject {|a| a[:status] =~ /terminated/}
+    def list_of_nonterminated_instances(list = list_of_instances)
+      list.reject {|a| a[:status] =~ /terminated/}
     end
-    # List the instances, regardless of their states
-    def list_of_instances
-      get_instances_description
+    # List the instances for the current key pair, regardless of their states
+    def list_of_instances(keypair = Application.keypair)
+      get_instances_description.select {|a| a[:keypair] == keypair}
+    end
+    # List all instances, regardless of their key pairs or states
+    def list_of_all_instances
+      a_list = []
+      cloud_keypairs.each {|keypair| list_of_instances(keypair).each { |inst| a_list << inst } }
+      a_list
+    end
+    # list of keypairs for the current AWS access key and secret key
+    def cloud_keypairs
+      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
     end
     # Get number of pending instances
-    def number_of_pending_instances
-      list_of_pending_instances.size
+    def number_of_pending_instances(list = list_of_pending_instances)
+      list.size
     end
     # get the number of running instances
-    def number_of_running_instances
-      list_of_running_instances.size
+    def number_of_running_instances(list = list_of_running_instances)
+      list.size
+    end
+    # get the number of pending and running instances for a list
+    def number_of_pending_and_running_instances_for_list(a_list = list_of_instances)
+      running_list = list_of_running_instances( a_list )
+      pending_list = list_of_pending_instances( a_list )
+      number_of_running_instances(running_list) + number_of_pending_instances(pending_list)
+    end
+    # get the number of pending and running instances for a keypair
+    def number_of_pending_and_running_instances(keypair = Application.keypair)
+      a_list = list_of_nonterminated_instances( list_of_instances(keypair) )
+      number_of_pending_and_running_instances_for_list( a_list )
     end
     # get the number of pending and running instances
-    def number_of_pending_and_running_instances
-      number_of_running_instances + number_of_pending_instances
+    def number_of_all_pending_and_running_instances
+      a_list = list_of_nonterminated_instances( list_of_all_instances )
+      number_of_pending_and_running_instances_for_list( a_list )
     end
     # == LAUNCHING
     # Request to launch a new instance

data/lib/poolparty/scheduler.rb

@@ -26,7 +26,7 @@ module PoolParty
     # Add a task in a new thread
     def <<(a, *args)
       thread = Thread.new(a) do |task|
-        Thread.stop
+        Thread.stop rescue ""
         Thread.current[:callee] = task
         a.call args
       end
@@ -78,7 +78,8 @@ module PoolParty
       block = lambda {        
         loop do
           begin
-            run_thread_list(&block)
+            yield if block_given?
+            run_thread_list
             wait interval
             reset!
           rescue Exception => e
@@ -90,8 +91,7 @@ module PoolParty
       opts[:daemonize] ? daemonize(&block) : block.call   
     end
     
-    def run_thread_list
-      yield if block_given?
+    def run_thread_list      
       run_threads
     end
     # Reset

data/lib/poolparty/tasks.rb

@@ -19,7 +19,7 @@ module PoolParty
       end
       
       # Require the poolparty specific tasks
-      Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |t| eval open(t).read }
+      Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |t| load t }
       
       Dir["#{PoolParty.plugin_dir}/*/Rakefile"].each {|t| load "#{t}" }
       

data/lib/poolparty/tasks/package.rake

@@ -0,0 +1,53 @@
+namespace(:pkg) do
+  ## Rake task to create/update a .manifest file in your project, as well as update *.gemspec
+  desc %{Update ".manifest" with the latest list of project filenames. Respect\
+  .gitignore by excluding everything that git ignores. Update `files` and\
+  `test_files` arrays in "*.gemspec" file if it's present.}
+  task :manifest do
+    list = Dir['**/*'].sort
+    spec_file = Dir['*.gemspec'].first
+    list -= [spec_file] if spec_file
+
+    File.read('.gitignore').each_line do |glob|
+      glob = glob.chomp.sub(/^\//, '')
+      list -= Dir[glob]
+      list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
+      puts "excluding #{glob}"
+    end
+
+    if spec_file
+      spec = File.read spec_file
+      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
+        assignment = $1
+        bunch = $2 ? list.grep(/^test\//) : list
+        '%s%%w(%s)' % [assignment, bunch.join(' ')]
+      end
+
+      File.open(spec_file,   'w') {|f| f << spec }
+    end
+    File.open('Manifest', 'w') {|f| f << list.join("\n") }
+  end
+  desc "Build gemspec for github"
+  task :gemspec => :manifest do
+    require "yaml"
+    `rake gem`
+    data = YAML.load(open("poolparty.gemspec").read).to_ruby
+    File.open("poolparty.gemspec", "w+") {|f| f << data }
+  end
+  desc "Update gemspec with the time"
+  task :gemspec_update => :gemspec do
+    data = open("poolparty.gemspec").read
+    str = "Updated at #{Time.now.strftime("%I:%M%p, %D")}"
+    
+    if data.scan(/Updated at/).empty?
+      data = data.gsub(/you just installed PoolParty\!/, '\0'+" (#{str})")
+    end
+    
+    File.open("poolparty.gemspec", "w+") {|f| f << data }
+  end
+  desc "Release them gem to the gem server"
+  task :release => :gemspec_update do
+    `git ci -a -m "Updated gemspec for github"`
+    `git push gem`
+  end
+end

data/lib/poolparty/tasks/plugins.rake

@@ -8,7 +8,7 @@ Usage:
 rake #{@command} location
 
 Example:
-rake #{@command} git://github.com/auser/pool-party-plugins.git
+rake #{@command} git://github.com/auser/poolparty-plugins.git
 
 Check the help does for more information how to install a plugin
 http://poolpartyrb.com

data/poolparty.gemspec

@@ -1,72 +1,64 @@
-
-# Gem::Specification for Poolparty-0.0.8
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.0.8"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "0.0.9"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-06-20}
+  s.cert_chain = nil
+  s.date = %q{2008-06-28}
   s.description = %q{Run your entire application off EC2, managed and auto-scaling}
   s.email = %q{ari.lerner@citrusbyte.com}
-  s.executables = ["instance", "pool"]
-  s.extra_rdoc_files = ["bin/instance", "bin/pool", "CHANGELOG", "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/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/safe_instance.rb", "lib/modules/vlad_override.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/monitors.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "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/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.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/tasks.rb", "lib/poolparty/tmp.rb", "lib/poolparty.rb", "lib/s3/s3_object_store_folders.rb", "README.txt"]
-  s.files = ["archives/ruby-1.8.6-p111.tar.gz", "bin/instance", "bin/pool", "CHANGELOG", "config/cloud_master_takeover", "config/create_proxy_ami.sh", "config/haproxy.conf", "config/heartbeat.conf", "config/heartbeat_authkeys.conf", "config/installers/ubuntu_install.sh", "config/monit/haproxy.monit.conf", "config/monit/nginx.monit.conf", "config/monit.conf", "config/nginx.conf", "config/reconfigure_instances_script.sh", "config/sample-config.yml", "config/scp_instances_script.sh", "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/callback.rb", "lib/modules/ec2_wrapper.rb", "lib/modules/safe_instance.rb", "lib/modules/vlad_override.rb", "lib/poolparty/application.rb", "lib/poolparty/init.rb", "lib/poolparty/master.rb", "lib/poolparty/monitors/cpu.rb", "lib/poolparty/monitors/memory.rb", "lib/poolparty/monitors/web.rb", "lib/poolparty/monitors.rb", "lib/poolparty/optioner.rb", "lib/poolparty/plugin.rb", "lib/poolparty/plugin_manager.rb", "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/provider.rb", "lib/poolparty/remote_instance.rb", "lib/poolparty/remoter.rb", "lib/poolparty/remoting.rb", "lib/poolparty/scheduler.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/tasks.rb", "lib/poolparty/tmp.rb", "lib/poolparty.rb", "lib/s3/s3_object_store_folders.rb", "Manifest", "misc/basics_tutorial.txt", "Rakefile", "README.txt", "spec/application_spec.rb", "spec/callback_spec.rb", "spec/core_spec.rb", "spec/helpers/ec2_mock.rb", "spec/kernel_spec.rb", "spec/master_spec.rb", "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", "tmp/node0-pool-party-ha.cf", "tmp/node0-pool-party-haresources", "tmp/node0-pool-party-hosts", "tmp/node1-pool-party-ha.cf", "tmp/node1-pool-party-haresources", "tmp/node1-pool-party-hosts", "tmp/pool-party-haproxy.cfg", "web/static/conf/nginx.conf", "web/static/site/images/balloon.png", "web/static/site/images/cb.png", "web/static/site/images/clouds.png", "web/static/site/images/railsconf_preso_img.png", "web/static/site/index.html", "web/static/site/javascripts/application.js", "web/static/site/javascripts/corner.js", "web/static/site/javascripts/jquery-1.2.6.pack.js", "web/static/site/misc.html", "web/static/site/storage/pool_party_presentation.pdf", "web/static/site/stylesheets/application.css", "web/static/site/stylesheets/reset.css", "web/static/src/layouts/application.haml", "web/static/src/pages/index.haml", "web/static/src/pages/misc.haml", "web/static/src/stylesheets/application.sass", "poolparty.gemspec"]
+  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.has_rdoc = true
   s.homepage = %q{http://blog.citrusbyte.com}
-  s.post_install_message = %q{    Thanks for installing PoolParty!
-    
-    Please check out the documentation for any questions or check out the google groups at
-    http://groups.google.com/group/poolpartyrb
-    
-    Don't forget to check out the plugins for extending PoolParty!
-    
-    For more information, check http://poolpartyrb.com
-    *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
-}
+  s.post_install_message = %q{
+      
+      Get ready to jump in the pool, you just installed PoolParty! (Updated at 05:15PM, 06/28/08)
+
+      Please check out the documentation for any questions or check out the google groups at
+        http://groups.google.com/group/poolpartyrb
+
+      Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!      
+
+      For more information, check http://poolpartyrb.com
+      On IRC: 
+        irc.freenode.net
+        #poolpartyrb
+      *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
+    }
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Poolparty", "--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{poolparty}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{Run your entire application off EC2, managed and auto-scaling}
 
-  s.add_dependency(%q<aws-s3>, [">= 0"])
-  s.add_dependency(%q<amazon-ec2>, [">= 0"])
-  s.add_dependency(%q<aska>, [">= 0"])
-  s.add_dependency(%q<git>, [">= 0"])
-end
-
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require 'rubygems'
-# require 'echoe'
-# require 'lib/poolparty'
-# 
-# task :default => :test
-# 
-# Echoe.new("poolparty") do |p|
-#   p.author = "Ari Lerner"
-#   p.email = "ari.lerner@citrusbyte.com"
-#   p.summary = "Run your entire application off EC2, managed and auto-scaling"
-#   p.url = "http://blog.citrusbyte.com"
-#   p.dependencies = %w(aws-s3 amazon-ec2 aska git)
-#   p.install_message =<<-EOM
-#     Thanks for installing PoolParty!
-#     
-#     Please check out the documentation for any questions or check out the google groups at
-#     http://groups.google.com/group/poolpartyrb
-#     
-#     Don't forget to check out the plugins for extending PoolParty!
-#     
-#     For more information, check http://poolpartyrb.com
-#     *** Ari Lerner @ <ari.lerner@citrusbyte.com> ***
-#   EOM
-#   p.include_rakefile = true
-# end
-# 
-# PoolParty.include_tasks
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<aws-s3>, [">= 0"])
+      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0"])
+      s.add_runtime_dependency(%q<auser-aska>, [">= 0"])
+      s.add_runtime_dependency(%q<git>, [">= 0"])
+      s.add_runtime_dependency(%q<crafterm-sprinkle>, [">= 0"])
+      s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
+    else
+      s.add_dependency(%q<aws-s3>, [">= 0"])
+      s.add_dependency(%q<amazon-ec2>, [">= 0"])
+      s.add_dependency(%q<auser-aska>, [">= 0"])
+      s.add_dependency(%q<git>, [">= 0"])
+      s.add_dependency(%q<crafterm-sprinkle>, [">= 0"])
+      s.add_dependency(%q<SystemTimer>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<aws-s3>, [">= 0"])
+    s.add_dependency(%q<amazon-ec2>, [">= 0"])
+    s.add_dependency(%q<auser-aska>, [">= 0"])
+    s.add_dependency(%q<git>, [">= 0"])
+    s.add_dependency(%q<crafterm-sprinkle>, [">= 0"])
+    s.add_dependency(%q<SystemTimer>, [">= 0"])
+  end
+end

data/spec/application_spec.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "Application" do
+  before(:each) do
+    stub_option_load
+  end
   it "should be able to send options in the Application.options" do
     options({:optparse => {:banner => "hi"}})
   end
@@ -36,4 +39,29 @@ 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
+  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"})
+    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)
+    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)
+    Application.make_options(:config_file => "ted")
+  end
 end