auser-poolparty 0.2.92 → 0.2.93

data/Manifest.txt

@@ -10,7 +10,6 @@ bin/cloud-add-access
 bin/cloud-add-keypair
 bin/cloud-configure
 bin/cloud-contract
-bin/cloud-ensure-provisioning
 bin/cloud-expand
 bin/cloud-handle-load
 bin/cloud-list
@@ -36,13 +35,17 @@ bin/pool-list
 bin/pool-start
 bin/server-build-messenger
 bin/server-clean-cert-for
+bin/server-ensure-provisioning
 bin/server-fire-cmd
 bin/server-get-load
 bin/server-list-active
 bin/server-list-responding
+bin/server-provision
+bin/server-query-agent
 bin/server-rerun
 bin/server-send-command
 bin/server-show-stats
+bin/server-start-agent
 bin/server-start-client
 bin/server-start-master
 bin/server-start-node
@@ -218,6 +221,7 @@ lib/poolparty/helpers/ruberl.rb
 lib/poolparty/modules/cloud_dsl.rb
 lib/poolparty/modules/cloud_resourcer.rb
 lib/poolparty/modules/configurable.rb
+lib/poolparty/modules/daemonizable.rb
 lib/poolparty/modules/definable_resource.rb
 lib/poolparty/modules/file_writer.rb
 lib/poolparty/modules/method_missing_sugar.rb
@@ -276,6 +280,7 @@ lib/poolparty/provisioners/capistrano/recipies/base.rb
 lib/poolparty/provisioners/capistrano/recipies/master.rb
 lib/poolparty/provisioners/capistrano/recipies/slave.rb
 lib/poolparty/provisioners/provisioner_base.rb
+lib/poolparty/server/agent.rb
 lib/poolparty/spec.rb
 lib/poolparty/spec/core/string.rb
 lib/poolparty/spec/matchers/a_spec_extensions_base.rb
@@ -320,6 +325,7 @@ lib/poolparty/templates/puppetrunner
 lib/poolparty/templates/yaws.conf
 lib/poolparty/version.rb
 lib/poolpartycl.rb
+log/agent.log
 log/pool.log
 poolparty.gemspec
 script/destroy

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 18:36 12/21/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:09 12/23/08)
 
 To get started, run the generator:
 

data/README.txt

@@ -47,6 +47,8 @@ sudo gem install auser-poolparty
 * Refactor provisioning to use erlang
 * Add queuing of tasks on the messenger
 * Add syntax checker on the manifests
+* Move in collectd support
+* Add master query
 
 == LICENSE:
 

data/bin/cloud-configure

@@ -11,17 +11,7 @@ end
 o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud) do
-    
-    # hide_output do
-      # if provision_class == "master" || provision_class == "all"
-      @cl = self
-      # daemon ? daemonize {Provisioner.configure_master(@cl, testing)} : Provisioner.configure_master(self, testing)
-      verbose ? provisioner_for(master).configure(testing) : hide_output { provisioner_for(master).configure(testing) }
-      # end
-      # if provision_class == "slave" || provision_class == "all"
-      #   Provisioner.configure_slaves(self, testing)
-      # end
-    # end    
-    clear_base_directory unless testing
+    verbose ? provisioner_for(master).configure(testing) : hide_output { provisioner_for(master).configure(testing) }
+    cleanup_storage_directory unless testing
   end    
 end

data/bin/cloud-provision

@@ -18,7 +18,6 @@ o.loaded_clouds.each do |cloud|
     if instance_num
       @instance = get_instance_by_number( instance_num )
       instance_num == 0 ? provisioner_for(master).install(testing) : provisioner_for(@instance).install(testing)
-      # Provisioner.process_clean_reconfigure_for!(@instance, self, testing)
     else
       if provision_slave
         vputs "Provisioning slaves"
@@ -29,7 +28,7 @@ o.loaded_clouds.each do |cloud|
       end
     end
     
-    clear_base_directory unless testing
+    cleanup_storage_directory unless testing
   end
 
 end

data/bin/{cloud-ensure-provisioning → server-ensure-provisioning}

@@ -26,8 +26,8 @@ o.loaded_clouds.each do |cloud|
   
       node_id = node.gsub(/node/, '')
       
-      cmd = ". /etc/profile && #{str};cloud-provision -n #{cloud.name} -i #{node_id};#{str}"
-      running_cmd = "ps aux | grep -v grep | grep \"cloud-provision -n #{cloud.name} -i #{node_id};\""
+      cmd = ". /etc/profile && #{str};server-provision -n #{cloud.name} -i #{node_id};#{str}"
+      running_cmd = "ps aux | grep -v grep | grep \"server-provision -n #{cloud.name} -i #{node_id};\""
       
       vputs "Executing #{cmd}"
       running = %x[#{running_cmd}]

data/bin/server-provision

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-p', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
+  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_number i }
+end
+
+o.loaded_clouds.each do |cloud|
+
+  with_cloud(cloud) do
+    setup_dev
+    instance_num = instance_number.to_i if instance_number
+    
+    if instance_num
+      @instance = get_instance_by_number( instance_num )
+      instance_num == 0 ? provisioner_for(master).install(testing) : provisioner_for(@instance).install(testing)
+    else
+      if provision_slave
+        vputs "Provisioning slaves"
+        verbose ? provisioner_for(nil).install(testing) : hide_output { provisioner_for(nil).install(testing) }
+      else
+        vputs "Provisioning master"
+        verbose ? provisioner_for(master).install(testing) : hide_output { provisioner_for(master).install(testing) }
+      end
+    end
+  end
+
+end

data/generators/poolspec/templates/pool_spec_template.erb

@@ -1,7 +1,6 @@
 # Basic poolparty template
 
 pool :<%= name -%> do
-  plugin_directory "#{File.dirname(__FILE__)}/plugins"
   
   cloud :app do
     instances 2..5

data/lib/poolparty.rb

@@ -39,7 +39,7 @@ ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
   require "#{File.dirname(__FILE__)}/poolparty/#{f}"
 end
 
-%w(core modules exceptions dependency_resolutions aska monitors provisioners extra net).each do |dir|
+%w(core modules exceptions dependency_resolutions aska monitors provisioners server extra net).each do |dir|
   Dir[File.dirname(__FILE__) + "/poolparty/#{dir}/**.rb"].each do |file|
     require file
   end

data/lib/poolparty/base_packages/poolparty.rb

@@ -58,24 +58,9 @@ module PoolParty
           template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner")
         end
         
-        # execute_on_node do
-          has_cron(:name => "node puppetd runner", :user => Base.user, :minute => "*/10") do
-            requires get_gempackage("poolparty")
-            command "/usr/bin/puppetrunner"
-          end
-        has_exec(:command => "/usr/bin/puppetrunner")
+        # has_exec(:name => "Puppet runner", :command => "/usr/bin/puppetrunner")
+        has_cron(:name => "Run the provisioner", :command => "/usr/bin/puppetrunner", :minute => "*/15")
         has_user(:name => user)
-        # end
-        
-        # end
-        
-        # Cloud panel setup
-        
-        # has_directory(:name => "/var/www/cloudpanel")
-        
-        # has_file(:name => "/etc/yaws/conf.d/localhost.conf") do
-        #   template File.join(File.dirname(__FILE__), "..", "templates/yaws.conf")
-        # end
         
         # Custom run puppet to minimize footprint
         # TODO: Update the offsetted times
@@ -91,11 +76,11 @@ module PoolParty
         
         execute_on_master do
           has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
-          has_exec(:command => ". /etc/profile && cloud-handle-load -n #{cloud.name}")
-          has_exec(:command => ". /etc/profile && cloud-ensure-provisioning -n #{cloud.name}")            
+          has_exec(:name => "Handle load", :command => ". /etc/profile && cloud-handle-load -n #{cloud.name}")
+          has_exec(:name => "Ensure provisioning", :command => ". /etc/profile && server-ensure-provisioning -n #{cloud.name}")            
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master") #, :ifnot => "/bin/ps aux | /bin/grep -q pm_master"
           has_exec(:name => "start client server", :command => ". /etc/profile && server-start-client") #, :ifnot => "/bin/ps aux | /bin/grep -q client_server"
-          has_exec(:command => ". /etc/profile && cloud-maintain -n #{cloud.name}")          
+          has_exec(:name => "Maintain the cloud", :command => ". /etc/profile && cloud-maintain -n #{cloud.name}")          
           has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "1")
           
         end        

data/lib/poolparty/helpers/binary.rb

@@ -57,19 +57,7 @@ module PoolParty
       end
       # Daemonize the process
       def daemonize(&block)
-        vputs "Daemonizing..."
-        trap("CHLD") {Process.wait(-1, Process::WNOHANG)}        
-        pid = fork do
-          Signal.trap('HUP', 'IGNORE') # Don't die upon logout
-          File.open("/dev/null", "r+") do |devnull|
-            $stdout.reopen(devnull)
-            $stderr.reopen(devnull)
-            $stdin.reopen(devnull) unless @use_stdin
-          end
-          block.call if block
-        end
-        Process.detach(pid)
-        pid
+        Daemonize.daemonize(&block)
       end
       
     end

data/lib/poolparty/modules/daemonizable.rb

@@ -0,0 +1,140 @@
+module PoolParty
+      
+  module Daemonizeable
+    
+    attr_accessor :pid_file
+    
+    def self.included(base)
+      base.extend ClassMethods
+    end
+    
+    def pid
+      @pid ||= File.file?(pid_file) ? open(pid_file).read.to_i : nil
+    end
+    
+    def pid_file
+      @pid_file ||= PoolParty::Base.agent_pid_file
+    end
+    
+    # Returns +true+ the process identied by +pid+ is running.
+    def running?
+      return false unless pid
+      Process.getpgid(pid) != -1
+    rescue Errno::ESRCH
+      false
+    end
+    
+    # Turns the current script into a daemon process that detaches from the console.
+    def daemonize(&block)
+      raise unless pid_file
+
+      remove_stale_pid_file
+      
+      pwd = Dir.pwd # Current directory is changed during daemonization, so store it
+      
+      vputs "Daemonizing..."
+      trap("CHLD") {Process.wait(-1, Process::WNOHANG)}        
+      @pid = fork do
+        Signal.trap('HUP', 'IGNORE') # Don't die upon logout
+        File.open("/dev/null", "r+") do |devnull|
+          $stdout.reopen(devnull)
+          $stderr.reopen(devnull)
+          $stdin.reopen(devnull) unless @use_stdin
+        end
+        block.call if block
+      end
+      
+      Dir.chdir(pwd)
+      
+      write_pid_file
+      
+      trap('HUP') { restart }
+      at_exit do
+        remove_pid_file
+      end
+      Process.detach(pid)
+    end
+    
+    # Register a proc to be called to restart the server.
+    def on_restart(&block)
+      @on_restart = block
+    end
+    
+    # Restart the server.
+    def restart
+      raise ArgumentError, "Can't restart, no 'on_restart' proc specified" unless @on_restart
+      stop
+      remove_pid_file
+      @on_restart.call
+      exit!
+    end
+    
+    module ClassMethods
+      # Send a QUIT signal the process which PID is stored in +pid_file+.
+      # If the process is still running after +timeout+, KILL signal is
+      # sent.
+      def kill(pid_file, timeout=60)
+        if pid = send_signal('QUIT', pid_file)
+          Timeout.timeout(timeout) do
+            sleep 0.1 while Process.running?(pid)
+          end
+        end
+      rescue Timeout::Error
+        print "Timeout! "
+        send_signal('KILL', pid_file)
+      rescue Interrupt
+        send_signal('KILL', pid_file)
+      ensure
+        puts pid_file
+        File.delete(pid_file) if File.exists?(pid_file)
+      end
+      
+      # Restart the server by sending HUP signal.
+      def restart(pid_file)
+        send_signal('HUP', pid_file)
+      end
+      
+      # Send a +signal+ to the process which PID is stored in +pid_file+.
+      def send_signal(signal, pid_file)
+        if File.exist?(pid_file) && pid = open(pid_file).read
+          pid = pid.to_i
+          print "Sending #{signal} signal to process #{pid} ... "
+          Process.kill(signal, pid)
+          puts
+          pid
+        else
+          puts "Can't stop process, no PID found in #{pid_file}"
+          nil
+        end
+      rescue Errno::ESRCH # No such process
+        puts "process not found!"
+        nil
+      end
+    end
+    
+    protected
+      def remove_pid_file
+        File.delete(@pid_file) if @pid_file && File.exists?(@pid_file)
+      end
+    
+      def write_pid_file
+        FileUtils.mkdir_p File.dirname(@pid_file)
+        open(@pid_file,"w") { |f| f.write(@pid) }
+        File.chmod(0644, @pid_file)
+      end
+      
+      # If PID file is stale, remove it.
+      def remove_stale_pid_file
+        if File.exist?(@pid_file)
+          if pid && running?
+            puts "Pid file exists" and raise
+          else
+            remove_pid_file
+          end
+        end
+      end
+  end
+  class Daemonize
+    include Daemonizeable
+  end
+end

data/lib/poolparty/modules/file_writer.rb

@@ -6,9 +6,7 @@ module PoolParty
       ::FileUtils.cp file, path unless file == path || ::File.file?(path)
     end
     def cleanup_storage_directory
-      Dir["#{Base.storage_directory}/**/*"].each do |f|
-        ::FileUtils.rm f if ::File.file?(f)
-      end
+      ::FileUtils.rm_rf "#{Base.storage_directory}"
     end
     def copy_template_to_storage_directory(file)
       make_template_directory
@@ -22,7 +20,13 @@ module PoolParty
       end
       ::File.basename(path)
     end
-    def make_directory_in_storage_directory(dirname="newdir")
+    def copy_directory_into_storage_directory(from, pat)
+      to = ::File.join(Base.storage_directory, pat)
+      
+      # make_directory_in_storage_directory(to) unless ::File.directory?(to)
+      FileUtils.cp_r(from, to)
+    end
+    def make_directory_in_storage_directory(dirname="newdir")      
       path = ::File.join( Base.storage_directory, dirname )
       make_base_path path
     end

data/lib/poolparty/net/remoter.rb

@@ -61,22 +61,6 @@ module PoolParty
       def list_of_node_ips(options={})
         list_of_running_instances.collect {|ri| ri.ip }
       end
-
-      # Get the instance first instance file that exists on the system from the expected places
-      # denoted in the local_instances_list_file_locations
-      def get_working_listing_file
-        local_instances_list_file_locations.reject {|f| f unless File.file?(f) }.first
-      end
-      # Expected places for the instances.list to be located at on the machine
-      def local_instances_list_file_locations
-        [
-          "#{Base.storage_directory}/#{name}-instances.list",
-          "#{Base.base_config_directory}/#{name}-instances.list",
-          "~/.#{name}-instances.list",
-          "~/#{name}-instances.list",          
-          "#{name}-instances.list"
-        ]
-      end
       
       # List calculation methods
       # 
@@ -191,12 +175,7 @@ module PoolParty
           last_instances = nonmaster_nonterminated_instances[(@num_instances - (num))..(@num_instances)]
           last_instances.each do |inst|
             vputs "Provision slave: #{inst}"
-            # hide_output {PoolParty::Provisioner.process_clean_reconfigure_for!(inst, self)}
-            # PoolParty::Provisioner.provision_slave(inst, self, false) unless inst.master? rescue vputs "Error"
-            verbose ? provisioner_for(inst).install(testing) : hide_output { provisioner_for(inst).install(testing) }
-            # hide_output {PoolParty::Provisioner.process_clean_reconfigure_for!(inst, self)}
-            # cmd = ". /etc/profile && cloud-provision -i #{inst.name.gsub(/node/, '')} &"
-            # vputs "Provision slave with command #{cmd}"
+            verbose ? provisioner_for(inst).install(testing) : hide_output { provisioner_for(inst).install(testing)}
           end
           # PoolParty::Provisioner.reconfigure_master(self)
         end
@@ -295,7 +274,7 @@ module PoolParty
       # Rsync a file or directory to a node.  Rsync to master by default
       def rsync_to(source, target=source, num=0)
         str = "#{rsync_to_command(source, target, get_instance_by_number( num ))}"
-        vputs "Running: #{str}"
+        dputs "Running: #{str}"
         verbose ?  Kernel.system(str) : hide_output {Kernel.system str}
       end
       
@@ -326,18 +305,6 @@ module PoolParty
         run_command_on(cmd, get_instance_by_number( num || 0 ) )
       end
       
-      # Prepare reconfiguration on the master
-      # TODO: Curious about the puppet/ssl problems...
-      # puppetd --test --no-daemonize 2>&1 &
-      # rm -rf /etc/puppet/ssl/*; 
-      def prepare_reconfiguration
-        unless @prepared
-          # cmd = "/etc/init.d/puppetmaster restart"
-          # run_command_on(cmd, master)
-          @prepared = true
-        end
-      end
-
       def self.included(receiver)
         receiver.extend self
       end

data/lib/poolparty/poolparty/base.rb

@@ -26,6 +26,8 @@ module PoolParty
       :proxy_mode => "http",
       :messenger_client_port => 7050,
       :minimum_runtime  => 3000, #50.minutes in seconds
+      :agent_pid_file => ::File.readable?("/var/run/poolparty_agent.pid") ? "/var/run/agent.pid" : "#{Dir.pwd}/agent.pid",
+      :agent_port => 8081,
       # EC2 Options
       :ami => "ami-1cd73375",
       :size => 'm1.small', # must be 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'
@@ -111,6 +113,14 @@ module PoolParty
           "#{Dir.pwd}/monitors"
         ].select {|d| d if viable_directory?(d) }
       end
+      
+      def custom_modules_directories
+        [
+          "/var/poolparty/modules",
+          "/etc/poolparty/modules",
+          "#{Dir.pwd}/modules"
+        ].select {|d| d if viable_directory?(d) }
+      end
       # Only return true if the directory we are reading is both readable
       # and exists
       def viable_directory?(dir)

data/lib/poolparty/poolparty/cloud.rb

@@ -85,6 +85,7 @@ module PoolParty
         make_base_directory
         copy_misc_templates
         copy_custom_monitors
+        copy_custom_modules
         store_keys_in_file
         Script.save!(self)
         # not my favorite...
@@ -150,11 +151,23 @@ module PoolParty
       def copy_custom_monitors
         unless Base.custom_monitor_directories.empty?
           make_directory_in_storage_directory("monitors")
-          Dir["#{Base.custom_monitor_directories}/*.rb"].each do |f|
-            copy_file_to_storage_directory(f, "monitors")
+          Base.custom_monitor_directories.each do |dir|
+            Dir["#{dir}/*.rb"].each {|f| copy_file_to_storage_directory(f, "monitors")}
           end
         end        
       end
+      
+      def copy_custom_modules
+        unless Base.custom_modules_directories.empty?
+          make_directory_in_storage_directory("modules")
+          Base.custom_modules_directories.each do |dir|
+            Dir["#{dir}/*"].each do |d|
+              to = ::File.join("modules", ::File.basename(d))
+              copy_directory_into_storage_directory(d, to) if ::File.directory?(d)
+            end
+          end
+        end
+      end
             
       # Configuration files
       def build_manifest

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

@@ -29,9 +29,7 @@ module PoolParty
           
         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 --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name} <<heredoc
-            1
-            heredoc"
+            command "gem install --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name}"
             ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
           end
         end

data/lib/poolparty/poolparty/resources/symlink.rb

@@ -17,6 +17,10 @@ module PoolParty
         source || from
       end
       
+      def ensure
+        present
+      end
+      
       def printable?
         true
       end

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

@@ -6,6 +6,10 @@ module PoolParty
       
       include ::Capistrano::Configuration::Actions::Invocation
       
+      def loaded
+        dputs "Capistrano provisioner loaded..."
+        create_config
+      end
       def process_install!(testing=false)
         unless testing
           @cloud.rsync_storage_files_to(@instance)
@@ -27,7 +31,6 @@ module PoolParty
       def configure_tasks
         provision_master? ? master_configure_tasks : slave_configure_tasks
       end
-      
       def master_install_tasks
         [
           "custom_install_tasks",
@@ -61,10 +64,6 @@ module PoolParty
           "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|

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

@@ -27,6 +27,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       create_local_node_entry_for_puppet
       move_provisioner_manifest
       move_template_files
+      move_custom_modules
       setup_poolparty_base_structure
       ensure_provisioner_is_running
       run_provisioner
@@ -43,7 +44,10 @@ Capistrano::Configuration.instance(:must_exist).load 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; echo 'downloaded #{name}'" if url
+          if url && !url.empty?
+            arr << "curl -L -o #{Base.remote_storage_path}/#{name}.gem #{url} 2>&1; echo 'downloaded #{name}'"
+            arr << "if test -s #{Base.remote_storage_path}/#{name}.gem; then echo ''; else rm #{Base.remote_storage_path}/#{name}.gem; fi; echo ''"
+          end
         end
       end.join(" && "))
     end
@@ -52,7 +56,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
           str = url.empty? ? "#{name}" : "#{Base.remote_storage_path}/#{name}.gem"
-          arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{str}"
+          arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{str}; echo 'insatlled #{name}'"
         end
       end.join(" && "))
     end
@@ -62,7 +66,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     desc "Restart provisioner base"
     def restart_provisioner_base
-      run "/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start"
+      run "/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;start_provisioner_based --verbose;/etc/init.d/puppetmaster start"
     end
     desc "Ensure provisioner is running"
     def ensure_provisioner_is_running
@@ -86,6 +90,14 @@ Capistrano::Configuration.instance(:must_exist).load do
         cp -R #{remote_storage_path}/templates/* #{template_path}
       EOR
     end
+    desc "Move custom modules"
+    def move_custom_modules
+      run <<-EOR
+        if test -d #{remote_storage_path}/modules; then
+          mkdir -p #{base_config_directory}/modules && cp -R #{remote_storage_path}/modules #{base_config_directory};
+        fi
+      EOR
+    end
     desc "Move manifest into place" 
     def move_provisioner_manifest
       run <<-EOR

data/lib/poolparty/server/agent.rb

@@ -0,0 +1,59 @@
+# require 'eventmachine'
+# 
+# module PoolParty
+#   
+#   module AgentServer
+#     attr_reader :cloud
+#     def initialize(cloud)
+#       @cloud = cloud
+#     end
+#     def receive_data(data)
+#       begin        
+#         meth, args = data.split(" ")[0], data.split(" ")[1..-1]
+#         puts "meth: #{meth}"
+#         if meth
+#           msg = "#{meth} #{args.join(" ") if args && args.length > 0}"
+#           open("log/agent.log", "a+") {|f| f << msg }
+#           send_data msg if @cloud.debugging
+#           out = @cloud.send meth.to_sym, *args
+#           send_data "#{out}"          
+#         end
+#         close_connection if data =~ /quit|exit/i
+#       rescue Exception => e
+#         send_data "#{e}"
+#       end
+#     end
+#   end
+#   
+#   class Agent
+#     include Daemonizeable
+#     attr_reader :cloud
+#     
+#     def initialize(cld)
+#       @cloud = cld
+#     end
+#     
+#     def verbose;@cloud.verbose;end
+#     def debug;@cloud.debugging;end
+#     def kill
+#       self.class.kill pid_file
+#     end
+#     # Run the agent
+#     def run
+#       unless running?
+#         kill if cloud.kill
+#         
+#         if debug
+#           EventMachine::run {EventMachine::start_server "127.0.0.1", Base.agent_port, AgentServer, @cloud}
+#         end
+#         daemonize do
+#           EventMachine::run {EventMachine::start_server "127.0.0.1", Base.agent_port, AgentServer, @cloud}
+#         end
+#       end
+#     end
+#     def self.run_for(cld)
+#       new(cld).run
+#     end
+#   end
+#   
+# end

data/lib/poolparty/templates/puppet.conf

@@ -2,8 +2,10 @@
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
   ssldir = /etc/poolparty/ssl
-  pluginsync = false
-  factsync = false
+  modulepath = /etc/poolparty/modules:$confdir/modules
+  # factsync = true
+  # pluginsync = true
+  # factpath = $vardir/lib/facter
 
 [puppetca]
   config = $config/puppetca.conf

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.92
+  version: 0.2.93
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-21 00:00:00 -08:00
+date: 2008-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ executables:
 - cloud-add-keypair
 - cloud-configure
 - cloud-contract
-- cloud-ensure-provisioning
 - cloud-expand
 - cloud-handle-load
 - cloud-list
@@ -87,13 +86,17 @@ executables:
 - pool-start
 - server-build-messenger
 - server-clean-cert-for
+- server-ensure-provisioning
 - server-fire-cmd
 - server-get-load
 - server-list-active
 - server-list-responding
+- server-provision
+- server-query-agent
 - server-rerun
 - server-send-command
 - server-show-stats
+- server-start-agent
 - server-start-client
 - server-start-master
 - server-start-node
@@ -126,7 +129,6 @@ files:
 - bin/cloud-add-keypair
 - bin/cloud-configure
 - bin/cloud-contract
-- bin/cloud-ensure-provisioning
 - bin/cloud-expand
 - bin/cloud-handle-load
 - bin/cloud-list
@@ -152,13 +154,17 @@ files:
 - bin/pool-start
 - bin/server-build-messenger
 - bin/server-clean-cert-for
+- bin/server-ensure-provisioning
 - bin/server-fire-cmd
 - bin/server-get-load
 - bin/server-list-active
 - bin/server-list-responding
+- bin/server-provision
+- bin/server-query-agent
 - bin/server-rerun
 - bin/server-send-command
 - bin/server-show-stats
+- bin/server-start-agent
 - bin/server-start-client
 - bin/server-start-master
 - bin/server-start-node
@@ -334,6 +340,7 @@ files:
 - lib/poolparty/modules/cloud_dsl.rb
 - lib/poolparty/modules/cloud_resourcer.rb
 - lib/poolparty/modules/configurable.rb
+- lib/poolparty/modules/daemonizable.rb
 - lib/poolparty/modules/definable_resource.rb
 - lib/poolparty/modules/file_writer.rb
 - lib/poolparty/modules/method_missing_sugar.rb
@@ -392,6 +399,7 @@ files:
 - lib/poolparty/provisioners/capistrano/recipies/master.rb
 - lib/poolparty/provisioners/capistrano/recipies/slave.rb
 - lib/poolparty/provisioners/provisioner_base.rb
+- lib/poolparty/server/agent.rb
 - lib/poolparty/spec.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
@@ -436,6 +444,7 @@ files:
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
+- log/agent.log
 - log/pool.log
 - poolparty.gemspec
 - script/destroy
@@ -535,7 +544,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 18:36 12/21/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:09 12/23/08)
   
   To get started, run the generator:
   

data/spec/poolparty/modules/file_writer_spec.rb

@@ -52,6 +52,12 @@ describe "FileWriter" do
       @test.copy_file_to_storage_directory(@filepath)
     end
   end
+  describe "cleanup_storage_directory" do
+    it "should call rm_rf on the FileUtils class with the storage_directory" do
+      ::FileUtils.should_receive(:rm_rf).with("#{Base.storage_directory}").and_return true
+      @test.cleanup_storage_directory
+    end
+  end
   after(:all) do
     ::File.unlink @path if ::File.file? @path
   end

data/spec/poolparty/poolparty/resources/symlink_spec.rb

@@ -6,7 +6,7 @@ describe "Symlink" do
   before(:each) do
     reset_resources!
     @cloud = cloud :symlink_test do
-      has_symlink(:name => "/etc/apache2/puppetmaster.conf", :source => "/etc/http/puppetmaster.conf")
+      has_symlink(:name => "/etc/apache2/puppetmaster.conf")
     end
     @symlink = @cloud.resource(:symlink).first
   end

data/spec/poolparty/spec_helper.rb

@@ -89,7 +89,6 @@ def stub_list_from_local_for(o)
   EOS
   @file = "filename"
   @file.stub!(:read).and_return @list
-  o.stub!(:get_working_listing_file).and_return @file
   o.stub!(:open).and_return @file
 
   @ris = @list.split(/\n/).map {|line| PoolParty::Remote::RemoteInstance.new(line) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.92
+  version: 0.2.93
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-21 00:00:00 -08:00
+date: 2008-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ executables:
 - cloud-add-keypair
 - cloud-configure
 - cloud-contract
-- cloud-ensure-provisioning
 - cloud-expand
 - cloud-handle-load
 - cloud-list
@@ -87,13 +86,17 @@ executables:
 - pool-start
 - server-build-messenger
 - server-clean-cert-for
+- server-ensure-provisioning
 - server-fire-cmd
 - server-get-load
 - server-list-active
 - server-list-responding
+- server-provision
+- server-query-agent
 - server-rerun
 - server-send-command
 - server-show-stats
+- server-start-agent
 - server-start-client
 - server-start-master
 - server-start-node
@@ -126,7 +129,6 @@ files:
 - bin/cloud-add-keypair
 - bin/cloud-configure
 - bin/cloud-contract
-- bin/cloud-ensure-provisioning
 - bin/cloud-expand
 - bin/cloud-handle-load
 - bin/cloud-list
@@ -152,13 +154,17 @@ files:
 - bin/pool-start
 - bin/server-build-messenger
 - bin/server-clean-cert-for
+- bin/server-ensure-provisioning
 - bin/server-fire-cmd
 - bin/server-get-load
 - bin/server-list-active
 - bin/server-list-responding
+- bin/server-provision
+- bin/server-query-agent
 - bin/server-rerun
 - bin/server-send-command
 - bin/server-show-stats
+- bin/server-start-agent
 - bin/server-start-client
 - bin/server-start-master
 - bin/server-start-node
@@ -334,6 +340,7 @@ files:
 - lib/poolparty/modules/cloud_dsl.rb
 - lib/poolparty/modules/cloud_resourcer.rb
 - lib/poolparty/modules/configurable.rb
+- lib/poolparty/modules/daemonizable.rb
 - lib/poolparty/modules/definable_resource.rb
 - lib/poolparty/modules/file_writer.rb
 - lib/poolparty/modules/method_missing_sugar.rb
@@ -392,6 +399,7 @@ files:
 - lib/poolparty/provisioners/capistrano/recipies/master.rb
 - lib/poolparty/provisioners/capistrano/recipies/slave.rb
 - lib/poolparty/provisioners/provisioner_base.rb
+- lib/poolparty/server/agent.rb
 - lib/poolparty/spec.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
@@ -436,6 +444,7 @@ files:
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
+- log/agent.log
 - log/pool.log
 - poolparty.gemspec
 - script/destroy
@@ -535,7 +544,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 18:36 12/21/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 01:09 12/23/08)
   
   To get started, run the generator: