auser-poolparty 0.2.85 → 0.2.88

data/Manifest.txt

@@ -6,6 +6,7 @@ PostInstall.txt
 README.txt
 Rakefile
 bin/cloud
+bin/cloud-add-access
 bin/cloud-add-keypair
 bin/cloud-configure
 bin/cloud-contract

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:19 12/15/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
 
 To get started, run the generator:
 

data/bin/cloud-add-access

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV, {:extra_help => "\nUsage: cloud [options] add-access file\n\n"}) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.num i }
+end
+
+@instance_number = (o.num || 0 ).to_i
+
+if o.unflagged_args.length == 1
+  @file = o.unflagged_args.pop
+else
+  puts header("Error")
+  puts "usage: \nUsage: cloud [options] add-access file\n\n"
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud, {:rsa_file=>@file }) do
+    # Add access here
+    cmd = "cat #{rsa_file} | #{ssh_command(master)} 'cat >> ~/.ssh/authorized_keys'"
+    vputs "Running #{cmd}"
+    Kernel.system cmd
+  end
+  
+end

data/bin/server-start-client

@@ -18,7 +18,7 @@ o.loaded_clouds.each do |cloud|
       boot_file = "#{Messenger.append_dir}/pm_client_rel-0.1"
 
       Kernel.system "cd #{Messenger.append_dir} && rake build_boot_scripts"  unless ::File.file?("#{boot_file}.boot") || testing    
-      command = Messenger.erl_command("client", "-setcookie #{generate_unique_cookie_string} -boot #{boot_file} #{noshell ? "" : "-detached -heart -noshell"}", 7049, 7050)
+      command = Messenger.erl_command("client", "-boot #{boot_file} #{noshell ? "" : "-detached -heart -noshell"}", 7049, 7050)
       vputs "Running #{command}"
       
       Kernel.system "export HOME=/root && #{command}" unless testing

data/bin/server-start-master

@@ -16,7 +16,7 @@ o.loaded_clouds.each do |cloud|
       
       boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
       Kernel.system ". /etc/profile && server-build-messenger"  unless ::File.file?("#{boot_file}.boot") || testing    
-      command = Messenger.erl_command("master", "-setcookie #{generate_unique_cookie_string} -boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"}")    
+      command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"}")    
       vputs "Running #{command}"
       
       Kernel.system "export HOME=/root && #{command}" unless testing

data/bin/server-start-node

@@ -22,7 +22,7 @@ o.loaded_clouds.each do |cloud|
       boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
 
       Kernel.system ". /etc/profile && server-build-messenger"  unless ::File.file?("#{boot_file}.boot") || testing
-      command = Messenger.erl_command(hostname, "-setcookie #{generate_unique_cookie_string} -boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"} -- #{available_monitors.join(" ")}")    
+      command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"} -- #{available_monitors.join(" ")}")    
       vputs "Running #{command}"
       
       Kernel.system "export HOME=/root && #{command}" unless testing

data/lib/poolparty/base_packages/haproxy.rb

@@ -5,9 +5,11 @@ module PoolParty
       def enable
         execute_on_master do
           has_package({:name => "haproxy"})
-
+          
+          # Service is required
+          has_service(:name => "haproxy", :ensures => "running")
           # Restart sysklogd after we update the haproxy.log
-          has_service(:name => "sysklogd")
+          has_service(:name => "sysklogd", :notify => get_service("haproxy"))
           
           # Template variables          
           has_variable(:name => "name_haproxy", :value => "#{cloud.name}")
@@ -22,9 +24,6 @@ module PoolParty
           has_line_in_file("ENABLED=1", "/etc/default/haproxy")
           has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
           has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => get_service("sysklogd")})
-
-          # Service is required
-          has_service(:name => "haproxy", :ensures => "running")
           
           # has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
 

data/lib/poolparty/base_packages/poolparty.rb

@@ -27,7 +27,13 @@ module PoolParty
           
           has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem")
           
-          has_gempackage(:name => "capistrano", :requires => get_gempackage("net-ssh"))
+          # Capistrano
+          has_gempackage(:name => "net-ssh", :download_url => "http://rubyforge.org/frs/download.php/48041/net-ssh-2.0.6.gem")
+          has_gempackage(:name => "net-sftp", :download_url => "http://rubyforge.org/frs/download.php/37669/net-sftp-2.0.1.gem")
+          has_gempackage(:name => "net-scp", :download_url => "http://rubyforge.org/frs/download.php/37664/net-scp-1.0.1.gem")
+          has_gempackage(:name => "net-ssh-gateway", :download_url => "http://rubyforge.org/frs/download.php/36389/net-ssh-gateway-1.0.0.gem")
+          has_gempackage(:name => "highline", :download_url => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem")
+          has_gempackage(:name => "capistrano", :requires => get_gempackage("highline"))
           
           has_gempackage(:name => "ParseTree", :download_url => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", :requires => [get_gempackage("sexp_processor"), get_gempackage("ZenTest")])
             

data/lib/poolparty/capistrano.rb

@@ -5,14 +5,6 @@ module PoolParty
       raise unless cld
       @cloud = cld
     end
-    
-    def set_poolparty_roles
-      returning Array.new do |arr|
-        arr << "role 'master.#{@cloud.name}'.to_sym, '#{@cloud.master.ip}'"
-        arr << "role :master, '#{@cloud.master.ip}'"
-        arr << "role :slaves, '#{@cloud.nonmaster_nonterminated_instances.map{|a| a.ip}.join('", "')}'" if @cloud.nonmaster_nonterminated_instances.size > 0
-      end.join("\n")
-    end
-    
+        
   end
 end

data/lib/poolparty/core/hash.rb

@@ -40,4 +40,7 @@ class Hash
     each {|k,v| m[k] = v.to_os }
     MyOpenStruct.new(m)
   end
+  def method_missing(sym, *args, &block)
+    key?(sym) ? fetch(sym) : super
+  end
 end

data/lib/poolparty/helpers/display.rb

@@ -19,7 +19,7 @@ module PoolParty
     end
     
     def available_bases
-      puts Remote.available_bases
+      remote_bases
     end
     
     def header(str="")

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -39,7 +39,7 @@ module PoolParty
     
     def setup_dev
       unless ::File.exists?("#{full_keypair_basename_path}.pub")
-        cmd = "scp #{ssh_array.join(" ")} #{Base.user}@#{master.ip}:.ssh/authorized_keys #{full_keypair_basename_path}.pub"
+        cmd = "scp #{scp_array.join(" ")} #{Base.user}@#{master.ip}:.ssh/authorized_keys #{full_keypair_basename_path}.pub"
         vputs "Running #{cmd}"
         Kernel.system(cmd)
       end

data/lib/poolparty/monitors/monitors/cpu_monitor.rb

@@ -4,7 +4,7 @@ module PoolParty
     class CpuMonitor < BaseMonitor
       
       def run
-        stdin, stdout, stderr = Open3.popen3('uptime')
+        stdout = %x[uptime]
         stdout.split(/\s+/)[-1].to_f rescue 0.0
       end
             

data/lib/poolparty/net/messenger.rb

@@ -16,7 +16,7 @@ module PoolParty
     end
     # TODO: Fix cookie setting
     def self.erl_command(hostname, extra="", min_ports=7000, max_ports=7050)
-      command_line_opts = "-pa #{append_dir}/ebin -kernel inet_dist_listen_min #{min_ports} inet_dist_listen_max #{max_ports} -sname #{hostname}"
+      command_line_opts = "-cookie -pa #{append_dir}/ebin -kernel inet_dist_listen_min #{min_ports} inet_dist_listen_max #{max_ports} -sname #{hostname}"
       
       "erl #{command_line_opts} #{extra}"
     end

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -9,6 +9,20 @@ require "#{::File.dirname(__FILE__)}/ec2/ec2_response_object"
 
 begin
   require 'EC2'
+rescue LoadError
+  puts <<-EOM
+Error: In order to use ec2, you need to install the amazon-ec2 gem
+
+Ec2 is the default remoter base for PoolParty. If you intend on using
+a different remoter base, specify it with:
+
+using :remoter_name
+
+in your config file, otherwise, to continue install amazon-ec2 with
+
+gem install amazon-ec2
+EOM
+end
   
   class String
     def convert_from_ec2_to_ip
@@ -141,26 +155,20 @@ begin
 
       # Hook
       #TODO#: Change this so they match with the cap tasks
-      def custom_install_tasks_for(o)
-        arr = if has_cert_and_key?
-          [ 
-            # "mv #{::File.basename(pub_key)} #{Base.base_config_directory}/ssl/public_keys/#{o.name}.pem", 
-            # "mv #{::File.basename(private_key)} #{Base.base_config_directory}/ssl/private_keys/#{o.name}.pem"
-          ]
-          else 
-            []
-          end
-        arr << [
-          "# ec2 installation tasks",
-          "# Set hostname",
+      def custom_install_tasks_for(o)        
+        [
           # "if [ -z $(grep -v '#' /etc/hosts | grep '#{o.name}') ]; then echo \"$(curl http://169.254.169.254/latest/meta-data/public-ipv4) #{o.name}\" >> /etc/hosts; fi",
           "if [ -z \"$(grep -v '#' /etc/hosts | grep '#{o.name}')\" ]; then echo '127.0.0.1 #{o.name}' >> /etc/hosts; fi",
           "hostname #{o.name}",
-          "echo #{o.name} > /etc/hostname",
+          "echo #{o.name} > /etc/hostname"
+        ]
+      end
+      
+      def after_install_tasks_for(o)
+        [
           "cd /var/poolparty && wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1",
-          "/usr/bin/gem install -y --no-ri --no-rdoc amazon-ec2.gem 2>&1",
+          "/usr/bin/gem install --no-ri --no-rdoc amazon-ec2.gem 2>&1"
         ]
-        []
       end
 
       def custom_configure_tasks_for(o)
@@ -173,18 +181,4 @@ begin
       end
     end
     register_remote_base :Ec2
-  end
-rescue LoadError
-  puts <<-EOM
-Error: In order to use ec2, you need to install the amazon-ec2 gem
-
-Ec2 is the default remoter base for PoolParty. If you intend on using
-a different remoter base, specify it with:
-
-using :remoter_name
-
-in your config file, otherwise, to continue install amazon-ec2 with
-
-gem install amazon-ec2
-EOM
-end
+  end

data/lib/poolparty/net/remoter.rb

@@ -15,7 +15,7 @@ module PoolParty
       end
       def run_command_on_command(cmd="ls -l", remote_instance=nil)
         vputs "Running #{cmd} on #{remote_instance.name == %x[hostname].chomp ? "self (master)" : "#{remote_instance.name}"}"
-        remote_instance.name == %x[hostname].chomp ? %x[#{cmd}] : "#{ssh_command(remote_instance)} '#{cmd}'"
+        (remote_instance.nil? || remote_instance.name == %x[hostname].chomp) ? %x[#{cmd}] : "#{ssh_command(remote_instance)} '#{cmd}'"
       end
       def ssh_command(remote_instance)
         "#{ssh_string} #{remote_instance.ip}"
@@ -32,6 +32,9 @@ module PoolParty
       def ssh_array
         ["-o StrictHostKeyChecking=no", "-l #{Base.user}", '-i "'+full_keypair_path+'"']
       end
+      def scp_array
+        ["-o StrictHostKeyChecking=no", '-i "'+full_keypair_path+'"']
+      end
       def rsync_command
         "rsync -azP --exclude cache -e '#{ssh_string} -l #{Base.user}'"
       end
@@ -144,6 +147,7 @@ module PoolParty
       def when_no_pending_instances(&block)
         reset!        
         if list_of_pending_instances.size == 0
+          vputs ""
           block.call if block
         else
           vprint "."
@@ -303,7 +307,7 @@ module PoolParty
       # Take the rsync command and execute it on the system
       # if there is an instance given
       def run_command_on(cmd, instance=nil)        
-        Kernel.system "#{run_command_on_command(cmd, instance)}" if instance
+        Kernel.system "#{run_command_on_command(cmd, instance)}"
       end
       
       # Ssh into the instance given

data/lib/poolparty/net/remoter_base.rb

@@ -20,7 +20,8 @@ module PoolParty
 
   def register_remote_base(*args)
     args.each do |arg|
-      (remote_bases << "#{arg}".downcase.to_sym)
+      base_name = "#{arg}".downcase.to_sym
+      (remote_bases << base_name) unless remote_bases.include?(base_name)
     end
   end
   
@@ -85,7 +86,7 @@ module PoolParty
       end
       # Get instance by number
       def get_instance_by_number(i=0, list = remote_instances_list)
-        name = (i.zero? ? "master" : "node#{i}")
+        name = ((i.nil? || i.zero?) ? "master" : "node#{i}")
         list.select {|i| i.name == name }.first
       end
       # A callback before the configuration task takes place
@@ -99,9 +100,10 @@ module PoolParty
       # List the instances for the current key pair, regardless of their states
       # If no keypair is passed, select them all
       def list_of_instances(keyp=nil)
-        tmp_key = (keyp ? keyp : keypair).to_s
+        tmp_key = (keyp ? keyp : nil)
+        
         unless @describe_instances
-          tmpInstanceList = describe_instances.select {|a| a if tmp_key ? a[:keypair] == tmp_key : true }
+          tmpInstanceList = describe_instances.select {|a| a if (tmp_key.nil? || tmp_key.empty? ? true : a[:keypair] == tmp_key) }
           has_master = !tmpInstanceList.select {|a| a[:name] == "master" }.empty?          
           if has_master
             @describe_instances = tmpInstanceList
@@ -134,7 +136,7 @@ module PoolParty
         @describe_instances = nil
       end
       def self.included(other)
-        PoolParty.register_remote_base(self.class.to_s.downcase.to_sym)
+        # PoolParty.register_remote_base(self.class.to_s.downcase.to_sym)
       end
       
       # Callback after loaded

data/lib/poolparty/poolparty/cloud.rb

@@ -127,7 +127,7 @@ module PoolParty
       # talk to each other safely. This is based off the keypair
       # and the name of the cloud
       def generate_unique_cookie_string
-        Digest::SHA256.hexdigest("#{full_keypair_name}#{name}")
+        Digest::SHA256.hexdigest("#{full_keypair_name}#{name}")[0..12]
       end
       
       # Build the new poolparty manifest

data/lib/poolparty/poolparty/resources/gem_package.rb

@@ -22,14 +22,14 @@ module PoolParty
           })
                     
           has_exec(opts.merge({:name => "#{name}", :cwd =>"#{Base.remote_storage_path}"})) do
-            command "gem install -y --no-ri --no-rdoc #{Base.remote_storage_path}/#{name}.gem"
+            command "gem install --no-ri --no-rdoc #{Base.remote_storage_path}/#{name}.gem"
             ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
             requires get_file("#{Base.remote_storage_path}/#{name}.gem")
           end
           
         else
           has_exec(opts.merge({:name => "#{name}", :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"})) do
-            command "gem install -y --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name} <<heredoc
+            command "gem install --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name} <<heredoc
             1
             heredoc"
             ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"

data/lib/poolparty/provisioners/capistrano/capistrano.rb

@@ -4,7 +4,6 @@ module PoolParty
   module Provisioner
     class Capistrano < ProvisionerBase
       
-      include PoolParty::Capistrano
       include ::Capistrano::Configuration::Actions::Invocation
       
       def process_install!(testing=false)
@@ -31,33 +30,48 @@ module PoolParty
       
       def master_install_tasks
         [
-          "master:provision_master"
-        ].push([custom_install_tasks, master_configure_tasks]).flatten#.map {|a| a.to_sym }
+          "custom_install_tasks",
+          "master_provision_master_task",
+          "after_install_tasks",
+          "custom_configure_tasks",
+          "run_provisioner_twice",
+          "master_configure_master_task"
+        ]#.map {|a| a.to_sym }
       end
       def master_configure_tasks
         [
-          "master:create_local_node_entry_for_puppet", "master:move_template_files", "master:setup_poolparty_base_structure",
-          "master:move_provisioner_manifest", "run_provisioner"
-        ].push(custom_configure_tasks).flatten#.map {|a| a.to_sym }
+          "master_configure_master_task"
+        ]#.map {|a| a.to_sym }
       end
       
       def slave_install_tasks
         [
-          "slave:add_master_to_hosts_file", "slave:add_provisioner_configs", "setup_provisioner_config",
-          "create_puppetrunner_command", "create_puppetrerun_command", "install_rubygems",
-          "install_provisioner", "slave:stop_provisioner_daemon"
-        ].push([custom_install_tasks, slave_configure_tasks]).flatten#.map {|a| a.to_sym }
+          "custom_install_tasks",
+          "slave_provision_slave_task",
+          "after_install_tasks",
+          "custom_configure_tasks",
+          "slave_configure_slave_task"
+        ]
       end
       def slave_configure_tasks
         [
-          "run_provisioner"
-        ].push(custom_configure_tasks).flatten#.map {|a| a.to_sym }
+          "custom_configure_tasks",
+          "slave_configure_slave_task"
+        ]#.flatten.map {|a| a.to_sym }
       end
       # Run tasks after the initialized
       def loaded
         create_config
       end
       
+      def set_poolparty_roles
+        returning Array.new do |arr|
+          arr << "role 'master.#{@cloud.name}'.to_sym, '#{@cloud.master.ip}'"
+          arr << "role :master, '#{@cloud.master.ip}'"
+          arr << "role :slaves, '#{@cloud.nonmaster_nonterminated_instances.map{|a| a.ip}.join('", "')}'" if @cloud.nonmaster_nonterminated_instances.size > 0
+        end.join("\n")
+      end
+      
       # Create the config for capistrano
       # This is a dynamic capistrano configuration file
       def create_config        
@@ -86,18 +100,31 @@ module PoolParty
       # Prerun
       def prerun_setup
       end
-            
+      
+      # In run_capistrano, we are going to run the entire capistrano process
+      # First, 
       def run_capistrano(roles=[:master], meth=:install)  
         prerun_setup
         
         commands = meth == :install ? install_tasks : configure_tasks
-        name = "provisioner_#{meth}"
-        
+        name = "#{roles.first}_provisioner_#{meth}"
+
         __define_task(name, roles) do
-          commands.map {|command| 
-            task = find_task(command)
-            task.options.merge!(:roles => roles)
-            execute_task task
+          commands.map {|command|
+            task = find_task(command.to_sym)            
+            
+            if task
+              task.options.merge!(:roles => roles)
+              execute_task task
+            else
+              if provisioner.respond_to?(command.to_sym)
+                cmd = provisioner.send(command.to_sym)
+                cmd = cmd.join(" && ") if cmd.is_a?(Array)
+                run(cmd)
+              else
+                self.send(command.to_sym)
+              end
+            end
           }
         end
                 
@@ -106,7 +133,7 @@ module PoolParty
           return true
         rescue ::Capistrano::CommandError => e
           return false unless verbose
-          raise ProvisionerException.new("Error: #{e}")
+          puts "Error: #{e} " and raise ProvisionerException.new("Error: #{e}")
         end
       end
                   

data/lib/poolparty/provisioners/capistrano/recipies/base.rb

@@ -4,68 +4,74 @@
 Capistrano::Configuration.instance(:must_exist).load do
   # namespace(:base) do
     desc "Install rubygems"
-    task :install_rubygems do
+    def install_rubygems
       run "#{installer_for} ruby rubygems"
     end
     desc "Setup for poolparty"
-    task :setup_for_poolparty do
+    def setup_for_poolparty
       run "mkdir -p /etc/poolparty"
     end
     desc "Install provisioner"
-    task :install_provisioner do
+    def install_provisioner
       run "#{installer_for} #{puppet_packages}"
     end
     desc "Create poolparty commands"
-    task :create_poolparty_commands do
+    def create_poolparty_commands
     end
     desc "Create poolparty runner command"
-    task :create_puppetrunner_command do
+    def create_puppetrunner_command
       run <<-EOR
         cp #{remote_storage_path}/templates/puppetrunner /usr/bin/puppetrunner &&
         chmod +x /usr/bin/puppetrunner
       EOR
     end
     desc "Create poolparty rerun command"
-    task :create_puppetrerun_command do
+    def create_puppetrerun_command
       run <<-EOR
         cp #{remote_storage_path}/templates/puppetrerun /usr/bin/puppetrerun &&
         chmod +x /usr/bin/puppetrerun
       EOR
     end
     desc "Add the proper configs for provisioner"
-    task :add_provisioner_configs do
+    def add_provisioner_configs
       run "cp #{remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf"
     end
     desc "Setup config file for provisioner"
-    task :setup_provisioner_config do
+    def setup_provisioner_config
       run "mv #{remote_storage_path}/puppet.conf /etc/puppet/puppet.conf"
     end
+    desc "Run the provisioner twice (usually on install)"
+    def run_provisioner_twice
+      run "/usr/sbin/puppetd --test --server master 2>1 > /dev/null && /usr/sbin/puppetd --onetime --daemonize --logdest syslog --server master"
+    end
     desc "Run the provisioner"
-    task :run_provisioner do
+    def run_provisioner
       run "/usr/sbin/puppetd --onetime --daemonize --logdest syslog --server master"
     end
     desc "Rerun the provisioner"
-    task :rerun_provisioner do
+    def rerun_provisioner
       run "/usr/bin/puppetrerun"
     end
     desc "Remove the certs"
-    task :remove_certs do
+    def remove_certs
       run "rm -rf /etc/puppet/ssl"
     end
     desc "Update rubygems"
-    task :update_rubygems do
+    def update_rubygems
       run "/usr/bin/gem update --system 2>1 > /dev/null && /usr/bin/gem update --system"
     end
     desc "Fix rubygems"
-    task :fix_rubygems do
+    def fix_rubygems
       # echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem &&
+      # cp #{remote_storage_path}/gem /usr/bin/gem
       run <<-EOR
+        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi &&
         /usr/bin/gem update --system 2>&1 > /dev/null;/usr/bin/gem update --system &&
-        cp -f #{remote_storage_path}/gem /usr/bin/gem
+        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi
       EOR
     end
     desc "Upgrade system"
-    task :upgrade_system do
+    def upgrade_system
       str = case os
       when :ubuntu
         "
@@ -78,15 +84,15 @@ aptitude update -y
       run str
     end
     desc "Upgrade rubygems"
-    task :upgrade_rubygems do
+    def upgrade_rubygems
       
     end
     desc "Make log directory"
-    task :make_log_directory do
+    def make_log_directory
       run "mkdir -p /var/log/poolparty"
     end
     desc "Create ssl storage directories for poolparty"
-    task :create_poolparty_ssl_store do
+    def create_poolparty_ssl_store
       run <<-EOR
         mkdir -p #{poolparty_config_directory}/ssl/private_keys &&
         mkdir -p #{poolparty_config_directory}/ssl/certs &&
@@ -94,11 +100,44 @@ aptitude update -y
       EOR
     end
     desc "Add erlang cookie"
-    task :write_erlang_cookie do
+    def write_erlang_cookie
       run <<-EOR
         mv #{remote_storage_path}/cookie ~/.erlang.cookie &&
         chmod 400 ~/.erlang.cookie
       EOR
     end
+    desc "Setup basic poolparty structure"
+    def setup_basic_poolparty_structure
+      run <<-EOR
+        echo "Creating basic structure for poolparty" &&
+        mkdir -p /etc/puppet/manifests/nodes  &&
+        mkdir -p /etc/puppet/manifests/classes &&
+        echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp &&
+        echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp          
+      EOR
+    end
+    desc "Setup shareable file system for provisioner"
+    def setup_provisioner_filestore
+      run <<-EOR
+        echo '[files]' > /etc/puppet/fileserver.conf &&
+        echo '  path #{remote_storage_path}' >> /etc/puppet/fileserver.conf &&
+        echo '  allow *' >> /etc/puppet/fileserver.conf &&
+        mkdir -p /var/poolparty/facts &&
+        mkdir -p /var/poolparty/files &&
+        mkdir -p #{base_config_directory}
+      EOR
+    end
+    desc "Setup autosigning for provisioner"
+    def setup_provisioner_autosigning
+      run "echo \"*\" > /etc/puppet/autosign.conf"
+    end
+    desc "Setup poolparty structure"
+    def setup_poolparty_base_structure
+      run <<-EOR
+        cp #{remote_storage_path}/#{key_file_locations.first} "#{base_config_directory}/.ppkeys" &&
+        mv #{remote_storage_path}/#{default_specfile_name} #{base_config_directory}/
+      EOR
+    end
+    
   # end
 end

data/lib/poolparty/provisioners/capistrano/recipies/master.rb

@@ -1,8 +1,8 @@
 # Cloud tasks
 Capistrano::Configuration.instance(:must_exist).load do
-  namespace(:master) do
+  # namespace(:master) do
     desc "Provision master"
-    task :provision_master do
+    def master_provision_master_task
       upgrade_system
       set_hostname_to_master
       create_local_hosts_entry
@@ -23,54 +23,24 @@ Capistrano::Configuration.instance(:must_exist).load do
       write_erlang_cookie
     end
     desc "Configure master"
-    task :configure_master do
-      master:move_provisioner_manifest
-      master:move_template_files
-      master:setup_poolparty_base_structure
+    def master_configure_master_task
+      create_local_node_entry_for_puppet
+      move_provisioner_manifest
+      move_template_files
+      setup_poolparty_base_structure
+      ensure_provisioner_is_running
       run_provisioner
     end
     desc "Set hostname to master"
-    task :set_hostname_to_master do
+    def set_hostname_to_master
       run "hostname master"
     end
     desc "Add host entry into the master instance"
-    task :create_local_hosts_entry do
+    def create_local_hosts_entry
       run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')\" ]; then echo '#{cloud.master.ip}          master puppet localhost' >> /etc/hosts; fi"
     end
-    desc "Setup basic poolparty structure"
-    task :setup_basic_poolparty_structure do
-      run <<-EOR
-        echo "Creating basic structure for poolparty" &&
-        mkdir -p /etc/puppet/manifests/nodes  &&
-        mkdir -p /etc/puppet/manifests/classes &&
-        echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp &&
-        echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp          
-      EOR
-    end
-    desc "Setup shareable file system for provisioner"
-    task :setup_provisioner_filestore do
-      run <<-EOR
-        echo '[files]' > /etc/puppet/fileserver.conf &&
-        echo '  path #{remote_storage_path}' >> /etc/puppet/fileserver.conf &&
-        echo '  allow *' >> /etc/puppet/fileserver.conf &&
-        mkdir -p /var/poolparty/facts &&
-        mkdir -p /var/poolparty/files &&
-        mkdir -p #{base_config_directory}
-      EOR
-    end
-    desc "Setup autosigning for provisioner"
-    task :setup_provisioner_autosigning do
-      run "echo \"*\" > /etc/puppet/autosign.conf"
-    end
-    desc "Setup poolparty structure"
-    task :setup_poolparty_base_structure do
-      run <<-EOR
-        cp #{remote_storage_path}/#{key_file_locations.first} "#{base_config_directory}/.ppkeys" &&
-        mv #{remote_storage_path}/#{default_specfile_name} #{base_config_directory}/
-      EOR
-    end
     desc "Download base gems"
-    task :download_base_gems do
+    def download_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
           arr << "wget #{url} -O #{Base.remote_storage_path}/#{name}.gem 2>&1"
@@ -78,7 +48,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end.join(" && "))
     end
     desc "Install base gems"
-    task :install_base_gems do
+    def install_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
           if url.empty?
@@ -90,15 +60,19 @@ Capistrano::Configuration.instance(:must_exist).load do
       end.join(" && "))
     end
     desc "Start provisioner base"
-    task :start_provisioner_base do
+    def start_provisioner_base
       run "/etc/init.d/puppetmaster start"
     end
     desc "Restart provisioner base"
-    task :restart_provisioner_base do
+    def restart_provisioner_base
       run "/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start"
     end
+    desc "Ensure provisioner is running"
+    def ensure_provisioner_is_running
+      run "/usr/sbin/puppetmasterd --verbose 2>1 > /dev/null;echo ''"
+    end
     desc "Create local node for puppet manifest"
-    task :create_local_node_entry_for_puppet do
+    def create_local_node_entry_for_puppet
       # run ". /etc/profile && server-write-new-nodes"
       str = returning Array.new do |arr|
         arr << "node default { include poolparty }"
@@ -109,21 +83,21 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "echo #{str} > #{manifest_path}/nodes/nodes.pp"
     end
     desc "Move template files into place"
-    task :move_template_files do
+    def move_template_files
       run <<-EOR
         mkdir -p #{template_path} &&
         cp -R #{remote_storage_path}/templates/* #{template_path}
       EOR
     end
     desc "Move manifest into place" 
-    task :move_provisioner_manifest do
+    def move_provisioner_manifest
       run <<-EOR
         cp #{remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
       EOR
     end
     desc "Move poolparty keys"
-    task :move_poolparty_keys do
+    def move_poolparty_keys
       run "cp #{remote_storage_path}/#{@full_keypair_name} #{@remote_keypair_path}"
     end
-  end
+  # end
 end

data/lib/poolparty/provisioners/capistrano/recipies/slave.rb

@@ -1,12 +1,40 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  namespace(:slave) do
+  # namespace(:slave) do
+    desc "Provision a slave"
+    def slave_provision_slave_task
+      upgrade_system
+      add_master_to_hosts_file
+      setup_for_poolparty
+      install_provisioner
+      stop_provisioner_daemon
+      setup_basic_poolparty_structure
+      setup_provisioner_filestore
+      setup_provisioner_autosigning
+      install_rubygems
+      fix_rubygems
+      add_provisioner_configs
+      setup_provisioner_config
+      create_puppetrunner_command
+      create_puppetrerun_command
+      download_base_gems
+      install_base_gems
+      write_erlang_cookie
+    end
+    desc "Configure a slave"
+    def slave_configure_slave_task
+      create_local_node_entry_for_puppet
+      move_provisioner_manifest
+      move_template_files
+      setup_poolparty_base_structure
+      run_provisioner
+    end
     desc "Add master ip to hosts file"
-    task :add_master_to_hosts_file do
-      run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'master')\" ]; then echo '#{master_ip} puppet master' >> /etc/hosts; else echo 'host already set'; fi"
+    def add_master_to_hosts_file
+      run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'master')\" ]; then echo '#{cloud.master.ip} puppet master' >> /etc/hosts; else echo 'host already set'; fi"
     end
     desc "Stop provisioner daemon"
-    task :stop_provisioner_daemon do
+    def stop_provisioner_daemon
       run "/etc/init.d/puppetmaster stop"
     end
-  end
+  # end
 end

data/lib/poolparty/provisioners/provisioner_base.rb

@@ -115,6 +115,11 @@ module PoolParty
         @cloud.custom_configure_tasks_for(@instance) || []
       end
       
+      # Last install tasks, if need to install after everything else
+      def after_install_tasks
+        @cloud.after_install_tasks_for(@instance)
+      end
+      
       # Get the packages associated with each os
       def puppet_packages
         case @os
@@ -159,6 +164,10 @@ module PoolParty
           :rake => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem",
           :sexp_processor => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem",
           "net-ssh" => "http://rubyforge.org/frs/download.php/48041/net-ssh-2.0.6.gem",
+          "net-sftp" => "http://rubyforge.org/frs/download.php/37669/net-sftp-2.0.1.gem",
+          "net-scp" => "http://rubyforge.org/frs/download.php/37664/net-scp-1.0.1.gem",
+          "net-ssh-gateway" => "http://rubyforge.org/frs/download.php/36389/net-ssh-gateway-1.0.0.gem",
+          :highline => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem",
           :capistrano => "http://rubyforge.org/frs/download.php/48031/capistrano-2.5.3.gem",
           :poolparty => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true",
           "ec2" => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem"

data/lib/poolparty/version.rb

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

data/lib/poolparty.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 # Load required gems
 @required_software = Array.new
-%w(activesupport ftools logging resolv ruby2ruby digest/sha2 open3 capistrano).each do |lib|
+%w(activesupport ftools logging resolv ruby2ruby digest/sha2 open3).each do |lib|
   begin
     require lib
   rescue Exception => e

data/lib/poolpartycl.rb

@@ -3,5 +3,5 @@ Dir["#{File.dirname(__FILE__)}/poolparty/helpers/**.rb"].each do |lib|
 end
 
 def help_array
-  ["-h", "--help", "-V", "--version"]
+  ["-h", "--help", "-V", "--version", "--debug", "-d"]
 end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.85
+  version: 0.2.88
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ email:
 - ari.lerner@citrusbyte.com
 executables: 
 - cloud
+- cloud-add-access
 - cloud-add-keypair
 - cloud-configure
 - cloud-contract
@@ -121,6 +122,7 @@ files:
 - README.txt
 - Rakefile
 - bin/cloud
+- bin/cloud-add-access
 - bin/cloud-add-keypair
 - bin/cloud-configure
 - bin/cloud-contract
@@ -530,7 +532,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:19 12/15/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
   
   To get started, run the generator:
   

data/spec/poolparty/core/hash_spec.rb

@@ -33,6 +33,14 @@ describe "Hash" do
   it "should be able to flush out with pre and posts" do
     @a.flush_out("hi", "ho").sort.should == ["hia => '10'ho","hib => '20'ho","hic => '30'ho"]
   end
+  describe "method_missing" do
+    it "should be able to call a key on the hash as a method" do
+      {:first_name => "bob", :last_name => "frank"}.first_name.should == "bob"
+    end
+    it "should return nil if there is no key set in the hash" do
+        {:first_name => "bob", :last_name => "frank"}.neighbor.should == nil
+    end
+  end
   describe "select" do
     before(:each) do
       @selected_hash = @a.select {|k,v| k if k == :a}

data/spec/poolparty/poolparty/cloud_spec.rb

@@ -389,7 +389,7 @@ describe "Cloud" do
             @cloud.respond_to?(:generate_unique_cookie_string).should == true
           end
           it "should call hexdigest to digest/sha" do
-            Digest::SHA256.should_receive(:hexdigest).with("#{@cloud.full_keypair_name}#{@cloud.name}")
+            Digest::SHA256.should_receive(:hexdigest).with("#{@cloud.full_keypair_name}#{@cloud.name}").and_return "blaaaaah"
             @cloud.generate_unique_cookie_string
           end
           it "should generate the same cookie string every time" do

data/spec/poolparty/provisioners/capistrano/capistrano_spec.rb

@@ -21,7 +21,12 @@ describe "Capistrano provisioner" do
       it "should create the config at ::Capistrano::Logger::IMPORTANT if the cloud is not verbose" do
         @cloud.stub!(:verbose).and_return false
         PoolParty::Provisioner::Capistrano.new(nil, @cloud).config.logger.level.should == ::Capistrano::Logger::IMPORTANT
-      end      
+      end
+    end
+    describe "install tasks" do
+      it "should have the configure tasks included" do
+        @pb.master_install_tasks.include?("custom_configure_tasks").should == true
+      end
     end
   end
 end

data/website/index.html

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.85
+  version: 0.2.88
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ email:
 - ari.lerner@citrusbyte.com
 executables: 
 - cloud
+- cloud-add-access
 - cloud-add-keypair
 - cloud-configure
 - cloud-contract
@@ -121,6 +122,7 @@ files:
 - README.txt
 - Rakefile
 - bin/cloud
+- bin/cloud-add-access
 - bin/cloud-add-keypair
 - bin/cloud-configure
 - bin/cloud-contract
@@ -530,7 +532,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:19 12/15/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
   
   To get started, run the generator: