auser-poolparty 0.2.79 → 0.2.80

data/Manifest.txt

@@ -18,6 +18,7 @@ bin/cloud-provision
 bin/cloud-refresh
 bin/cloud-rsync
 bin/cloud-run
+bin/cloud-spec
 bin/cloud-ssh
 bin/cloud-start
 bin/cloud-stats
@@ -152,7 +153,6 @@ lib/erlang/messenger/src/client_server.erl
 lib/erlang/messenger/src/master_app.erl
 lib/erlang/messenger/src/node_app.erl
 lib/erlang/messenger/src/pm_client.erl
-lib/erlang/messenger/src/pm_client_old.erl
 lib/erlang/messenger/src/pm_client_supervisor.erl
 lib/erlang/messenger/src/pm_cluster.erl
 lib/erlang/messenger/src/pm_event_manager.erl
@@ -199,14 +199,12 @@ lib/poolparty/exceptions/RuntimeException.rb
 lib/poolparty/exceptions/SpecException.rb
 lib/poolparty/exceptions/TemplateNotFound.rb
 lib/poolparty/exceptions/UnacceptableCommand.rb
+lib/poolparty/extra/deployments.rb
 lib/poolparty/helpers/binary.rb
 lib/poolparty/helpers/console.rb
 lib/poolparty/helpers/display.rb
 lib/poolparty/helpers/nice_printer.rb
 lib/poolparty/helpers/optioner.rb
-lib/poolparty/helpers/provisioner_base.rb
-lib/poolparty/helpers/provisioners/master.rb
-lib/poolparty/helpers/provisioners/slave.rb
 lib/poolparty/helpers/ruberl.rb
 lib/poolparty/modules/cloud_dsl.rb
 lib/poolparty/modules/cloud_resourcer.rb
@@ -257,11 +255,15 @@ lib/poolparty/poolparty/resources/host.rb
 lib/poolparty/poolparty/resources/mount.rb
 lib/poolparty/poolparty/resources/package.rb
 lib/poolparty/poolparty/resources/remote_file.rb
+lib/poolparty/poolparty/resources/remote_user.rb
 lib/poolparty/poolparty/resources/service.rb
 lib/poolparty/poolparty/resources/sshkey.rb
 lib/poolparty/poolparty/resources/symlink.rb
 lib/poolparty/poolparty/resources/variable.rb
 lib/poolparty/poolparty/script.rb
+lib/poolparty/provisioners/provisioner_base.rb
+lib/poolparty/provisioners/provisioners/master.rb
+lib/poolparty/provisioners/provisioners/slave.rb
 lib/poolparty/spec/core/string.rb
 lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 lib/poolparty/spec/matchers/have_cron.rb
@@ -325,6 +327,7 @@ spec/poolparty/core/object_spec.rb
 spec/poolparty/core/string_spec.rb
 spec/poolparty/core/time_spec.rb
 spec/poolparty/dependency_resolutions/base_spec.rb
+spec/poolparty/extra/deployments_spec.rb
 spec/poolparty/helpers/binary_spec.rb
 spec/poolparty/helpers/display_spec.rb
 spec/poolparty/helpers/optioner_spec.rb
@@ -349,35 +352,36 @@ spec/poolparty/plugins/deploydirectory_spec.rb
 spec/poolparty/plugins/git_spec.rb
 spec/poolparty/plugins/line_spec.rb
 spec/poolparty/plugins/svn_spec.rb
-spec/poolparty/pool/base_spec.rb
-spec/poolparty/pool/cloud_spec.rb
-spec/poolparty/pool/configurers/files/ruby_basic.rb
-spec/poolparty/pool/configurers/files/ruby_plugins.rb
-spec/poolparty/pool/configurers/ruby_spec.rb
-spec/poolparty/pool/custom_resource_spec.rb
-spec/poolparty/pool/example_spec.rb
-spec/poolparty/pool/plugin_model_spec.rb
-spec/poolparty/pool/plugin_spec.rb
-spec/poolparty/pool/pool_spec.rb
-spec/poolparty/pool/resource_spec.rb
-spec/poolparty/pool/resources/class_package_spec.rb
-spec/poolparty/pool/resources/conditional_spec.rb
-spec/poolparty/pool/resources/cron_spec.rb
-spec/poolparty/pool/resources/directory_spec.rb
-spec/poolparty/pool/resources/exec_spec.rb
-spec/poolparty/pool/resources/file_spec.rb
-spec/poolparty/pool/resources/gem_spec.rb
-spec/poolparty/pool/resources/host_spec.rb
-spec/poolparty/pool/resources/package_spec.rb
-spec/poolparty/pool/resources/remote_file_spec.rb
-spec/poolparty/pool/resources/service_spec.rb
-spec/poolparty/pool/resources/sshkey_spec.rb
-spec/poolparty/pool/resources/symlink_spec.rb
-spec/poolparty/pool/resources/variable_spec.rb
-spec/poolparty/pool/script_spec.rb
-spec/poolparty/pool/test_plugins/sshkey_test
-spec/poolparty/pool/test_plugins/virtual_host_template.erb
-spec/poolparty/pool/test_plugins/webserver.rb
+spec/poolparty/poolparty/base_spec.rb
+spec/poolparty/poolparty/cloud_spec.rb
+spec/poolparty/poolparty/configurers/files/ruby_basic.rb
+spec/poolparty/poolparty/configurers/files/ruby_plugins.rb
+spec/poolparty/poolparty/configurers/ruby_spec.rb
+spec/poolparty/poolparty/custom_resource_spec.rb
+spec/poolparty/poolparty/example_spec.rb
+spec/poolparty/poolparty/plugin_model_spec.rb
+spec/poolparty/poolparty/plugin_spec.rb
+spec/poolparty/poolparty/pool_spec.rb
+spec/poolparty/poolparty/resource_spec.rb
+spec/poolparty/poolparty/resources/class_package_spec.rb
+spec/poolparty/poolparty/resources/conditional_spec.rb
+spec/poolparty/poolparty/resources/cron_spec.rb
+spec/poolparty/poolparty/resources/directory_spec.rb
+spec/poolparty/poolparty/resources/exec_spec.rb
+spec/poolparty/poolparty/resources/file_spec.rb
+spec/poolparty/poolparty/resources/gem_spec.rb
+spec/poolparty/poolparty/resources/host_spec.rb
+spec/poolparty/poolparty/resources/package_spec.rb
+spec/poolparty/poolparty/resources/remote_file_spec.rb
+spec/poolparty/poolparty/resources/service_spec.rb
+spec/poolparty/poolparty/resources/sshkey_spec.rb
+spec/poolparty/poolparty/resources/symlink_spec.rb
+spec/poolparty/poolparty/resources/user_spec.rb
+spec/poolparty/poolparty/resources/variable_spec.rb
+spec/poolparty/poolparty/script_spec.rb
+spec/poolparty/poolparty/test_plugins/sshkey_test
+spec/poolparty/poolparty/test_plugins/virtual_host_template.erb
+spec/poolparty/poolparty/test_plugins/webserver.rb
 spec/poolparty/poolparty_spec.rb
 spec/poolparty/spec/core/string_spec.rb
 spec/poolparty/spec_helper.rb
@@ -394,6 +398,7 @@ test/test_generator_helper.rb
 test/test_helper.rb
 test/test_pool_spec_generator.rb
 test/test_poolparty.rb
+website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js
 website/stylesheets/code.css

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:46 12/06/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 15:39 12/09/08)
 
 To get started, run the generator:
 

data/bin/cloud-provision

@@ -18,7 +18,7 @@ o.loaded_clouds.each do |cloud|
     if instance_num
       @instance = get_instance_by_number( instance_num )
       instance_num == 0 ? Provisioner.provision_master(self, testing) : Provisioner.provision_slave(@instance, self, testing)
-      Provisioner.process_clean_reconfigure_for!(@instance, self, testing)
+      # Provisioner.process_clean_reconfigure_for!(@instance, self, testing)
     else
       if provision_slave
         vputs "Provisioning slaves"

data/bin/cloud-spec

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+available_tests = {
+  :launch => "Launches a cloud and ensures it is accessible at port 80"
+}
+
+available_tests_string = available_tests.map {|k,v| "#{k}: #{v}"}.join("\n")
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|  
+  optioner.cloudnames
+  optioner.daemonizeable
+  opts.on('--type type', 
+    "Run type of test. Available tests: #{available_tests_string} (default: launch)")    { |c| optioner.testtype c }
+end
+
+o.loaded_clouds.each do |cloud|
+  with_cloud(cloud) do
+    puts "Are you sure you want to live test?"
+    body = ["Normal charges for running instances will apply"]
+    body << "as this will run instances"
+    body.each {|st| puts "\t#{st}"}
+    print "(y|n): "
+    input = gets.downcase.chomp
+    do_test = input.downcase == "y" ? true : false
+    if do_test
+      case testtype
+      when "launch"
+      when nil
+        print_with_nice_printer("Starting live specing cloud #{name}")      
+        # hide_output {launch_and_configure_master!}
+        print_with_nice_printer("Waiting for cloud to provision")
+        
+      end
+    end
+  end
+  
+end

data/lib/poolparty.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 # Load required gems
 @required_software = Array.new
-%w(activesupport ftools logging resolv ruby2ruby).each do |lib|
+%w(activesupport ftools logging resolv ruby2ruby digest/sha2).each do |lib|
   begin
     require lib
   rescue Exception => e
@@ -38,7 +38,7 @@ ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
 ## Load PoolParty
 require "#{File.dirname(__FILE__)}/poolparty/version"
 
-%w(core modules exceptions dependency_resolutions aska monitors net).each do |dir|
+%w(core modules exceptions dependency_resolutions aska monitors provisioners 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

@@ -50,7 +50,7 @@ module PoolParty
         end
         
         # execute_on_node do
-          has_cron(:name => "node puppetd runner", :user => Base.user, :minute => "*/11") do
+          has_cron(:name => "node puppetd runner", :user => Base.user, :minute => "*/15") do
             requires get_gempackage("poolparty")
             command "/usr/bin/puppetrunner"
           end

data/lib/poolparty/extra/deployments.rb

@@ -0,0 +1,31 @@
+module PoolParty
+  module Extra
+    class Deployments
+
+      class << self
+        
+        def include_deployment(filename)
+          return nil unless ::File.file? filename
+          name = ::File.basename(filename, ::File.extname(filename))
+          contents = open(filename).read
+
+          plugin_klass = PoolParty::PluginModel::PluginModel.new(name)
+          plugin_klass.klass.class_eval <<-EOE
+            def enable
+              #{contents}
+            end
+          EOE
+          plugin_klass
+        end
+        
+        def include_deployments(dir)
+          return nil unless ::File.directory? dir
+          Dir["#{dir}/*"].each do |fi|
+            include_deployment fi
+          end
+          dir
+        end
+      end
+    end    
+  end
+end

data/lib/poolparty/helpers/binary.rb

@@ -13,6 +13,15 @@ module PoolParty
     end
   end
   
+  def print_with_nice_printer(header=nil, strs=[])
+    returning NicePrinter.new do |printer|
+      printer.header
+      printer.center(header) if header
+      strs.each {|st| printer << st if st}
+      printer.footer
+    end.print
+  end
+  
   def pool_specfile
     $pool_specfile
   end

data/lib/poolparty/modules/cloud_dsl.rb

@@ -6,7 +6,7 @@ module PoolParty
       ebs_volume_mount_point loc
       ebs_volume_device "/dev/#{id.sanitize}"
             
-      has_mount(:name => loc, :device => ebs_volume_device, :onlyif => "test -d #{loc}")
+      has_mount(:name => loc, :device => ebs_volume_device)
       has_directory(:name => loc)
     end
     

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -55,6 +55,8 @@ module PoolParty
       return nil
     end
     
+    # The keypair name can be one name or another including id_rsa or not
+    # So let's get the name that exists as a keypair
     def full_keypair_name
       keypair_paths.each do |path|
         possible_keypair_basenames.each do |base|

data/lib/poolparty/modules/file_writer.rb

@@ -26,11 +26,11 @@ module PoolParty
       path = ::File.join( Base.storage_directory, dirname )
       make_base_path path
     end
-    def write_to_file_in_storage_directory(file, str, preceded="", &block)
+    def write_to_file_in_storage_directory(file, str="", preceded="", &block)
       path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) )
       write_to_file(path, str, &block)
     end
-    def write_to_file(file, str, preceded="", &block)
+    def write_to_file(file, str="", preceded="", &block)
       path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) )
       make_base_path( Base.storage_directory )
       ::File.open(path, "w+") do |f|

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} -setcookie poolparty"
+      command_line_opts = "-pa #{append_dir}/ebin -kernel inet_dist_listen_min #{min_ports} inet_dist_listen_max #{max_ports} -sname #{hostname} -cookie"
       
       "erl #{command_line_opts} #{extra}"
     end

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

@@ -125,8 +125,7 @@ begin
         pub_key && private_key
       end
       # The keys are used only for puppet certificates
-      # and are only used for EC2. These should be abstracted
-      # eventually into the ec2 remoter_base
+      # and are only used for EC2.
       # Public key 
       def pub_key
         @pub_key ||= ENV["EC2_CERT"] ? ENV["EC2_CERT"] : nil
@@ -135,6 +134,10 @@ begin
       def private_key
         @private_key ||= ENV["EC2_PRIVATE_KEY"] ? ENV["EC2_PRIVATE_KEY"] : nil
       end
+      
+      def custom_minimum_runnable_options
+        [:ami, :availabilty_zone, :security_group]
+      end
 
       # Callback
       def custom_install_tasks_for(o)

data/lib/poolparty/net/remoter.rb

@@ -2,8 +2,6 @@
   This module is included by the remote module and defines the remoting methods
   that the clouds can use to rsync or run remote commands
 =end
-require File.dirname(__FILE__) + "/../helpers/provisioner_base"
-
 module PoolParty
   module Remote
     module Remoter
@@ -189,9 +187,9 @@ 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)}
+            # hide_output {PoolParty::Provisioner.process_clean_reconfigure_for!(inst, self)}
             PoolParty::Provisioner.provision_slave(inst, self, false) unless inst.master? rescue vputs "Error"
-            hide_output {PoolParty::Provisioner.process_clean_reconfigure_for!(inst, self)}
+            # 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}"
           end

data/lib/poolparty/net/remoter_base.rb

@@ -140,6 +140,13 @@ module PoolParty
       # Callback after loaded
       def loaded_remoter_base        
       end
+      
+      # Custom minimum runnable options
+      # Extend the minimum runnable options that are necessary
+      # for poolparty to run on the remote base
+      def custom_minimum_runnable_options
+        []
+      end
             
       # Custom installation tasks
       # Allow the remoter bases to attach their own tasks on the 

data/lib/poolparty/poolparty/cloud.rb

@@ -54,9 +54,9 @@ module PoolParty
         # set_parent(parent) if parent && !@parent
         # self.run_in_context parent, &block if block
         setup_defaults
-        realize_plugins!
-        reset! # reset the clouds
-        reset_remoter_base!
+        # realize_plugins!
+        # reset! # reset the clouds
+        # reset_remoter_base!
       end
       
       def setup_defaults
@@ -79,7 +79,7 @@ module PoolParty
       def generate_keypair(*args)
         options[:keypair] = "#{parent && parent.is_a?(PoolParty::Pool::Pool) ? parent.name : "poolparty"}_#{name}" unless has_keypair?
       end
-      
+            
       # Prepare to send the new configuration to the instances
       # First, let's make sure that our base directory is made
       # Then copy the templates that have no other reference in
@@ -97,6 +97,7 @@ module PoolParty
         Script.save!(self)
         # not my favorite...
         copy_ssh_key
+        write_unique_cookie
         before_configuration_tasks
       end
       
@@ -112,6 +113,20 @@ module PoolParty
         Base.store_keys_in_file_for(self)
       end
       
+      # Let's write the cookie into the tmp path
+      def write_unique_cookie
+        write_to_file_in_storage_directory("cookie") do
+          generate_unique_cookie_string
+        end
+      end
+      
+      # Generate a unique cookie string so that our erlang modules can 
+      # 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}")
+      end
+      
       # Build the new poolparty manifest
       # Wrapping all of these requirements into the one 
       # poolparty class.
@@ -201,10 +216,10 @@ module PoolParty
       # they need a few options to run, these are the required options
       # to be saved on the remote "master" machine
       def minimum_runnable_options
-        [
-          :keypair, :minimum_instances, :maximum_instances, :ami, :security_group,
+        ([
+          :keypair, :minimum_instances, :maximum_instances,
           :expand_when, :contract_when, :set_master_ip_to
-        ]
+        ]<< custom_minimum_runnable_options).flatten
       end
       
       # Add all the poolparty requirements here

data/lib/poolparty/poolparty/plugin_model.rb

@@ -4,7 +4,7 @@ module PoolParty
   module PluginModel
     
     def plugin(name=:plugin, cloud=nil, &block)
-      plugins.has_key?(name) ? plugins[name] : (plugins[name] = PluginModel.new(name, cloud, &block))
+      plugins.has_key?(name) ? plugins[name] : (plugins[name] = PluginModel.new(name, &block))
     end
     alias_method :register_plugin, :plugin
     
@@ -18,15 +18,15 @@ module PoolParty
       include Configurable
       include PrettyPrinter      
       
-      def initialize(name,cld,&block)
+      def initialize(name,&block)
         @name = name
         # @parent = cld
         class_string_name = "#{name}"
         
         # Create the class to evaluate the plugin on the implemented call
-        klass = class_string_name.class_constant(PoolParty::Plugin::Plugin)
+        @klass = klass = class_string_name.class_constant(PoolParty::Plugin::Plugin)
         mod = class_string_name.module_constant(&block)
-
+        
         klass.send :include, mod
         
         # Store the name of the class for pretty printing later