.gitmodules TODO.textile VERSION.yml bin/cloud-bootstrap bin/cloud-console bin/ec2-list-active config/jeweler.rb examples/default.rb examples/fairchild.rb examples/suspenders.conf.erb lib/poolparty/dependencies.rb lib/poolparty/dependency_resolver/dependency_resolver.rb lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb lib/poolparty/dependency_resolver/puppet.rb lib/poolparty/dependency_resolver/puppet_resolver.rb lib/poolparty/exceptions/dependency_resolver_exception.rb lib/poolparty/exceptions/package_exception.rb lib/poolparty/helpers/hash_printer.rb lib/poolparty/lite.rb lib/poolparty/net/init.rb lib/poolparty/net/remote_bases.rb lib/poolparty/net/remoter/cloud_control.rb lib/poolparty/net/remoter/connections.rb lib/poolparty/net/remoter/interactive.rb lib/poolparty/net/remoter/lists.rb lib/poolparty/net/remoter_bases/ec2/ec2.rb lib/poolparty/net/remoter_bases/ec2/ec2_remote_instance.rb lib/poolparty/net/remoter_bases/ec2/ec2_response_object.rb lib/poolparty/plugins/chef.rb lib/poolparty/poolparty/default.rb lib/poolparty/poolparty/key.rb lib/poolparty/poolparty/neighborhoods.rb lib/poolparty/poolparty/poolparty_base_class.rb lib/poolparty/poolparty/service.rb lib/poolparty/poolparty/template.rb lib/poolparty/provision/boot_strapper.rb lib/poolparty/provision/configurations/chef.rb lib/poolparty/provision/configurations/puppet.rb lib/poolparty/provision/dr_configure.rb lib/poolparty/provisioners/capistrano/recipes/aws.rb lib/poolparty/provisioners/capistrano/recipes/base.rb lib/poolparty/provisioners/capistrano/recipes/master.rb lib/poolparty/provisioners/capistrano/recipes/puppet.rb lib/poolparty/provisioners/capistrano/recipes/slave.rb lib/poolparty/resources/cron.rb lib/poolparty/resources/custom_service.rb lib/poolparty/resources/directory.rb lib/poolparty/resources/exec.rb lib/poolparty/resources/file.rb lib/poolparty/resources/host.rb lib/poolparty/resources/line.rb lib/poolparty/resources/mount.rb lib/poolparty/resources/package.rb lib/poolparty/resources/remote_file.rb lib/poolparty/resources/service.rb lib/poolparty/resources/sshkey.rb lib/poolparty/resources/symlink.rb lib/poolparty/resources/user.rb lib/poolparty/resources/variable.rb lib/poolparty/schema.rb lib/poolparty/services/conditional.rb lib/poolparty/services/gem_package.rb lib/poolparty/templates/erlang_cookie_maker lib/poolparty/templates/gemrc lib/poolparty/templates/puppet/add_puppet_to_hosts lib/poolparty/templates/puppet/puppet.conf lib/poolparty/templates/puppet/puppetrunner lib/poolparty/templates/puppet/site.pp pkg/poolparty-1.0.1.gem spec/bin/bin_spec_helper.rb spec/bin/fixtures/bin_cloud_for_test.rb spec/bin/server-list-active_spec.rb spec/poolparty/dependencies_spec.rb spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb spec/poolparty/dependency_resolver/dependency_resolver_spec.rb spec/poolparty/dependency_resolver/puppet_resolver_spec.rb spec/poolparty/fixtures/test_template.erb spec/poolparty/helpers/hash_printer_spec.rb spec/poolparty/id_rsa spec/poolparty/net/remoter_bases/ec2_mocks_and_stubs.rb spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb spec/poolparty/net/remoter_bases/ec2_spec.rb spec/poolparty/plugins/chef_spec.rb spec/poolparty/poolparty/default_spec.rb spec/poolparty/poolparty/key_spec.rb spec/poolparty/poolparty/neighborhoods_spec.rb spec/poolparty/poolparty/service_spec.rb spec/poolparty/poolparty/template_spec.rb spec/poolparty/poolparty_base_class_spec.rb spec/poolparty/resources/cron_spec.rb spec/poolparty/resources/directory_spec.rb spec/poolparty/resources/exec_spec.rb spec/poolparty/resources/file_spec.rb spec/poolparty/resources/gem_spec.rb spec/poolparty/resources/host_spec.rb spec/poolparty/resources/package_spec.rb spec/poolparty/resources/service_spec.rb spec/poolparty/resources/sshkey_spec.rb spec/poolparty/resources/symlink_spec.rb spec/poolparty/resources/user_spec.rb spec/poolparty/resources/variable_spec.rb spec/poolparty/schema_spec.rb spec/poolparty/services/conditional_spec.rb spec/poolparty/test_spec_helper.rb tasks/poolparty.rake vendor/gems/dslify vendor/gems/parenting vendor/gems/suitcase @@ -1,4 +1,5 @@ -tmp/* +.com.apple.timemachine.supported +.DS_Store *tmp* pkg/*.tgz pkg/poolparty*/* @@ -10,4 +11,9 @@ test_manifest.pp # erl_crash.dump *erl_crash.dump* log -*.beam \ No newline at end of file +*.beam +ri/ +doc/ +config/manifest.pp +vendor/dependencies/cache +vendor/dependencies/packages \ No newline at end of file .gitignore @@ -1,4 +1,4 @@ -Copyright (c) 2008 Ari Lerner +Copyright (c) 2009 Ari Lerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the License.txt @@ -49,7 +49,7 @@ sudo gem install auser-poolparty * Add queuing of tasks on the messenger * Add syntax checker on the manifests * Move in collectd support -* Add master query +* Remove master-slave protocol == LICENSE: README.txt @@ -1,15 +1,17 @@ require 'config/requirements' -require 'config/hoe' # setup Hoe + all gem configuration +require 'config/jeweler' # setup gem configuration Dir['tasks/**/*.rake'].each { |rake| load rake } desc "Clean tmp directory" task :clean_tmp do |t| - %x[rm #{File.dirname(__FILE__)}/Manifest.txt; touch #{File.dirname(__FILE__)}/Manifest.txt] + FileUtils.rm_rf("#{File.dirname(__FILE__)}/Manifest.txt") if ::File.exists?("#{File.dirname(__FILE__)}/Manifest.txt") + FileUtils.touch("#{File.dirname(__FILE__)}/Manifest.txt") %w(logs tmp).each do |dir| FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}") end end + desc "Remove the pkg directory" task :clean_pkg do |t| %w(pkg).each do |dir| @@ -17,9 +19,6 @@ task :clean_pkg do |t| end end -desc "Generate a new manifest and a new gem" -task :build_local_gem => [:clean_tmp, :spec, :clean_pkg, :"manifest:refresh", :package] - desc "Packge with timestamp" task :update_timestamp do data = open("PostInstall.txt").read @@ -33,37 +32,14 @@ task :update_timestamp do ::File.open("PostInstall.txt", "w+") {|f| f << data } end -desc "Release to github" -task :github_release => [:clean_tmp, :spec, :clean_pkg, :"manifest:refresh", :update_timestamp, :package] do - res = %x[rake debug_gem] - res = res.split("\n")[1..-1].join("\n") - ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f| - f << res - end - `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty.gem` -end - -desc "Generate gemspec" -task :gemspec => [:spec, :clean_tmp, :"manifest:refresh", :build_local_gem] do |t| - res = %x[rake debug_gem] - res = res.split("\n")[1..-1].join("\n") - ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f| - f << res - end -end - -desc "Generate gemspec for github" -task :gh => [:github_release, :package] do - filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec") - data = open(filepath).read - spec = eval("$SAFE = 3\n#{data}") - yml = YAML.dump spec - File.open(filepath, "w+") do |f| - f << yml - end +namespace :gem do + task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation + + desc "Build the gem only if the specs pass" + task :test_then_build => [:spec, :build] + + desc "Build and install the gem only if the specs pass" + task :test_then_install => [:spec, :install] end -desc "Generate github gemspec and latest gem" -task :ghgem => [:gh] do - %x[sudo gem install pkg/poolparty.gem] -end \ No newline at end of file +task :release => [:update_timestamp] \ No newline at end of file Rakefile @@ -1,17 +1,22 @@ #!/usr/bin/env ruby $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "poolparty" -require "poolpartycl" +# require "poolpartycl" + o = PoolParty::Optioner.new(ARGV) do |opts, optioner| optioner.cloudnames # optioner.daemonizeable end -o.loaded_clouds.each do |cloud| +o.loaded_clouds.each do |cld| - with_cloud(cloud) do - verbose ? provisioner_for(master).configure(testing) : hide_output { provisioner_for(master).configure(testing) } - cleanup_storage_directory unless testing - end + # If an IP or DNS name is given, configure that node, otherwise, configure all running nodes. + nodes = !o.unflagged_args.empty? ? o.unflagged_args : cld.remote_instances_list.collect {|inst| inst.ip if inst.running? }.compact + nodes.each do |address| + puts "configuring: #{address}" + ::PoolParty::Provision::DrConfigure.new( address, + :full_keypair_path => cld.keypair.full_filepath, + :cloud => cld ) + end end \ No newline at end of file bin/cloud-configure @@ -1,7 +1,6 @@ #!/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('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)') { |o| optioner.location o } @@ -10,17 +9,15 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner| opts.on('-n name', '--name name', 'Listing for cloud name') { |c| optioner.cloudname c } end -o.loaded_clouds.each do |cloud| +o.loaded_clouds.each do |cld| - with_cloud(cloud) do - puts header("Listing cloud #{name}") - puts subheader("Active instances") - puts list_of_running_instances.map{|a| a.to_s}.join("\n") - puts "" - if list_of_pending_instances.size > 0 - puts subheader("Pending instances") - puts list_of_pending_instances.map{|a| a.to_s}.join("\n") - end - end + puts header("Listing cloud #{cld.name}") + puts subheader("Active instances") + puts cld.list_of_running_instances.map{|a| a.to_s}.join("\n") + + if cld.list_of_pending_instances.size > 0 + puts subheader("Pending instances") + puts cld.list_of_pending_instances.map{|a| a.to_s}.join("\n") + end end \ No newline at end of file bin/cloud-list @@ -1,34 +1,24 @@ #!/usr/bin/env ruby $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "poolparty" -require "poolpartycl" +require "poolparty/provision/boot_strapper" 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 +o.loaded_clouds.each do |cld| + # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes. + nodes = !o.unflagged_args.empty? ? o.unflagged_args : cld.remote_instances_list.collect {|inst| inst.ip if inst.running? }.compact + if nodes.empty? + puts "No nodes to bootstrap" + else + nodes.each do |address| + puts "bootstrapping: #{address}" + ::PoolParty::Provision::BootStrapper.new( address, {:full_keypair_path => cld.keypair.full_filepath, :cloud => cld} ) + ::PoolParty::Provision::DrConfigure.new( address, :full_keypair_path => cld.keypair.full_filepath, + :cloud => cld ) end - - cleanup_storage_directory unless testing end +end -end \ No newline at end of file bin/cloud-provision @@ -29,7 +29,8 @@ o.loaded_clouds.each do |cloud| case testtype when "launch" when nil - print_with_nice_printer("Starting live specing cloud #{name}") + print_with_nice_printer("Starting live specing cloud #{name}") + puts "TODO: this isn't implented yet." # hide_output {launch_and_configure_master!} print_with_nice_printer("Waiting for cloud to provision") bin/cloud-spec @@ -4,11 +4,19 @@ require "poolparty" require "poolpartycl" o = PoolParty::Optioner.new(ARGV) do |opts, optioner| + optioner.options( :num => 0 ) 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 } + # opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)') { |i| optioner.num i.to_i } end -load_pool(o.spec || Binary.get_existing_spec_location) +load_pool(o.spec? ? o.spec : Binary.get_existing_spec_location) @cloud = o.loaded_clouds.first +nodes = @cloud.list_of_running_instances -@cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud \ No newline at end of file +puts nodes.map {|a| a.to_s}.join("\n") + +if !nodes.empty? + @cloud.ssh_into( nodes.first ) if @cloud +else + puts "No running instances can be found" +end \ No newline at end of file bin/cloud-ssh @@ -1,32 +1,36 @@ #!/usr/bin/env ruby $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require "poolparty" -require "poolpartycl" -o = PoolParty::Optioner.new(ARGV) do |opts, optioner| - optioner.cloudnames - optioner.daemonizeable +o = PoolParty::Optioner.new(ARGV) do |opts, optioner| + opts.on('-n cloudname', '--name name', 'Start cloud by this name') { |c| optioner.cloudname c } end -o.loaded_clouds.each do |cloud| - with_cloud(cloud) do - setup_dev - vputs header("Starting cloud #{name}") - vputs "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})" - # if list_of_running_instances.size <= 1 - puts "Starting the master instance" - # if testing - # puts("\tNot launching while in testing mode") - # else - vputs "Launching and configuring the master" - @cl = self - daemon ? daemonize {@cl.launch_and_configure_master!} : launch_and_configure_master! - # end +o.loaded_clouds.each do |cld| + if cld.list_of_running_instances.size.zero? + puts header("Starting cloud #{cld.name}") + puts "#{cld.list_of_running_instances.size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})" + + inst = cld.launch_instance! + # unil inst.ip do + # sleep 2 + # node = cld.remote_instances_list.select {|i| i.running? } # end - when_no_pending_instances do - puts open(::File.join(File.dirname(__FILE__), "..", "lib", "poolparty", "config", "postlaunchmessage.txt")).read ^ {:master_ip => master.ip.chomp} - clear_base_directory unless testing + + cld.when_no_pending_instances do + cld.remote_instances_list.select {|i| i.running? }.each do |node| + ::PoolParty::Provision::BootStrapper.new(node.ip, :full_keypair_path => cld.keypair.full_filepath, :cloud => cld) + ::PoolParty::Provision::DrConfigure.new(node.ip, :full_keypair_path => cld.keypair.full_filepath, :cloud => cld) + end + + first_inst = cld.remote_instances_list.select {|i| i.running? }.first + puts <<-EOM + Your cloud has started. Your ip is #{first_inst.ip} + EOM end + else + puts <<-EOE + Your cloud is already running. + EOE end - end \ No newline at end of file bin/cloud-start @@ -13,7 +13,7 @@ o.loaded_clouds.each do |cloud| list_of_running_instances.each do |inst| puts "Shutting down #{inst.instance_id}" - terminate_instance!(inst.instance_id) + terminate_instance!(:instance_id => inst.instance_id) end end bin/cloud-terminate @@ -16,7 +16,7 @@ include Remote @clouds.each do |cl| with_cloud(cl, {:testing => o.testing}) do - cmd = "hostname master && #{PoolParty::Remote::RemoteInstance.puppet_runner_command}" + cmd = "hostname master && #{PoolParty::Remote::RemoteInstance.dependency_resolver_comand}" %x[#{cmd}] unless testing after_launch_master end bin/server-become-master @@ -11,5 +11,5 @@ end o.loaded_clouds.each do |cloud| # @nodes = cloud.messenger_send!("get_current_nodes") # @nodes = @nodes.split(" ").map {|a| a.split(/@/)[-1] } - PoolParty::Ruberl::Base.new(cloud.master, Base.messenger_client_port).messenger_send!("clear_cert_for #{cloud.for}") + PoolParty::Ruberl::Base.new(cloud.master, Default.messenger_client_port).messenger_send!("clear_cert_for #{cloud.for}") end \ No newline at end of file bin/server-clean-cert-for @@ -20,8 +20,7 @@ o.loaded_clouds.each do |cloud| next if node == "master" # @tp.process do str = returning Array.new do |s| - s << "/usr/sbin/puppetca --clean #{node}.compute-1.internal" - s << "/usr/sbin/puppetca --clean #{node}.ec2.internal" + s << cloud.dependency_resolver_command end.join(";") node_id = node.gsub(/node/, '') bin/server-ensure-provisioning @@ -1,18 +1,15 @@ #!/usr/bin/env ruby $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) -require "poolparty" -require "poolpartycl" +require "poolparty/lite" +Dir["#{File.dirname(__FILE__)}/../lib/poolparty/monitors/base_monitor.rb"].each {|f| require f} -available_monitors = PoolParty::Monitors.available_monitors -o = PoolParty::Optioner.new(ARGV) do |opts, optioner| - # opts.on('-n name', '--name name', 'Listing for cloud name') { |c| optioner.cloudname c } - opts.on('-m name', '--monitor monitor_name', "Monitor name (default: cpu) (Available monitors: #{available_monitors.join(", ")})") {|c| optioner.monitorname c} -end +monitor = ARGV.pop || "cpu" -@monitor = o.monitorname ? o.monitorname : "cpu" +begin + Dir["#{File.dirname(__FILE__)}/../lib/poolparty/monitors/monitors/#{monitor}_monitor.rb"].each {|f| require f} -if PoolParty::Monitors.available_monitors.include?(@monitor.downcase.to_sym) - print "PoolParty::Monitors::#{@monitor.capitalize}Monitor".constantize.run.to_f -else - puts "Unknown monitor" + klass = eval("PoolParty::Monitors::#{monitor.capitalize}Monitor") + print (klass.send :run).to_f rescue -1.0 +rescue Exception => e + puts -1.0 end \ No newline at end of file bin/server-get-load @@ -1,18 +1,14 @@ #!/usr/bin/env ruby $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) -require "poolparty" -require "poolpartycl" +require "poolparty/lite" -o = PoolParty::Optioner.new(ARGV) do |opts, optioner| - opts.on('-c name', '--class name', 'Listing for cloud class (valid args: [name|ip])') { |t| optioner.classname t } - opts.on('-n name', '--name name', 'Listing for cloud name') { |c| optioner.cloudname c } -end +list_type = ARGV.pop || "ip" -@ctype = (o.classname || "name").downcase.to_sym +json_file = ARGV[0] || PoolParty::Default.properties_hash_file +raise "ERROR: no json_file given" if !json_file +schema = PoolParty::Schema.new( ::File.read(json_file) ) -o.loaded_clouds.each do |cloud| - with_cloud(cloud, {:ctype => @ctype}) do - print "#{list_of_running_instances.collect{|a| "#{a.send ctype}" }.join("\t")}" - end - -end \ No newline at end of file +remoter_base = schema.options.remote_base + +instances = PoolParty::Remote::Ec2.describe_instances(schema.options) +print instances.map {|inst| inst.send list_type.to_sym }.join("\t") \ No newline at end of file bin/server-list-active @@ -5,7 +5,7 @@ Dir["#{::File.dirname(__FILE__)}/../lib/poolparty/modules/*.rb"].each {|f| requi require "poolparty/base" def query(meth, *args) - socket = TCPSocket.open("127.0.0.1", PoolParty::Base.agent_port) + socket = TCPSocket.open("127.0.0.1", PoolParty::Default.agent_port) out = socket.send("#{meth} #{args}", 100) socket.close out bin/server-query-agent @@ -16,7 +16,7 @@ include Remote @clouds.each do |cl| with_cloud(cl, {:testing => o.testing}) do - cmd = PoolParty::Remote::RemoteInstance.puppet_runner_command + cmd = PoolParty::Remote::RemoteInstance.dependency_resolver_comand %x[#{cmd}] unless testing end bin/server-rerun @@ -30,7 +30,7 @@ o.loaded_clouds.each do |cloud| if testing puts new_hosts_listing else - new_hosts_file = "#{Base.manifest_path}/classes/hosts.pp" + new_hosts_file = "#{Default.manifest_path}/classes/hosts.pp" arr = returning Array.new do |arr| new_hosts_listing.split(/\n/).each do |line| bin/server-update-hosts @@ -11,7 +11,7 @@ end o.loaded_clouds.each do |cloud| with_cloud(cloud) do - new_nodes_file = "#{Base.manifest_path}/nodes/nodes.pp" + new_nodes_file = "#{Default.manifest_path}/nodes/nodes.pp" str = returning Array.new do |arr| arr << "node default { include poolparty }" bin/server-write-new-nodes @@ -2,14 +2,6 @@ require 'fileutils' include FileUtils require 'rubygems' -%w[rake hoe newgem rubigen].each do |req_gem| - begin - require req_gem - rescue LoadError - puts "This Rakefile requires the '#{req_gem}' RubyGem." - puts "Installation: gem install #{req_gem} -y" - exit - end -end +require 'rake' $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib])) config/requirements.rb @@ -1,20 +1,23 @@ # Basic pool spec # Shows global settings for the clouds - pool :application do - - instances 3..5 + instances 3..50 keypair "auser" + testing true - cloud :app do - minimum_instances 2 + cloud :basic_app do + minimum_instances 12 ami "ami-abc123" + junk_yard_dogs "pains" + has_file :name => "/etc/init.d/motd", :content => "Welcome to your PoolParty instance" end - cloud :db do + cloud :basic_db do + minimum_instances 19 keypair "hotstuff_database" maximum_instances 20 ami "ami-1234bc" + junk_yard_dogs "are bad" end end \ No newline at end of file examples/basic.rb @@ -21,7 +21,7 @@ class PoolspecGenerator < RubiGen::Base m.directory '' BASEDIRS.each { |path| m.directory path } - m.template "pool_spec_template.erb", "clouds.pool" + m.template "pool_spec_template.erb", "clouds.rb" # Create stubs # m.template "template.rb", "some_file_after_erb.rb" # m.template_copy_each ["template.rb", "template2.rb"] @@ -31,14 +31,6 @@ class PoolspecGenerator < RubiGen::Base end protected - def banner - <<-EOS -Creates a basic poolparty spec tempalte - -USAGE: #{spec.name} name -EOS - end - def add_options!(opts) opts.separator '' opts.separator 'Options:' generators/poolspec/poolspec_generator.rb @@ -54,7 +54,7 @@ task :compile => ['ebin'] + OBJ desc "Rebuild the boot scripts" task :build_boot_scripts => [:recompile] do puts "Rebuilding boot scripts" - @version = "0.1" + @version = ENV["VERSION"] || ENV["V"] || 0.1 cmd = "erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell" Kernel.system cmd end lib/erlang/messenger/Rakefile @@ -38,7 +38,7 @@ % Get the load for the type sent... get_current_load_for_type(Type) -> - String = string:concat(". /etc/profile && server-get-load -m ",Type), + String = string:concat(". /etc/profile && server-get-load ",Type), LatestLoad = os:cmd(String), Load = gen_server:call(server_location(), {update_load, Type, LatestLoad}), {Load}. lib/erlang/messenger/src/pm_node.erl @@ -58,7 +58,6 @@ average_for_list(Num, L) -> % Provisioning utils distribute_modules_to(Modules, Nodes) -> % transfer the modules to all the nodes - io:format("Sending ~p to ~p~n", [Modules, Nodes]), lists:foreach(fun(Node) -> transfer_modules(Node, Modules) end, Nodes). lib/erlang/messenger/src/utils.erl @@ -1,6 +1,8 @@ +$LOAD_PATH<< File.dirname(__FILE__) # Load required gems +#TODO: remove activesupport @required_software = Array.new -%w(rubygems activesupport ftools logging resolv ruby2ruby digest/sha2).each do |lib| +%w(rubygems activesupport ftools logging resolv ruby2ruby digest/sha2 json pp).each do |lib| begin require lib rescue Exception => e @@ -30,28 +32,79 @@ unless @required_software.empty? exit(0) end -# Use active supports auto load mechanism -ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__) +Dir.glob(File.join(File.dirname(__FILE__),'..', 'vendor/gems/*/lib/*.rb')).each do |d| + require d +end +t=Time.now ## Load PoolParty %w(version).each do |f| require "#{File.dirname(__FILE__)}/poolparty/#{f}" end -%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 +def PoolParty.require_directory(dir) + if ::File.file?(dir) + puts "#{::File.expand_path(dir)}" if $DEBUGGING || $GENERATING_MANIFEST + require dir + else + Dir["#{dir}/*.rb"].sort.each do |file| + puts "#{::File.expand_path(file)}" if $DEBUGGING || $GENERATING_MANIFEST + require "#{file}" if ::File.file?(file) + end + Dir["#{dir}/*"].sort.each do |dir| + require_directory(dir) if ::File.directory?(dir) + end + end +end + +#load poolparty framework in specific order +$_poolparty_load_directories = [ + "core", + "dependencies.rb", + "dependency_resolver/dependency_resolver_cloud_extensions.rb", + "poolparty/poolparty_base_class.rb", + "modules", + "exceptions", + 'poolparty/key.rb', + "dependency_resolver", + "aska", + "config", + "monitors", + "capistrano.rb", + 'provisioners/provisioner_base.rb', + 'provisioners/capistrano/capistrano.rb', + 'provision', + "extra", + "net", + "helpers", + "poolparty/resource.rb", + "poolparty/service.rb", + "resources", + "services", + "poolparty/cloud.rb", + "poolparty", + "templates" + ] +manifest_file_location = ::File.join(::File.dirname(__FILE__), '../config/manifest.pp') + +if ::File.file?(manifest_file_location) + ::File.readlines(manifest_file_location).each do |line| + puts "#{::File.expand_path(line)}" if $DEBUGGING + require "#{line.gsub(/\n/, '')}" end +else + $_poolparty_load_directories.each do |dir| + PoolParty.require_directory(::File.join(::File.dirname(__FILE__),'poolparty', dir)) + end end -Kernel.load_p File.dirname(__FILE__) + "/poolparty/poolparty" Logging.init :debug, :info, :warn, :error, :fatal module PoolParty include FileWriter def log - @logger ||= make_new_logger + @logger ||= STDOUT #make_new_logger end def reset! $pools = $clouds = $plugins = @describe_instances = nil @@ -65,10 +118,10 @@ module PoolParty private #:nodoc:# - def make_new_logger - FileUtils.mkdir_p ::File.dirname(Base.pool_logger_location) unless ::File.directory?(::File.dirname(Base.pool_logger_location)) - Loggable.new - end + # def make_new_logger + # FileUtils.mkdir_p ::File.dirname(Default.pool_logger_location) unless ::File.directory?(::File.dirname(Default.pool_logger_location)) + # Loggable.new + # end end class Object @@ -80,16 +133,15 @@ class Object end class Class - include PoolParty::PluginModel + include PoolParty::PluginModel end ## Load PoolParty Plugins and package module PoolParty %w(plugins base_packages).each do |dir| - Dir[::File.dirname(__FILE__) + "/poolparty/#{dir}/*.rb"].each do |file| - require file - end + require_directory(::File.join(::File.dirname(__FILE__), 'poolparty', dir)) end end -PoolParty.reset! \ No newline at end of file +PoolParty.reset! +puts "duration = #{Time.now-t}" if $DEBUGGING lib/poolparty.rb @@ -1,40 +1,43 @@ module PoolParty class Base - plugin :haproxy do + plugin :poolparty_base_haproxy do def enable - execute_on_master do - has_package({:name => "haproxy"}) + case_of "hostname" do + when_is "master" do + has_package({:name => "haproxy"}) - # Restart sysklogd after we update the haproxy.log - has_service(:name => "sysklogd") + # Restart sysklogd after we update the haproxy.log + has_service(:name => "sysklogd") - # Template variables - has_variable(:name => "name_haproxy", :value => "#{cloud.name}") - has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')") - has_variable(:name => "node_ips_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')") + # Template variables + has_variable("name_haproxy", :value => "#{cloud.name}") + has_variable("nodenames_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', 'name')") + has_variable("node_ips_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', 'ip')") + # + has_variable("ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Default.port)].flatten)) + has_variable("forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Default.forwarding_port)) + has_variable("proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Default.proxy_mode)) - has_variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten)) - has_variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port)) - has_variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode)) + # Startup haproxy and enable it + has_line_in_file(:line => "ENABLED=1", :file => "/etc/default/haproxy") + has_line_in_file({:line => "SYSLOGD=\"-r\"", :file => "/etc/default/syslogd"}) + has_line_in_file({:line => "local0.* /var/log/haproxy.log", :file => "/etc/syslog.conf"}, {:notify => get_service("sysklogd")}) + + has_exec(:name => "reloadhaproxy", + :command => "/etc/init.d/haproxy reload", + :requires => get_package("haproxy")) + # Service is required + has_service("haproxy", :ensures => "running", :hasrestart => true) + has_service(:name => "haproxy", :ensures => "running", :hasrestart => true, :notify => get_exec("reloadhaproxy")) - # Startup haproxy and enable it - 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")}) - - has_exec(:name => "reloadhaproxy", - :command => "/etc/init.d/haproxy reload", - :requires => get_package("haproxy")) - # Service is required - has_service(:name => "haproxy", :ensures => "running", :hasrestart => true, :notify => get_exec("reloadhaproxy")) - - # These can also be passed in via hash - has_remotefile(:name => "/etc/haproxy.cfg") do - mode 644 - requires get_package("haproxy") - notify get_service("haproxy") - template "haproxy.conf" + # These can also be passed in via hash + # has_remotefile(:name => "/etc/haproxy.cfg") do + # mode 644 + # requires get_package("haproxy") + # notify get_service("haproxy") + # template "haproxy.conf" + # end end end end lib/poolparty/base_packages/haproxy.rb @@ -1,70 +1,53 @@ module PoolParty class Base - plugin :heartbeat do + plugin :poolparty_base_heartbeat do - def enable + def enable # execute_on_master do - has_package(:name => "heartbeat") do - has_service(:name => "heartbeat", :hasstatus => true, :hasrestart => true) - has_directory(:name => "/etc/ha.d") - - has_remotefile(:name => "/etc/ha.d/ha.cf") do - mode 444 - notify service(:name => "heartbeat") - template "ha.cf" - end - - has_remotefile(:name => "/etc/ha.d/logd.cf") do - mode 600 - notify service(:name => "heartbeat") - template File.join(File.dirname(__FILE__), "..", "templates/logd.cf") - end - - has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true) - - has_remotefile(:name => "/etc/ha.d/authkeys") do - mode 600 - notify service(:name => "heartbeat") - template File.join(File.dirname(__FILE__), "..", "templates/authkeys") - end - - has_remotefile(:name => "/etc/ha.d/cib.xml") do - mode 444 - notify exec(:name => "heartbeat-update-cib") - template File.join(File.dirname(__FILE__), "..", "templates/cib.xml") - end - - has_remotefile(:name => "/etc/ha.d/haresources") do - mode 644 - template File.join(File.dirname(__FILE__), "..", "templates/haresources") - end - # end - - # variables for the templates - has_variable(:name => "ha_nodenames", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')") - has_variable(:name => "ha_node_ips", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')") - - has_variable({:name => "ha_timeout", :value => (self.respond_to?(:timeout) ? timeout : "5s")}) - has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Base.port)}) - - # Finally, let's set a few options and start it -# has_exec(:name => "set and start") do -# refreshonly true -# command <<-EOC -# crm_mon -i5 -# EOC -# end - - end - - # execute_on_master do - # if list_of_node_names.size > 1 - # has_exec(:name => "update pem for heartbeat", :refreshonly => true) do - # command "scp /etc/puppet/ssl/ca/ca_crl.pem #{user || Base.user}@#{list_of_node_ips[1]}:#{Base.base_config_directory}/ssl/ca" - # end - # end + has_package({:name => "heartbeat"}) + + # has_service(:name => "heartbeat", :hasstatus => true, :hasrestart => true) + # has_directory(:name => "/etc/ha.d") + # + # has_remotefile(:name => "/etc/ha.d/ha.cf") do + # mode 444 + # notify service(:name => "heartbeat") + # template "ha.cf" # end - + # + # has_remotefile(:name => "/etc/ha.d/logd.cf") do + # mode 600 + # notify service(:name => "heartbeat") + # template File.join(File.dirname(__FILE__), "..", "templates/logd.cf") + # end + # + # has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true) + # + # has_remotefile(:name => "/etc/ha.d/authkeys") do + # mode 600 + # notify service(:name => "heartbeat") + # template File.join(File.dirname(__FILE__), "..", "templates/authkeys") + # end + # + # has_remotefile(:name => "/etc/ha.d/cib.xml") do + # mode 444 + # notify exec(:name => "heartbeat-update-cib") + # template File.join(File.dirname(__FILE__), "..", "templates/cib.xml") + # end + # + # has_remotefile(:name => "/etc/ha.d/haresources") do + # mode 644 + # template File.join(File.dirname(__FILE__), "..", "templates/haresources") + # end + # # end + # + # # variables for the templates + # has_variable(:name => "ha_nodenames", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')") + # has_variable(:name => "ha_node_ips", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')") + # + # has_variable({:name => "ha_timeout", :value => (self.respond_to?(:timeout) ? timeout : "5s")}) + # has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Default.port)}) + end end lib/poolparty/base_packages/heartbeat.rb @@ -2,92 +2,82 @@ module PoolParty class Base plugin :poolparty_base_packages do - def enable - # Build hostsfile - - has_package(:name => "erlang") - has_package(:name => "erlang-dev") - has_package(:name => "erlang-src") - # has_package(:name => "yaws") - - has_package(:name => "rubygems") do - # These should be installed automagically by poolparty, but just in case - # TODO: Fix the requires method with a helper - has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem") - has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem") - has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")]) - - has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem") - has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge")) - has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")]) - - has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem") - has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem") - has_gempackage(:name => "amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple")) - - has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem") - - # Capistrano - has_gempackage(:name => "net-ssh", :download_url => "http://rubyforge.org/frs/download.php/51288/net-ssh-2.0.10.gem", :version => "2.0.10") - 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 => "echoe", :download_url => "http://rubyforge.org/frs/download.php/51240/echoe-3.1.gem") - has_gempackage(:name => "highline", :download_url => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem") - has_gempackage(:name => "capistrano", :download_url => "http://rubyforge.org/frs/download.php/51294/capistrano-2.5.4.gem", :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")]) - - has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", :requires => get_gempackage("ParseTree")) - - has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem") - - has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem") - - has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")]) - - # , :ifnot => "/bin/ps aux | /bin/grep -q pm_node" - # has_runit_service("pm_node", "pm_node", File.join(File.dirname(__FILE__), "..", "templates/messenger/node/")) - end - - has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger") - has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node") - - # execute_on_node do - has_remotefile(:name => "/usr/bin/puppetrunner") do - mode 744 - template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner") - end - - # 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) - - # Custom run puppet to minimize footprint - # TODO: Update the offsetted times - has_remotefile(:name => "/usr/bin/puppetrerun") do - mode 744 - template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun") - end - - has_remotefile(:name => "/usr/bin/puppetcleaner") do - mode 744 - template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner") - end - - execute_on_master do - has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -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(: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 - # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip) - end + # def enable + # # Build hostsfile + # + # has_package(:name => "erlang") + # has_package(:name => "erlang-dev") + # has_package(:name => "erlang-src") + # # has_package(:name => "yaws") + # + # has_package(:name => "rubygems") + # # These should be installed automagically by poolparty, but just in case + # # TODO: Fix the requires method with a helper + # has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem") + # has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem") + # has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")]) + # + # has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem") + # has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge")) + # has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")]) + # + # has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem") + # has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem") + # has_gempackage(:name => "amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple")) + # + # has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem") + # + # # Capistrano + # has_gempackage(:name => "net-ssh", :download_url => "http://rubyforge.org/frs/download.php/51288/net-ssh-2.0.10.gem", :version => "2.0.10") + # 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 => "echoe", :download_url => "http://rubyforge.org/frs/download.php/51240/echoe-3.1.gem") + # has_gempackage(:name => "highline", :download_url => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem") + # has_gempackage(:name => "capistrano", :download_url => "http://rubyforge.org/frs/download.php/51294/capistrano-2.5.4.gem", :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")]) + # + # has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", :requires => get_gempackage("ParseTree")) + # + # has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem") + # + # has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem") + # + # has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")]) + # + # # , :ifnot => "/bin/ps aux | /bin/grep -q pm_node" + # # has_runit_service("pm_node", "pm_node", File.join(File.dirname(__FILE__), "..", "templates/messenger/node/")) + # # end + # + # has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger") + # has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node") + # + # has_remotefile(:name => "/usr/bin/puppetrunner") do + # mode 744 + # template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner") + # end + # + # has_exec(:name => "Puppet runner", :command => "/usr/bin/puppetrunner") + # has_cron(:name => "Run the provisioner", :command => "/usr/bin/puppetrunner", :minute => "*/10") + # has_user(:name => user) + # + # # case_of "hostname" + # # when_is "master" do + # # poolparty_bin_path="/var/lib/gems/1.8/bin" + # # has_exec(:name => "update_hosts", :command => ". /etc/profile && #{poolparty_bin_path}/server-update-hosts -n #{cloud.name}") + # # has_exec(:name => "Handle load", :command => ". /etc/profile && #{poolparty_bin_path}/cloud-handle-load -n #{cloud.name}") + # # has_exec(:name => "Ensure provisioning", :command => ". /etc/profile && #{poolparty_bin_path}/server-ensure-provisioning -n #{cloud.name}") + # # has_exec(:name => "start master messenger", :command => ". /etc/profile && #{poolparty_bin_path}/server-start-master") #, :ifnot => "/bin/ps aux | /bin/grep -q pm_master" + # # has_exec(:name => "start client server", :command => ". /etc/profile && #{poolparty_bin_path}/server-start-client") #, :ifnot => "/bin/ps aux | /bin/grep -q client_server" + # # has_exec(:name => "Maintain the cloud", :command => ". /etc/profile && #{poolparty_bin_path}/cloud-maintain -n #{cloud.name}") + # # # has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "1") + # # + # # end + # # end_of + # # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip) + # end - end + end end end \ No newline at end of file lib/poolparty/base_packages/poolparty.rb @@ -1,8 +1,8 @@ module PoolParty class Base - plugin :ruby do + plugin :poolparty_base_ruby do - def enable + def enable install_base_packages end @@ -10,9 +10,9 @@ module PoolParty has_package(:name => "libreadline-ruby1.8") has_package(:name => "libruby1.8") has_package(:name => "ruby1.8-dev") - has_package(:name => "ruby1.8") + has_package(:name => "ruby1.8") - has_line_in_file("export PATH=$PATH:/var/lib/gems/1.8/bin:/sbin", "/etc/profile") + has_line_in_file(:line => "export PATH=$PATH:/var/lib/gems/1.8/bin", :file => "/etc/profile") # exec(:name => "update-rubygems") do # command "gem update --system" lib/poolparty/base_packages/ruby.rb @@ -4,7 +4,7 @@ =end module PoolParty class Base - plugin :runit do + plugin :poolparty_base_runit do def enable unless enabled lib/poolparty/base_packages/runit.rb @@ -17,7 +17,7 @@ module PoolParty $cap_clouds[name] = cld @cloud = cld instance_eval <<-EOE - ssh_options[:keys] = [ '#{cld.full_keypair_basename_path}' ] + ssh_options[:keys] = [ '#{cld.full_keypair_path}' ] set :user, '#{cld.user}' set :username, "#{cld.user}" ssh_options[:forward_agent] = true @@ -33,6 +33,7 @@ module PoolParty set_cloud(name) end + # Get the master ip for the cloud to set in the deploy.rb file def cloud_master(name) get_cloud(name).ip end lib/poolparty/capistrano.rb @@ -21,10 +21,16 @@ class Array def get_named(str="") map {|a| a.name == str ? a : nil }.reject {|a| a.nil? } end - def to_option_string(ns=[]) - "[ #{map {|e| e.to_option_string }.reject {|a| a.nil? || a.empty? }.join(", ")} ]" - end def respec_string(ns=[]) "'#{map {|e| e.to_option_string }.join("', '")}'" end + # Example nodes.select_with_hash(:status=>'running') + def select_with_hash(conditions={}) + select do |node| + conditions.any? do |k,v| + ( node.has_key?(k) && node[k]==v ) or ( node.respond_to?(k) && node.send(k)==v ) + end + end + end + end \ No newline at end of file lib/poolparty/core/array.rb @@ -2,16 +2,23 @@ Hash extentions =end class Hash - alias :old_select :select - - def select(&block) - Hash[*self.old_select(&block).inject([]){|res,(k,v)| res << k << v}] + def choose(&block) + Hash[*self.select(&block).inject([]){|res,(k,v)| res << k << v}] end - def extract!(&block) - o = select(&block) - o.keys.each {|k| self.delete(k) } - o + + def to_instance_variables(inst=nil) + each do |k,v| + inst.instance_variable_set "@#{k}", v + inst.class.send :attr_reader, k if inst + end end + + #TODO: deprecate + # def extract!(&block) + # o = Hash[*select(&block).flatten] + # o.keys.each {|k| self.delete(k) } + # o + # end def append(other_hash) returning Hash.new do |h| h.merge!(self) @@ -32,15 +39,12 @@ class Hash def safe_merge!(other_hash) merge!(other_hash.delete_if {|k,v| has_key?(k) && !v.nil? }) end - def flush_out(pre="", post="") - map {|k,v| "#{pre}#{k} => #{v.to_option_string}#{post}"} - end def to_os m={} each {|k,v| m[k] = v.to_os } MyOpenStruct.new(m) end def method_missing(sym, *args, &block) - key?(sym) ? fetch(sym) : super + has_key?(sym) ? fetch(sym) : super end end \ No newline at end of file lib/poolparty/core/hash.rb @@ -27,14 +27,6 @@ module Kernel def as(klass_or_obj, &block) block.in_context(klass_or_obj).call end - def load_p(dir) - Dir["#{dir}/*.rb"].sort.each do |file| - require "#{file}" if ::FileTest.file?(file) - end - Dir["#{dir}/*"].sort.each do |dir| - load_p(dir) if ::FileTest.directory?(dir) - end - end def with_warnings_suppressed saved_verbosity = $-v $-v = nil @@ -42,6 +34,18 @@ module Kernel ensure $-v = saved_verbosity end + + def capture_stdout(&block) + old_stdout = $stdout + out = StringIO.new + $stdout = out + begin + block.call if block + ensure + $stdout = old_stdout + end + out.string + end #redirect stdout and stderr to /dev/null and reopen after block def hide_output lib/poolparty/core/kernel.rb @@ -6,6 +6,9 @@ class Object def my_methods self.methods.sort - (self.class.methods + self.class.superclass.methods) end + def this + self + end def to_os self end @@ -13,8 +16,8 @@ class Object original = self.method(original_id).to_proc define_method(new_id){|*args| original.call(*args)} end - def with_options(opts={}, parent=self, &block) - @p = parent.clone + def with_options(opts={}, par=nil, &block) + @p = par.clone @p.options.merge!(opts) @p.instance_eval &block if block end @@ -31,17 +34,7 @@ class Object v else vs = v.to_s.to_sym - respond_to?(vs) ? self.send(vs, *args) : v rescue v - end - end - def to_option_string - case self.class - when String - self.to_option_string - when Array - self.each {|a| a.to_option_string }.join(" ") - else - "#{self}" + respond_to?(vs) ? self.send(vs, *args) : v rescue v #NOTE MF: maybe we should not rescue all errors? end end def respec_string @@ -72,13 +65,12 @@ class Object def meta_undef name meta_eval { remove_method name } end - def run_in_context(context=self, &block) - name="temp_#{self.class}_#{respond_to?(:parent) ? parent.to_s : Time.now.to_i}".to_sym - meta_def name, &block - self.send name, context - # self.instance_eval &block if block - meta_undef name rescue "" - end + # def run_in_context(context=self, &block) + # name="temp_#{self.class}_#{respond_to?(:parent) ? parent.to_s : Time.now.to_i}".to_sym + # meta_def name, &block + # self.send name, context + # meta_undef name rescue "" + # end def vputs(m="", o=self) puts m if o.verbose rescue "" end @@ -86,8 +78,15 @@ class Object print m if o.verbose rescue "" end def dputs(m="", o=self) - puts m if o.debugging rescue "" + puts "-- #{m}" if $DEBUGGING rescue "" + end + def debugging(bool=false) + $DEBUGGING = bool + end + def testing(bool=$TESTING) + bool.nil? ? false : bool end + alias :debug :debugging def unix_hide_string "2>&1 > /dev/null" end lib/poolparty/core/object.rb @@ -43,23 +43,13 @@ class String self.downcase.gsub(/[ ]/, '_') end def safe_quote - self.gsub(/[']/, '\\\\\'') + self.gsub(/['"]/, '\\\"') + # self.gsub(/["']/, "\\\"") end def nice_runnable(quite=true) self.split(/ && /).join("\n") end - # This is the method we use to turn the options into a string to build the main - # manifests - def to_option_string(ns=[]) - a_template = (self =~ /template/) == 0 - a_service = self =~ /^[A-Z][a-zA-Z]*\[[a-zA-Z0-9\-\.\"\'_\$\{\}\/]*\]/ - a_function = self =~/(.)*\((.)*\)(.)*/ - if is_a?(PoolParty::Resources::Resource) - self.to_s - else - (a_service || a_template || a_function) ? self : "'#{self}'" - end - end + # Refactor this guy to get the class if the class is defined, and not always create a new one # although, it doesn't really matter as ruby will just reopen the class def class_constant(superclass=nil, opts={}, &block) @@ -77,6 +67,42 @@ class String klass end + def camel_case + gsub(/(^|_|-)(.)/) { $2.upcase } + end + + # "FooBar".snake_case #=> "foo_bar" + def snake_case + gsub(/\B[A-Z]+/, '_\&').downcase + end + + # "FooBar".dasherize #=> "foo-bar" + def dasherize + gsub(/\B[A-Z]+/, '-\&').downcase + end + + # Constantize tries to find a declared constant with the name specified + # in the string. It raises a NameError when the name is not in CamelCase + # or is not initialized. + # + # Examples + # "Module".constantize #=> Module + # "Class".constantize #=> Class + def constantize + camel_cased_word = camel_case + begin + Object.module_eval(camel_cased_word, __FILE__, __LINE__) + rescue NameError + puts "#{camel_cased_word} is not defined." + nil + end + end + + def preserved_class_constant(append="") + klass = "#{self}#{append}".classify + Object.const_defined?(klass.to_sym) ? klass.to_s.constantize : nil + end + def module_constant(append="", &block) symc = "#{self}_Module#{append}".camelcase mod = Object.const_defined?(symc) ? Object.const_get(symc.to_sym) : Module.new(&block) lib/poolparty/core/string.rb @@ -1,31 +1,31 @@ +#TODO: Reimplement module PoolParty module Extra - class Deployments + class Deployments - class << self - - def include_deployment(filename) + def self.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 + plugin_klass.class_eval <<-EOE def enable + puts "Called enable" #{contents} end EOE plugin_klass end - def include_deployments(dir) + def self.include_deployments(dir) return nil unless ::File.directory? dir Dir["#{dir}/*"].each do |fi| include_deployment fi end dir end - end + end end end \ No newline at end of file lib/poolparty/extra/deployments.rb @@ -3,7 +3,7 @@ module PoolParty # Load a file that contains a pool into memory def load_pool(filename=nil) - filename = Binary.get_existing_spec_location#Dir["#{Dir.pwd}/**/*.rb"].select {|f| ::File.basename(f) == "clouds.rb" }.first unless filename + filename = filename || Binary.get_existing_spec_location dputs "Using spec at #{filename}" unless filename && ::File.readable?(filename) @@ -11,7 +11,7 @@ module PoolParty exit(1) else $pool_specfile = filename - PoolParty::Script.inflate(open(filename).read, filename) + PoolParty::Pool::Pool.load_from_file filename end end @@ -45,12 +45,11 @@ module PoolParty # aborts because it cannot load the cloud def get_existing_spec_location [ - "#{Base.remote_storage_path}/#{Base.default_specfile_name}", - "#{Base.default_specfile_name}", - "#{Base.base_config_directory}/#{Base.default_specfile_name}", + "#{Default.remote_storage_path}/#{Default.default_specfile_name}", + "#{Default.default_specfile_name}", + "#{Default.base_config_directory}/#{Default.default_specfile_name}", Dir["#{Dir.pwd}/*/clouds.rb"], - ENV["POOL_SPEC"], - "#{Base.storage_directory}/#{Base.default_specfile_name}" + ENV["POOL_SPEC"] ].flatten.reject {|a| a.nil?}.reject do |f| f unless ::File.readable?(f) end.first lib/poolparty/helpers/binary.rb @@ -17,11 +17,7 @@ module PoolParty puts "" pools.size end - - def available_bases - remote_bases - end - + def header(str="") "*** #{str}" end lib/poolparty/helpers/display.rb @@ -7,12 +7,16 @@ require 'date' module PoolParty class Optioner - include Configurable - include MethodMissingSugar + include Dslify + + default_options(:verbose => false, + :quiet => false, + :cloudname => false, + :poolname => false) def initialize(args=[], opts={}, &block) boolean_args << opts[:boolean_args] if opts.has_key?(:boolean_args) - + @arguments = parse_args(args) @extra_help = opts.has_key?(:extra_help) ? opts[:extra_help] : "" @abstract = opts.has_key?(:abstract) ? opts[:abstract] : false @@ -21,11 +25,10 @@ module PoolParty @command = opts.has_key?(:command) ? opts[:command] : false parse_options(&block) if @parse_options - set_default_options self end def daemonizeable - @opts.on('-d', '--daemonize', 'Daemonize starting the cloud') { self.daemon true } + @opts.on('-D', '--daemonize', 'Daemonize starting the cloud') { self.daemon true } end def cloudnames @opts.on('-n cloudname', '--name name', 'Start cloud by this name') { |c| self.cloudname c } @@ -63,18 +66,21 @@ module PoolParty args end + # def parent + # self + # end + def parent self end - def set_default_options - self.verbose false - self.quiet false - end - def parse_options(&blk) + self.spec = nil + self.num = nil + progname = $0.include?("-") ? "#{::File.basename($0[/(\w+)-/, 1])} #{::File.basename($0[/-(.*)/, 1])}" : ::File.basename($0) @opts = OptionParser.new + @opts.extend(Dslify) @opts.banner = "Usage: #{progname} #{@abstract ? "[command] " : ""}[options]" @opts.separator "" @@ -82,10 +88,10 @@ module PoolParty unless @abstract @opts.separator "Options:" - @opts.on('-v', '--verbose', 'Be verbose') { self.verbose true } - @opts.on('', "--debug", "Debug setting") {self.debugging true} - @opts.on('-s [file]', '--spec-file [file]', 'Set the spec file') { |file| self.spec file.chomp } - @opts.on('-t', '--test', 'Testing mode') { self.testing true } + @opts.on('-v', '--verbose', 'Be verbose') { self.verbose true } + @opts.on('-d', "--debug", "Debug setting") { self.debugging true } + @opts.on('-s [file]', '--spec-file [file]', 'Set the spec file') { |file| self.spec file.chomp } + @opts.on('-t', '--test', 'Testing mode') { self.testing true } blk.call(@opts, self) if blk end @@ -103,26 +109,27 @@ module PoolParty output_options if verbose if @load_pools - self.loaded_pool load_pool(self.spec || Binary.get_existing_spec_location) - + self.loaded_pool load_pool( spec? ? spec : Binary.get_existing_spec_location) self.loaded_clouds extract_cloud_from_options(self) self.loaded_pools extract_pool_from_options(self) reject_junk_options! raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./clouds.rb or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty? loaded_pools.each do |pl| - pl.configure(self.options) + pl.options(self.options) end loaded_clouds.each do |cl| - cl.configure(self.options) + cl.options(self.options) end end end + def reject_junk_options! %w(loaded_pool cloudname extract_pool_from_options).each do |opt| - @options.delete(opt.to_sym) + @dsl_options.delete(opt.to_sym) end end + def process_options end lib/poolparty/helpers/optioner.rb @@ -10,5 +10,11 @@ module PoolParty has_directory(:name => loc) end + def dependency_resolver(name='puppet') + klass = name.preserved_class_constant("Resolver") + raise DependencyResolverException.new("Unknown resolver") unless klass + dsl_options[:dependency_resolver] = klass unless dsl_options[:dependency_resolver] + end + end end \ No newline at end of file lib/poolparty/modules/cloud_dsl.rb @@ -11,9 +11,15 @@ require "ftools" module PoolParty module CloudResourcer - def plugin_directory(*args) - args = ["#{::File.expand_path(Dir.pwd)}/plugins"] if args.empty? - args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f }} + def plugin_directory(arr=[]) + arr = [arr] if arr.is_a?(String) + arr << [ + "#{::File.expand_path(Dir.pwd)}/plugins", + "#{::File.expand_path(Default.poolparty_home_path)}/plugins" + ] + arr.flatten.each {|arg| + Dir["#{arg}/*/*.rb"].each {|f| require f } if ::File.directory?(arg) + } end # Store block @@ -32,7 +38,7 @@ module PoolParty end # Set instances with a range or a number - def instances(arg) + def instances(arg) case arg when Range minimum_instances arg.first @@ -46,119 +52,56 @@ module PoolParty end def setup_dev - return true if ::File.exists?("#{remote_keypair_path}") || master.nil? - # unless ::File.exists?("#{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}" - # if %x[hostname].chomp == "master" - # Kernel.system("cat ~/.ssh/authorized_keys > #{full_keypair_basename_path}.pub") - # else - # Kernel.system(cmd) - # end - # end - end - - # Keypairs - def keypair(*args) - if args && !args.empty? && !has_keypair? - options[:keypair] = args.first - else - options[:keypair] ||= generate_keypair - end - end - - # Let's just make sure that the keypair exists on the options - def has_keypair? - options.has_key?(:keypair) && options[:keypair] && !options[:keypair].empty? - end - # Generate a keypair based on the parent's name (if there is a parent) - # and the cloud's name - def generate_keypair(*args) - options[:keypair] = "#{parent && parent.is_a?(PoolParty::Pool::Pool) ? parent.name : "poolparty"}_#{name}" unless has_keypair? - end - - def full_keypair_path - unless keypair_path - raise RuntimeException.new("Keypair cannot be found") + return true if keypair || master.nil? + end + + def using(t) + @cloud = self + if t && self.class.available_bases.include?(t.to_sym) + unless using_remoter? + self.class.send :attr_reader, :remote_base + self.class.send :attr_reader, :parent_cloud + klass_string = "#{t}".classify + klass = "::PoolParty::Remote::#{klass_string}".constantize + @remote_base = klass.send :new, self + options[:remote_base] = klass.to_s if respond_to?(:options) + + remote_instance_klass = "::PoolParty::Remote::#{klass_string}RemoteInstance" + options[:remote_instance_base] = remote_instance_klass if respond_to?(:options) + + @parent_cloud = @cloud + instance_eval "def #{t};@remote_base;end;" + end else - ::File.expand_path(keypair_path) + puts "Unknown remote base" end end - def full_keypair_basename_path - dir = ::File.dirname(full_keypair_path) - basename = ::File.basename(full_keypair_path, ::File.extname(full_keypair_path)) - ::File.join(dir, basename) - end - def keypair_path - keypair_paths.each do |path| - possible_keypair_basenames.each do |base| - full_path = ::File.join( File.expand_path(path), "#{base}#{keypair}") - return full_path if ::File.exists?(full_path) - end - end - return nil + def using_remoter? + @remote_base 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| - full_path = ::File.join( File.expand_path(path), "#{base}#{keypair}") - return "#{base}#{keypair}" if ::File.exists?(full_path) - end + # Keypairs + # Use the keypair path + def keypair(*args) + if args && !args.empty? + args.each {|arg| _keypairs.unshift Key.new(arg) } + else + _keypairs.select {|key| key.exists? }.first end - return nil end - def remote_keypair_path - ::File.join( keypair_paths.last, "#{possible_keypair_basenames.first}#{keypair}" ) - end - def new_keypair_path - ::File.join( keypair_paths.first, "#{possible_keypair_basenames.first}#{keypair}" ) - end + alias :set_keypairs :keypair - def possible_keypair_basenames - [ - "id_rsa-", - "" - ] + def _keypairs + dsl_options[:keypairs] ||= [Key.new] end - def keypair_paths - [ - Base.base_keypair_path, - Base.base_config_directory, - Base.remote_storage_path, - Dir.pwd - ] - end - - def context_stack - @@context_stack ||= [] + def full_keypair_path + @full_keypair_path ||= keypair.full_filepath end - def run_setup(parent, should_set_parent=true, &block) - context_stack.push parent - - set_parent if should_set_parent - run_in_context self, &block if block - - context_stack.pop - end - - # Set the parent on the resource - def set_parent(sink_options=true) - unless context_stack.last.nil? - @parent = context_stack.last - # Add self as a service on the parent - parent.add_service(self) if parent.respond_to?(:add_service) - # Take the options of the parents - configure(parent.options) if parent && parent.respond_to?(:options) && sink_options - end - end - + # TODO: deprecate def number_of_resources arr = resources.map do |n, r| r.size @@ -166,20 +109,13 @@ module PoolParty resources.map {|n,r| r.size}.inject(0){|sum,i| sum+=i} end - def parent - @parent ||= nil - end - def plugin_store @plugin_store ||= [] end + # TODO: deprecate def realize_plugins!(force=false) - plugin_store.each {|plugin| plugin.realize!(force) if plugin } - end - - def plugin_store - @plugins ||= [] + plugin_store.each {|plugin| puts "plugin: #{plugin}";plugin.realize!(force) if plugin } end end lib/poolparty/modules/cloud_resourcer.rb @@ -13,7 +13,7 @@ module PoolParty end def pid_file - @pid_file ||= PoolParty::Base.agent_pid_file + @pid_file ||= PoolParty::Default.agent_pid_file end # Returns +true+ the process identied by +pid+ is running. lib/poolparty/modules/daemonizable.rb @@ -36,7 +36,7 @@ module PoolParty # Note that you can define any resources within the virtual resource # within the definition or the call. # Call example: - # has_virtualhost do + # has_virtualhost do # name "xnot.org" # end # @@ -44,17 +44,14 @@ module PoolParty # # An example is included in the poolparty-apache-plugin def virtual_resource(name=:virtual_resource, opts={}, &block) - symc = "#{name}".camelcase - eval <<-EOE - class PoolParty::Resources::#{symc} < PoolParty::Resources::Resource - end - EOE - klass = "PoolParty::Resources::#{symc}".constantize + symc = "#{name}".top_level_class.camelcase + klass = symc.class_constant(PoolParty::Plugin::Plugin, {:preserve => true}, &block) + + PoolParty::Service.add_has_and_does_not_have_methods_for(symc) + klass.module_eval &block if block - klass.send :define_method, :virtual_resource?, Proc.new{true} - klass.send :define_method, :printable?, Proc.new{false} klass end - end + end end \ No newline at end of file lib/poolparty/modules/definable_resource.rb @@ -2,15 +2,15 @@ module PoolParty module FileWriter def copy_file_to_storage_directory(file, preceded="") make_base_directory - path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) ) + path = ::File.join( Default.storage_directory, preceded, ::File.basename(file) ) ::FileUtils.cp file, path unless file == path || ::File.file?(path) end def cleanup_storage_directory - ::FileUtils.rm_rf "#{Base.storage_directory}" + ::FileUtils.rm_rf "#{Default.storage_directory}" end def copy_template_to_storage_directory(file, force=false) make_template_directory - path = ::File.join( Base.tmp_path, Base.template_directory, ::File.basename(file) ) + path = ::File.join( Default.tmp_path, Default.template_directory, ::File.basename(file) ) if force FileUtils.cp file, path else @@ -25,22 +25,22 @@ module PoolParty ::File.basename(path) end def copy_directory_into_storage_directory(from, pat) - to = ::File.join(Base.storage_directory, pat) + to = ::File.join(Default.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 ) + path = ::File.join( Default.storage_directory, dirname ) make_base_path path end def write_to_file_in_storage_directory(file, str="", preceded="", &block) - path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) ) + path = ::File.join( Default.storage_directory, preceded, ::File.basename(file) ) write_to_file(path, str, &block) end def write_to_file(file, str="", preceded="", &block) - path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) ) - make_base_path( Base.storage_directory ) + path = ::File.join( Default.storage_directory, preceded, ::File.basename(file) ) + make_base_path( Default.storage_directory ) ::File.open(path, "w+") do |f| f.print str f.flush @@ -50,7 +50,7 @@ module PoolParty # Write a temp file with the content str and return the Tempfile # It creates a random file name def write_to_temp_file(str="", &block) - returning Tempfile.new("#{Base.storage_directory}/PoolParty-#{str[0..10].chomp}-#{rand(1000)}") do |fp| + returning Tempfile.new("#{Default.storage_directory}/PoolParty-#{str[0..10].chomp}-#{rand(1000)}") do |fp| fp.print str fp.flush block.call(fp) @@ -69,14 +69,14 @@ module PoolParty end def make_base_directory begin - FileUtils.mkdir_p Base.storage_directory unless ::File.directory?(Base.storage_directory) + FileUtils.mkdir_p Default.storage_directory unless ::File.directory?(Default.storage_directory) rescue Errno::EEXIST - FileUtils.rm Base.storage_directory + FileUtils.rm Default.storage_directory make_base_directory end end def make_template_directory(dir=nil) - path = dir ? ::File.join(Base.tmp_path, Base.template_directory, ::File.basename(dir)) : ::File.join(Base.tmp_path, Base.template_directory) + path = dir ? ::File.join(Default.tmp_path, Default.template_directory, ::File.basename(dir)) : ::File.join(Default.tmp_path, Default.template_directory) begin make_base_directory FileUtils.mkdir path unless ::File.directory?(path) @@ -87,7 +87,7 @@ module PoolParty path end def clear_base_directory - Dir["#{Base.storage_directory}/**/*"].each do |f| + Dir["#{Default.storage_directory}/**/*"].each do |f| ::FileUtils.rm f if ::File.file?(f) end end lib/poolparty/modules/file_writer.rb @@ -26,7 +26,7 @@ module PoolParty def pretty_options(pre, o) return "" unless o.respond_to?(:options) print_options = (o.respond_to?(:parent) && o.parent && o.parent.respond_to?(:options)) ? - (o.options.delete_if {|k,v| o.parent.options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : + (o.dsl_options.delete_if {|k,v| o.parent.dsl_options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : o.options print_options = print_options.map {|k,v| [k, o.send(k.to_sym).to_s] }.inject({}) { |r,e| r[e[0]] = e[1] unless o.class.default_options[e[0]] == e[1] || e[1].nil? || e[1].empty?; r } print_options.flush_out("#{pre}\t") lib/poolparty/modules/pretty_printer.rb @@ -2,70 +2,51 @@ module PoolParty module ResourcingDsl # Overrides for syntax # Allows us to send require to require a resource - def require(str="") - str ? options.merge!(:require => str) : options[:require] - end def requires(str=nil) - # str ? options.append!(:require => str) : options[:require] - str ? options.append!(:require => send_if_method(str)) : options[:require] + str ? dsl_options.merge!(:require => send_if_method(str)) : dsl_options[:require] + end + def on_change(str=nil) + str ? dsl_options.merge!(:notify => send_if_method(str)) : dsl_options[:notify] end def ensures(str="running") - # if %w(absent running).map {|a| self.send a.to_sym}.include?(str) - str == "absent" ? is_absent : is_present - # else - # options.append!(:ensure => str) - # end - # str + str == :absent ? is_absent : is_present + end + def present + "present" + end + def absent + "absent" end # Allows us to send an ensure to ensure the presence of a resource def is_present(*args) - options.merge!(:ensure => present) + dsl_options.merge!(:ensures => present) + present end # Ensures that what we are sending is absent def is_absent(*args) - options.merge!(:ensure => absent) + dsl_options.merge!(:ensures => absent) + absent end # Alias for unless def ifnot(str="") - options.merge!(:unless => str) - end - def present - "present" - end - def absent - "absent" + dsl_options.merge!(:unless => str) end def cancel(*args) - options[:cancelled] = args.empty? ? true : args[0] + dsl_options[:cancelled] = args.empty? ? true : args[0] end def cancelled? - options[:cancelled] || false + dsl_options[:cancelled] || false end def printed(*args) - options[:printed] = true + dsl_options[:printed] = true end def printed? - options[:printed] || false - end - # Give us a template to work with on the resource - # Make sure this template is moved to the tmp directory as well - # - # TODO: Change this method to store the template files for later - # copying to prevent unnecessary copying and tons of directories - # everywhere - def template(file, opts={}) - # require 'rubygems'; require 'ruby-debug'; debugger - vputs "Template called on #{file}" - filename = ::File.basename(file) - raise TemplateNotFound.new("no template given") unless filename - #TODO: check more MF - unless opts[:just_copy] - options.merge!({:content => "template(\"#{::File.basename(file)}\")"}) - options.delete(:source) if options.has_key?(:source) - copy_template_to_storage_directory get_client_or_gem_template(file) - else - copy_file_to_storage_directory get_client_or_gem_template(file) - end + dsl_options[:printed] || false + end + + #TODO: Diet + def render_template + # @templates. end def get_client_or_gem_template(file) lib/poolparty/modules/resourcing_dsl.rb @@ -29,7 +29,7 @@ Notice that at the end, you must call register_monitor :monitorname. This will tell your cloud that it can monitor it with this monitor. =end -require "#{::File.dirname(__FILE__)}/../poolparty/base" +require "#{::File.dirname(__FILE__)}/../poolparty/default" module PoolParty module Monitors @@ -78,12 +78,4 @@ end # Require included monitors Dir["#{File.dirname(__FILE__)}/monitors/*.rb"].each {|f| require f} # Require custom monitors -Dir["#{PoolParty::Base.custom_monitor_directories}/*.rb"].each {|f| require f} - -module PoolParty - module Cloud - class Cloud - include PoolParty::Monitors - end - end -end \ No newline at end of file +Dir["#{PoolParty::Default.custom_monitor_directories}/*.rb"].each {|f| require f} \ No newline at end of file lib/poolparty/monitors/base_monitor.rb @@ -9,7 +9,7 @@ module PoolParty def with_socket(testing=false, &block) host = testing ? "localhost" : (master.ip) vputs "Pinging #{host} with the messenger" - socket = TCPSocket.open(host, Base.messenger_client_port) + socket = TCPSocket.open(host, Default.messenger_client_port) out = yield(socket) socket.close out @@ -52,21 +52,4 @@ module PoolParty end end -end - -module PoolParty - module Cloud - class Cloud - include PoolParty::Messenger - - def get_current_nodes - nodes = messenger_send!("get_current_nodes") - nodes.split(" ").map {|a| a.split(/@/)[-1] } - end - - def reconfigure_cloud!(msg="force_reconfig") - messenger_cast!(msg) - end - end - end end \ No newline at end of file lib/poolparty/net/messenger.rb @@ -1,19 +1,14 @@ -require File.dirname(__FILE__) + "/remoter" - module PoolParty module Remote class RemoteInstance - include Remote - include Configurable - include CloudResourcer + include Dslify - def initialize(opts, parent=self) - run_setup(parent) + def initialize(opts={}, containing_cloud=nil) + @parent = containing_cloud - set_vars_from_options(parent.options) if parent && parent.respond_to?(:options) - set_vars_from_options(opts) unless opts.nil? || opts.empty? - + set_vars_from_options(containing_cloud.options) if containing_cloud && containing_cloud.respond_to?(:options) + set_vars_from_options(opts) if opts.is_a?(Hash) on_init end @@ -26,50 +21,68 @@ module PoolParty end # Is this remote instance the master? + # DEPRECATE def master? name == "master" end # The remote instances is only valid if there is an ip and a name def valid? - !(ip.nil? || name.nil?) + (ip.nil? || name.nil?) ? false : true end # Determine if the RemoteInstance is responding def responding? - !responding.nil? + running? + # !responding.nil? #TODO MF this needs to actually ping the node or something similar. stubbed to running? for now end # This is how we get the current load of the instance # The approach of this may change entirely, but the usage of # it will always be the same def load - current_load ||= 0.0 + current_load ||= 0.0 #NOTE MF: returning 0.0 seems like a bad idea here. should return nil if we dont have a real value end - + + # Note, the next 4 methods will be overridden by the cloud specific remoter_base # Is this instance running? def running? - !(status =~ /running/).nil? + true end # Is this instance pending? def pending? - !(status =~ /pending/).nil? + false end # Is this instance terminating? def terminating? - !(status =~ /shutting/).nil? + false end # Has this instance been terminated? def terminated? - !(status =~ /terminated/).nil? + false end # Printing. This is how we extract the instances into the listing on the # local side into the local listing file def to_s - "#{name}\t#{ip}\t#{instance_id}" + "#{name}\t#{ip}\t#{instance_id rescue ""}" + end + + # Class method to disect a neighborhood line + def self.hash_from_s(s) + arr = s.split("\t") + {:name => arr[0], :ip => arr[1]} + end + + def self.to_s(hsh) + new(hsh).to_s + end + + def dependency_resolver_command + cloud.dependency_resolver_command end + #FIXME: deprecate puppet specific commands in this class def puppet_runner_command self.class.send :puppet_runner_command end @@ -83,13 +96,8 @@ module PoolParty def self.puppet_rerun_commad puppet_runner_command end - def my_cloud - @pa = parent - while !(@pa.is_a?(PoolParty::Cloud::Cloud) || @pa.nil? || @pa == self) - @pa = @pa.parent - end - @pa - end + # + def hosts_file_listing_for(cl) string = (cl.name == cloud.name) ? "#{name}.#{my_cloud.name}\t#{name}" : "#{name}.#{my_cloud.name}" "#{internal_ip}\t#{string}" @@ -97,4 +105,4 @@ module PoolParty end end -end \ No newline at end of file +end lib/poolparty/net/remote_instance.rb @@ -16,155 +16,70 @@ register_remote_base :remote_base_name =end -module PoolParty - def register_remote_base(*args) - args.each do |arg| - base_name = "#{arg}".downcase.to_sym - (remote_bases << base_name) unless remote_bases.include?(base_name) - end - end - - def remote_bases - $remote_bases ||= [] - end +module PoolParty module Remote - # This class is the base class for all remote types + # This class is the base class for all remote types, such as ec2 # Everything remoting-wise is derived from this class - module RemoterBaseMethods + class RemoterBase + include Remote + + def initialize(prnt = nil) + @parent = prnt + end + + def method_missing(meth, *args, &block) + if @parent + @parent.send meth, *args, &block rescue super + else + super + end + end + # Required methods # The next methods are required on all RemoteInstance types # If your RemoteInstance type does not overwrite the following methods # An exception will be raised and poolparty will explode into tiny little # pieces. Don't forget to overwrite these methods # Launch a new instance - def launch_new_instance! + def self.launch_new_instance!(o={}) raise RemoteException.new(:method_not_defined, "launch_new_instance!") end + def launch_new_instance!(o={}) + self.class.launch_new_instance!( options.merge(o) ) + end # Terminate an instance by id - def terminate_instance!(id=nil) + def self.terminate_instance!(o={}) raise RemoteException.new(:method_not_defined, "terminate_instance!") end + def terminate_instance!(o={}) + self.class.terminate_instance!(o ? options.merge(o) : options) + end # Describe an instance's status - def describe_instance(id=nil) + def self.describe_instance(o={}) raise RemoteException.new(:method_not_defined, "describe_instance") end + def describe_instance(o={}) + self.class.describe_instance(o ? options.merge(o) : options) + end # Get instances # The instances must have a status associated with them on the hash - def describe_instances + def self.describe_instances(o={}) raise RemoteException.new(:method_not_defined, "describe_instances") end - - end - module RemoterBase - # The following methods are inherent on the RemoterBase - # If you need to overwrite these methods, do so with caution - # Listing methods - def list_of_running_instances(list = list_of_nonterminated_instances) - list.select {|a| a.running? } - end - # Get a list of the pending instances - def list_of_pending_instances(list = list_of_nonterminated_instances) - list.select {|a| a.pending? } - end - # list of shutting down instances - def list_of_terminating_instances(list = remote_instances_list) - list.reject {|i| true if !i.terminating? } - end - # Get the instances that are non-master instances - def nonmaster_nonterminated_instances(list = list_of_nonterminated_instances) - list_of_nonterminated_instances.reject {|i| i.master? } - end - # list all the nonterminated instances - def list_of_nonterminated_instances(list = remote_instances_list) - list.reject {|i| i.terminating? || i.terminated? } - end - # We'll stub the ip to be the master ip for ease and accessibility - def ip - master.ip - end - # get the master instance - def master - get_instance_by_number(0) - end - # Get instance by number - def get_instance_by_number(i=0, list = remote_instances_list) - name = ((i.nil? || i.zero?) ? "master" : "node#{i}") - list.select {|i| i.name == name }.first - end - # A callback before the configuration task takes place - def before_configuration_tasks - end - def remote_instances_list - @containing_cloud = self - # puts "> #{@containing_cloud} #{@describe_instances.nil?}" - list_of_instances(keypair).collect {|h| PoolParty::Remote::RemoteInstance.new(h, @containing_cloud) } - end - # 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 : nil) - - unless @describe_instances - 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 - else - @id = 0 - running = select_from_instances_on_status(/running/, tmpInstanceList) - pending = select_from_instances_on_status(/pending/, tmpInstanceList) - terminated = select_from_instances_on_status(/shutting/, tmpInstanceList) - - running = running.map do |inst| - inst[:name] = (@id == 0 ? "master" : "node#{@id}") - @id += 1 - inst - end.sort_by {|a| a[:index] } - - @describe_instances = [running, pending, terminated].flatten - end - end - @describe_instances - end - # Select the instances based on their status - def select_from_instances_on_status(status=/running/, list=[]) - list.select {|a| a[:status] =~ status} - end - # Helpers - def create_keypair - end - # Reset the cache of descriptions - def reset_remoter_base! - @describe_instances = nil - end - def self.included(other) - # PoolParty.register_remote_base(self.class.to_s.downcase.to_sym) + def describe_instances(o={}) + self.class.describe_instances(o ? options.merge(o) : options) end - # Callback after loaded - def loaded_remoter_base + # After launch callback + # This is called after a new instance is launched + def after_launched(force=false) 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 - # installation process - def custom_install_tasks_for(a=nil) - [] - end - # Custom configure tasks - # Allows the remoter bases to attach their own - # custom configuration tasks to the configuration process - def custom_configure_tasks_for(a=nil) - [] + # Before shutdown callback + # This is called before the cloud is contracted + def before_shutdown end end @@ -172,4 +87,6 @@ module PoolParty end end -Dir["#{File.dirname(__FILE__)}/remote_bases/*.rb"].each {|base| require base } \ No newline at end of file +Dir["#{File.dirname(__FILE__)}/remoter/*.rb"].each do |remoter_module| + require remoter_module +end \ No newline at end of file lib/poolparty/net/remoter_base.rb @@ -5,33 +5,35 @@ the master instance of the cloud. This enables you to send a directory up to the cloud and let the master host it for the remote slaves =end -module PoolParty +module PoolParty class Deploydirectory - + virtual_resource(:deploydirectory) do - def loaded(opts={}, parent=self) - package_directory + def loaded(opts={}) + package_directory unpack_directory sync_directories end - + def package_directory - path = ::File.join( Base.tmp_path, "#{::File.basename(from_dir)}.tar.gz" ) + path = ::File.join( Default.tmp_path, "#{::File.basename(from_dir)}.tar.gz" ) archive_name = "#{::File.basename(name).dir_safe}.tar.gz" - cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{archive_name} . && mv #{archive_name} #{Base.tmp_path}" + cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{archive_name} . && mv #{archive_name} #{Default.tmp_path}" Kernel.system(cmd) unless testing end def unpack_directory - execute_on_master do + case_of "hostname" + when_is "master" do has_exec({:name => "deploy-directory-#{name}", :requires => get_directory("#{cwd}"), :cwd => cwd}) do # && rm #{Base.tmp_path}/#{parent.name.dir_safe}.tar.gz archive_name = "#{::File.basename(name).dir_safe}.tar.gz" - command "cd #{cwd}; tar -zxf #{Base.remote_storage_path}/#{archive_name}; rm #{Base.remote_storage_path}/#{archive_name}; chown #{owner} #{::File.basename(name).dir_safe}" - onlyif "test -f #{Base.remote_storage_path}/#{archive_name}" + command "cd #{cwd}; tar -zxf #{Default.remote_storage_path}/#{archive_name}; rm #{Default.remote_storage_path}/#{archive_name}; chown #{owner} #{::File.basename(name).dir_safe}" + onlyif "test -f #{Default.remote_storage_path}/#{archive_name}" end end + end_of end def sync_directories @@ -48,7 +50,6 @@ module PoolParty cwd dir name dir has_directory(:name => "#{dir}", - :requires => get_directory("#{::File.dirname(dir)}"), :owner => owner, :mode => mode) end lib/poolparty/plugins/deploydirectory.rb @@ -9,25 +9,32 @@ module PoolParty virtual_resource(:git_repos) do - def loaded(opts={}, parent=self, &block) - has_git - has_git_repos - end - - def has_git_repos - has_exec({:name => key, :requires => [get_directory("#{working_dir}"), get_package("git-core")] }) do - command requires_user ? "git clone #{requires_user}@#{source} #{working_dir}" : "cd #{working_dir} && git clone #{source}" + def loaded(opts={}, &block) + # opts.has_key?(:at) ? at(opts.delete(:at)) : raise(Exception.new("You must include a directory for the git repos set by :at")) + # opts.has_key?(:source) ? git_repos(opts.delete(:source) || opts[:name]) : raise(Exception.new("You must include the git source set by :source")) + has_package("git-core") + has_git_repository + end + + def has_git_repository + has_exec(:name => "git-#{name}", :requires => [get_directory("#{working_dir}"), get_package("git-core")] ) do + # Cloud, GitRepos, Exec + command parent.requires_user? ? "git clone #{requires_user}@#{source} #{working_dir}" : "cd #{working_dir} && git clone #{source}" cwd "#{working_dir if working_dir}" creates creates_dir end - has_exec(:name => "update-#{name}") do - cwd ::File.dirname( creates_dir ) + has_exec(:name => "update-#{name}", :cwd => ::File.dirname( creates_dir )) do command "git pull" end end + def git_repos(src) + source src + end + def at(dir) working_dir dir + has_directory(::File.dirname(dir)) has_directory(:name => "#{dir}", :requires => get_directory("#{::File.dirname(dir)}")) end @@ -45,12 +52,6 @@ module PoolParty "exec" end - # Because we are requiring an exec, instead of a built-in package of the git, we have to overload - # the to_s method and prepend it with the same name as above - def key - "git-#{name}" - end - end end lib/poolparty/plugins/git.rb @@ -3,11 +3,10 @@ module PoolParty virtual_resource(:rsyncmirror) do - def loaded(opts={}, parent=self) - @parent = parent + def loaded(opts={}) execute_on_node do @dir = dir || name - has_exec(opts.merge({:command => "#{cloud.remote_rsync_command} --no-implied-dirs --delete-excluded #{Base.user}@master:#{@dir}/ #{@dir}/".safe_quote, :name => "rsync-#{name}"})) + has_exec(opts.merge({:command => "#{cloud.remote_rsync_command} --no-implied-dirs --delete-excluded #{Default.user}@master:#{@dir}/ #{@dir}/".safe_quote, :name => "rsync-#{name}"})) end end lib/poolparty/plugins/rsyncmirror.rb @@ -3,8 +3,8 @@ require File.dirname(__FILE__) + "/resource" module PoolParty module Cloud - def cloud(name=:app, parent=self, &block) - clouds.has_key?(name) ? clouds[name] : (clouds[name] = Cloud.new(name, parent, &block)) + def cloud(name=:app, &block) + clouds[name] ||= Cloud.new(name, &block) end def clouds @@ -17,61 +17,91 @@ module PoolParty cl.run_in_context &block if block end - class Cloud - attr_reader :templates + class Cloud < PoolParty::PoolPartyBaseClass + attr_reader :templates, :cloud_name + + include CloudResourcer include PoolParty::PluginModel include PoolParty::Resources + include PoolParty::DependencyResolverCloudExtensions include PrettyPrinter - include Configurable - include CloudResourcer include Provisioner - # extend CloudResourcer - # Net methods - include Remote + + # Net methods + include ::PoolParty::Remote include PoolParty::CloudDsl + include PoolParty::Monitors + + def verbose + true + end + + def self.immutable_methods + [:name] + end + + def self.method_added sym + raise "Exception: #{sym.to_s.capitalize} method has been redefined" if immutable_methods.include?(sym) && !respond_to?(sym) + end + + alias :name :cloud_name + + def method_missing(m, *args, &block) + remote_base.respond_to?(m) ? remote_base.send(m, *args, &block) : super + end - default_options({ + default_options( :minimum_instances => 2, :maximum_instances => 5, :contract_when => "cpu < 0.65", :expand_when => "cpu > 1.9", - :access_key => Base.access_key, - :secret_access_key => Base.secret_access_key, + :access_key => Default.access_key, + :secret_access_key => Default.secret_access_key, :ec2_dir => ENV["EC2_HOME"], - :keypair => (ENV["KEYPAIR_NAME"].nil? || ENV["KEYPAIR_NAME"].empty?) ? nil : ENV["KEYPAIR_NAME"], - :minimum_runtime => Base.minimum_runtime, - :user => Base.user, + :minimum_runtime => Default.minimum_runtime, + :user => Default.user, :ami => 'ami-44bd592d' - }) + ) - def initialize(name, pare=self, &block) + def initialize(name, &block) @cloud_name = name @cloud_name.freeze - - plugin_directory - - p = pare.is_a?(PoolParty::Pool::Pool) ? pare : nil - store_block(&block) - run_setup(p, &block) - - # set_parent(parent) if parent && !@parent - # self.run_in_context parent, &block if block + plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins" + super setup_defaults - # realize_plugins! - # reset! # reset the clouds - # reset_remoter_base! + + after_create + end + + def name(*args) + @cloud_name ||= @cloud_name ? @cloud_name : (args.empty? ? :default_cloud : args.first) + end + + # Callback + def after_create end def setup_defaults # this can be overridden in the spec, but ec2 is the default - self.using :ec2 - generate_keypair unless has_keypair? + using :ec2 + options[:keypair] = keypair.basename + dependency_resolver 'puppet' + end + + # provide list of public ips to get into the cloud + def ips + list_of_running_instances.map {|ri| ri.ip } end - def name - @cloud_name + def ip + ips.first #TODO: make this be a random ip, since we should not rely on it being the same each time end - + + # FIXME: this is a quick hack. refactor this to the resources class #MF + def dependency_resolver_command + "/usr/bin/puppet -v --logdest syslog /etc/puppet/manifests/site.pp" + 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 @@ -88,11 +118,12 @@ module PoolParty copy_custom_modules copy_custom_templates store_keys_in_file - Script.save!(self) + # Script.save!(self) # not my favorite... copy_ssh_key write_unique_cookie before_configuration_tasks + write_properties_hash if debugging || testing end def copy_custom_templates @@ -109,7 +140,7 @@ module PoolParty # Store our keys for cloud access in a file # that is specific to this cloud def store_keys_in_file - Base.store_keys_in_file_for(self) + Default.store_keys_in_file_for(self) end # Let's write the cookie into the tmp path @@ -123,7 +154,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}")[0..12] + Digest::SHA256.hexdigest("#{keypair.basename}#{name}")[0..12] end # Build the new poolparty manifest @@ -133,17 +164,18 @@ module PoolParty # TODO: Consider the benefits of moving all the manifest # classes to separate files and keeping the containing # references in the include - def build_and_store_new_config_file(force=false) + def build_and_store_new_config_file(filepath=nil, force=false) + filepath ||= ::File.join(Default.storage_directory, "poolparty.pp") + # write_properties_hash if debugging vputs "Building new manifest configuration file (forced: #{force})" manifest = force ? rebuild_manifest : build_manifest - config_file = ::File.join(Base.storage_directory, "poolparty.pp") - ::File.open(config_file, "w") do |file| + ::File.open(filepath, "w") do |file| file << manifest end - end + end def copy_misc_templates - ["namespaceauth.conf", "puppet.conf", "gem"].each do |f| + ["namespaceauth.conf", "puppet/puppet.conf", "gem"].each do |f| copy_file_to_storage_directory(::File.join(::File.dirname(__FILE__), "..", "templates", f)) end end @@ -155,18 +187,18 @@ module PoolParty # the monitors directory for any custom monitors # that are in known locations, these are included def copy_custom_monitors - unless Base.custom_monitor_directories.empty? + unless Default.custom_monitor_directories.empty? make_directory_in_storage_directory("monitors") - Base.custom_monitor_directories.each do |dir| + Default.custom_monitor_directories.each do |dir| Dir["#{dir}/*.rb"].each {|f| copy_file_to_storage_directory(f, "monitors")} end - end + end end def copy_custom_modules - unless Base.custom_modules_directories.empty? + unless Default.custom_modules_directories.empty? make_directory_in_storage_directory("modules") - Base.custom_modules_directories.each do |dir| + Default.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) @@ -174,16 +206,18 @@ module PoolParty end end end - + + #FIXME MOVE TO DEPENDECY RESOL # Configuration files def build_manifest vputs "Building manifest" @build_manifest ||= build_from_existing_file unless @build_manifest + run_in_context(&lambda {add_poolparty_base_requirements}) - add_poolparty_base_requirements - - @build_manifest = "class poolparty {\n #{build_short_manifest}\n}" + props = to_properties_hash + + @build_manifest = options[:dependency_resolver].send(:compile, props) end @build_manifest end @@ -193,34 +227,43 @@ module PoolParty build_manifest end - def build_short_manifest - returning Array.new do |str| - - # Refactor this into the resources method - # TODO - services.each do |service| - service.options.merge!(:name => service.name) - classpackage_with_self(service) - end - - options.merge!(:name => "user") - classpackage_with_self - # resources.each do |type, res| - # str << "# #{type.to_s.pluralize}" - # str << res.to_string - # end - - global_classpackages.each do |cls| - str << cls.to_string - end - - str << "# Custom functions" - str << Resources::CustomResource.custom_functions_to_string - end.join("\n") - end + #FIXME DEPRECATE + # def build_short_manifest + # returning Array.new do |str| + # + # # Refactor this into the resources method + # # TODO + # services.each do |service| + # service.options.merge!(:name => service.name) + # classpackage_with_self(service) + # end + # + # options.merge!(:name => "user") + # classpackage_with_self + # # resources.each do |type, res| + # # str << "# #{type.to_s.pluralize}" + # # str << res.to_string + # # end + # + # global_classpackages.each do |cls| + # str << cls.to_string + # end + # + # str << "# Custom functions" + # str << Resources::CustomResource.custom_functions_to_string + # end.join("\n") + # end def build_from_existing_file - ::FileTest.file?("#{Base.manifest_path}/classes/poolparty.pp") ? open("#{Base.manifest_path}/classes/poolparty.pp").read : nil + ::FileTest.file?("#{Default.manifest_path}/classes/poolparty.pp") ? open("#{Default.manifest_path}/classes/poolparty.pp").read : nil + end + + def write_properties_hash(filename=::File.join(Default.tmp_path, Default.properties_hash_filename) ) + file_path = ::File.dirname(filename) + file_name = "#{::File.basename(filename, ::File.extname(filename))}_#{name}#{::File.extname(filename)}" + output = to_properties_hash.to_json + ::File.open("#{file_path}/#{file_name}", "w") {|f| f.write output } + true end # To allow the remote instances to do their job, @@ -229,22 +272,33 @@ module PoolParty def minimum_runnable_options ([ :keypair, :minimum_instances, :maximum_instances, - :expand_when, :contract_when, :set_master_ip_to + :expand_when, :contract_when, :set_master_ip_to #DEPRECATE set_master_ip_to ]<< custom_minimum_runnable_options).flatten end + def custom_minimum_runnable_options + using_remoter? ? remote_base.custom_minimum_runnable_options : [] + end + + def remote_base + @remote_base ||= nil + end + + def call_before_bootstrap_callbacks + plugin_store.each {|a| a.before_bootstrap } + end + # Add all the poolparty requirements here # NOTE: These are written as plugins in the lib/poolparty/base_packages directory # for examples. # Also note that there is no block associated. This is because we have written # all that is necessary in a method called enable # which is called when there is no block - def add_poolparty_base_requirements - heartbeat - haproxy - ruby + def add_poolparty_base_requirements + poolparty_base_haproxy + poolparty_base_heartbeat + poolparty_base_ruby poolparty_base_packages - realize_plugins!(true) # Force realizing of the plugins end def other_clouds @@ -257,18 +311,8 @@ module PoolParty def reset! reset_remoter_base! - @build_manifest = @describe_instances = nil - end - - # Add to the services pool for the manifest listing - def add_service(serv) - services << serv - end - # Container for the services - def services - @services ||= [] - end - + @build_manifest = @describe_instances = @remote_instances_list = nil + end end - end -end \ No newline at end of file + end +end lib/poolparty/poolparty/cloud.rb @@ -7,8 +7,8 @@ module PoolParty module Resources - def call_custom_function(str, opts={}, parent=self, &block) - add_resource(:call_function, opts.merge({:str => str, :name => str.keyerize}), parent, &block) + def call_custom_function(str, opts={}, &block) + add_resource(:call_function, opts.merge({:str => str, :name => str.keyerize}), &block) end # Resources for function call lib/poolparty/poolparty/custom_resource.rb @@ -1,27 +1,28 @@ -=begin rdoc - A logging class to allow us to log to locations -=end -class Loggable - def initialize - self.class.loggers << file_logger - file_logger.level = :info - end - def file_logger - @file_logger ||= Logging.logger( Base.pool_logger_location, logging_opts ) - end - def stdout_logger - @stdout_logger ||= Logging.logger(STDOUT, logging_opts.merge({:pattern => "%m\n"})) - end - def logging_opts - {:pattern => "[%d] %-l : %m\n", - :date_pattern => "%Y-%m-%d %H:%M:%S.%s"} - end - %w(info warn debug notice).each do |meth| - define_method(meth.to_sym) do |*args| - self.class.loggers.each {|l| l.send meth.to_sym, args} - end - end - def self.loggers - @loggers ||= [] - end -end \ No newline at end of file +#todo: Deprecate +# =begin rdoc +# A logging class to allow us to log to locations +# =end +# class Loggable +# def initialize +# self.class.loggers << file_logger +# file_logger.level = :info +# end +# def file_logger +# @file_logger ||= Logging.logger( Default.pool_logger_location, logging_opts ) +# end +# def stdout_logger +# @stdout_logger ||= Logging.logger(STDOUT, logging_opts.merge({:pattern => "%m\n"})) +# end +# def logging_opts +# {:pattern => "[%d] %-l : %m\n", +# :date_pattern => "%Y-%m-%d %H:%M:%S.%s"} +# end +# %w(info warn debug notice).each do |meth| +# define_method(meth.to_sym) do |*args| +# self.class.loggers.each {|l| l.send meth.to_sym, args} +# end +# end +# def self.loggers +# @loggers ||= [] +# end +# end \ No newline at end of file lib/poolparty/poolparty/loggable.rb @@ -1,33 +1,53 @@ +require "#{::File.dirname(__FILE__)}/service.rb" +require "#{::File.dirname(__FILE__)}/../provision/boot_strapper.rb" + module PoolParty - module Plugin - class Plugin - include Configurable + class Plugin < PoolParty::Service include CloudResourcer - include Resources - - class_inheritable_accessor :name - + include PoolParty::DependencyResolverCloudExtensions + default_options({}) - def initialize(p=self, opts={}, &block) - store_block &block - run_setup(p) - realize! unless block + def initialize(opts={}, prnt=nil, &block) + before_load(opts, &block) + + block = Proc.new {enable} unless block + + @opts = opts + super(opts, &block) + + run_in_context do + loaded @opts, &block + end end - - def realize!(force=false) - force ? force_realize! : (@realized ? nil : force_realize!) + + # Overwrite this method + def before_load(o={}, &block) + end + def loaded(o={}, &block) + end + def before_bootstrap + end + def enable + end + def is_plugin? + true + end + def bootstrap_gems *gems + gems.each do |g| + Provision::BootStrapper.gem_list << g unless Provision::BootStrapper.gem_list.include?(g) + end end - def force_realize! - run_setup(parent, false, &stored_block) - enable unless stored_block + def bootstrap_commands cmds + Provision::BootStrapper.class_commands << cmds end - # Overwrite this method - def enable + def self.inherited(subclass) + method_name = subclass.to_s.top_level_class.gsub(/pool_party_/, '').gsub(/_class/, '').downcase.to_sym + add_has_and_does_not_have_methods_for(method_name) end end lib/poolparty/poolparty/plugin.rb @@ -12,34 +12,31 @@ module PoolParty $plugins ||= {} end - class PluginModel - attr_accessor :name, :klass - include MethodMissingSugar - include Configurable - include PrettyPrinter + class PluginModel + attr_accessor :klass def initialize(name,&block) - @name = name - # @parent = cld - class_string_name = "#{name}" - - # Create the class to evaluate the plugin on the implemented call - @klass = klass = class_string_name.class_constant(PoolParty::Plugin::Plugin) - mod = class_string_name.module_constant(&block) - - klass.send :include, mod + symc = "#{name}".top_level_class.camelcase + klass = symc.class_constant(PoolParty::Plugin::Plugin, {:preserve => true}, &block) + lowercase_class_name = symc.downcase # Store the name of the class for pretty printing later - klass.name = name + # klass.name = name # Add the plugin definition to the cloud as an instance method - PoolParty::Cloud::Cloud.class_eval <<-EOE - def #{name}(parent=self, &block) - @pa = parent - @#{class_string_name.downcase} ||= returning #{class_string_name.class_constant}.new(parent, &block) do |pl| - @pa.plugin_store << pl + meth = <<-EOM + def #{lowercase_class_name}(opts={}, &block) + i = plugin_store.select {|i| i if i.class == #{lowercase_class_name.camelcase}Class }.first if plugin_store + if i + i + else + inst = #{lowercase_class_name.camelcase}Class.new(opts, parent, &block) + this_context.plugin_store << inst if this_context + inst end end - EOE + EOM + + PoolParty::Cloud::Cloud.class_eval meth end end lib/poolparty/poolparty/plugin_model.rb @@ -2,8 +2,8 @@ module PoolParty module Pool def pool(name=:app, &block) - pools.has_key?(name) ? pools[name] : (pools[name] = Pool.new(name, &block)) - end + pools[name] ||= Pool.new(name, &block) + end def pools $pools ||= {} @@ -23,41 +23,40 @@ module PoolParty $pools = $clouds = $plugins = @describe_instances = nil end - class Pool - # include PoolParty::Cloud - include MethodMissingSugar - # include PluginModel - include Configurable + class Pool < PoolParty::PoolPartyBaseClass include PrettyPrinter include CloudResourcer include Remote - default_options({ - :access_key => Base.access_key, - :secret_access_key => Base.secret_access_key - }) + default_options Default.default_options def initialize(name,&block) - set_pool_specfile get_latest_caller - setup_defaults @pool_name = name @pool_name.freeze - # run_in_context &block if block - run_setup(self, &block) + + ::PoolParty.context_stack.clear + + set_pool_specfile get_latest_caller + setup_defaults + + super(&block) end - - def name - @pool_name + def self.load_from_file(filename=nil) + # a = new ::File.basename(filename, ::File.extname(filename)) + File.open(filename, 'r') do |f| + instance_eval f.read + end + # a + end + def name(*args) + @pool_name ||= @pool_name ? @pool_name : (args.empty? ? :default_pool : args.first) end + + def parent;nil;end - def setup_defaults - plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins" + def setup_defaults PoolParty::Extra::Deployments.include_deployments "#{Dir.pwd}/deployments" end - - # This is where the entire process starts - def inflate - end def pool_clouds returning Array.new do |arr| lib/poolparty/poolparty/pool.rb @@ -6,101 +6,26 @@ Most of the Resources will not need to create their own =end -module PoolParty +module PoolParty module Resources - def resources - @resources ||= {} - end - - def resource(type=:file) - resources[type] ||= [] - end - - # Add resource - # When we are looking to add a resource, we want to make sure the - # resources isn't already added. This way we prevent duplicates - # as puppet can be finicky about duplicate resource definitions. - # We'll look for the resource in either a local or global store - # If the resource appears in either, return that resource, we'll just append - # to the resource config, otherwise instantiate a new resource of the type - # and store it into the global and local resource stores - # - # A word about stores, the global store stores the entire list of stored - # resources. The local resource store is available on all clouds and plugins - # which stores the instance variable's local resources. - def add_resource(type, opts={}, parent=self, &block) - temp_name = (opts[:name] || "#{type}_#{type.to_s.keyerize}") - if in_a_resource_store?(type, temp_name) - @res = get_from_local_resource_store(type, temp_name, parent) - @res ||= get_from_global_resource_store(type, temp_name) - else - @res = returning "PoolParty::Resources::#{type.to_s.camelize}".camelize.constantize.new(opts, parent, &block) do |o| - store_into_global_resource_store(o) - resource(type) << o - end - end - @res - end - def should_duplicate_resource?(type, res, pare, opts) - pare != @res.parent && - pare.cloud != @res.cloud && - in_global_resource_store?(type, opts[:name]) && - !in_resources?(type, res, pare) - end - def get_resource(ty, key, parent=self) - get_from_local_resource_store(ty, key, parent) || get_from_global_resource_store(ty, key) - end - def get_from_local_resource_store(type, key, parent) - resource(type).select {|r| r.key == key }.first - end - def in_a_resource_store?(type, key, parent=self) - !(get_resource(type, key) && in_global_resource_store?(type, key)).nil? - end - def in_resources?(type, key, parent=self) - !get_resource(type, key).nil? - end - def global_resources_store - $global_resources ||= [] - end - def store_into_global_resource_store(r) - global_resources_store << r unless in_global_resource_store?(r.class_name_sym, r.key) - end - def get_from_global_resource_store(ty, key) - global_resources_store.select {|r| r if r.same_resources_of(ty, key) }.first - end - def in_global_resource_store?(ty, key) - !get_from_global_resource_store(ty, key).nil? - end - #:nodoc: - def reset_resources! - $global_resources = $global_classpackage_store = @resources = nil - end - - # def resources_string(pre="") - # returning Array.new do |output| - # output << resources_string_from_resources(resources) - # end.join("\n") - # end - def custom_file(path, str) write_to_file_in_storage_directory(path, str) end - - class Resource + + class Resource < PoolParty::PoolPartyBaseClass attr_accessor :prestring, :poststring - include CloudResourcer - include Configurable + # include CloudResourcer + # For the time being, we'll make puppet the only available dependency resolution # base, but in the future, we can rip this out and make it an option - include PoolParty::DependencyResolutions::Puppet + # include PoolParty::DependencyResolutions::Puppet + include PoolParty::DependencyResolverResourceExtensions + # DSL Overriders include PoolParty::ResourcingDsl - extend PoolParty::Resources - include PoolParty::Resources - # When we subclass Resource, we want to add a few methods to the Resources class # This will anable us to call out to these resources in our DSLified manner # When we call a method from the subclass, say it's the File class @@ -114,20 +39,24 @@ module PoolParty def self.inherited(subclass) subclass = subclass.to_s.split("::")[-1] if subclass.to_s.index("::") lowercase_class_name = subclass.to_s.underscore.downcase || subclass.downcase + method_name = "__#{lowercase_class_name}".to_sym # Add add resource method to the Resources module - unless PoolParty::Resources.respond_to?(lowercase_class_name.to_sym) + unless PoolParty::PoolPartyBaseClass.respond_to?(method_name) method =<<-EOE - def #{lowercase_class_name}(opts={}, parent=self, &blk) - add_resource(:#{lowercase_class_name}, opts, parent, &blk) + private + def #{method_name}(opts={}, &blk) + add_resource(:#{lowercase_class_name}, opts, &blk) end - def get_#{lowercase_class_name}(n, opts={}, parent=self, &block) - in_a_resource_store?(:#{lowercase_class_name}, n) ? - get_resource(:#{lowercase_class_name}, n) : nil + def get_#{lowercase_class_name}(n, opts={}, &block) + res = get_resource(:#{lowercase_class_name}, n, opts, &block) + raise PackageException.new("A required #{lowercase_class_name} \#\{n\} was not found.") unless res + res end + public EOE - PoolParty::Resources.module_eval method - PoolParty::Resources.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym) + PoolParty::PoolPartyBaseClass.module_eval method + PoolParty::PoolPartyBaseClass.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym) available_resources << subclass end @@ -145,62 +74,49 @@ module PoolParty # Then it takes the value of the block and sets whatever is sent there as # the options # Finally, it uses the parent's options as the lowest priority - def initialize(opts={}, parent=self, &block) - run_setup(parent, &block) - # Take the options of the parents - set_vars_from_options(opts) unless opts.empty? + def initialize(opts={}, extra_opts={}, &block) + super(opts, &block) - set_resource_parent - - loaded(opts, @parent, &block) - end - - # Helper to set the containing parent on the resource - def set_resource_parent - if @parent && @parent != self - if can_set_requires_for_parent - # requires @parent.to_s - end - end - end - - def can_set_requires_for_parent - @parent.is_a?(PoolParty::Resources::Resource) && - @parent.printable? && - @parent.name != name && - !@parent.is_a?(PoolParty::Resources::Classpackage) + @resource_name = @base_name + dsl_options[:name] = resource_name unless dsl_options.has_key?(:name) end # Stub, so you can create virtual resources # This is called after the resource is initialized # with the options given to it in the init-block - def loaded(opts={}, parent=self) + def loaded(opts={}) end - def cloud - @pa = parent - while !(@pa.is_a?(PoolParty::Cloud::Cloud) || @pa.nil? || @pa == self) - @pa = @pa.respond_to?(:parent) ? @pa.parent : nil - end - @pa + def resource_name + @resource_name ||= nil end - def parent_tree - @pa = self - returning Array.new do |arr| - while !(@pa.is_a?(PoolParty::Cloud::Cloud) || @pa.nil? || @pa == self) - @pa = @pa.respond_to?(:parent) ? @pa.parent : nil - arr << @pa - end - end + def name(*args) + resource_name end - def same_resources_of(t, k) - key == k && class_name_sym == t + # After create callback + def after_create end + + # We don't want to inherit the services on a resource, as resources + # are a base and should never have services. + def services + end + + def cloud + 2.upto(context_stack.size) do |i| + return ::PoolParty.context_stack[-i] if ::PoolParty.context_stack[-i].is_a?(PoolParty::Cloud::Cloud) + end + nil + end + def duplicatable? false end + def resource? + true + end # This way we can subclass resources without worry def class_type_name self.class.to_s.top_level_class.underscore.downcase @@ -228,23 +144,32 @@ module PoolParty def disallowed_options [] end - def allowed_options - [ - :subscribe, :owner, :group, :path, :mode, :source, :notify, :subscribe, :check, :creates, :cwd, :command, :ensure, - :require, :schedule, :range, :alias, :hour, :minute, :user, :month, :monthday, :name, :onlyif, :unless, :refreshonly, - :refresh, :content, :template, :ip, :repeat, :provider, :key, :device, :fstype, :remounts, :options, :atboot, :before, - :binary, :status, :start, :stop, :restart, :pattern, :recurse, :home - ] - end + def key name end - def virtual_resource? - false + # def virtual_resource? + # false + # end + # def printable? + # true + # end + def is_in_plugin? + parent.is_plugin? end - def printable? + + def is_a_resource? true end + + def method_missing(m,*a,&block) + if parent && parent.dsl_options.has_key?(m) && is_in_plugin? + parent.send m, *a, &block + else + super + end + end + # Private method just for resource retrievling purposes def class_name_sym self.class.to_s.top_level_class.downcase.to_sym @@ -256,8 +181,8 @@ module PoolParty # it returns an empty hash def get_modified_options unless @modified_options - if options - opts = options.inject({}) do |sum,h| + if dsl_options + opts = dsl_options.inject({}) do |sum,h| sum.merge!({h[0].to_sym => ((h[1].nil?) ? self.send(h[0].to_sym) : h[1]) }) end else @@ -266,42 +191,15 @@ module PoolParty @full_allowed_options ||= allowed_options.reject {|ele| disallowed_options.include?(ele) } @modified_options = opts.reject do |k,v| !@full_allowed_options.include?(k) || - @parent && @parent.respond_to?(:options) && @parent != self && @parent.options.has_key?(k) && @parent.options[k] == options[k] + @parent && @parent.respond_to?(:dsl_options) && @parent != self && @parent.dsl_options.has_key?(k) && @parent.dsl_options[k] == dsl_options[k] end end @modified_options end - end - - # Adds two methods to the module - # Adds the method type: - # has_ - # and - # does_not_have_ - # for the type passed - # for instance - # add_has_and_does_not_have_methods_for(:file) - # gives you the methods has_file and does_not_have_file - # TODO: Refactor nicely to include other types that don't accept ensure - def self.add_has_and_does_not_have_methods_for(type=:file) - module_eval <<-EOE - def has_#{type}(opts={}, parent=self, &block) - #{type}(handle_option_values(opts).merge(:ensures => "present"), parent, &block) - end - def does_not_have_#{type}(opts={}, parent=self, &block) - #{type}(handle_option_values(opts).merge(:ensures => "absent"), parent, &block) - end - EOE - end - - def handle_option_values(o) - case o.class.to_s - when "String" - {:name => o} - else - o - end + end end -end \ No newline at end of file +end + +Dir["#{::File.dirname(__FILE__)}/../resources/*.rb"].each {|lib| require "#{lib}"} \ No newline at end of file lib/poolparty/poolparty/resource.rb @@ -1,21 +1,29 @@ +require "parenting" module PoolParty class Script + include Parenting def self.inflate_file(file) inflate open(file).read if file end def self.inflate(script, file="__SCRIPT__") - apool = new - apool.instance_eval script, file - apool.inflate + module_eval script, file + # a = new + # a.instance_eval <<-EOM + # def run_child(pa) + # context_stack.push pa + # #{str} + # context_stack.pop + # remove_method(:run_child) + # self + # end + # EOM + # a.run_child(self) + # a end - - def inflate - pools.map {|name,pool| pool.inflate } unless pools.empty? - end - + def self.to_ruby(opts={},&blk) blk.to_ruby(opts) end @@ -41,7 +49,7 @@ end end def self.save!(to_file=true) - write_to_file_in_storage_directory(Base.default_specfile_name, for_save_string) if to_file + write_to_file_in_storage_directory(Default.default_specfile_name, for_save_string) if to_file for_save_string end lib/poolparty/poolparty/script.rb @@ -13,15 +13,13 @@ module PoolParty def process_install!(testing=false) unless testing @cloud.rsync_storage_files_to(@instance) - roles = provision_master? ? [:master] : [:single] - run_capistrano(roles,:install) + run_capistrano(roles_to_provision, :install) end end def process_configure!(testing=false) unless testing @cloud.rsync_storage_files_to(@instance) - roles = provision_master? ? [:master] : [:single] - run_capistrano(roles, :configure) + run_capistrano(roles_to_provision, :configure) end end @@ -68,16 +66,20 @@ module PoolParty def set_poolparty_roles return "" if testing 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 + arr << "role 'master.#{cloud.name}'.to_sym, '#{cloud.ip}'" + arr << "role :master, '#{cloud.ip}'" + arr << "role :slaves, '#{cloud.nonmaster_nonterminated_instances.map{|a| a.ip}.join('", "')}'" if cloud.nonmaster_nonterminated_instances.size > 0 arr << "role :single, '#{@instance.ip}'" if @instance && @instance.ip end.join("\n") end + def parent + @cloud + end + # Create the config for capistrano # This is a dynamic capistrano configuration file - def create_config + def create_config @config = ::Capistrano::Configuration.new if @cloud.debug || @cloud.verbose @config.logger.level = @cloud.debug ? ::Capistrano::Logger::MAX_LEVEL : ::Capistrano::Logger::INFO @@ -86,8 +88,8 @@ module PoolParty end capfile = returning Array.new do |arr| - Dir["#{::File.dirname(__FILE__)}/recipies/*.rb"].each {|a| arr << "require '#{a}'" } - arr << "ssh_options[:keys] = '#{@cloud.full_keypair_basename_path}'" + Dir["#{::File.dirname(__FILE__)}/recipes/*.rb"].each {|a| arr << "require '#{a}'" } + arr << "ssh_options[:keys] = '#{parent.keypair}'" arr << set_poolparty_roles end.join("\n") @@ -97,7 +99,7 @@ module PoolParty @config.load(:string => capfile) - @cloud.deploy_file ? @config.load(@cloud.deploy_file) : @config.set(:user, @cloud.user) + @cloud.deploy_file? ? @config.load(@cloud.deploy_file) : @config.set(:user, @cloud.user) end # Prerun @@ -106,16 +108,15 @@ module PoolParty # In run_capistrano, we are going to run the entire capistrano process # First, - def run_capistrano(roles=[:master], meth=:install) + def run_capistrano(roles = [:master], meth = :install) prerun_setup - - commands = meth == :install ? install_tasks : configure_tasks + commands = (meth == :install ? install_tasks : configure_tasks) name = "#{roles.first}_provisioner_#{meth}" __define_task(name, roles) do - commands.map {|command| - task = find_task(command.to_sym) - + commands.map do |command| + puts "executing task #{command}" + task = find_task(command.to_sym) if task task.options.merge!(:roles => roles) execute_task task @@ -128,7 +129,7 @@ module PoolParty self.send(command.to_sym) end end - } + end end begin @@ -152,6 +153,6 @@ module PoolParty "#{name.to_s.downcase.underscore}".to_sym end - end + end end end \ No newline at end of file lib/poolparty/provisioners/capistrano/capistrano.rb @@ -8,7 +8,7 @@ module Capistrano class Configuration attr_accessor :cloud, :provisioner - + def method_missing_without_variables(sym, *args, &block) if parent.respond_to?(sym) parent.send(sym, *args, &block) @@ -16,10 +16,10 @@ module Capistrano provisioner.send(sym, *args, &block) elsif cloud.respond_to?(sym) cloud.send(sym, *args, &block) - elsif PoolParty::Base.options.has_key?(sym) - PoolParty::Base.options[sym] - elsif PoolParty::Base.respond_to?(sym) - PoolParty::Base.send(sym, *args, &block) + elsif PoolParty::Default.options.has_key?(sym) + PoolParty::Default.options[sym] + elsif PoolParty::Default.respond_to?(sym) + PoolParty::Default.send(sym, *args, &block) else super end @@ -35,27 +35,34 @@ module Capistrano def cloud(name=nil) puts "name: #{name}" - name ? get_cloud(name) : parent.cloud + name ? PoolParty::Cloud.clouds[name] : parent.cloud end - def get_cloud(name) - PoolParty::Cloud.cloud(name) - end + def parent + cloud + end def method_missing(sym, *args, &block) + # if parent + # parent.send(sym, *args, &block) rescue super + # else + # super + # end + if parent.respond_to?(sym) parent.send(sym, *args, &block) elsif provisioner.respond_to?(sym) provisioner.send(sym, *args, &block) elsif cloud.respond_to?(sym) cloud.send(sym, *args, &block) - elsif PoolParty::Base.options.has_key?(sym) - PoolParty::Base.options[sym] - elsif PoolParty::Base.respond_to?(sym) - PoolParty::Base.send(sym, *args, &block) + elsif PoolParty::Default.options.has_key?(sym) + PoolParty::Default.options[sym] + elsif PoolParty::Default.respond_to?(sym) + PoolParty::Default.send(sym, *args, &block) else super end + end end end lib/poolparty/provisioners/capistrano/capistrano_configurer.rb @@ -9,34 +9,40 @@ require 'capistrano/cli' module PoolParty module Provisioner - def provisioner_for(inst) - PoolParty::Provisioner::Capistrano.new(inst, self, :ubuntu) + def provisioner_for(inst, caller=self) + PoolParty::Provisioner::Capistrano.new(inst, caller, :ubuntu) end class ProvisionerBase attr_accessor :config, :loaded_tasks, :instance, :cloud, :os - include Configurable + include Dslify include CloudResourcer include FileWriter - def initialize(instance=nil, cld=self, os=:ubuntu, &block) + def initialize(instance=nil, cld=nil, os=:ubuntu, &block) @instance = instance @cloud = cld - options(cloud.options) if cloud && cloud.respond_to?(:options) - # set_vars_from_options(instance.options) unless instance.nil? || !instance.options || !instance.options.empty? - # options(instance.options) if instance.respond_to?(:options) - @os = os.to_s.downcase.to_sym + dputs "Using key at: #{cld.keypair}" + + @os = os.to_s.downcase.to_sym self.instance_eval &block if block loaded + + # PoolPartyBootStrapper.new(options).execute! end - def provision_master? + # deprecate + def provision_master? !@instance.nil? && @instance.master? end + + def roles_to_provision + [:master] #always provision the master role for now. When do we ever want anything else? MF + end # Callback after initialized def loaded @@ -48,14 +54,14 @@ module PoolParty ### Installation tasks - # This is the actual runner for the installation + # This is the actual runner for the installation def install(testing=false) error unless valid? setup_runner - unless testing + unless testing before_install(@instance) - vputs "Provisioning #{@instance.name}" + vputs "Provisioning #{@instance}" process_install!(testing) after_install(@instance) @@ -63,13 +69,14 @@ module PoolParty end # The provisioner bases overwrite this method def process_install!(testing=false) + # raise ProvisionerException(" process_install! should be overwritten by provioner, but it was not.") #MF todo end # Configuration def configure(testing=false) error unless valid? setup_runner - unless testing + unless testing before_configure(@instance) vputs "Provisioning #{@instance.name}" @@ -84,17 +91,18 @@ module PoolParty def setup_runner(force=false) @cloud.prepare_for_configuration @cloud.build_and_store_new_config_file(force) + Neighborhoods.clump(@cloud.remote_instances_list, "#{Default.tmp_path}/neighborhood.json") unless testing end # Callbacks # Before installation callback - def before_install(instance) + def before_install(instance) end - def after_install(instance) + def after_install(instance) end - def before_configure(instance) + def before_configure(instance) end - def after_configure(instance) + def after_configure(instance) end def valid? @@ -129,7 +137,7 @@ module PoolParty else "puppet puppetmaster" end - end + end # Package installers for general *nix operating systems def self.installers @installers ||= { @@ -146,40 +154,38 @@ module PoolParty packages = names.is_a?(Array) ? names.join(" ") : names "#{self.class.installers[@os]} #{packages}" end - + #TODO# # Abstract the gems out def base_gems { - :logging => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", - :ZenTest => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", - :ParseTree => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", - :ruby2ruby => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", - :activesupport => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem", - :"xml-simple" => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem", - :RubyInline => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem", - :flexmock => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem", - :hoe => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", - :lockfile => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem", - :rubyforge => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem", - :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/51288/net-ssh-2.0.10.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", + :logging => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", + :ZenTest => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", + :ParseTree => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", + :ruby2ruby => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", + :activesupport => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem", + :"xml-simple" => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem", + :RubyInline => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem", + :flexmock => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem", + :lockfile => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem", + :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/51288/net-ssh-2.0.10.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", - :echoe => "http://rubyforge.org/frs/download.php/51240/echoe-3.1.gem", - :highline => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem", - :capistrano => "http://rubyforge.org/frs/download.php/51294/capistrano-2.5.4.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" + :echoe => "http://rubyforge.org/frs/download.php/51240/echoe-3.1.gem", + :highline => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem", + :capistrano => "http://rubyforge.org/frs/download.php/51294/capistrano-2.5.4.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" } end def download_base_gems_string returning(Array.new) do |arr| base_gems.each do |name, url| - arr << "wget #{url} -O #{Base.remote_storage_path}/#{name}.gem 2>&1" + arr << "wget #{url} -O #{Default.remote_storage_path}/#{name}.gem 2>&1" end end.join(" && ") end @@ -187,7 +193,7 @@ module PoolParty def install_base_gems_string returning(Array.new) do |arr| base_gems.each do |name, url| - arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{Base.remote_storage_path}/#{name}.gem" + arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{Default.remote_storage_path}/#{name}.gem" end end.join(" && ") end @@ -196,7 +202,7 @@ module PoolParty def template_directory File.join(File.dirname(__FILE__), "..", "templates") end - + # Install from the class-level def self.install(instance, cl=self, testing=false) new(instance, cl).install(testing) @@ -207,7 +213,7 @@ module PoolParty end end - end + end end ## Load the provisioners lib/poolparty/provisioners/provisioner_base.rb @@ -2,11 +2,8 @@ Dir[File.join(File.dirname(__FILE__), "spec", dir, "*.rb")].each {|f| require f} end -class TestCloudClass < PoolParty::Cloud::Cloud - def build_test_manifest - reset_resources! - realize_plugins! - +class TestCloudClass < PoolParty::Cloud::Cloud + def build_test_manifest returning Array.new do |arr| services.each do |service| lib/poolparty/spec.rb @@ -6,7 +6,7 @@ initdead 60 # Don't boot instances between 60 seconds of each other logfacility daemon # Log to syslog as facility "daemon" auto_failback on use_logd yes -crm yes +bcast eth0 <% ha_node_ips.chomp.split(/\t/).each_with_index do |ip,index| -%> <% if hostname != ha_nodenames.chomp.split(/\t/)[index] -%> lib/poolparty/templates/ha.cf @@ -1,575 +1,48 @@ ---- !ruby/object:Gem::Specification -name: poolparty -version: !ruby/object:Gem::Version - version: 1.0.0 -platform: ruby -authors: -- Ari Lerner -autorequire: -bindir: bin -cert_chain: [] +:q +# -*- encoding: utf-8 -*- -date: 2009-03-02 00:00:00 -08:00 -default_executable: -dependencies: -- !ruby/object:Gem::Dependency - name: activesupport - type: :runtime - version_requirement: - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: "0" - version: -- !ruby/object:Gem::Dependency - name: logging - type: :runtime - version_requirement: - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: "0" - version: -- !ruby/object:Gem::Dependency - name: ruby2ruby - type: :runtime - version_requirement: - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: "0" - version: -- !ruby/object:Gem::Dependency - name: hoe - type: :development - version_requirement: - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: 1.8.0 - version: -description: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing fun and easy -email: -- ari.lerner@citrusbyte.com -executables: -- cloud -- cloud-add-access -- cloud-add-keypair -- cloud-configure -- cloud-contract -- cloud-expand -- cloud-handle-load -- cloud-list -- cloud-maintain -- cloud-osxcopy -- cloud-provision -- cloud-refresh -- cloud-rsync -- cloud-run -- cloud-setup-dev -- cloud-spec -- cloud-ssh -- cloud-start -- cloud-stats -- cloud-terminate -- messenger-get-current-nodes -- pool -- pool-console -- pool-describe -- pool-generate -- pool-init -- pool-list -- pool-start -- server-become-master -- 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 -- server-stop-client -- server-stop-master -- server-stop-node -- server-update-hosts -- server-write-new-nodes -extensions: [] +Gem::Specification.new do |s| + s.name = %q{poolparty} + s.version = "1.0.1" -extra_rdoc_files: -- History.txt -- License.txt -- Manifest.txt -- PostInstall.txt -- README.txt -- lib/erlang/messenger/lib/eunit/examples/tests.txt -- lib/poolparty/config/postlaunchmessage.txt -- website/index.txt -files: -- Capfile -- History.txt -- License.txt -- Manifest.txt -- PostInstall.txt -- README.txt -- Rakefile -- bin/cloud -- bin/cloud-add-access -- bin/cloud-add-keypair -- bin/cloud-configure -- bin/cloud-contract -- bin/cloud-expand -- bin/cloud-handle-load -- bin/cloud-list -- bin/cloud-maintain -- bin/cloud-osxcopy -- bin/cloud-provision -- bin/cloud-refresh -- bin/cloud-rsync -- bin/cloud-run -- bin/cloud-setup-dev -- bin/cloud-spec -- bin/cloud-ssh -- bin/cloud-start -- bin/cloud-stats -- bin/cloud-terminate -- bin/messenger-get-current-nodes -- bin/pool -- bin/pool-console -- bin/pool-describe -- bin/pool-generate -- bin/pool-init -- bin/pool-list -- bin/pool-start -- bin/server-become-master -- 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 -- bin/server-stop-client -- bin/server-stop-master -- bin/server-stop-node -- bin/server-update-hosts -- bin/server-write-new-nodes -- config/hoe.rb -- config/requirements.rb -- examples/basic.rb -- examples/deploy.rb -- examples/plugin_without_plugin_directory.rb -- examples/poolparty.rb -- generators/poolspec/USAGE -- generators/poolspec/poolspec_generator.rb -- generators/poolspec/templates/pool_spec_template.erb -- lib/erlang/messenger/Emakefile -- lib/erlang/messenger/Makefile -- lib/erlang/messenger/README -- lib/erlang/messenger/Rakefile -- lib/erlang/messenger/control -- lib/erlang/messenger/ebin/client.app -- lib/erlang/messenger/ebin/master.app -- lib/erlang/messenger/ebin/node.app -- lib/erlang/messenger/ebin/packager.app -- lib/erlang/messenger/ebin/pm_client_rel-0.1.rel -- lib/erlang/messenger/ebin/pm_master_rel-0.1.rel -- lib/erlang/messenger/ebin/pm_node_rel-0.1.rel -- lib/erlang/messenger/include/defines.hrl -- lib/erlang/messenger/lib/eunit/AUTHORS -- lib/erlang/messenger/lib/eunit/CHANGELOG -- lib/erlang/messenger/lib/eunit/COPYING -- lib/erlang/messenger/lib/eunit/Makefile -- lib/erlang/messenger/lib/eunit/NOTES -- lib/erlang/messenger/lib/eunit/README -- lib/erlang/messenger/lib/eunit/doc/edoc-info -- lib/erlang/messenger/lib/eunit/doc/erlang.png -- lib/erlang/messenger/lib/eunit/doc/eunit.html -- lib/erlang/messenger/lib/eunit/doc/index.html -- lib/erlang/messenger/lib/eunit/doc/modules-frame.html -- lib/erlang/messenger/lib/eunit/doc/overview-summary.html -- lib/erlang/messenger/lib/eunit/doc/overview.edoc -- lib/erlang/messenger/lib/eunit/doc/packages-frame.html -- lib/erlang/messenger/lib/eunit/doc/stylesheet.css -- lib/erlang/messenger/lib/eunit/ebin/autoload.beam -- lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit.app -- lib/erlang/messenger/lib/eunit/ebin/eunit.appup -- lib/erlang/messenger/lib/eunit/ebin/eunit.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam -- lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam -- lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam -- lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl -- lib/erlang/messenger/lib/eunit/examples/fib.erl -- lib/erlang/messenger/lib/eunit/examples/tests.txt -- lib/erlang/messenger/lib/eunit/include/eunit.hrl -- lib/erlang/messenger/lib/eunit/src/Makefile -- lib/erlang/messenger/lib/eunit/src/autoload.erl -- lib/erlang/messenger/lib/eunit/src/code_monitor.erl -- lib/erlang/messenger/lib/eunit/src/eunit.app.src -- lib/erlang/messenger/lib/eunit/src/eunit.appup.src -- lib/erlang/messenger/lib/eunit/src/eunit.erl -- lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl -- lib/erlang/messenger/lib/eunit/src/eunit_data.erl -- lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl -- lib/erlang/messenger/lib/eunit/src/eunit_lib.erl -- lib/erlang/messenger/lib/eunit/src/eunit_proc.erl -- lib/erlang/messenger/lib/eunit/src/eunit_serial.erl -- lib/erlang/messenger/lib/eunit/src/eunit_server.erl -- lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl -- lib/erlang/messenger/lib/eunit/src/eunit_test.erl -- lib/erlang/messenger/lib/eunit/src/eunit_tests.erl -- lib/erlang/messenger/lib/eunit/src/eunit_tty.erl -- lib/erlang/messenger/lib/eunit/src/file_monitor.erl -- lib/erlang/messenger/lib/eunit/sys.config -- lib/erlang/messenger/lib/eunit/vsn.mk -- lib/erlang/messenger/pm_client_rel-0.1.boot -- lib/erlang/messenger/pm_client_rel-0.1.script -- lib/erlang/messenger/pm_master_rel-0.1.boot -- lib/erlang/messenger/pm_master_rel-0.1.script -- lib/erlang/messenger/pm_node_rel-0.1.boot -- lib/erlang/messenger/pm_node_rel-0.1.script -- lib/erlang/messenger/src/client_app.erl -- 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_supervisor.erl -- lib/erlang/messenger/src/pm_cluster.erl -- lib/erlang/messenger/src/pm_event_manager.erl -- lib/erlang/messenger/src/pm_master.erl -- lib/erlang/messenger/src/pm_master_event_handler.erl -- lib/erlang/messenger/src/pm_master_supervisor.erl -- lib/erlang/messenger/src/pm_node.erl -- lib/erlang/messenger/src/pm_node_supervisor.erl -- lib/erlang/messenger/src/pm_packager.erl -- lib/erlang/messenger/src/pm_spawner.erl -- lib/erlang/messenger/src/pm_strings.erl -- lib/erlang/messenger/src/utils.erl -- lib/erlang/messenger/useful_snippets -- lib/poolparty.rb -- lib/poolparty/aska/aska.rb -- lib/poolparty/base_packages/haproxy.rb -- lib/poolparty/base_packages/heartbeat.rb -- lib/poolparty/base_packages/poolparty.rb -- lib/poolparty/base_packages/ruby.rb -- lib/poolparty/base_packages/runit.rb -- lib/poolparty/capistrano.rb -- lib/poolparty/capistrano/cloud_tasks.rb -- lib/poolparty/config/postlaunchmessage.txt -- lib/poolparty/core/array.rb -- lib/poolparty/core/class.rb -- lib/poolparty/core/exception.rb -- lib/poolparty/core/float.rb -- lib/poolparty/core/hash.rb -- lib/poolparty/core/kernel.rb -- lib/poolparty/core/metaid.rb -- lib/poolparty/core/module.rb -- lib/poolparty/core/my_open_struct.rb -- lib/poolparty/core/object.rb -- lib/poolparty/core/proc.rb -- lib/poolparty/core/string.rb -- lib/poolparty/core/symbol.rb -- lib/poolparty/core/time.rb -- lib/poolparty/dependency_resolutions/base.rb -- lib/poolparty/dependency_resolutions/puppet.rb -- lib/poolparty/exceptions/CloudNotFoundException.rb -- lib/poolparty/exceptions/LoadRulesException.rb -- lib/poolparty/exceptions/MasterException.rb -- lib/poolparty/exceptions/ProvisionerException.rb -- lib/poolparty/exceptions/RemoteException.rb -- lib/poolparty/exceptions/ResourceException.rb -- 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/loading.rb -- lib/poolparty/helpers/nice_printer.rb -- lib/poolparty/helpers/optioner.rb -- 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 -- lib/poolparty/modules/output.rb -- lib/poolparty/modules/pretty_printer.rb -- lib/poolparty/modules/resourcing_dsl.rb -- lib/poolparty/modules/s3_string.rb -- lib/poolparty/modules/safe_instance.rb -- lib/poolparty/modules/thread_pool.rb -- lib/poolparty/monitors/base_monitor.rb -- lib/poolparty/monitors/monitors/cpu_monitor.rb -- lib/poolparty/monitors/monitors/memory_monitor.rb -- lib/poolparty/monitors/monitors/web_monitor.rb -- lib/poolparty/net/messenger.rb -- lib/poolparty/net/remote.rb -- lib/poolparty/net/remote_bases/ec2.rb -- lib/poolparty/net/remote_bases/ec2/ec2_response_object.rb -- lib/poolparty/net/remote_instance.rb -- lib/poolparty/net/remoter.rb -- lib/poolparty/net/remoter_base.rb -- lib/poolparty/plugins/deploydirectory.rb -- lib/poolparty/plugins/git.rb -- lib/poolparty/plugins/line.rb -- lib/poolparty/plugins/rsyncmirror.rb -- lib/poolparty/plugins/runit.rb -- lib/poolparty/plugins/svn.rb -- lib/poolparty/poolparty/base.rb -- lib/poolparty/poolparty/cloud.rb -- lib/poolparty/poolparty/custom_resource.rb -- lib/poolparty/poolparty/loggable.rb -- lib/poolparty/poolparty/plugin.rb -- lib/poolparty/poolparty/plugin_model.rb -- lib/poolparty/poolparty/pool.rb -- lib/poolparty/poolparty/resource.rb -- lib/poolparty/poolparty/resources/class_package.rb -- lib/poolparty/poolparty/resources/conditional.rb -- lib/poolparty/poolparty/resources/cron.rb -- lib/poolparty/poolparty/resources/custom_service.rb -- lib/poolparty/poolparty/resources/directory.rb -- lib/poolparty/poolparty/resources/exec.rb -- lib/poolparty/poolparty/resources/file.rb -- lib/poolparty/poolparty/resources/gem_package.rb -- 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/capistrano/capistrano.rb -- lib/poolparty/provisioners/capistrano/capistrano_configurer.rb -- 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 -- lib/poolparty/spec/matchers/have_cron.rb -- lib/poolparty/spec/matchers/have_deploydirectory.rb -- lib/poolparty/spec/matchers/have_directory.rb -- lib/poolparty/spec/matchers/have_exec.rb -- lib/poolparty/spec/matchers/have_file.rb -- lib/poolparty/spec/matchers/have_gempackage.rb -- lib/poolparty/spec/matchers/have_git.rb -- lib/poolparty/spec/matchers/have_host.rb -- lib/poolparty/spec/matchers/have_mount.rb -- lib/poolparty/spec/matchers/have_package.rb -- lib/poolparty/spec/matchers/have_remotefile.rb -- lib/poolparty/spec/matchers/have_rsyncmirror.rb -- lib/poolparty/spec/matchers/have_service.rb -- lib/poolparty/spec/matchers/have_sshkey.rb -- lib/poolparty/spec/matchers/have_symlink.rb -- lib/poolparty/spec/matchers/have_variable.rb -- lib/poolparty/spec/spec/dynamic_matchers.rb -- lib/poolparty/spec/spec/ensure_matchers_exist.rb -- lib/poolparty/spec/templates/have_base.rb -- lib/poolparty/templates/authkeys -- lib/poolparty/templates/cib.xml -- lib/poolparty/templates/gem -- lib/poolparty/templates/ha.cf -- lib/poolparty/templates/haproxy.conf -- lib/poolparty/templates/haresources -- lib/poolparty/templates/logd.cf -- lib/poolparty/templates/messenger/client/log-run.erb -- lib/poolparty/templates/messenger/client/run.erb -- lib/poolparty/templates/messenger/master/log-run.erb -- lib/poolparty/templates/messenger/master/run.erb -- lib/poolparty/templates/messenger/node/log-run.erb -- lib/poolparty/templates/messenger/node/run.erb -- lib/poolparty/templates/namespaceauth.conf -- lib/poolparty/templates/poolparty.monitor -- lib/poolparty/templates/puppet.conf -- lib/poolparty/templates/puppetcleaner -- lib/poolparty/templates/puppetrerun -- lib/poolparty/templates/puppetrunner -- lib/poolparty/templates/yaws.conf -- lib/poolparty/version.rb -- lib/poolpartycl.rb -- log/pool.log -- poolparty.gemspec -- script/destroy -- script/generate -- script/txt2html -- setup.rb -- spec/poolparty/aska/aska_spec.rb -- spec/poolparty/base_packages/haproxy_spec.rb -- spec/poolparty/base_packages/heartbeat_spec.rb -- spec/poolparty/bin/console_spec.rb -- spec/poolparty/core/array_spec.rb -- spec/poolparty/core/float.rb -- spec/poolparty/core/hash_spec.rb -- spec/poolparty/core/kernel_spec.rb -- spec/poolparty/core/module_spec.rb -- 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 -- spec/poolparty/modules/cloud_resourcer_spec.rb -- spec/poolparty/modules/configurable_spec.rb -- spec/poolparty/modules/definable_resource.rb -- spec/poolparty/modules/file_writer_spec.rb -- spec/poolparty/modules/s3_string_spec.rb -- spec/poolparty/monitors/base_monitor_spec.rb -- spec/poolparty/monitors/monitors/cpu_monitor_spec.rb -- spec/poolparty/monitors/monitors/memory_monitor_spec.rb -- spec/poolparty/net/messenger_spec.rb -- spec/poolparty/net/remote_bases/ec2_spec.rb -- spec/poolparty/net/remote_instance_spec.rb -- spec/poolparty/net/remote_spec.rb -- spec/poolparty/net/remoter_base_spec.rb -- spec/poolparty/net/remoter_spec.rb -- 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/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/provisioners/capistrano/capistrano_spec.rb -- spec/poolparty/provisioners/provisioner_base_spec.rb -- spec/poolparty/spec/core/string_spec.rb -- spec/poolparty/spec_helper.rb -- tasks/cloud.rake -- tasks/deployment.rake -- tasks/development.rake -- tasks/ec2.rake -- tasks/environment.rake -- tasks/instance.rake -- tasks/server.rake -- tasks/spec.rake -- tasks/website.rake -- 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 -- website/stylesheets/screen.css -- website/template.html.erb -has_rdoc: true -homepage: http://poolparty.rubyforge.org -post_install_message: |- - Get ready to jump in the pool, you just installed PoolParty! (Updated at 19:34 03/02/09) - - To get started, run the generator: - - pool spec <name> - - Please check out the documentation for any questions or check out the google groups at - http://groups.google.com/group/poolpartyrb - - More tutorials can be found at - http://poolpartyrb.com - - Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs! - - For more information, check http://PoolPartyrb.com or visit us on IRC at: - irc.freenode.net - #poolpartyrb - - *** Ari Lerner @ <arilerner@mac.com> *** -rdoc_options: -- --main -- README.txt -require_paths: -- lib -required_ruby_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: "0" - version: -required_rubygems_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: "0" - version: -requirements: [] + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Ari Lerner"] + s.date = %q{2009-04-01} + s.description = %q{Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing fun and easy} + s.email = %q{ari.lerner@citrusbyte.com} + s.executables = ["cloud", "cloud-add-access", "cloud-add-keypair", "cloud-bootstrap", "cloud-configure", "cloud-console", "cloud-contract", "cloud-expand", "cloud-handle-load", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-rsync", "cloud-run", "cloud-setup-dev", "cloud-spec", "cloud-ssh", "cloud-start", "cloud-stats", "cloud-terminate", "ec2-list-active", "messenger-get-current-nodes", "pool", "pool-describe", "pool-generate", "pool-init", "pool-list", "pool-start", "server-become-master", "server-build-messenger", "server-clean-cert-for", "server-ensure-provisioning", "server-fire-cmd", "server-get-load", "server-list-active", "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", "server-stop-client", "server-stop-master", "server-stop-node", "server-update-hosts", "server-write-new-nodes"] + s.extra_rdoc_files = ["README.txt", "License.txt", "History.txt"] + s.files = ["Rakefile", "History.txt", "README.txt", "PostInstall.txt", "License.txt", "VERSION.yml", "config/jeweler.rb", "config/requirements.rb", "examples/basic.rb", "examples/default.rb", "examples/deploy.rb", "examples/fairchild.rb", "examples/plugin_without_plugin_directory.rb", "examples/poolparty.rb", "examples/suspenders.conf.erb", "lib/erlang", "lib/erlang/messenger", "lib/erlang/messenger/control", "lib/erlang/messenger/ebin", "lib/erlang/messenger/ebin/client.app", "lib/erlang/messenger/ebin/master.app", "lib/erlang/messenger/ebin/node.app", "lib/erlang/messenger/ebin/packager.app", "lib/erlang/messenger/ebin/pm_client_rel-0.1.rel", "lib/erlang/messenger/ebin/pm_master_rel-0.1.rel", "lib/erlang/messenger/ebin/pm_node_rel-0.1.rel", "lib/erlang/messenger/Emakefile", "lib/erlang/messenger/include", "lib/erlang/messenger/include/defines.hrl", "lib/erlang/messenger/lib", "lib/erlang/messenger/lib/eunit", "lib/erlang/messenger/lib/eunit/AUTHORS", "lib/erlang/messenger/lib/eunit/CHANGELOG", "lib/erlang/messenger/lib/eunit/COPYING", "lib/erlang/messenger/lib/eunit/doc", "lib/erlang/messenger/lib/eunit/doc/edoc-info", "lib/erlang/messenger/lib/eunit/doc/erlang.png", "lib/erlang/messenger/lib/eunit/doc/eunit.html", "lib/erlang/messenger/lib/eunit/doc/index.html", "lib/erlang/messenger/lib/eunit/doc/modules-frame.html", "lib/erlang/messenger/lib/eunit/doc/overview-summary.html", "lib/erlang/messenger/lib/eunit/doc/overview.edoc", "lib/erlang/messenger/lib/eunit/doc/packages-frame.html", "lib/erlang/messenger/lib/eunit/doc/stylesheet.css", "lib/erlang/messenger/lib/eunit/ebin", "lib/erlang/messenger/lib/eunit/ebin/autoload.beam", "lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit.app", "lib/erlang/messenger/lib/eunit/ebin/eunit.appup", "lib/erlang/messenger/lib/eunit/ebin/eunit.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam", "lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam", "lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam", "lib/erlang/messenger/lib/eunit/examples", "lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl", "lib/erlang/messenger/lib/eunit/examples/fib.erl", "lib/erlang/messenger/lib/eunit/examples/tests.txt", "lib/erlang/messenger/lib/eunit/include", "lib/erlang/messenger/lib/eunit/include/eunit.hrl", "lib/erlang/messenger/lib/eunit/Makefile", "lib/erlang/messenger/lib/eunit/NOTES", "lib/erlang/messenger/lib/eunit/README", "lib/erlang/messenger/lib/eunit/src", "lib/erlang/messenger/lib/eunit/src/autoload.erl", "lib/erlang/messenger/lib/eunit/src/code_monitor.erl", "lib/erlang/messenger/lib/eunit/src/eunit.app.src", "lib/erlang/messenger/lib/eunit/src/eunit.appup.src", "lib/erlang/messenger/lib/eunit/src/eunit.erl", "lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl", "lib/erlang/messenger/lib/eunit/src/eunit_data.erl", "lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl", "lib/erlang/messenger/lib/eunit/src/eunit_lib.erl", "lib/erlang/messenger/lib/eunit/src/eunit_proc.erl", "lib/erlang/messenger/lib/eunit/src/eunit_serial.erl", "lib/erlang/messenger/lib/eunit/src/eunit_server.erl", "lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl", "lib/erlang/messenger/lib/eunit/src/eunit_test.erl", "lib/erlang/messenger/lib/eunit/src/eunit_tests.erl", "lib/erlang/messenger/lib/eunit/src/eunit_tty.erl", "lib/erlang/messenger/lib/eunit/src/file_monitor.erl", "lib/erlang/messenger/lib/eunit/src/Makefile", "lib/erlang/messenger/lib/eunit/sys.config", "lib/erlang/messenger/lib/eunit/vsn.mk", "lib/erlang/messenger/Makefile", "lib/erlang/messenger/pm_client_rel-0.1.boot", "lib/erlang/messenger/pm_client_rel-0.1.script", "lib/erlang/messenger/pm_master_rel-0.1.boot", "lib/erlang/messenger/pm_master_rel-0.1.script", "lib/erlang/messenger/pm_node_rel-0.1.boot", "lib/erlang/messenger/pm_node_rel-0.1.script", "lib/erlang/messenger/Rakefile", "lib/erlang/messenger/README", "lib/erlang/messenger/src", "lib/erlang/messenger/src/client_app.erl", "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_supervisor.erl", "lib/erlang/messenger/src/pm_cluster.erl", "lib/erlang/messenger/src/pm_event_manager.erl", "lib/erlang/messenger/src/pm_master.erl", "lib/erlang/messenger/src/pm_master_event_handler.erl", "lib/erlang/messenger/src/pm_master_supervisor.erl", "lib/erlang/messenger/src/pm_node.erl", "lib/erlang/messenger/src/pm_node_supervisor.erl", "lib/erlang/messenger/src/pm_packager.erl", "lib/erlang/messenger/src/pm_spawner.erl", "lib/erlang/messenger/src/pm_strings.erl", "lib/erlang/messenger/src/utils.erl", "lib/erlang/messenger/useful_snippets", "lib/poolparty", "lib/poolparty/aska", "lib/poolparty/aska/aska.rb", "lib/poolparty/base_packages", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/base_packages/runit.rb", "lib/poolparty/capistrano", "lib/poolparty/capistrano/cloud_tasks.rb", "lib/poolparty/capistrano.rb", "lib/poolparty/config", "lib/poolparty/config/postlaunchmessage.txt", "lib/poolparty/core", "lib/poolparty/core/array.rb", "lib/poolparty/core/class.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/metaid.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/dependencies.rb", "lib/poolparty/dependency_resolver", "lib/poolparty/dependency_resolver/dependency_resolver.rb", "lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb", "lib/poolparty/dependency_resolver/puppet.rb", "lib/poolparty/dependency_resolver/puppet_resolver.rb", "lib/poolparty/exceptions", "lib/poolparty/exceptions/CloudNotFoundException.rb", "lib/poolparty/exceptions/dependency_resolver_exception.rb", "lib/poolparty/exceptions/LoadRulesException.rb", "lib/poolparty/exceptions/MasterException.rb", "lib/poolparty/exceptions/package_exception.rb", "lib/poolparty/exceptions/ProvisionerException.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/exceptions/UnacceptableCommand.rb", "lib/poolparty/extra", "lib/poolparty/extra/deployments.rb", "lib/poolparty/helpers", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "lib/poolparty/helpers/hash_printer.rb", "lib/poolparty/helpers/loading.rb", "lib/poolparty/helpers/nice_printer.rb", "lib/poolparty/helpers/optioner.rb", "lib/poolparty/helpers/ruberl.rb", "lib/poolparty/lite.rb", "lib/poolparty/modules", "lib/poolparty/modules/cloud_dsl.rb", "lib/poolparty/modules/cloud_resourcer.rb", "lib/poolparty/modules/daemonizable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/resourcing_dsl.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/modules/thread_pool.rb", "lib/poolparty/monitors", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/monitors/monitors", "lib/poolparty/monitors/monitors/cpu_monitor.rb", "lib/poolparty/monitors/monitors/memory_monitor.rb", "lib/poolparty/monitors/monitors/web_monitor.rb", "lib/poolparty/net", "lib/poolparty/net/init.rb", "lib/poolparty/net/messenger.rb", "lib/poolparty/net/remote_bases", "lib/poolparty/net/remote_bases.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter", "lib/poolparty/net/remoter/cloud_control.rb", "lib/poolparty/net/remoter/connections.rb", "lib/poolparty/net/remoter/interactive.rb", "lib/poolparty/net/remoter/lists.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/net/remoter_bases", "lib/poolparty/net/remoter_bases/ec2", "lib/poolparty/net/remoter_bases/ec2/ec2.rb", "lib/poolparty/net/remoter_bases/ec2/ec2_remote_instance.rb", "lib/poolparty/net/remoter_bases/ec2/ec2_response_object.rb", "lib/poolparty/plugins", "lib/poolparty/plugins/chef.rb", "lib/poolparty/plugins/deploydirectory.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/rsyncmirror.rb", "lib/poolparty/plugins/runit.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/poolparty", "lib/poolparty/poolparty/cloud.rb", "lib/poolparty/poolparty/custom_resource.rb", "lib/poolparty/poolparty/default.rb", "lib/poolparty/poolparty/key.rb", "lib/poolparty/poolparty/loggable.rb", "lib/poolparty/poolparty/neighborhoods.rb", "lib/poolparty/poolparty/plugin.rb", "lib/poolparty/poolparty/plugin_model.rb", "lib/poolparty/poolparty/pool.rb", "lib/poolparty/poolparty/poolparty_base_class.rb", "lib/poolparty/poolparty/resource.rb", "lib/poolparty/poolparty/script.rb", "lib/poolparty/poolparty/service.rb", "lib/poolparty/poolparty/template.rb", "lib/poolparty/provision", "lib/poolparty/provision/boot_strapper.rb", "lib/poolparty/provision/configurations", "lib/poolparty/provision/configurations/chef.rb", "lib/poolparty/provision/configurations/puppet.rb", "lib/poolparty/provision/dr_configure.rb", "lib/poolparty/provisioners", "lib/poolparty/provisioners/capistrano", "lib/poolparty/provisioners/capistrano/capistrano.rb", "lib/poolparty/provisioners/capistrano/capistrano_configurer.rb", "lib/poolparty/provisioners/capistrano/recipes", "lib/poolparty/provisioners/capistrano/recipes/aws.rb", "lib/poolparty/provisioners/capistrano/recipes/base.rb", "lib/poolparty/provisioners/capistrano/recipes/master.rb", "lib/poolparty/provisioners/capistrano/recipes/puppet.rb", "lib/poolparty/provisioners/capistrano/recipes/slave.rb", "lib/poolparty/provisioners/provisioner_base.rb", "lib/poolparty/resources", "lib/poolparty/resources/cron.rb", "lib/poolparty/resources/custom_service.rb", "lib/poolparty/resources/directory.rb", "lib/poolparty/resources/exec.rb", "lib/poolparty/resources/file.rb", "lib/poolparty/resources/host.rb", "lib/poolparty/resources/line.rb", "lib/poolparty/resources/mount.rb", "lib/poolparty/resources/package.rb", "lib/poolparty/resources/remote_file.rb", "lib/poolparty/resources/service.rb", "lib/poolparty/resources/sshkey.rb", "lib/poolparty/resources/symlink.rb", "lib/poolparty/resources/user.rb", "lib/poolparty/resources/variable.rb", "lib/poolparty/schema.rb", "lib/poolparty/services", "lib/poolparty/services/conditional.rb", "lib/poolparty/services/gem_package.rb", "lib/poolparty/spec", "lib/poolparty/spec/core", "lib/poolparty/spec/core/string.rb", "lib/poolparty/spec/matchers", "lib/poolparty/spec/matchers/a_spec_extensions_base.rb", "lib/poolparty/spec/matchers/have_cron.rb", "lib/poolparty/spec/matchers/have_deploydirectory.rb", "lib/poolparty/spec/matchers/have_directory.rb", "lib/poolparty/spec/matchers/have_exec.rb", "lib/poolparty/spec/matchers/have_file.rb", "lib/poolparty/spec/matchers/have_gempackage.rb", "lib/poolparty/spec/matchers/have_git.rb", "lib/poolparty/spec/matchers/have_host.rb", "lib/poolparty/spec/matchers/have_mount.rb", "lib/poolparty/spec/matchers/have_package.rb", "lib/poolparty/spec/matchers/have_remotefile.rb", "lib/poolparty/spec/matchers/have_rsyncmirror.rb", "lib/poolparty/spec/matchers/have_service.rb", "lib/poolparty/spec/matchers/have_sshkey.rb", "lib/poolparty/spec/matchers/have_symlink.rb", "lib/poolparty/spec/matchers/have_variable.rb", "lib/poolparty/spec/spec", "lib/poolparty/spec/spec/dynamic_matchers.rb", "lib/poolparty/spec/spec/ensure_matchers_exist.rb", "lib/poolparty/spec/templates", "lib/poolparty/spec/templates/have_base.rb", "lib/poolparty/spec.rb", "lib/poolparty/templates", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/erlang_cookie_maker", "lib/poolparty/templates/gem", "lib/poolparty/templates/gemrc", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/haresources", "lib/poolparty/templates/logd.cf", "lib/poolparty/templates/messenger", "lib/poolparty/templates/messenger/client", "lib/poolparty/templates/messenger/client/log-run.erb", "lib/poolparty/templates/messenger/client/run.erb", "lib/poolparty/templates/messenger/master", "lib/poolparty/templates/messenger/master/log-run.erb", "lib/poolparty/templates/messenger/master/run.erb", "lib/poolparty/templates/messenger/node", "lib/poolparty/templates/messenger/node/log-run.erb", "lib/poolparty/templates/messenger/node/run.erb", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/poolparty.monitor", "lib/poolparty/templates/puppet", "lib/poolparty/templates/puppet/add_puppet_to_hosts", "lib/poolparty/templates/puppet/puppet.conf", "lib/poolparty/templates/puppet/puppetrunner", "lib/poolparty/templates/puppet/site.pp", "lib/poolparty/templates/yaws.conf", "lib/poolparty/version.rb", "lib/poolparty.rb", "lib/poolpartycl.rb", "spec/bin", "spec/bin/bin_spec_helper.rb", "spec/bin/fixtures", "spec/bin/fixtures/bin_cloud_for_test.rb", "spec/bin/server-list-active_spec.rb", "spec/poolparty", "spec/poolparty/aska", "spec/poolparty/aska/aska_spec.rb", "spec/poolparty/base_packages", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/dependencies_spec.rb", "spec/poolparty/dependency_resolver", "spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb", "spec/poolparty/dependency_resolver/dependency_resolver_spec.rb", "spec/poolparty/dependency_resolver/puppet_resolver_spec.rb", "spec/poolparty/extra", "spec/poolparty/extra/deployments_spec.rb", "spec/poolparty/fixtures", "spec/poolparty/fixtures/clouds.json", "spec/poolparty/fixtures/test_template.erb", "spec/poolparty/helpers", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/hash_printer_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/id_rsa", "spec/poolparty/modules", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/monitors", "spec/poolparty/monitors/base_monitor_spec.rb", "spec/poolparty/monitors/monitors", "spec/poolparty/monitors/monitors/cpu_monitor_spec.rb", "spec/poolparty/monitors/monitors/memory_monitor_spec.rb", "spec/poolparty/net", "spec/poolparty/net/messenger_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_bases", "spec/poolparty/net/remoter_bases/ec2_mocks_and_stubs.rb", "spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb", "spec/poolparty/net/remoter_bases/ec2_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins", "spec/poolparty/plugins/chef_spec.rb", "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/poolparty", "spec/poolparty/poolparty/cloud_spec.rb", "spec/poolparty/poolparty/configurers", "spec/poolparty/poolparty/configurers/files", "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/default_spec.rb", "spec/poolparty/poolparty/example_spec.rb", "spec/poolparty/poolparty/key_spec.rb", "spec/poolparty/poolparty/neighborhoods_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/script_spec.rb", "spec/poolparty/poolparty/service_spec.rb", "spec/poolparty/poolparty/template_spec.rb", "spec/poolparty/poolparty/test_plugins", "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_base_class_spec.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/provisioners", "spec/poolparty/provisioners/capistrano", "spec/poolparty/provisioners/capistrano/capistrano_spec.rb", "spec/poolparty/provisioners/provisioner_base_spec.rb", "spec/poolparty/resources", "spec/poolparty/resources/cron_spec.rb", "spec/poolparty/resources/directory_spec.rb", "spec/poolparty/resources/exec_spec.rb", "spec/poolparty/resources/file_spec.rb", "spec/poolparty/resources/gem_spec.rb", "spec/poolparty/resources/host_spec.rb", "spec/poolparty/resources/package_spec.rb", "spec/poolparty/resources/service_spec.rb", "spec/poolparty/resources/sshkey_spec.rb", "spec/poolparty/resources/symlink_spec.rb", "spec/poolparty/resources/user_spec.rb", "spec/poolparty/resources/variable_spec.rb", "spec/poolparty/schema_spec.rb", "spec/poolparty/services", "spec/poolparty/services/conditional_spec.rb", "spec/poolparty/spec", "spec/poolparty/spec/core", "spec/poolparty/spec/core/string_spec.rb", "spec/poolparty/spec_helper.rb", "spec/poolparty/test_spec_helper.rb", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "tasks/cloud.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/poolparty.rake", "tasks/server.rake", "tasks/spec.rake", "script/destroy", "script/generate", "generators/poolspec", "generators/poolspec/poolspec_generator.rb", "generators/poolspec/templates", "generators/poolspec/templates/pool_spec_template.erb", "generators/poolspec/USAGE", "bin/cloud", "bin/cloud-add-access", "bin/cloud-add-keypair", "bin/cloud-bootstrap", "bin/cloud-configure", "bin/cloud-console", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-handle-load", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-rsync", "bin/cloud-run", "bin/cloud-setup-dev", "bin/cloud-spec", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-stats", "bin/cloud-terminate", "bin/ec2-list-active", "bin/messenger-get-current-nodes", "bin/pool", "bin/pool-describe", "bin/pool-generate", "bin/pool-init", "bin/pool-list", "bin/pool-start", "bin/server-become-master", "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-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", "bin/server-stop-client", "bin/server-stop-master", "bin/server-stop-node", "bin/server-update-hosts", "bin/server-write-new-nodes", "vendor/dependencies", "vendor/dependencies/cache", "vendor/dependencies/cache/activesupport-2.3.2.gem", "vendor/dependencies/cache/archive-tar-minitar-0.5.2.gem", "vendor/dependencies/cache/capistrano-2.5.5.gem", "vendor/dependencies/cache/echoe-3.1.1.gem", "vendor/dependencies/cache/flexmock-0.8.5.gem", "vendor/dependencies/cache/grempe-amazon-ec2-0.3.7.gem", "vendor/dependencies/cache/highline-1.5.0.gem", "vendor/dependencies/cache/json-1.1.3.gem", "vendor/dependencies/cache/lockfile-1.4.3.gem", "vendor/dependencies/cache/logging-0.9.7.gem", "vendor/dependencies/cache/net-scp-1.0.2.gem", "vendor/dependencies/cache/net-sftp-2.0.2.gem", "vendor/dependencies/cache/net-ssh-2.0.11.gem", "vendor/dependencies/cache/net-ssh-gateway-1.0.1.gem", "vendor/dependencies/cache/ParseTree-3.0.3.gem", "vendor/dependencies/cache/puppet-0.24.8.gem", "vendor/dependencies/cache/rake-0.8.4.gem", "vendor/dependencies/cache/rdoc-2.4.2.gem", "vendor/dependencies/cache/ruby2ruby-1.2.2.gem", "vendor/dependencies/cache/RubyInline-3.8.1.gem", "vendor/dependencies/cache/sexp_processor-3.0.1.gem", "vendor/dependencies/cache/xml-simple-1.0.12.gem", "vendor/dependencies/cache/ZenTest-4.0.0.gem", "vendor/dependencies/packages", "vendor/dependencies/packages/rubygems-1.3.1.tgz", "vendor/gems", "vendor/gems/dslify", "vendor/gems/dslify/config", "vendor/gems/dslify/config/hoe.rb", "vendor/gems/dslify/config/requirements.rb", "vendor/gems/dslify/dslify.gemspec", "vendor/gems/dslify/History.txt", "vendor/gems/dslify/lib", "vendor/gems/dslify/lib/dslify", "vendor/gems/dslify/lib/dslify/dslify.rb", "vendor/gems/dslify/lib/dslify/version.rb", "vendor/gems/dslify/lib/dslify.rb", "vendor/gems/dslify/Manifest.txt", "vendor/gems/dslify/PostInstall.txt", "vendor/gems/dslify/Rakefile", "vendor/gems/dslify/README.txt", "vendor/gems/dslify/script", "vendor/gems/dslify/script/console", "vendor/gems/dslify/script/destroy", "vendor/gems/dslify/script/generate", "vendor/gems/dslify/script/txt2html", "vendor/gems/dslify/setup.rb", "vendor/gems/dslify/tasks", "vendor/gems/dslify/tasks/deployment.rake", "vendor/gems/dslify/tasks/environment.rake", "vendor/gems/dslify/tasks/website.rake", "vendor/gems/dslify/test", "vendor/gems/dslify/test/test_dslify.rb", "vendor/gems/dslify/website", "vendor/gems/dslify/website/index.html", "vendor/gems/dslify/website/index.txt", "vendor/gems/dslify/website/javascripts", "vendor/gems/dslify/website/javascripts/rounded_corners_lite.inc.js", "vendor/gems/dslify/website/stylesheets", "vendor/gems/dslify/website/stylesheets/screen.css", "vendor/gems/dslify/website/template.html.erb", "vendor/gems/parenting", "vendor/gems/parenting/History.txt", "vendor/gems/parenting/lib", "vendor/gems/parenting/lib/parenting", "vendor/gems/parenting/lib/parenting/base.rb", "vendor/gems/parenting/lib/parenting.rb", "vendor/gems/parenting/Manifest.txt", "vendor/gems/parenting/parenting.gemspec", "vendor/gems/parenting/PostInstall.txt", "vendor/gems/parenting/Rakefile", "vendor/gems/parenting/README.rdoc", "vendor/gems/parenting/script", "vendor/gems/parenting/script/console", "vendor/gems/parenting/script/destroy", "vendor/gems/parenting/script/generate", "vendor/gems/parenting/test", "vendor/gems/parenting/test/file_to_eval.rb", "vendor/gems/parenting/test/test_helper.rb", "vendor/gems/parenting/test/test_parenting.rb", "vendor/gems/suitcase", "vendor/gems/suitcase/lib", "vendor/gems/suitcase/lib/suitcase", "vendor/gems/suitcase/lib/suitcase/unzipper.rb", "vendor/gems/suitcase/lib/suitcase/zipper.rb", "vendor/gems/suitcase/lib/suitcase.rb", "vendor/gems/suitcase/LICENSE", "vendor/gems/suitcase/Rakefile", "vendor/gems/suitcase/README.rdoc", "vendor/gems/suitcase/test", "vendor/gems/suitcase/test/suitcase_test.rb", "vendor/gems/suitcase/test/test_dir", "vendor/gems/suitcase/test/test_dir/box.rb", "vendor/gems/suitcase/test/test_dir/test.txt", "vendor/gems/suitcase/test/test_helper.rb"] + s.has_rdoc = true + s.homepage = %q{http://poolpartyrb.com} + s.rdoc_options = ["--quiet", "--title", "PoolParty documentation", "--opname", "index.html", "--line-numbers", "--main", "README", "--inline-source", "--inline-source", "--charset=UTF-8"] + s.require_paths = ["lib"] + s.rubygems_version = %q{1.3.1} + s.summary = %q{Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing fun and easy} + s.test_files = ["test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb"] -rubyforge_project: poolparty -rubygems_version: 1.3.1 -signing_key: -specification_version: 2 -summary: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing fun and easy -test_files: -- test/test_generator_helper.rb -- test/test_helper.rb -- test/test_pool_spec_generator.rb -- test/test_poolparty.rb + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 2 + + if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q<activesupport>, [">= 0"]) + s.add_runtime_dependency(%q<logging>, [">= 0"]) + s.add_runtime_dependency(%q<ruby2ruby>, [">= 0"]) + s.add_runtime_dependency(%q<grempe-amazon-ec2>, [">= 0"]) + s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"]) + else + s.add_dependency(%q<activesupport>, [">= 0"]) + s.add_dependency(%q<logging>, [">= 0"]) + s.add_dependency(%q<ruby2ruby>, [">= 0"]) + s.add_dependency(%q<grempe-amazon-ec2>, [">= 0"]) + s.add_dependency(%q<rubigen>, [">= 1.5.2"]) + end + else + s.add_dependency(%q<activesupport>, [">= 0"]) + s.add_dependency(%q<logging>, [">= 0"]) + s.add_dependency(%q<ruby2ruby>, [">= 0"]) + s.add_dependency(%q<grempe-amazon-ec2>, [">= 0"]) + s.add_dependency(%q<rubigen>, [">= 1.5.2"]) + end +end poolparty.gemspec @@ -10,5 +10,5 @@ end require 'rubigen/scripts/destroy' ARGV.shift if ['--help', '-h'].include?(ARGV[0]) -RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit] +RubiGen::Base.use_component_sources! [:rubygems] RubiGen::Scripts::Destroy.new.run(ARGV) script/destroy @@ -10,5 +10,5 @@ end require 'rubigen/scripts/generate' ARGV.shift if ['--help', '-h'].include?(ARGV[0]) -RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit] +RubiGen::Base.use_component_sources! [:rubygems] RubiGen::Scripts::Generate.new.run(ARGV) script/generate @@ -47,16 +47,16 @@ describe "Rules" do @car.names.to_s.should == "'x > 0', 'y > 0', 'x > y'" end it "should be able to say that rules are defined when they are defined" do - @car.names.should_not be_nil + @car.names.should_not == nil end - it "should be able tos ay that rules are not defined when they are not defined" do - @car.look_up_rules(:cars_and_wheels).should be_empty + it "should be able to say that rules are not defined when they are not defined" do + @car.look_up_rules(:cars_and_wheels).empty?.should == true end it "should be able to say if the rules are not rules" do - @car.are_rules?(:cars_and_wheels).should be_false + @car.are_rules?(:cars_and_wheels).should == false end it "should be able to say that rules are rules" do - @car.are_rules?(:names).should be_true + @car.are_rules?(:names).should == true end describe "parsing" do it "should be able to parse the x > 0 into an array" do spec/poolparty/aska/aska_spec.rb @@ -1,13 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "haproxy base package" do - before(:each) do - @ha = PoolPartyHaproxyClass.new do - end - stub_list_from_remote_for(@ha) - @ha.stub!(:list_of_running_instances).and_return [] - end - it "should have the heartbeat package defined" do - lambda {PoolPartyHaproxyClass}.should_not raise_error + it "should have the haproxy package defined" do + lambda {PoolpartyBaseHaproxyClass}.should_not raise_error end end \ No newline at end of file spec/poolparty/base_packages/haproxy_spec.rb @@ -1,30 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "heartbeat base package" do - # before(:each) do - # @cloud = Cloud.new(:app, self) - # @hb = PoolPartyHeartbeatClass.new(@cloud) - # stub_list_from_remote_for(@cloud) - # stub_list_of_instances_for(@cloud) - # end - # it "should have the heartbeat package defined" do - # lambda {PoolPartyHeartbeatClass}.should_not raise_error - # end - # it "should have a parent set to the cloud" do - # @hb.parent.should == @cloud - # end - # it "should call enable (and setup resources) since there is no block given when it's instantiated" do - # @hb.resources.should_not be_empty - # end - # it "should have no resources when starting with a block (that defines no methods)" do - # @pphc = PoolPartyHeartbeatClass.new do - # end - # @pphc.resources.should be_empty - # end - # it "should have a file resource" do - # @hb.resource(:remotefile).should_not be_empty - # end - # it "should have at least 3 remotefiles" do - # @hb.resource(:remotefile).size.should >= 3 - # end + it "should have the heartbeat package defined" do + lambda {PoolpartyBaseHeartbeatClass}.should_not raise_error + end end \ No newline at end of file spec/poolparty/base_packages/heartbeat_spec.rb @@ -18,38 +18,21 @@ describe "Console" do pool :app do maximum_instances 2 cloud :rawr do - maximum_instances 2 + maximum_instances 200 end end EOS self.stub!(:open).and_return @string @string.stub!(:read).and_return @string + ::File.stub!(:readable?).with(@string).and_return true end it "should give you the load_pool method" do self.respond_to?(:load_pool).should == true end it "should call script inflate on the filename" do - PoolParty::Script.should_receive(:inflate).once + PoolParty::Pool::Pool.should_receive(:load_from_file).and_return "wee" load_pool("pop") end - describe "calling" do - before(:each) do - reset! - load_pool("pop") - end - it "should instance_eval the string" do - pool(:app).should_not be_nil - end - it "should store the cloud inside the pool after inflating" do - pool(:app).cloud(:rawr).should_not be_nil - end - it "should say that the cloud inside the pool's parent is the containing parent" do - pool(:app).cloud(:rawr).parent.should == pool(:app) - end - it "should say that the maximum_instances on the cloud is the containing pool's option" do - pool(:app).cloud(:rawr).maximum_instances.should == 2 - end - end end describe "reload!" do before(:each) do @@ -78,7 +61,7 @@ describe "Console" do } end it "should call inflate from Script with the poolspec" do - PoolParty::Script.should_receive(:inflate).with("spec contents", "myspec.spec").and_return true + PoolParty::Pool::Pool.should_receive(:load_from_file).with("myspec.spec").and_return true load_pool(@filename) end end @@ -94,10 +77,10 @@ describe "Console" do EOS self.stub!(:open).and_return @string @string.stub!(:read).and_return @string - load_pool("pop") + PoolParty::Pool::Pool.new(:dummy).instance_eval @string end it "should be able to print the clouds" do - pools.should_not be_empty + pools.empty?.should == false hide_output do pool_describe.should == pools.size end spec/poolparty/bin/console_spec.rb @@ -23,9 +23,24 @@ describe "Array" do @array.to_os end end - describe "to_option_string" do - it "should map the to_option_strings in an array of strings" do - ["hi", "be"].to_option_string.should == "[ 'hi', 'be' ]" + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + + describe "select_with_hash" do + before(:all) do + @remote_instances_list =[ + {:status=>'running', :ip=>'10'}, + {:status => 'pending', :ip=>'not.assigned'}, + {:status=>'running', :ip=>'192', :bogus=>nil} + ] + end + it "should return the selected array" do + @remote_instances_list.select_with_hash( {:status => 'running'}).size.should == 2 + @remote_instances_list.select_with_hash( {:ip => 'not.assigned'}).should == [{:status => 'pending', :ip=>'not.assigned'},] + @remote_instances_list.select_with_hash( {:bogus => nil}).size.should == 1 + @remote_instances_list.select_with_hash().size.should == 0 + end + it "should not raise an error if element does not have key" do + @remote_instances_list.select_with_hash( {:snot => 'runny'}).size.should == 0 end end end \ No newline at end of file spec/poolparty/core/array_spec.rb @@ -24,50 +24,44 @@ describe "Hash" do it "should be able to turn itself into an open struct with the method to_hash on the object" do @a.to_os.to_hash.should == @a end - it "should not put quotes around integers" do - {:a => 10, :b => "q"}.flush_out.sort.should == ["a => 10", "b => 'q'"] - end - it "should be able to flush out into a string into an array" do - @a.flush_out.sort.should == ["a => '10'","b => '20'","c => '30'"] - end - 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 + {:first_name => "bob", :last_name => "frank"}.neighbor.should == nil end end - describe "select" do + describe "choose" do before(:each) do - @selected_hash = @a.select {|k,v| k if k == :a} + @selected_hash = @a.choose {|k,v| k if k == :a} end - it "should return a hash when selecting" do + it "should return a hash when choosing" do @selected_hash.class.should == Hash end - it "should only have the key a (selected)" do + it "should only have the key a (choos)" do @selected_hash.keys.should == [:a] end end - describe "extract!" do - before(:each) do - @rejected_hash = @a.extract! {|k,v| k == :a } - end - it "should have a reject with the keys" do - @rejected_hash.keys.should == [:a] - end - it "should return the old array with the other keys" do - @a.keys.sort.should == [:b, :c] - end - it "should not throw a fit with an empty hash" do - lambda { - {}.extract! - }.should_not raise_error - end - end + #TODO: deprecate + # describe "extract!" do + # before(:each) do + # @rejected_hash = @a.extract! {|k,v| k == :a } + # end + # it "should have a reject with the keys" do + # @rejected_hash.keys.should == [:a] + # end + # it "should return the old array with the other keys" do + # @a.keys.sort.should == [:b, :c] + # end + # it "should not throw a fit with an empty hash" do + # {}.extract! + # lambda { + # {}.extract! + # }.should_not raise_error + # end + # end + describe "append" do before(:each) do @hash = {:game => "token", :required => "for_play"} spec/poolparty/core/hash_spec.rb @@ -42,8 +42,7 @@ describe "Object" do describe "running" do before(:each) do Class.stub!(:default_options).and_return({}) - Class.send :include, Configurable - Class.send :include, MethodMissingSugar + Class.send :include, Dslify @a = Class.new @b = Class.new @@ -59,7 +58,7 @@ describe "Object" do describe "contextual running" do before(:each) do @obj.stub!(:default_options).and_return {} - @a = @obj.run_in_context { @a = "hello world" } + @a = @obj.instance_eval { @a = "hello world" } end it "should have the method meta_eval" do @obj.respond_to?(:meta_eval).should == true spec/poolparty/core/object_spec.rb @@ -119,33 +119,7 @@ listen web_proxy 127.0.0.1:3000 "file".camelcase.should == "File" end end - describe "to_option_string" do - it "should not touch a string, but return the string with single quotes" do - "rocks".to_option_string.should == "'rocks'" - end - it "should return a string of the format Service[nagios] with no single quotes" do - "Service[nagios]".to_option_string.should == "Service[nagios]" - end - it "should also return a string if there is a string within the string" do - 'Package["heartbeat-2"]'.to_option_string.should == 'Package["heartbeat-2"]' - end - it "should return File['/etc/apache2/conf.d/base.conf'] as a string" do - 'File["/etc/apache2/conf.d/base.conf"]'.to_option_string.should == "File[\"/etc/apache2/conf.d/base.conf\"]" - end - it "should turn a resource into a requires file" do - @cloud = cloud :app do - file(:name => "franke") - end - @file = @cloud.resource(:file).first - @file.to_option_string.should == "File['franke']" - end - it "should turn a function into a string without quotes" do - "active_nodes()".to_option_string.should == "active_nodes()" - end - it "should turna function into a string outsid ethe quotes with a parameter" do - "active_nodes(10)".to_option_string.should == "active_nodes(10)" - end - end + describe "sanitize" do it "should remove the periods from the string" do "xnot.org".sanitize.should == "xnotorg" spec/poolparty/core/string_spec.rb @@ -1,3 +1,4 @@ +#TODO: Reimplement require File.dirname(__FILE__) + '/../spec_helper' describe "deployments" do @@ -19,19 +20,22 @@ describe "deployments" do @contents = "'hello goober'" @klass.stub!(:open).with(@file).and_return @file @file.stub!(:read).and_return @contents + @klass.include_deployment(@file).should_not == nil end it "should not be nil if the file does exist" do @klass.include_deployment(@file).should_not == nil end it "should create a class called PoolPartyHankyDankyRankyClass" do - @klass.include_deployment(@file).should_not == nil - Object.const_defined?(:PoolPartyHankyDankyRankyClass).should == true + @klass.include_deployment(@file).nil?.should == false + Object.const_defined?(:HankyDankyRankyClass).should == true end it "should create a method on the class called enable" do - PoolPartyHankyDankyRankyClass.new.respond_to?(:enable).should == true + HankyDankyRankyClass.new.respond_to?(:enable).should == true end it "should add the contents of the file to be eval'd on the method" do - PoolPartyHankyDankyRankyClass.new.enable.should == "hello goober" + # puts HankyDankyRankyClass.new.enable + # HankyDankyRankyClass.new.enable.should == "hello goober" + pending end end describe "include_deployments" do @@ -52,7 +56,7 @@ describe "deployments" do Dir.stub!(:[]).and_return @contents end it "should not be nil if the directory exists" do - @klass.include_deployments(@dir).should_not == nil + @klass.include_deployments(@dir).nil?.should == false end it "should call Dir.[] on the directory" do Dir.should_receive(:[]).with("#{@dir}/*").and_return [] spec/poolparty/extra/deployments_spec.rb @@ -17,7 +17,7 @@ describe "Binary" do describe "get_existing_spec_location" do before(:each) do ::File.stub!(:readable?).and_return false - ::File.stub!(:readable?).with("#{Base.storage_directory}/clouds.rb").and_return true + ::File.stub!(:readable?).with("/etc/poolparty/clouds.rb").and_return true end it "should be a String" do Binary.get_existing_spec_location.class.should == String @@ -33,6 +33,7 @@ describe "Binary" do end it "should call Dir[Dir.pwd] if there is no filename given" do Dir.should_receive(:[]).with("#{Dir.pwd}/*/clouds.rb").and_return ["clouds.rb"] + ::File.stub!(:open).with("/var/poolparty/clouds.rb", 'r').and_return "wee" Binary.load_pool end end spec/poolparty/helpers/binary_spec.rb @@ -14,7 +14,7 @@ describe "Option Parser" do @op.verbose.should == false end it "should call a method called on it that is not defined on the options if they exist" do - @op.options.should_receive(:[]).with(:verbose).once.and_return true + @op.dsl_options.should_receive(:[]).with(:verbose).at_least(1).and_return true @op.verbose end it "should exit after displaying the help message" do spec/poolparty/helpers/optioner_spec.rb @@ -1,26 +1,11 @@ require File.dirname(__FILE__) + '/../spec_helper' -class ResourcerTestClass - include CloudResourcer - include Configurable - +class ResourcerTestClass < PoolParty::Cloud::Cloud default_options({ :minimum_runtime => 50.minutes }) - - def initialize(&block) - store_block(&block) if block - end - - # Stub keypair - def keypair - "rangerbob" - end end -class TestParentClass - def options - {} - end +class TestParentClass < PoolParty::Cloud::Cloud def services @services ||= [] end @@ -30,7 +15,8 @@ class TestParentClass end describe "CloudResourcer" do before(:each) do - @tc = ResourcerTestClass.new + @tc = ResourcerTestClass.new :bank do + end end it "should have the method instances" do @tc.respond_to?(:instances).should == true @@ -49,103 +35,32 @@ describe "CloudResourcer" do @tc.maximum_instances.should == 10 end it "should have default minimum_runtime of 50 minutes (3000 seconds)" do - Base.stub!(:minimum_runtime).and_return 50.minutes + Default.stub!(:minimum_runtime).and_return 50.minutes @tc.minimum_runtime.should == 50.minutes end it "should have minimum_runtime" do @tc.minimum_runtime 40.minutes @tc.minimum_runtime.should == 40.minutes end - describe "keypair_path" do - before(:each) do - end - it "should look for the file in the known directories it should reside in" do - @tc.should_receive(:keypair_paths).once.and_return [] - @tc.keypair_path - end - it "should see if the file exists" do - @t = "#{File.expand_path(Base.base_keypair_path)}" - ::File.should_receive(:exists?).with(@t+"/id_rsa-rangerbob").and_return false - ::File.stub!(:exists?).with(@t+"/rangerbob").and_return false - @tc.should_receive(:keypair_paths).once.and_return [@t] - @tc.keypair_path - end - it "should fallback to the second one if the first doesn't exist" do - @t = "#{File.expand_path(Base.base_keypair_path)}" - @q = "#{File.expand_path(Base.base_config_directory)}" - ::File.stub!(:exists?).with(@t+"/id_rsa-rangerbob").and_return false - ::File.stub!(:exists?).with(@t+"/rangerbob").and_return false - ::File.stub!(:exists?).with(@q+"/id_rsa-rangerbob").and_return false - ::File.should_receive(:exists?).with(@q+"/rangerbob").and_return true - @tc.should_receive(:keypair_paths).once.and_return [@t, @q] - @tc.keypair_path.should == "/etc/poolparty/rangerbob" - end - describe "exists" do - before(:each) do - @t = "#{File.expand_path(Base.base_keypair_path)}" - ::File.stub!(:exists?).with(@t+"/id_rsa-rangerbob").and_return false - ::File.stub!(:exists?).with(@t+"/rangerbob").and_return true - end - it "should have the keypair_path" do - @tc.respond_to?(:keypair_path).should == true - end - it "should set the keypair to the Base.keypair_path" do - @tc.keypair_path.should =~ /\.ec2\/rangerbob/ - end - it "should set the keypair to have the keypair set" do - @tc.keypair.should =~ /rangerbob/ - end - it "should set it to the Base keypair_path and the keypair" do - @tc.keypair_path.should == "#{File.expand_path(Base.base_keypair_path)}/#{@tc.keypair}" - end - end - end - it "should provide set_parent" do - @tc.respond_to?(:set_parent).should == true - end describe "parents" do before(:each) do - @testparent = TestParentClass.new - end - describe "setting" do - it "should add the child to its services" do - @testparent.should_receive(:add_service) - end - it "should call configure with options" do - @tc.should_receive(:configure).with(@testparent.options) - end - after do - @tc.run_setup(@testparent) - end - end - describe "parent's services" do - before(:each) do - @tc.run_setup(@testparent) - end - it "should set the parent" do - @tc.parent.should == @testparent - end - it "should have one service set" do - @testparent.services.size.should == 1 - end - it "should have the child in the parent's services" do - @testparent.services.first.should == @tc - end - end - describe "storing block" do - before(:each) do - @new_tc = ResourcerTestClass.new do - "hi" + @testparent = + TestParentClass.new(:parent_of_bob) do + test_option "blankity blank blank" + + ResourcerTestClass.new :bob do end end - it "should store the block when creating a new one" do - @new_tc.store_block.should_not == nil - end - it "should have a reference to the stored block" do - @new_tc.store_block.class.should == Proc - end - it "should store the containing block" do - @new_tc.store_block.call.should == "hi" + describe "setting" do + it "set 1 service on the parent class" do + @testparent.services.size.should == 1 + end + it "set the service as a ResourcerTestClass named bob" do + @testparent.services.first.name.should == :bob + end + it "set the parent's options on the child" do + @testparent.services.first.test_option.should == "blankity blank blank" + end end end end spec/poolparty/modules/cloud_resourcer_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' include PoolParty::DefinableResource -describe "define_resource" do +context "define_resource" do it "should have the method define_resource available" do self.respond_to?(:define_resource).should == true end spec/poolparty/modules/definable_resource.rb @@ -7,7 +7,7 @@ describe "FileWriter" do before(:each) do @test = TestClass.new @filepath = File.join("nilly.rb") - @path = File.join(Base.storage_directory, @filepath) + @path = File.join(Default.storage_directory, @filepath) end %w(write_to_file_in_storage_directory copy_file_to_storage_directory write_to_temp_file).each do |method| eval <<-EOE @@ -16,8 +16,8 @@ describe "FileWriter" do end EOE end - it "should copy the file to the Base.storage_directory when calling copy_file_to_storage_directory" do - FileUtils.should_receive(:cp).with("ranger", Base.storage_directory+"/ranger").and_return true + it "should copy the file to the Default.storage_directory when calling copy_file_to_storage_directory" do + FileUtils.should_receive(:cp).with("ranger", Default.storage_directory+"/ranger").and_return true @test.copy_file_to_storage_directory("ranger") end describe "write to file in storage directory" do @@ -37,7 +37,7 @@ describe "FileWriter" do end it "should write the string in the file" do @test.write_to_file_in_storage_directory(@filepath, "STRING TO WRITE") - open(::File.join( Base.storage_directory, @filepath)).read.should == "STRING TO WRITE" + open(::File.join( Default.storage_directory, @filepath)).read.should == "STRING TO WRITE" end after do @test.write_to_file_in_storage_directory(@filepath, "STRING TO WRITE") @@ -54,7 +54,7 @@ describe "FileWriter" do 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 + ::FileUtils.should_receive(:rm_rf).with("#{Default.storage_directory}").and_return true @test.cleanup_storage_directory end end spec/poolparty/modules/file_writer_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' class TestMonitorClass include PoolParty::Monitors - include Configurable + include Dslify def default_options {} end spec/poolparty/monitors/base_monitor_spec.rb @@ -5,6 +5,7 @@ include PoolParty::Monitors describe "CpuMonitor" do before(:each) do @mon = CpuMonitor.new + @mon.stub!(:run).and_return 0.5 end it "should have the singleton method run defined" do CpuMonitor.respond_to?(:run).should == true spec/poolparty/monitors/monitors/cpu_monitor_spec.rb @@ -1,81 +1,17 @@ -require File.dirname(__FILE__) + '/../spec_helper' +require File.join(File.dirname(__FILE__), '/../spec_helper') -include Remote -include Aska +include PoolParty::Remote +# include Aska describe "Remote Instance" do before(:each) do setup @valid_hash = {:ip => "127.0.0.1", :name => "master", :responding => "true"} end - describe "configurable" do - it "should set the options sent in the options" do - @ri = RemoteInstance.new(@valid_hash, nil) - @ri.ip.should == "127.0.0.1" - end - it "should set the options sent by the parent" do - @obj = Object.new - @obj.stub!(:options).and_return({:dude => "tte"}) - @ri = RemoteInstance.new(@valid_hash, @obj) - @ri.dude.should == "tte" - end - it "should not overwrite the options that are already set" do - @obj = Object.new - @obj.stub!(:options).and_return({:ip => "172.176.0.1"}) - @ri = RemoteInstance.new(@valid_hash, @obj) - @ri.ip.should == "127.0.0.1" - end - end - it "should create a remote instance with a Hash" do - @ri = RemoteInstance.new(@valid_hash, nil) - @ri.valid?.should == true - end - it "should not be valid if there is no ip associated" do - @ri = RemoteInstance.new(@valid_hash.merge({:ip => nil}), nil) - @ri.valid?.should == false - end - it "should not be valid if there is no name associated" do - @ri = RemoteInstance.new(@valid_hash.merge({:name => nil}), nil) - @ri.valid?.should == false - end - describe "status" do - it "should say it is running when the status == running" do - RemoteInstance.new(@valid_hash.merge(:status => "running")).running?.should == true - end - it "should say it is pending when the status == pending" do - RemoteInstance.new(@valid_hash.merge(:status => "pending")).pending?.should == true - end - it "should say it is terminating when the status == shutting down" do - RemoteInstance.new(@valid_hash.merge(:status => "shutting down")).terminating?.should == true - end - it "should say it is terminated when the status == terminated" do - RemoteInstance.new(@valid_hash.merge(:status => "terminated")).terminated?.should == true - end - it "should not say it is running when it is pending" do - RemoteInstance.new(@valid_hash.merge(:status => "pending"), nil).running?.should == false - end - end - describe "methods" do - before(:each) do - @ri = RemoteInstance.new(@valid_hash, nil) - end - it "should give the elapsed time" do - @ri.stub!(:launching_time).and_return(30.minutes.ago) - @ri.elapsed_runtime.should be >= 1800 - end - it "should be say that it is the master if the name is master" do - @ri.name.should == "master" - @ri.master?.should == true - end - it "should say that it is responding? if responding is not nil" do - @ri.responding.should_not be_nil - @ri.responding?.should == true - end - it "should have the puppet_runner_command" do - @ri.respond_to?(:puppet_runner_command).should == true - end - it "should return the puppet_runner_command with puppetd" do - @ri.puppet_runner_command.should =~ /puppetrun/ - end + + it "should have tests for the abstaract RemoteInstance class" do + pending end -end \ No newline at end of file + + +end spec/poolparty/net/remote_instance_spec.rb @@ -1,23 +1,29 @@ require File.dirname(__FILE__) + '/../spec_helper' require "ftools" -module Hype +class PoolParty::Remote::Hype < PoolParty::Remote::RemoterBase def hyper "beatnick" end - def instances_list + def self.describe_instances(o={}) [] end - register_remote_base :Hype + def instances_list + [] + end +end + +class PoolParty::Remote::HypeRemoteInstance < PoolParty::Remote::RemoteInstance end +PoolParty::Remote.register_remote_base :Hype + describe "Remote" do before(:each) do @cloud = cloud :test_cloud do;end - - @tc = TestClass.new + @tc = TestRemoterClass.new @tc.stub!(:verbose).and_return false - setup + setup end it "should have the method 'using'" do @tc.respond_to?(:using).should == true @@ -26,12 +32,13 @@ describe "Remote" do @tc.instance_eval do @remote_base = nil end - @tc.should_receive(:extend).with("Hype".preserved_module_constant).once @tc.using :hype + @tc.remote_base.class =="Hype".class_constant end it "should keep a list of the remote_bases" do @tc.stub!(:remote_bases).and_return [:ec2, :hype] - @tc.available_bases.should == [:ec2, :hype] + @tc.available_bases.include?(:ec2).should == true + @tc.available_bases.include?(:hype).should == true end it "should be able to register a new base" do @tc.remote_bases.should_receive(:<<).with(:hockey).and_return true @@ -52,42 +59,40 @@ describe "Remote" do @tc.should_receive(:using_remoter?).once @tc.using :hype end - it "should only include the remote class once" do - @tc.instance_eval do - @remote_base = nil - end - @tc.should_receive(:extend).with(Hype).once - @tc.using :hype - @tc.using :hype - @tc.using :hype - end end describe "after using" do before(:each) do - @tc = TestClass.new - stub_list_from_remote_for(@tc, false) - @tc.using :hype + @hype_cloud = TestCloud.new do + using :hype + end + stub_list_from_remote_for(@hype_cloud, false) + end + it "should set the remote_base as an instance of the remoter base" do + @hype_cloud.remote_base.class.should == Hype end it "should now have the methods available from the module" do - @tc.respond_to?(:hyper).should == true + lambda { + @hype_cloud.hyper + }.should_not raise_error end it "should raise an exception because the launch_new_instance! is not defined" do lambda { - @tc.launch_new_instance! - }.should raise_error + @tc.launch_new_instance! + }.should raise_error end it "should not raise an exception because instances_list is defined" do + @hype_cloud.remote_instances_list lambda { - @tc.remote_instances_list + @hype_cloud.remote_instances_list }.should_not raise_error end it "should run hyper" do - @tc.hyper.should == "beatnick" + @hype_cloud.hype.hyper.should == "beatnick" end end describe "methods" do before(:each) do - @tc = TestClass.new + @tc = TestClass.new @tc.using :ec2 @tc.reset! @@ -134,6 +139,7 @@ describe "Remote" do end describe "can_start_a_new_instance?" do it "should be true because the maximum instances are not running" do + @tc.stub!(:list_of_pending_instances).and_return ["none"] @tc.can_start_a_new_instance?.should == false end it "should say that we cannot start a new instance because we are at the maximum instances" do @@ -154,23 +160,6 @@ describe "Remote" do @tc.maximum_number_of_instances_are_not_running?.should == false end end - describe "request_launch_one_instance_at_a_time" do - before(:each) do - @tc.stub!(:wait).and_return "true" - remove_stub_instance_from(@tc, 3) - remove_stub_instance_from(@tc, 5) - @tc.stub!(:launch_new_instance!).and_return {} - end - it "should call reset! once" do - @tc.should_receive(:reset!).once - @tc.request_launch_one_instance_at_a_time - end - it "should not call wait if there are no pending instances" do - Kernel.should_not_receive(:sleep) - @tc.request_launch_one_instance_at_a_time - end - # TODO: Stub methods with wait - end describe "launch_minimum_number_of_instances" do it "should not call minimum_number_of_instances_are_running? if if cannot start a new instance" do @tc.stub!(:can_start_a_new_instance?).and_return false @@ -180,13 +169,18 @@ describe "Remote" do # TODO: Stub methods with wait end describe "request_termination_of_non_master_instance" do + before(:each) do + @inst = "last instance of the pack" + @inst.stub!(:instance_id).and_return "12345" + @tc.stub!(:nonmaster_nonterminated_instances).and_return [@inst] + end it "should reject the master instance from the list of instances (we should never shut down the master unless shutting down the cloud)" do @master = @tc.list_of_running_instances.select {|a| a.master? }.first @tc.should_not_receive(:terminate_instance!).with(@master).and_return true @tc.request_termination_of_non_master_instance end it "should call terminate on an instance" do - @tc.should_receive(:terminate_instance!).once + @tc.should_receive(:terminate_instance!).with("12345").and_return true @tc.request_termination_of_non_master_instance end end @@ -205,44 +199,45 @@ describe "Remote" do @tc.stub!(:run_command_on).and_return true @tc.stub!(:full_keypair_path).and_return "true" end - describe "expand_cloud_if_necessary" do - before(:each) do - setup - stub_list_from_remote_for(@tc) - @ri = PoolParty::Remote::RemoteInstance.new(:ip => "127.0.0.1", :num => 1, :name => "master") - @tc.stub!(:request_launch_new_instances).and_return @ri - @tc.stub!(:can_start_a_new_instance).and_return true - @tc.stub!(:list_of_pending_instances).and_return [] - @tc.stub!(:prepare_for_configuration).and_return true - @tc.stub!(:build_and_store_new_config_file).and_return true - PoolParty::Provisioner.stub!(:provision_slaves).and_return true - @cloud.stub!(:master).and_return @ri - @cloud.stub!(:list_of_nonterminated_instances).and_return [@ri] - @cloud.stub!(:full_keypair_path).and_return "keyairs" - - @provisioner = PoolParty::Provisioner::Capistrano.new(@ri, @cloud, :ubuntu) - PoolParty::Provisioner::Capistrano.stub!(:new).and_return @provisioner - @provisioner.stub!(:install).and_return true - @provisioner.stub!(:configure).and_return true - end - it "should receive can_start_a_new_instance?" do - @tc.should_receive(:can_start_a_new_instance?).once - end - it "should see if we should expand the cloud" do - @tc.should_receive(:can_expand_cloud?).once.and_return false - end - it "should call request_launch_new_instances if we can_expand_cloud?" do - @tc.should_receive(:can_expand_cloud?).once.and_return true - @tc.should_receive(:request_launch_one_instance_at_a_time).once.and_return [{:ip => "127.0.0.5", :name => "node2"}] - end - it "should call a new slave provisioner" do - @tc.stub!(:can_expand_cloud?).once.and_return true - @provisioner.should_receive(:install).at_least(1) - end - after(:each) do - @tc.expand_cloud_if_necessary - end - end + # describe "expand_cloud_if_necessary" do + # before(:each) do + # setup + # stub_list_from_remote_for(@tc) + # @ri = PoolParty::Remote::RemoteInstance.new(:ip => "127.0.0.1", :num => 1, :name => "master") + # @tc.stub!(:request_launch_new_instances).and_return @ri + # @tc.stub!(:can_start_a_new_instance).and_return true + # @tc.stub!(:list_of_pending_instances).and_return [] + # @tc.stub!(:prepare_for_configuration).and_return true + # @tc.stub!(:build_and_store_new_config_file).and_return true + # PoolParty::Provisioner.stub!(:provision_slaves).and_return true + # @cloud.stub!(:master).and_return @ri + # @cloud.stub!(:list_of_nonterminated_instances).and_return [@ri] + # @cloud.stub!(:full_keypair_path).and_return "keyairs" + # + # @provisioner = PoolParty::Provisioner::Capistrano.new(@ri, @cloud, :ubuntu) + # PoolParty::Provisioner::Capistrano.stub!(:new).and_return @provisioner + # @provisioner.stub!(:install).and_return true + # @provisioner.stub!(:configure).and_return true + # end + # it "should receive can_start_a_new_instance?" do + # @tc.should_receive(:can_start_a_new_instance?).once + # end + # it "should see if we should expand the cloud" do + # @tc.should_receive(:can_expand_cloud?).once.and_return false + # end + # it "should call request_launch_new_instances if we can_expand_cloud?" do + # @tc.should_receive(:can_expand_cloud?).once.and_return true + # @tc.should_receive(:request_launch_one_instance_at_a_time).once.and_return [{:ip => "127.0.0.5", :name => "node2"}] + # end + # it "should call a new slave provisioner" do + # @tc.stub!(:can_expand_cloud?).once.and_return true + # @provisioner.should_receive(:install).at_least(1) + # end + # after(:each) do + # @tc.expand_cloud_if_necessary + # end + # end + describe "contract_cloud_if_necessary" do before(:each) do @tc.stub!(:request_termination_of_non_master_instance).and_return true @@ -270,36 +265,23 @@ describe "Remote" do before(:each) do Kernel.stub!(:system).and_return true @tc.extend CloudResourcer - @tc.stub!(:keypair_path).and_return "~/.ec2/fake_keypair" @obj = Object.new @obj.stub!(:ip).and_return "192.168.0.1" end it "should call exec on the kernel" do - @tc.stub!(:keypair).and_return "funky" - ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-funky").and_return true lambda { - @tc.rsync_storage_files_to(@tc.master) + @tc.rsync_storage_files_to(stub_instance(1)) }.should_not raise_error end describe "run_command_on" do before(:each) do - @tc.stub!(:keypair).and_return "fake_keypair" - @tc.stub!(:keypair_path).and_return "~/.ec2/fake_keypair" @obj.stub!(:name).and_return "pop" end it "should call system on the kernel" do - ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-funky").and_return true + ::File.stub!(:exists?).with("#{File.expand_path(Default.base_keypair_path)}/id_rsa-funky").and_return true Kernel.should_receive(:system).with("#{@tc.ssh_string} 192.168.0.1 'ls'").and_return true @tc.run_command_on("ls", @obj) end - end - describe "ssh_into_instance_number" do - before(:each) do - @tc.stub!(:keypair).and_return "fake_keypair" - ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-funky").and_return true - - Kernel.stub!(:system).with("#{@tc.ssh_string} 192.168.0.1").and_return true - end it "should find the instance" do @tc.should_receive(:get_instance_by_number).with(0).and_return @obj @tc.ssh_into_instance_number spec/poolparty/net/remote_spec.rb @@ -1,12 +1,8 @@ require File.dirname(__FILE__) + '/../spec_helper' -class TestRemoteClass +class TestRemoteClass < PoolParty::Remote::RemoteInstance include CloudResourcer include PoolParty::Remote - - def keypair - "fake_keypair" - end end describe "RemoterBase" do @@ -20,7 +16,8 @@ describe "RemoterBase" do %w(launch_new_instance! terminate_instance describe_instance instances_list).each do |method| eval <<-EOE it "should raise an exception if #{method} is not defined as a method" do - lambda { @tr.#{method} }.should raise_error + # pending # Weird .should raise_error + lambda { @tr.class.#{method} }.should raise_error end it "should not raise an exception if #{method} is defined as a method" do lambda { @@ -33,59 +30,6 @@ describe "RemoterBase" do end EOE end - describe "lists" do - before(:each) do - @tr = TestClass.new - stub_list_of_instances_for(@tr) - end - it "should gather a list of the running instances" do - @tr.list_of_running_instances.map {|a| a.name }.should == ["master", "node1"] - end - it "should be able to gather a list of the pending instances" do - @tr.list_of_pending_instances.map {|a| a.name }.should == ["node3"] - end - it "should be able to gather a list of the terminating instances" do - @tr.list_of_terminating_instances.map {|a| a.name }.should == [] - end - it "should be able to gather a list of the non-terminated instances" do - @tr.list_of_nonterminated_instances.map {|a| a.name }.should == ["master", "node1", "node3"] - end - it "should return a list of remote instances" do - @tr.remote_instances_list.first.class.should == PoolParty::Remote::RemoteInstance - end - describe "by keypairs" do - it "should be able to grab all the alist keypairs" do - @tr.list_of_instances("fake_keypair").map {|a| a[:name] }.should == ["master", "node1", "node2", "node3"] - end - it "should be able to grab all the blist keypairs" do - @tr.list_of_instances("blist").map {|a| a[:name] }.should == ["node4"] - end - end - describe "get by name" do - it "should fetch the instance by number " do - @tr.get_instance_by_number(1).name.should == "node1" - end - it "should fetch the master by number 0" do - @tr.get_instance_by_number(0).name.should == "master" - end - it "should not throw a fit if the node doesn't exist" do - lambda {@tr.get_instance_by_number(1000)}.should_not raise_error - end - end - end - describe "adding custom install tasks (like set_hostname, for example)" do - before(:each) do - @master = Object.new - @master.stub!(:ip).and_return "192.68.0.1" - @tr = TestClass.new - @tr.stub!(:master).and_return @master - end - it "should have the method custom_install_tasks" do;@tr.respond_to?(:custom_install_tasks_for).should == true;end - it "should have the method custom_configure_tasks" do;@tr.respond_to?(:custom_configure_tasks_for).should == true;end - it "should set the ip to the master ip" do - @tr.ip.should == "192.68.0.1" - end - end end end \ No newline at end of file spec/poolparty/net/remoter_base_spec.rb @@ -6,7 +6,6 @@ describe "Remoter" do @cloud = cloud :app do;end @tc = TestClass.new @tc.parent = @cloud - ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-fake_keypair").and_return true @sample_instances_list = [{:ip => "192.168.0.1", :name => "master"}, {:ip => "192.168.0.2", :name => "node1"}] end describe "ssh_string" do @@ -14,7 +13,7 @@ describe "Remoter" do @tc.ssh_string.should =~ /ssh -o StrictHostKeyChecking=no -l/ end it "should have the keypair in the ssh_string" do - @tc.ssh_string.should =~ /#{@tc.keypair}/ + @tc.ssh_string.should =~ /#{@tc.full_keypair_path}/ end end describe "ssh_array" do @@ -31,59 +30,67 @@ describe "Remoter" do @ri.stub!(:ip).and_return "192.168.0.22" end it "should have rsync in the rsync_command" do - @tc.rsync_command.should == "rsync -azP --exclude cache -e '#{@tc.ssh_string} -l #{Base.user}'" + @tc.rsync_command.should == "rsync -azP --exclude cache -e '#{@tc.ssh_string} -l #{Default.user}'" end it "should be able to rsync storage commands" do - @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Base.storage_directory}/ 192.168.0.22:/var/poolparty" - end - end - describe "launch_and_configure_master!" do - before(:each) do - @tc.stub!(:wait).and_return true - stub_list_from_remote_for(@tc) - stub_remoting_methods_for(@tc) - @tc.stub!(:maximum_instances).and_return 5 - @tc.stub!(:list_of_pending_instances).and_return [] - @tc.stub!(:list_of_nonterminated_instances).and_return [] - @tc.stub!(:list_of_running_instances).and_return [] - @tc.stub!(:master).and_return ris.first - @tc.stub!(:after_launched).and_return true - @tc.stub!(:verbose).and_return false - ::File.stub!(:exists?).and_return true - - @pb = PoolParty::Provisioner::Capistrano.new(nil, @tc) - PoolParty::Provisioner::Capistrano.stub!(:new).and_return @pb - @pb.stub!(:setup_runner) - @pb.stub!(:install).and_return true - @pb.stub!(:configure).and_return true - @pb.stub!(:create_roles).and_return true - end - it "should have the method launch_master!" do - @tc.respond_to?(:launch_and_configure_master!).should == true - end - it "should test if it can start a new instance" do - @tc.should_receive(:can_start_a_new_instance?).once.and_return false - end - it "should test if the master is running" do - @tc.should_receive(:is_master_running?).and_return false - end - it "should ask to request_launch_new_instances when the master is not running and we can start a new instance" do - @tc.should_receive(:request_launch_master_instance) - @tc.stub!(:can_start_a_new_instance?).and_return true - @tc.stub!(:is_master_running?).and_return false - end - after(:each) do - @tc.launch_and_configure_master! + @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Default.storage_directory}/ 192.168.0.22:/var/poolparty" end end + + # describe "launch_and_configure_master!" do + # before(:each) do + # @tc.stub!(:wait).and_return true + # stub_list_from_remote_for(@tc) + # stub_remoting_methods_for(@tc) + # @tc.stub!(:maximum_instances).and_return 5 + # @tc.stub!(:list_of_pending_instances).and_return [] + # @tc.stub!(:list_of_nonterminated_instances).and_return [] + # @tc.stub!(:list_of_running_instances).and_return [] + # @tc.stub!(:master).and_return ris.first + # @tc.stub!(:after_launched).and_return true + # @tc.stub!(:verbose).and_return false + # # @tc.stub!(:testing).and_return true #MF + # ::File.stub!(:exists?).and_return true + # + # @pb = PoolParty::Provisioner::Capistrano.new(nil, @tc) + # PoolParty::Provisioner::Capistrano.stub!(:new).and_return @pb + # @pb.stub!(:setup_runner) + # @pb.stub!(:install).and_return true + # @pb.stub!(:configure).and_return true + # @pb.stub!(:create_roles).and_return true + # end + # it "should have dependency_resolver_command" do + # @tc.respond_to?(:dependency_resolver_command) + # @tc.dependency_resolver_command.should match(/puppet/) + # end + # it "should have the method launch_master!" do + # @tc.respond_to?(:launch_and_configure_master!).should == true + # end + # it "should test if it can start a new instance" do + # @tc.should_receive(:can_start_a_new_instance?).once.and_return false + # end + # it "should test if the master is running" do + # @tc.should_receive(:is_master_running?).and_return false + # end + # it "should ask to request_launch_new_instances when the master is not running and we can start a new instance" do + # @tc.should_receive(:request_launch_master_instance) + # @tc.stub!(:can_start_a_new_instance?).and_return true + # @tc.stub!(:is_master_running?).and_return false + # end + # after(:each) do + # @tc.launch_and_configure_master! + # end + # end + describe "expansions and contractions" do before(:each) do @tc = TestClass.new stub_list_from_remote_for @tc # sets the list of instances to 2 + stub_running_remote_instances @tc end describe "list_of_nodes_exceeding_minimum_runtime" do before(:each) do - @tc.stub!(:minimum_runtime).and_return 3000 + @tc.stub!(:minimum_runtime).and_return 3000 end it "should not be empty" do @tc.list_of_running_instances.size.should == 2 spec/poolparty/net/remoter_spec.rb @@ -1,52 +1,51 @@ -require File.dirname(__FILE__) + '/../spec_helper' - -include PoolParty::Resources - -class TestClass - include PoolParty::Resources -end -describe "Remote Instance" do - before(:each) do - reset_resources! - Kernel.stub!(:system).and_return true - end - describe "wrapped" do - before(:each) do - @tc = TestClass.new - @cloud = MyOpenStruct.new(:keypair => "keys", :remote_keypair_path => "/keypair_path", :name => "cloudcloud") - @cloud.stub!(:is_a?).with(PoolParty::Cloud::Cloud).and_return true - @tc.stub!(:parent).and_return @cloud - - @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false} - end - it "should be a string" do - @tc.has_deploydirectory(@options).to_string.should =~ /exec \{/ - end - it "should included the flushed out options" do - @tc.has_deploydirectory(@options).to_string.should =~ /command/ - end - describe "in resource" do - before(:each) do - @tc.instance_eval do - has_deploydirectory do - name "deploydirectory" - from ::File.dirname(__FILE__) - to "/var/www/deploydirectory" - end - end - end - it "should have the path set within the resource" do - @tc.resource(:deploydirectory).first.to_string.should =~ /exec \{/ - end - it "should not have the from in the to_string" do - @tc.resource(:deploydirectory).first.to_string.should_not =~ /from / - end - it "should not have the to in the to_string" do - @tc.resource(:deploydirectory).first.to_string.should_not =~ /to / - end - it "should have onlyif in the to_string" do - @tc.resource(:deploydirectory).first.to_string.should =~ /onlyif/ - end - end - end -end \ No newline at end of file +# require File.dirname(__FILE__) + '/../spec_helper' +# +# include PoolParty::Resources +# +# class TestClass +# include PoolParty::Resources +# end +# describe "Remote Instance" do +# before(:each) do +# Kernel.stub!(:system).and_return true +# end +# describe "wrapped" do +# before(:each) do +# @tc = TestClass.new +# @cloud = MyOpenStruct.new(:keypair => "keys", :remote_keypair_path => "/keypair_path", :name => "cloudcloud") +# @cloud.stub!(:is_a?).with(PoolParty::Cloud::Cloud).and_return true +# @tc.stub!(:parent).and_return @cloud +# +# @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false} +# end +# it "should be a string" do +# @tc.has_deploydirectory(@options).to_string.should =~ /exec \{/ +# end +# it "should included the flushed out options" do +# @tc.has_deploydirectory(@options).to_string.should =~ /command/ +# end +# describe "in resource" do +# before(:each) do +# @tc.instance_eval do +# has_deploydirectory do +# name "deploydirectory" +# from ::File.dirname(__FILE__) +# to "/var/www/deploydirectory" +# end +# end +# end +# it "should have the path set within the resource" do +# @tc.resource(:deploydirectory).first.to_string.should =~ /exec \{/ +# end +# it "should not have the from in the to_string" do +# @tc.resource(:deploydirectory).first.to_string.should_not =~ /from / +# end +# it "should not have the to in the to_string" do +# @tc.resource(:deploydirectory).first.to_string.should_not =~ /to / +# end +# it "should have onlyif in the to_string" do +# @tc.resource(:deploydirectory).first.to_string.should =~ /onlyif/ +# end +# end +# end +# end \ No newline at end of file spec/poolparty/plugins/deploydirectory_spec.rb @@ -1,44 +1,38 @@ require File.dirname(__FILE__) + '/../spec_helper' -include PoolParty::Resources - -class TestGitClass - include PoolParty::Resources - - def options(h={}) - {} - end +class TestGitClass < PoolParty::Cloud::Cloud end + describe "Remote Instance" do - before(:each) do - reset_resources! - end describe "wrapped" do before(:each) do - @tc = TestGitClass.new + @tc = cloud :test_git_class_cloud do + has_git_repos :at => "/var/www/", :name => "gitrepos.git", :source => "git://git/repos/source.git", :requires_user => "finger" + end + @compiled = PuppetResolver.new(@tc.to_properties_hash).compile end it "should be a string" do - @tc.has_git_repos(:at => "/var/www/", :name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec/ + @compiled.should =~ /exec/ end it "should included the flushed out options" do - @tc.has_git_repos({:name => "git.git", :source => "git://source.git", :requires_user => "finger", :at => "/var/www/"}).to_string.should =~ /finger@git:/ + @compiled.should =~ /finger@git:/ end it "should not include the user if none is given" do - @tc.has_git_repos({:name => "git.git", :source => "git://source.git",:at => "/var/www/"}).to_string.should =~ /git clone git:/ + @compiled.should =~ /git clone finger@git:/ end describe "in resource" do before(:each) do - @tc.instance_eval do + @tc = cloud :test_git_class_cloud_two do has_git_repos(:name => "gittr") do - source "git://source.git" - path "/var/www/xnot.org" symlink "/var/www/xnot.org/public" + source "git://source.git" + path "/var/www/xnot.org" at "/var/www" end end end it "should have the path set within the resource" do - @tc.resource(:git_repos).first.to_string.should =~ /exec \{ \"git-gittr/ + PuppetResolver.new(@tc.to_properties_hash).compile.should =~ /exec \{ \"git-gittr/ end end end spec/poolparty/plugins/git_spec.rb @@ -1,16 +1,20 @@ require File.dirname(__FILE__) + '/../spec_helper' -class TestClass - include PoolParty::Resources -end describe "Remote Instance" do before(:each) do - @tc = TestClass.new + @tc = TestBaseClass.new do + end end - it "should be a string" do - @tc.has_line_in_file("hi", "ho").to_string.should =~ /line \{/ + it "should have the method has_line_in_file available on the class" do + @tc.respond_to?(:has_line_in_file).should == true end - it "should included the flushed out options" do - @tc.has_line_in_file("hi", "who", {:name => "finger"}).to_string.should =~ /name => 'finger'/ + describe "call" do + before(:each) do + @line = @tc.has_line_in_file({:line => "hi", :file => "ho"}) + @compiled = PuppetResolver.new(@tc.to_properties_hash).compile + end + it "should have the line in the file from PuppetResolver" do + @compiled.should match(/grep -q "hi" ho/) + end end end \ No newline at end of file spec/poolparty/plugins/line_spec.rb @@ -1,11 +1,11 @@ require File.dirname(__FILE__) + '/../spec_helper' -include PoolParty::Cloud -include PoolParty::Resources - -class TestServiceClass +class TestService plugin :test_service do - def enable + def initialize(o={}, e=nil, &block) + super(&block) + end + def enable(o={}) has_file(:name => "/etc/poolparty/lobos") end end @@ -14,7 +14,7 @@ end describe "Cloud" do before(:each) do setup - reset_resources! + # end describe "wrapped" do before(:each) do @@ -38,7 +38,7 @@ describe "Cloud" do @cloud1.using_remoter?.should_not == nil end it "should say the remoter_base is ec2 (by default)" do - @cloud1.remote_base.should == PoolParty::Ec2 + @cloud1.remote_base.class.should == Kernel::Ec2 end end it "should return the cloud if the cloud key is already in the clouds list" do @@ -49,32 +49,44 @@ describe "Cloud" do before(:each) do reset! setup - @p = pool :options do + pool :options do + user "bob" + pop_stick true minimum_instances 100 - access_key "access_key" - cloud :apple do + access_key "pool_access_key" + cloud :apple do access_key "cloud_access_key" end end - @c = @p.cloud(:apple) end it "should be able to grab the cloud from the pool" do - @c.should == @p.cloud(:apple) + clouds[:apple].should == pools[:options].cloud(:apple) end it "should take the options set on the pool" do - @p.minimum_instances.should == 100 + pools[:options].minimum_instances.should == 100 end it "should take the access_key option set from the cloud" do - @c.access_key.should == "cloud_access_key" + clouds[:apple].access_key.should == "cloud_access_key" + end + it "should take the option pop_stick from the superclass" do + clouds[:apple].pop_stick.should == true + end + it "should take the option testing true from the superclass" do + pools[:options].user.should == "bob" + clouds[:apple].user.should == "bob" end end describe "block" do before(:each) do reset! - @cloud = Cloud.new(:test, @pool) do - # Inside cloud block - keypair "fake_keypair" + pool :test do + Cloud.new(:test) do + # Inside cloud block + testing true + keypair "fake_keypair" + end end + @cloud = cloud :test @cloud.stub!(:plugin_store).and_return [] end @@ -88,19 +100,19 @@ describe "Cloud" do end cloud(:paddy_wack).parent.should == pool(:knick_knack) end - it "should have services in an array" do - @cloud.services.class.should == Array + it "should have services in an hash" do + @cloud.services.class.should == Hash end it "should have no services in the array when there are no services defined" do @cloud.services.size.should == 0 end - it "should respond to a configure method" do - @cloud.respond_to?(:configure).should == true + it "should respond to a options method (from Dslify)" do + @cloud.respond_to?(:options).should == true end describe "configuration" do before(:each) do reset! - @cloud2 = Cloud.new(:test, @pool) do + @cloud2 = Cloud.new(:test) do minimum_instances 1 maximum_instances 2 end @@ -124,8 +136,8 @@ describe "Cloud" do @cloud.minimum_instances.should == 3 end it "should be able to take a hash from configure and convert it to the options" do - @cloud.configure( {:minimum_instances => 1, :maximum_instances => 10, :keypair => "friend"} ) - @cloud.keypair.should == "friend" + @cloud.set_vars_from_options( {:minimum_instances => 1, :maximum_instances => 10, :keypair => "friend"} ) + @cloud.minimum_instances.should == 1 end describe "minimum_instances/maximum_instances as a range" do before(:each) do @@ -152,35 +164,32 @@ describe "Cloud" do @c = cloud :app do keypair "hotdog" end - @c.keypair.should == "hotdog" + @c.keypairs.first.filepath.should == "hotdog" end it "should take the pool parent's keypair if it's defined on the pool" do pool :pool do keypair "ney" cloud :app do end - cloud :group do - end end - pool(:pool).cloud(:app).keypair.should == "ney" - pool(:pool).cloud(:group).keypair.should == "ney" + clouds[:app]._keypairs.first.stub!(:exists?).and_return true + clouds[:app]._keypairs.first.stub!(:full_filepath).and_return "ney" + clouds[:app].keypair.full_filepath.should == "ney" end - it "should generate a keypair based on the cloud name if none is defined" do + it "should default to ~/.ssh/id_rsa if none are defined" do + File.stub!(:exists?).with("#{ENV["HOME"]}/.ssh/id_rsa").and_return(true) pool :pool do cloud :app do end - cloud :nickes do - end end - pool(:pool).cloud(:app).keypair.should == "pool_app" - pool(:pool).cloud(:nickes).keypair.should == "pool_nickes" + clouds[:app].keypair.full_filepath.should match(/\.ssh\/id_rsa/) end end describe "Manifest" do before(:each) do reset! stub_list_from_remote_for(@cloud) - @cloud.instance_eval do + @cloud = TestClass.new :test_more_manifest do has_file(:name => "/etc/httpd/http.conf") do content <<-EOE hello my lady @@ -189,51 +198,52 @@ describe "Cloud" do has_gempackage(:name => "poolparty") has_package(:name => "dummy") end + context_stack.push @cloud end it "should it should have the method build_manifest" do @cloud.respond_to?(:build_manifest).should == true end it "should make a new 'haproxy' class" do - @cloud.stub!(:realize_plugins!).and_return true - PoolPartyHaproxyClass.should_receive(:new).once + PoolpartyBaseHaproxyClass.should_receive(:new).once @cloud.add_poolparty_base_requirements end - it "should have 3 resources" do + it "should have 3 resources" do @cloud.add_poolparty_base_requirements - @cloud.number_of_resources.should > 2 + @cloud.services.size.should > 2 end it "should receive add_poolparty_base_requirements before building the manifest" do @cloud.should_receive(:add_poolparty_base_requirements).once @cloud.build_manifest end + after(:each) do + context_stack.pop + end describe "add_poolparty_base_requirements" do before(:each) do reset! @cloud.instance_eval do @heartbeat = nil end - @hb = "heartbeat".class_constant.new(@cloud) - @cloud.stub!(:realize_plugins!).and_return [] + @hb = PoolpartyBaseHeartbeatClass.new end it "should call initialize on heartbeat (in add_poolparty_base_requirements)" do - @cloud.stub!(:realize_plugins!).and_return [] @hb.class.should_receive(:new).and_return true @cloud.add_poolparty_base_requirements end it "should call heartbeat on the cloud" do - @cloud.should_receive(:heartbeat).and_return true + @cloud.should_receive(:poolparty_base_heartbeat).and_return true @cloud.add_poolparty_base_requirements end it "should call Hearbeat.new" do - "heartbeat".class_constant.should_receive(:new).and_return @hb + PoolpartyBaseHeartbeatClass.should_receive(:new).and_return @hb @cloud.add_poolparty_base_requirements end it "should call enable on the plugin call" do - @hb = "heartbeat".class_constant - "heartbeat".class_constant.stub!(:new).and_return @hb + @hb = PoolpartyBaseHeartbeatClass.new + PoolpartyBaseHeartbeatClass.stub!(:new).and_return @hb @cloud.add_poolparty_base_requirements - @cloud.heartbeat.should == @hb + @cloud.poolparty_base_heartbeat.should == @hb end describe "after adding" do before(:each) do @@ -243,18 +253,18 @@ describe "Cloud" do it "should add resources onto the heartbeat class inside the cloud" do @cloud.services.size.should > 0 end - it "should store the class heartbeat" do - @cloud.services.map {|a| a.class}.include?("heartbeat".class_constant).should == true + it "should store the class heartbeat" do + @cloud.services.map {|k,v| k}.include?(:poolparty_base_heartbeat_class).should == true end it "should have an array of resources on the heartbeat" do - @cloud.services.first.resources.class.should == Hash + @cloud.services.class.should == Hash end describe "resources" do before(:each) do - @cloud8 = Cloud.new(:tester, @pool) do - test_service + @cloud8 = cloud :tester do + test_service end - @service = @cloud8.services.first + @service = clouds[:tester].services.test_service_class @files = @service.resource(:file) end it "should have a file resource" do @@ -295,9 +305,6 @@ describe "Cloud" do it "should include the poolparty gem" do @manifest.should =~ /package \{/ end - it "should include custom functions" do - @manifest.should =~ /define line\(\$file/ - end end describe "prepare_for_configuration" do before(:each) do @@ -339,8 +346,8 @@ describe "Cloud" do end describe "copy_custom_monitors" do before(:each) do - Base.stub!(:custom_monitor_directories).and_return ["/tmp/monitors/custom_monitor.rb"] - Dir.stub!(:[]).with("#{Base.custom_monitor_directories}/*.rb").and_return ["/tmp/monitors/custom_monitor.rb"] + Default.stub!(:custom_monitor_directories).and_return ["/tmp/monitors/custom_monitor.rb"] + Dir.stub!(:[]).with("#{Default.custom_monitor_directories}/*.rb").and_return ["/tmp/monitors/custom_monitor.rb"] @cloud.stub!(:copy_misc_templates).and_return true @cloud.stub!(:copy_file_to_storage_directory).and_return true end @@ -360,7 +367,7 @@ describe "Cloud" do @cloud.should_receive(:store_keys_in_file).once end it "should call save! on Script" do - Script.should_receive(:save!).with(@cloud).once + pending end it "should copy_ssh_key" do @cloud.should_receive(:copy_ssh_key).once @@ -407,7 +414,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}").and_return "blaaaaah" + Digest::SHA256.should_receive(:hexdigest).with("#{@cloud.keypair.basename}#{@cloud.name}").and_return "blaaaaah" @cloud.generate_unique_cookie_string end it "should generate the same cookie string every time" do @@ -421,18 +428,19 @@ describe "Cloud" do end end - describe "instances" do - before(:each) do - @cloud3 = cloud :pop do;keypair "fake_keypair";end - stub_list_from_remote_for(@cloud3) - end - it "should respond to the method master" do - @cloud3.respond_to?(:master).should == true - end - it "should return a master that is not nil" do - @cloud3.master.should_not be_nil - end - end + # describe "instances" do + # before(:each) do + # @cloud3 = cloud :pop do;keypair "fake_keypair";end + # stub_list_from_remote_for(@cloud3) + # end + # it "should respond to the method master" do + # @cloud3.master.should_not be_nil + # @cloud3.respond_to?(:master).should == true + # end + # it "should return a master that is not nil" do + # @cloud3.master.should_not be_nil + # end + # end end end end \ No newline at end of file spec/poolparty/poolparty/cloud_spec.rb @@ -1,13 +1,12 @@ pool :poolpartyrb do - plugin_directory "docs_plugins" + plugin_directory "docs_plugins" cloud :app do # Configuration - configure({ :maximum_instances => 1,:keypair => "name" }) - minimum_instances 1 + minimum_instances 1 - apache do + apachetest do enable_php site("poolpartyrb.com") end spec/poolparty/poolparty/configurers/files/ruby_basic.rb @@ -4,8 +4,8 @@ require File.dirname(__FILE__) + '/../test_plugins/webserver' describe "Configurer" do before(:each) do reset! - @basic = read_file(File.join(File.dirname(__FILE__), "files", "ruby_basic.rb")) - Script.inflate @basic + @basic = File.join(File.dirname(__FILE__), "files", "ruby_basic.rb") + PoolParty::Pool::Pool.load_from_file @basic @conf = Object.new end it "should not be nil" do @@ -16,25 +16,13 @@ describe "Configurer" do before(:each) do @s = Script.new Script.stub!(:new).and_return(@s) - @basic = read_file(File.join(File.dirname(__FILE__), "files", "ruby_basic.rb")) - end - it "should load the basic example configure" do - @s.should_receive(:inflate).and_return true - end - it "should call inflate on the pools" do - @s.pools.each {|a,b| b.should_receive(:inflate).and_return true } - end - describe "pool" do - before(:each) do - Script.inflate @basic - @pool = pool(:poolpartyrb) - end + @basic = File.join(File.dirname(__FILE__), "files", "ruby_basic.rb") end describe "clouds" do before(:each) do reset! - Script.inflate @basic - @cloud = pool(:poolpartyrb).cloud(:app) + PoolParty::Pool::Pool.load_from_file @basic + @cloud = clouds[:app] end it "should contain a list of the clouds within the pool (:app)" do @cloud.should_not be_nil @@ -43,16 +31,12 @@ describe "Configurer" do @cloud.minimum_instances.should == 1 end it "should set the maximum instances on the :app cloud" do - @cloud.maximum_instances.should == 1 + @cloud.maximum_instances.should == 5 end it "should set the keypair name on the :app cloud too" do - @cloud.keypair.should == "name" + @cloud.keypair.to_s.should =~ /id_rsa/ end end - - after do - Script.inflate @basic - end end end \ No newline at end of file spec/poolparty/poolparty/configurers/ruby_spec.rb @@ -46,7 +46,7 @@ describe "Custom Resource" do end describe "printing" do before do - reset_resources! + define_resource(:rockstar) do def has_a_line_in_file(line="line_in_file", file="file") call_custom_function "line(#{file}, #{line})" @@ -72,48 +72,7 @@ describe "Custom Resource" do @resource.resource(:call_function).first.to_string.should == "line(filename, hi)" end it "should be stored in an array" do - resource(:rockstar).class.should == Array - end - describe "call function" do - before(:each) do - @res = Class.new - @res.stub!(:class_name_sym).and_return :bunk - @res.stub!(:key).and_return "bunk" - end - it "should have the class CallFunction available" do - lambda {PoolParty::Resources::CallFunction}.should_not raise_error - end - it "should create a new CallFunction instance when calling call_function with a string" do - PoolParty::Resources::CallFunction.should_receive(:new).and_return @res - add_resource(:call_function, :name => "line") - end - it "should create a call function in the function call array" do - add_resource(:call_function, {:name => "custom_function"}, @cloud) - resource(:call_function).size.should == 1 - end - describe "defining" do - it "should add the methods to the class through module_eval" do - PoolParty::Resources.should_receive(:module_eval).at_least(1) - define_resource :imarockstar2YEAH do - end - end - end - - describe "within context" do - before(:each) do - cloud :apple do - has_line_in_file("hello", "messages") - brain_child("meee") - end - @cloud = cloud(:apple) - end - it "should have 1 resource (the line resource)" do - @cloud.resources.should_not be_empty - end - it "should have one call_function resource" do - @cloud.resource(:call_function).first.to_string.should =~ /line \{/ - end - end + @resource.resource(:rockstar).class.should == Array end end end spec/poolparty/poolparty/custom_resource_spec.rb @@ -3,26 +3,58 @@ require "open-uri" describe "basic" do before(:each) do - @example_dir = ::File.join(::File.dirname(__FILE__), "..", "..", "..", "examples") - reset! - PoolParty::Script.inflate open(@example_dir + "/basic.rb").read + PoolParty.reset! + @example_spec_file = ::File.join(::File.dirname(__FILE__), "..", "..", "..", "examples", 'basic.rb') + PoolParty::Pool::Pool.load_from_file(@example_spec_file) + @db = clouds[:basic_db] + @app = clouds[:basic_app] end it "should have one pool called :app" do - pool(:app).should_not be_nil + pool(:application).should_not == nil + pools[:application].should_not == nil end it "should have a cloud called :app" do - pool(:app).cloud(:app).should_not be_nil + clouds[:basic_app].should_not == nil end it "should have a cloud called :db" do - pool(:app).cloud(:db).should_not be_nil + pools[:application].clouds[:basic_db].should_not == nil end - it "should set the minimum_instances on the cloud to 2 (overriding the pool options)" do - pool(:app).cloud(:app).minimum_instances.should == 2 + it "should set the minimum_instances on the cloud to 2 (overriding the pool options)" do + pools[:application].minimum_instances.should == 3 + clouds[:basic_app].minimum_instances.should == 12 end - it "should set the maximum_instances on the cloud to 5" do - pool(:app).cloud(:app).maximum_instances.should == 5 + it "should set the maximum_instances on the cloud to 50" do + clouds[:basic_app].maximum_instances.should == 50 end it "should set the minimum_instances on the db cloud to 3" do - pool(:app).cloud(:db).minimum_instances.should == 3 + clouds[:basic_db].minimum_instances.should == 19 + clouds[:basic_app].minimum_instances.should == 12 + pools[:application].minimum_instances.should ==3 + end + it "should set ambiguous methods on the cloud" do + clouds[:basic_app].junk_yard_dogs.should == "pains" + clouds[:basic_db].junk_yard_dogs.should == "are bad" + end + it "should set the parent to the pool" do + clouds[:basic_app].parent.should == pools[:application] + clouds[:basic_db].parent.should == pools[:application] + clouds[:basic_db].parent.should_not == pools[:app] + end + it "should have the keypair matching /auser/on the db cloud " do + clouds[:basic_db]._keypairs.select{|a| a.filepath.match(/auser/)} + end + it "cloud should know what remoter base it is using" do + clouds[:basic_db].remote_base.class.should == PoolParty::Remote::Ec2 + end + it "cloud should have methods from the remoter base available" do + clouds[:basic_db].remote_base.should_receive(:describe_instances).and_return({}) + clouds[:basic_db].describe_instances.should == {} + end + it "should not return nil to undefined methods" do + lambda {clouds[:basic_db].not_a_method_that_exists_anywhere}.should raise_error + end + it "should have the keypair set for the specific cloud on top of the keypair stack" do + #I think this should be the behavior. mf + # pools[:application].clouds[:basic_db].keypairs.last.filepath.should_match(/auser/) end end \ No newline at end of file spec/poolparty/poolparty/example_spec.rb @@ -1,54 +1,44 @@ require File.dirname(__FILE__) + '/../spec_helper' -include PoolParty::Resources require File.dirname(__FILE__) + '/test_plugins/webserver' describe "Plugin" do - before(:each) do - @p = pool :poolpartyrb do - cloud :app do - apache do - enable_php - site("heady", { - :document_root => "/root" - }) - end + before(:each) do + @c = cloud :test_plugin_model_cloud do + apachetest do + enable_php + site("heady", { + :document_root => "/root" + }) end end - @c = @p.cloud(:app) end describe "methods should include" do it "register_plugin(plugin)" do;WebServers.respond_to?(:register_plugin).should == true;end end describe "registered" do before(:each) do - @plugin = "apache".class_constant.new(@c) + @plugin = @c.apachetest end describe "storage" do - it "should store the plugin in a Hash on the pool" do - @c.plugins.class.should == Hash - end it "should be able to retrieve the plugin as a name" do - @c.plugin("apache").should_not be_nil + @c.plugin("apachetest").should_not be_nil end end + it "be of the class apachetesttestClass on the Kernel" do + @plugin.class.should == Kernel::ApachetestClass + end it "should store the regsitered plugins in an array" do @plugin.should_not be_nil end - it "should set the pool on the plugin" do - @plugin.parent.should == @c - end it "should have the plugin name as a method on the cloud " do - @c.respond_to?(:apache).should == true + @c.respond_to?(:apachetest).should == true end describe "methods" do - before(:each) do - reset! - end it "should call the enable_php method when in the defininition of the cloud" do @plugin.respond_to?(:enable_php).should == true end it "should call php = true in the enable_php" do - @plugin.php.should_not == true + @plugin.php?.should == false @plugin.enable_php @plugin.php.should == true end spec/poolparty/poolparty/plugin_model_spec.rb @@ -4,109 +4,38 @@ include PoolParty::Resources require File.dirname(__FILE__) + '/test_plugins/webserver' describe "Plugin" do - before(:each) do - reset_resources! - end describe "wrapped" do before(:each) do reset! - pool :poolpartyrb do - cloud :app do - apache do - enable_php - site("heady", { - :document_root => "/root" - }) - end - end - end - @p = pool :poolpartyrb - @c = @p.cloud(:app) - end - - it "should allow access to the pool on the cloud" do - @c.parent.should == @p - end - describe "instance" do - before(:each) do - @plugin = @c.apache - end - it "should not be empty" do - @plugin.class.should == PoolPartyApacheClass - end - it "should have access to the cloud's container" do - @plugin.parent.should == @c - end - it "should have enable_php as a method" do - @plugin.respond_to?(:enable_php).should == true - end - describe "after eval'ing" do - before(:each) do - @plugin.instance_eval do - enable_php - has_gempackage(:name => "aska") - end - end - it "should call enable_php on the class" do - @plugin.php.should == true - end - it "should have resources attached to it" do - @plugin.resources.class.should == Hash - end - it "should have an array of gem resources" do - @plugin.resource(:gempackage).class.should == Array - end - it "should have 1 gem in the resources defined" do - @plugin.resource(:gempackage).size.should == 1 - end - it "should have the gem named aska in the gem resource" do - @plugin.get_resource(:gempackage, "aska").name.should == "aska" + cloud :app_for_plugin do + apachetest do + enable_php + site("heady", { + :document_root => "/root" + }) end - it "should have its resources visible to its parent" do - @plugin.parent = @c - @c.resources - end - end - describe "before eval'ing" do - before(:each) do - reset! - @plugin = "apache".class_constant.new(@c) - end - it "should call has_line_in_file" do - @plugin.should_receive(:php).and_return true - end - it "should call site" do - @plugin.should_receive(:site).with("frank").and_return true - end - after do - @plugin.instance_eval do - enable_php - site("frank") - end + apachetest do + site("boob") end end + @plugin = clouds[:app_for_plugin].apachetest end - describe "DSL" do - it "should have a cloud method from within the plugin" do - @plugin.respond_to?(:cloud).should == true - end - it "should get a hold of the containing cloud" do - @plugin.cloud.should == @c - end - describe "enable" do - before(:each) do - reset! - @plugin = PoolParty::Plugin::Plugin.new - Kernel::PoolPartyApacheClass.stub!(:new).and_return @plugin - end - it "should call enable on calling realize! when there is no block included" do - @plugin.should_receive(:enable).at_least(1).and_return true - @cloud = cloud :app do - apache - end - @cloud.realize_plugins! - end - end + it "should not be empty" do + clouds[:app_for_plugin].apachetest.class.should == ApachetestClass + end + it "should set loaded == true" do + clouds[:app_for_plugin].apachetest.loaded.should == true + end + it "should have enable_php as a method" do + ApachetestClass.new.respond_to?(:enable_php).should == true + end + it "should set enable_php" do + @plugin.enable_php.should == true + end + it "should store the plugin in the clouds plugin_store" do + clouds[:app_for_plugin].plugin_store.should == [@plugin] + clouds[:app_for_plugin].apachetest + clouds[:app_for_plugin].plugin_store.should == [@plugin] end end end \ No newline at end of file spec/poolparty/poolparty/plugin_spec.rb @@ -36,7 +36,9 @@ describe "Pool" do plugin_directory "yaway" end end - it "should call Dir when the plugin directory is set" do + it "should call Dir when the plugin directory is set" do + ::File.should_receive(:directory?).with("yaway").once.and_return true + ::File.stub!(:directory?).and_return(false) Dir.should_receive(:[]).with("yaway/*/*.rb").once.and_return [] end end spec/poolparty/poolparty/pool_spec.rb @@ -6,9 +6,7 @@ require File.dirname(__FILE__) + '/test_plugins/webserver' class MyResource < PoolParty::Resources::Resource # Just to give some options for the test class - def options(h={}) - @options ||= {:a => 1,:b => 2,:c => 3} - end + default_options(:a => 1,:b => 2,:c => 3) end describe "Resource" do before(:each) do @@ -29,17 +27,12 @@ describe "Resource" do it "should not wipe out the rest of the default options" do @resource.c.should == 3 end - describe "to_s" do - it "should be able to coalesce the instances" do - @resource.to_string.should =~ /resource \{/ - end - end describe "class methods" do it "should have an array of available resources" do PoolParty::Resources::Resource.available_resources.class.should == Array end it "should not be empty" do - PoolParty::Resources::Resource.available_resources.should_not be_empty + PoolParty::Resources::Resource.available_resources.empty?.should == false end end describe "instance methods" do @@ -63,339 +56,152 @@ describe "Resource" do @resource.respond_to?(:ensures).should == true end it "should push the option ensure onto the options" do - @resource.options.has_key?(:ensure).should == false + @resource.options.has_key?(:ensures).should == false @resource.ensures("nibbles") - @resource.options.has_key?(:ensure).should == true + @resource.options.has_key?(:ensures).should == true + @resource.options.ensures.should == 'present' end it "should write the option ensures as present with is_present" do - @resource.options.has_key?(:ensure).should == false + @resource.options.has_key?(:ensures).should == false @resource.is_present - @resource.options[:ensure].should == "present" + @resource.options[:ensures].should == "present" end it "should write the option ensures as absent with is_absent" do - @resource.options.has_key?(:ensure).should == false + @resource.options.has_key?(:ensures).should == false @resource.is_absent - @resource.options[:ensure].should == "absent" + @resource.options[:ensures].should == "absent" end it "should write the option unless for ifnot" do @resource.options.has_key?(:unless).should == false @resource.ifnot "str" @resource.options[:unless].should == "str" end - describe "templating" do - before(:each) do - FileUtils.stub!(:cp).and_return true - end - it "should have the method template" do - @resource.respond_to?(:template).should == true - end - it "should raise an exception if no file is given" do - lambda { - @resource.template - }.should raise_error - end - it "should not raise an exception if there is a file passed and the file is found" do - File.stub!(:file?).and_return true - lambda { - @resource.template("radar") - }.should_not raise_error - end - # it "should push the template option on to the options" do - # File.stub!(:file?).with("radar").and_return true - # @resource.options.has_key?(:template).should == false - # @resource.template("radar") - # @resource.options.has_key?(:template).should == true - # end - end end describe "command" do - include PoolParty::Resources before(:each) do - @cloud = cloud :command_cloud do; end + @tc = TestBaseClass.new do + has_file(:name => "frank") + end + @cloud = @tc end describe "add_resource" do it "should call add_resource when creating using the command: file" do - @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud) + @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}) @cloud.instance_eval do - file(:name => "frank") + __file(:name => "frank") end end it "should return a resource when the resource does not exist" do - file(:name => "/etc/frank.txt").class.should == PoolParty::Resources::File + @cloud.resource(:file).first.class.should == PoolParty::Resources::File end it "should return a resource when the resource does exist" do - file(:name => "frank") - file(:name => "frank").class.should == PoolParty::Resources::File + @cloud.instance_eval do + resources[:file] = nil + has_file({:name => "frank"}) + end + @cloud.resource(:file).first.class.should == PoolParty::Resources::File end end it "should create the new 'resource' as a resource" do - resource(:file).class.should == Array - end - it "should receive << when adding a new one" do - resource(:file).should_receive(:<<).once - has_file({:name => "pop"}) + @tc.resource(:file).class.should == Array end it "should contain 3 instances after calling resource 3 times" do - file({:name => "red"}) - file({:name => "hot"}) - file({:name => "summer"}) - resource(:file).size.should == 3 + @cloud.instance_eval do + resources[:file] = nil + has_file({:name => "red"}) + has_file({:name => "hot"}) + has_file({:name => "summer"}) + end + @tc.resource(:file).size.should == 3 end describe "adding" do before(:each) do - @a = file({:name => "red"}) - @b = file({:name => "hot"}) - @c = file({:name => "summer"}) + @cloud.instance_eval do + resources[:file] = nil + has_file({:name => "red"}) + has_file({:name => "hot"}) + has_file({:name => "summer"}) + end end it "should contain file named with 'red'" do - get_resource(:file, "red").nil?.should == false + @cloud.get_resource(:file, "red").nil?.should == false end end describe "method_missing" do before(:each) do - file({:name => "red"}) - file({:name => "hot"}) - file({:name => "summer"}) + @cloud.instance_eval do + resources[:file] = nil + has_file({:name => "red"}) + has_file({:name => "hot"}) + has_file({:name => "summer"}) + end end it "should be able to pick out methods with the phrase has_" do lambda { - has_file + @cloud.instance_eval do + has_file({:name => "summer"}) + end }.should_not raise_error end - it "should not have a method prepended with crabs_" do - lambda { - crabs_file - }.should raise_error - end it "should pick out methods with the phrase does_not_" do lambda { - does_not_have_file({:name => "red"}) + @cloud.instance_eval do + does_not_have_file({:name => "summer"}) + end }.should_not raise_error end - it "should set the has_file to present ensure" do - has_file({:name => "redface"}) - resource(:file).get_named("redface").first.options[:ensure].should == "present" - end - it "should set the does_not_have_file to absent ensure" do - does_not_have_file({:name => "net"}) - resource(:file).get_named("net").first.options[:ensure].should == "absent" - end - it "should be able to have_service as well" do - has_service({:name => "apache"}) - resource(:service).get_named("apache").first.options[:ensure].should == "running" - end end describe "get_resource" do before(:each) do - reset_resources! - @cloud_get_resource = cloud :get_resource do - file(:name => "red") - file(:name => "hot") - file(:name => "tamales") + @tc.instance_eval do + resources[:file] = nil + has_file(:name => "red") + has_file(:name => "hot") + has_file(:name => "tamales") end end it "should return a type of resource when looking for a resource that exists" do - @cloud_get_resource.get_resource(:file, "hot").class.should == PoolParty::Resources::File + @tc.get_resource(:file, "hot").class.should == PoolParty::Resources::File end it "should return the resource of the name requested" do - @cloud_get_resource.get_resource(:file, "hot").name.should == "hot" + @tc.get_resource(:file, "hot").name.should == "hot" end it "should return nil if the resource requested is not there" do - @cloud_get_resource.get_resource(:file, "smarties").should be_nil + @tc.get_resource(:file, "smarties").nil?.should == true end it "should not have created any more resources" do - @cloud_get_resource.resource(:file).size.should == 3 - end - end - describe "parent" do - before(:each) do - @cloud = cloud :orange do - tangerine "orange" - file(:name => "file.txt") - end - @file = @cloud.resources[:file].first - end - it "should take the options of the parent" do - @file.parent.tangerine.should_not == nil - end - it "should set the option as the same from the parent" do - @file.parent.tangerine.should == "orange" + @tc.resource(:file).size.should == 3 end end describe "appending to resource" do before(:each) do - @cloud1 = cloud :apples do - directory(:name => "/var/www") do - file(:name => "/var/www/file.html") + @tc = TestBaseClass.new do + has_directory(:name => "/var/www") do + has_file(:name => "/var/www/file.html") end end - @dir = @cloud1.get_resource(:directory, "/var/www") - @file = @dir.get_resource(:file, "/var/www/file.html") + @dir = @tc.resource(:directory).first + @file = @tc.resource(:file).first end it "should say there is 1 resource because the lower-level resources should be contained on the parenting resource" do - @cloud1.resources.size.should == 1 - end - it "should set the exec to notify apache2" do - has_service("apache2") - has_exec(:name => "reload-page", :notify => get_service("apache2")) - resource(:exec).get_named("reload-page").first.options[:notify].to_s.should == "Service['apache2']" + @tc.resources.size.should == 2 end it "should say there is one resource on the outer resource" do @dir.resources.size.should == 1 end it "should contain the file as a resource" do - @dir.resource(:file)[0].to_s.should == @file.to_s - end - it "should set the parent as the parenting resource" do - @file.parent.to_s.should == @dir.to_s - end - end - describe "handle_option_value" do - it "should turn a string into a hash with the string as the key name" do - handle_option_values("vat of cats").should == {:name => "vat of cats"} - end - it "should not change a hash into anything" do - handle_option_values({:name => "poe"}).should == {:name => "poe"} + @dir.resource(:file)[0].class.should == PoolParty::Resources::File end end describe "fetching" do before(:each) do - @file = file(:name => "pancakes") - end - it "should not create a new resource if the same resource exists" do - PoolParty::Resources::File.should_not_receive(:new) - file(:name => "pancakes") - end - it "should return the file preiously created" do - get_resource(:file, "pancakes").options.keys.sort.should == @file.options.keys.sort - end - it "should be able to use the helper to grab the file" do - PoolParty::Resources::File.should_not_receive(:new) - self.stub!(:key).and_return "false" - file(:name => "pancakes").name.should == @file.name - end - it "should turn the resource into a string" do - @file.to_s.should == "File['pancakes']" - end - describe "cancelled" do - it "should make a resource not cancelled by default" do - @file.cancelled?.should == false - end - it "should say cancelled? is true if it has been cancelled" do - @file.cancel - @file.cancelled?.should == true - end - it "should be able to get the file from the helper" do - get_file("pancakes").options.keys.sort.should == @file.options.keys.sort + @tc = TestBaseClass.new do + has_file(:name => "pancakes") end + @file = @tc.resource(:file).first end - describe "virtual_resources" do - before(:each) do - @virtual_resource = git(:at => "/var/paint/cans", :name => "tank", :source => "git://github.com/auser/testgit.git") - end - it "should fetch a virtual resource the same" do - git(:at => "/var/paint/cans", :name => "tank", :source => "git://github.com/auser/testgit.git").to_s.should == @virtual_resource.to_s - end - end - end - describe "global resources" do - describe "setting" do - before(:each) do - @cloud2 = cloud :applepie do - directory(:name => "/var/www") do - file(:name => "/var/www/file.html") - end - end - @cloud2 = cloud(:applepie) - end - it "should have a global_resources_store available as an Array" do - @cloud2.global_resources_store.class.should == Array - end - it "should have stored the two resources from the cloud into the global_resources_store" do - @cloud2.global_resources_store.size.should >= 2 - end - it "should be an array of resources" do - @cloud2.global_resources_store.first.is_a?(PoolParty::Resources::Resource).should == true - end - it "should say that the type directory of name /var/www is in the global_resources_store" do - @cloud2.in_global_resource_store?(:directory, "/var/www").should == true - end - it "should say that the type file of the name /var/www/file.html is in the global_resources_store" do - @cloud2.in_global_resource_store?(:file, "/var/www/file.html").should == true - end - it "should say tht the type exec of the name echo 'hello' is not in the global_resources_store" do - @cloud2.in_global_resource_store?(:exec, "echo 'hello'").should == false - end - it "should say that the resource is in the global_resources_store when put in the global_resources_store" do - @file1 = PoolParty::Resources::File.new(:name => "/var/tmp.txt") - @cloud2.store_into_global_resource_store(@file1) - @cloud2.in_global_resource_store?(:file, "/var/tmp.txt") - end - it "should put the resource into the global_resources_store when calling store_into_global_resource_store" do - @file2 = PoolParty::Resources::File.new({:name => "/var/bunk.txt"}) - @cloud2.global_resources_store.should_receive(:<<).with(@file2) - @cloud2.store_into_global_resource_store(@file2) - end - it "should not put a resource into the global_resources_store if it's already there" do - @file3 = PoolParty::Resources::File.new({:name => "/var/www/file.html"}) - @cloud2.global_resources_store.should_not_receive(:<<).with(@file3) - @cloud2.store_into_global_resource_store(@file3) - end - it "should be able to get the resource from the global_resources_store by the name and type" do - @cloud2.get_from_global_resource_store(:directory, "/var/www").key.should == "/var/www" - end - describe "adding to global resource store" do - before(:each) do - @cloud3 = cloud :pumpkinpie do - file(:name => "/var/www/pumpkinfile.html") - file(:name => "/var/www/pumpkinfile.html") - apache do - file(:name => "/var/www/pumpkinfile.html") - end - end - @cloud3 = cloud(:pumpkinpie) - end - it "should not have 2 of the same resources" do - @cloud3.resource(:file).size.should == 1 - end - end - describe "grabbing after already instantiated" do - before(:each) do - @cloud2.instance_eval do - has_package(:name => "apache2") do - has_exec(:name => "Add apache2 module") do - command "a2enmod mpm_worker" - end - end - has_package(:name => "boxers") do - has_file(:name => "/var/list_of_boxers.txt", :requires => (get_package("apache2")) ) - end - end - end - describe "same_resources_of" do - it "should say that two resources are the same" do - has_file(:name => "tanks") - has_file(:name => "tanks").same_resources_of(:file, "tanks").should == true - end - it "should say that two resources are the same regardless of their context" do - @cloud2.instance_eval do - has_file(:name => "mighty_mighty_bosstones") - end - @cloud2.resource(:file).first.same_resources_of(:file, "mighty_mighty_bosstones").should == true - end - it "should say that two resources are not the same if they are not the same" do - has_file(:name => "trees").same_resources_of(:file, "timber").should == false - end - end - it "should grab the resource when called in in a block"# do - # @cloud2.resources_string_from_resources(@cloud2.resources).should =~ /\[ Package\['apache2'\], Package\['boxers'\] \]/ - # end - end - describe "inherited" do - it "should turn passengersite_with_ssl into PassengerSiteWithSsl" do - "PassengersiteWithSsl".to_s.split("::")[-1].underscore.should == "passengersite_with_ssl" - end - end + it "should return the file preiously created" do + @tc.resource(:file).first.options.keys.sort.should == @file.options.keys.sort end end end spec/poolparty/poolparty/resource_spec.rb @@ -4,7 +4,7 @@ include PoolParty::Resources describe "Script" do before(:each) do - reset_resources! + setup end describe "wrapped" do @@ -14,59 +14,36 @@ describe "Script" do it "should have inflate_file as an instance method" do Script.respond_to?(:inflate_file).should == true end - it "should have inflate as an instance method" do - Script.new.respond_to?(:inflate).should == true - end describe "with a script" do - before(:each) do - @script = 'script' - @filename = 'filename' - - @pool = Script.new - Script.stub!(:new).and_return(@pool) - @pool.stub!(:inflate).and_return true - end - - it "should create a new Script when calling on the class method" do - Script.should_receive(:new).and_return @pool - end - it "should instance eval the script" do - @pool.should_receive(:instance_eval).with(@script, @filename).and_return true - end - it "should call inflate on itself" do - @pool.should_receive(:inflate).and_return true - end - after do - Script.inflate(@script, @filename) - end - describe "save!" do - before(:each) do - reset! - reset_resources! - pool :appdotcomcool do - keypair "snoodle" - ami "ami-123456" - - cloud :app do - expand_when "cpu > 90", "memory > 80" - contract_when "cpu < 10", "memory < 10" - - has_file :name => "/etc/httpd/httpd.conf" - end - end - @saved = Script.save!(false) - end - it "should save the keypair" do - @saved.should =~ /keypair 'snoodle'/ - end - it "should save the ami" do - @saved.should =~ /ami 'ami-123456'/ - end - it "should save the expansions" do - @saved.should =~ /expand_when 'cpu>90', 'memory>80'/ - end - end + # describe "save!" do + # before(:each) do + # reset! + # + # pool :appdotcomcool do + # ami "ami-123456" + # + # cloud :app do + # expand_when "cpu > 90", "memory > 80" + # contract_when "cpu < 10", "memory < 10" + # + # has_file :name => "/etc/httpd/httpd.conf" + # end + # end + # @saved = Script.save!(false) + # end + # it "should save the full keypair" do + # @saved.should =~ /keypair ([\w -\/]+)+id_rsa'/ + # end + # it "should save the ami" do + # @saved.should =~ /ami 'ami-123456'/ + # end + # it "should save the expansions" do + # @saved.should =~ /expand_when 'cpu>90', 'memory>80'/ + # end + # end + # NOT ENTIRELY CERTAIN THIS SHOULD WORK THE SAME WAY IT WORKED BEFORE + # AL end end -end \ No newline at end of file +end spec/poolparty/poolparty/script_spec.rb @@ -1,19 +1,20 @@ class WebServers - plugin :apache do - include PoolParty::Resources - + plugin :apachetest do attr_accessor :php - def enable + def loaded(o={}, &block) + @loaded ||= true + end + + def enable end def enable_php @php = true - php end def php - @php + @php ||= false end def site(name=:domain1, opts={}) @@ -24,24 +25,6 @@ class WebServers opts = { :document_root => opts[:document_root] || "/www/#{name}/" } - call_function "virtual_host()" - end - - custom_function <<-EOE -define virtual_host($docroot, $ip, $order = 500, $ensure = "enabled") { - $file = "/etc/sites-available/$name.conf" - file { $file: - content => template("virtual_host.erb"), - notify => Service[apache] - } - file { "/etc/sites-enabled/$order-$name.conf": - ensure => $ensure ? { - enabled => $file, - disabled => absent - } - } -} - EOE - + end end end spec/poolparty/poolparty/test_plugins/webserver.rb @@ -2,18 +2,18 @@ require File.dirname(__FILE__) + '/spec_helper' describe "PoolParty" do after(:all) do - # FileUtils.rm_r(Base.storage_directory) rescue "" + # FileUtils.rm_r(Default.storage_directory) rescue "" end it "should have the method copy_file_to_storage_directory on the PoolParty" do PoolParty.respond_to?(:copy_file_to_storage_directory).should == true end it "should copy the file given with File" do - FileUtils.should_receive(:cp).with("haymaker", Base.storage_directory + "/haymaker").once + FileUtils.should_receive(:cp).with("haymaker", Default.storage_directory + "/haymaker").once PoolParty.copy_file_to_storage_directory("haymaker") end describe "writing file to storage_directory" do before(:each) do - @path = "#{Base.storage_directory}/happydayz" + @path = "#{Default.storage_directory}/happydayz" end it "should have the method write_to_file_in_storage_directory" do PoolParty.respond_to?(:write_to_file_in_storage_directory).should == true @@ -31,6 +31,6 @@ describe "PoolParty" do end end it "should have a logger" do - PoolParty.log.should_not be_nil + PoolParty.log.should_not == nil end end \ No newline at end of file spec/poolparty/poolparty_spec.rb @@ -2,31 +2,39 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe "Capistrano provisioner" do before(:each) do - @cloud = cloud :app do;end - @remote_instance = PoolParty::Remote::RemoteInstance.new({:ip => "192.168.0.1", :status => "running", :name => "master"}, @cloud) - stub_list_from_remote_for(@cloud) + @cloud = new_test_cloud + stub_remoter_for(@cloud) end describe "instance" do - before(:each) do - @pb = PoolParty::Provisioner::Capistrano.new(@remote_instance, @cloud) - end - it "should create the config on the initialize" do - @pb.config.class.should == ::Capistrano::Configuration - end - describe "config" do - it "should create the config at ::Capistrano::Logger::INFO if the cloud is verbose" do - @cloud.stub!(:verbose).and_return true - PoolParty::Provisioner::Capistrano.new(nil, @cloud).config.logger.level.should == ::Capistrano::Logger::INFO - end - 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 - describe "install tasks" do - it "should have the configure tasks included" do - @pb.master_install_tasks.include?("custom_configure_tasks").should == true - end + it "should be meaningfully spec'd" do + pending end + # before(:each) do + # @pb = PoolParty::Provisioner::Capistrano.new(@remote_instance, @cloud) + # end + # it "should have the cloud set as the cloud" do + # @pb.cloud.should == @cloud + # end + # it "should create the config on the initialize" do + # @pb.config.class.should == ::Capistrano::Configuration + # end + # describe "config" do + # it "should create the config at ::Capistrano::Logger::INFO if the cloud is verbose" do + # @cloud.stub!(:verbose).and_return true + # PoolParty::Provisioner::Capistrano.new(nil, @cloud).config.logger.level.should == ::Capistrano::Logger::INFO + # end + # 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 + # describe "install tasks" do + # it "should have the configure tasks included" do + # @pb.master_install_tasks.include?("custom_configure_tasks").should == true + # end + # it "should call the copy_gem_bins_to_usr_bin method" do + # pending + # end + # end end end \ No newline at end of file spec/poolparty/provisioners/capistrano/capistrano_spec.rb @@ -4,7 +4,9 @@ include Provisioner describe "ProvisionerBase" do before(:each) do - @cloud = cloud :app do;end + ::Suitcase::Zipper.stub!(:gems).and_return true + # ::Suitcase::Zipper.stub!(:packages).and_return true + @cloud = new_test_cloud @remote_instance = PoolParty::Remote::RemoteInstance.new({:ip => "192.168.0.1", :status => "running", :name => "master"}, @cloud) @pb = PoolParty::Provisioner::ProvisionerBase.new(@remote_instance, @cloud) stub_list_from_remote_for(@cloud) @@ -23,6 +25,7 @@ describe "ProvisionerBase" do describe "in action" do it "should call a new ProvisionerBase" do ProvisionerBase.should_receive(:new).with(@remote_instance, @cloud).and_return @pb + @cloud.stub!(:remote_instances_list).and_return sample_instances_list ProvisionerBase.install(@remote_instance, @cloud) end end @@ -32,6 +35,7 @@ describe "ProvisionerBase" do @pb = PoolParty::Provisioner::ProvisionerBase.new(@remote_instance, @cloud) stub_list_from_remote_for(@pb) stub_list_from_remote_for(@cloud) + @cloud.stub!(:remote_instances_list).and_return sample_instances_list stub_remoting_methods_for(@pb) end it "should store the instance on the ProvisionerBase" do spec/poolparty/provisioners/provisioner_base_spec.rb @@ -1,6 +1,8 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') require 'poolparty' +# TODO: FIX THE STUBS +# %w(context matchy).each do |library| %w(spec).each do |library| begin require library @@ -12,33 +14,78 @@ end # Dir["#{File.dirname(__FILE__)}/helpers/**"].each {|a| require a} ENV["POOL_SPEC"] = nil +ENV["AWS_ACCESS_KEY"] = 'fake_access_key' +ENV["AWS_SECRET_ACCESS_KEY"] = 'fake_aws_secret_access_key' include PoolParty extend PoolParty -def debugging - false -end -def are_too_many_instances_running? -end -def are_any_nodes_exceeding_minimum_runtime? +def debugging(*args); false; end +def are_too_many_instances_running?; end +def are_any_nodes_exceeding_minimum_runtime?; end +def are_too_few_instances_running?; end + +include Remote +require File.dirname(__FILE__)+'/net/remoter_bases/ec2_mocks_and_stubs.rb' + +# Append this directory - which contains a mock key named id_rsa - to the list of searchable locations +class Key + class << self + alias :keypair_paths_without_spec_dir :keypair_paths unless method_defined?(:keypair_paths_without_spec_dir) + def keypair_paths + [keypair_paths_without_spec_dir, File.dirname(__FILE__)].flatten + end + end + end -def are_too_few_instances_running? + +class TestRemoterClass < ::PoolParty::Remote::Ec2 + include CloudResourcer + include CloudDsl + + def ami;"ami-abc123";end + def size; "small";end + def security_group; "default";end + def ebs_volume_id; "ebs_volume_id";end + def availabilty_zone; "us-east-1a";end + def verbose; false; end + def debugging; false; end + def ec2 + @ec2 ||= EC2::Base.new( :access_key_id => "not_an_access_key", :secret_access_key => "not_a_secret_access_key") + end + def describe_instances(o={}) + response_list_of_instances + end end -class TestClass < PoolParty::Cloud::Cloud +class TestClass < ::PoolParty::Cloud::Cloud include CloudResourcer + include PoolParty::Remote attr_accessor :parent - def initialize(&block) - super :test_cloud, nil, &block + def initialize(name=:name, &block) + super :test_cloud, &block end - def keypair - "fake_keypair" + def verbose + false end end +class TestCloud < TestClass +end + +class TestBaseClass < PoolParty::PoolPartyBaseClass +end def setup - PoolParty::Messenger.stub!(:messenger_send!).and_return false + PoolParty::Messenger.stub!(:messenger_send!).and_return false +end + +def new_test_cloud(force_new=false) + unless @test_cloud || force_new + @test_cloud = TestCloud.new("test_cloud_#{rand(10000)}") + stub_list_from_remote_for @test_cloud + @test_cloud.stub!(:describe_instances).and_return response_list_of_instances + end + @test_cloud end def setup_cl @@ -93,9 +140,17 @@ def stub_list_from_local_for(o) @ris = @list.split(/\n/).map {|line| PoolParty::Remote::RemoteInstance.new(line) } end -def stub_remoter_for(o) - o.stub!(:ec2).and_return EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "even more not a key") +def stub_remoter_for(o) + @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "even more not a key") + EC2::Base.stub!(:new).and_return @ec2 + + o.class.stub!(:ec2).and_return @ec2 o.stub!(:list_of_running_instances).and_return sample_instances + + o.stub!(:list_of_instances).and_return sample_instances + @ec2.stub!(:run_instances).and_return true + @ec2.stub!(:describe_instances).and_return sample_instances + @ec2.stub!(:describe_instance).and_return sample_instances end def stub_list_from_remote_for(o, launch_stub=true) stub_remoter_for(o) @@ -109,8 +164,6 @@ def stub_list_from_remote_for(o, launch_stub=true) stub_remoting_methods_for(o) end def stub_remoting_methods_for(o) - o.stub!(:keypair).and_return "fake_keypair" - o.stub!(:keypair_path).and_return "~/.ec2/fake_keypair" o.stub!(:other_clouds).and_return [] o.stub!(:expand_when).and_return "cpu > 10" o.stub!(:copy_file_to_storage_directory).and_return true @@ -125,20 +178,26 @@ def stub_remoting_methods_for(o) o.stub!(:can_expand_cloud?).and_return false end def stub_list_of_instances_for(o) - # o.stub!(:list_of_running_instances).once.and_return running_remote_instances - o.stub!(:keypair).and_return "fake_keypair" - o.stub!(:describe_instances).and_return response_list_of_instances + o.stub!(:list_of_running_instances).once.and_return running_remote_instances + # o.stub!(:describe_instances).and_return response_list_of_instances +end + +def stub_running_remote_instances(o) + o.stub!(:list_of_running_instances).and_return(running_remote_instances.map {|h| PoolParty::Remote::RemoteInstance.new(h) }) end def response_list_of_instances(arr=[]) unless @response_list_of_instances @a1 = stub_instance(1); @a1[:name] = "master" - @a2 = stub_instance(1); @a3 = stub_instance(2, "terminated"); @a4 = stub_instance(3, "pending") - @b1 = stub_instance(4, "shutting down", "blist"); @c1 = stub_instance(5, "pending", "clist") + @a2 = stub_instance(1); + @a3 = stub_instance(2, "terminated"); + @a4 = stub_instance(3, "pending") + @b1 = stub_instance(4, "shutting down", "blist"); + @c1 = stub_instance(5, "pending", "clist") @response_list_of_instances = [@a1, @a2, @a3, @a4, @b1, @c1] end - @response_list_of_instances + @response_list_of_instances+arr end def running_remote_instances @@ -179,4 +238,26 @@ class Object def messenger_send!(*args) true end +end + +class Object + def to_html_list + str = '' + str << "<ul>" + str << self.collect {|k,v| + "<li>#{k} => #{(v.instance_of?(Hash) || v.instance_of?(Array)) ? v.to_html_list : v.inspect}</li> " + }.join(" ") + str << "</ul>" + end +end + +class Array + def to_html_list + str ='' + str<< "<ul class='array'>" + str<< self.collect {|v| + "<li>#{(v.is_a?(Array) || v.is_a?(Hash)) ? v.to_html_list : v.inspect}</li>" + }.join(' ') + str<<"</ul>" + end end \ No newline at end of file spec/poolparty/spec_helper.rb @@ -1,75 +1,82 @@ -namespace(:dev) do - task :initialize do - Kernel.system"mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2") - end - # Setup a basic development environment for the user - desc "Setup development environment specify the config_file" - task :setup => [:initialize, :setup_keypair] do - certloc = "#{Base.ec2_dir}/#{Base.keypair}/cert-*.pem 2>/dev/null" - pkloc = "#{Base.ec2_dir}/#{Base.keypair}/pk-*.pem 2>/dev/null" - unless `ls #{certloc}`.length > 1 && `ls #{pkloc}`.length > 1 - puts <<-EOM -Make sure you run rake dev:setup_pemkeys before you run this command - -I cannot continue until your keys are setup. -exiting... - EOM - exit +namespace :poolparty do + namespace(:ec2) do + + task :initialize do + Kernel.system"mkdir ~/.ec2 >/dev/null 2>/dev/null" unless File.directory?("~/.ec2") end - keyfilename = ".#{Base.keypair}_pool_keys" - run <<-EOR - echo 'export AWS_ACCESS_KEY=\"#{Base.access_key}\"' > $HOME/#{keyfilename} - echo 'export AWS_SECRET_ACCESS=\"#{Base.secret_access_key}\"' >> $HOME/#{keyfilename} - echo 'export EC2_HOME=\"#{Base.ec2_dir}\"' >> $HOME/#{keyfilename} - echo 'export KEYPAIR_NAME=\"#{Base.keypair}\"' >> $HOME/#{keyfilename} - echo 'export EC2_PRIVATE_KEY=`ls ~/.ec2/#{Base.keypair}/pk-*.pem`;' >> $HOME/#{keyfilename} - echo 'export EC2_CERT=`ls ~/.ec2/#{Base.keypair}/cert-*.pem`;' >> $HOME/#{keyfilename} - EOR - puts <<-EOM -To work on this cloud, source the file like: + # Setup a basic development environment for the user + + desc "Setup development environment specify the config_file" + task :setup => [:initialize, :setup_keypair] do + certloc = "#{Default.ec2_dir}/#{Default.keypair}/cert-*.pem 2>/dev/null" + pkloc = "#{Default.ec2_dir}/#{Default.keypair}/pk-*.pem 2>/dev/null" + unless `ls #{certloc}`.length > 1 && `ls #{pkloc}`.length > 1 + puts <<-EOM + Make sure you run rake dev:setup_pemkeys before you run this command + + I cannot continue until your keys are setup. + exiting... + EOM + exit + end + keyfilename = ".#{Default.keypair}_pool_keys" + run <<-EOR + echo 'export AWS_ACCESS_KEY=\"#{Default.access_key}\"' > $HOME/#{keyfilename} + echo 'export AWS_SECRET_ACCESS=\"#{Default.secret_access_key}\"' >> $HOME/#{keyfilename} + echo 'export EC2_HOME=\"#{Default.ec2_dir}\"' >> $HOME/#{keyfilename} + echo 'export KEYPAIR_NAME=\"#{Default.keypair}\"' >> $HOME/#{keyfilename} + echo 'export EC2_PRIVATE_KEY=`ls ~/.ec2/#{Default.keypair}/pk-*.pem`;' >> $HOME/#{keyfilename} + echo 'export EC2_CERT=`ls ~/.ec2/#{Default.keypair}/cert-*.pem`;' >> $HOME/#{keyfilename} + EOR + puts <<-EOM + To work on this cloud, source the file like: - source $HOME/#{keyfilename} + source $HOME/#{keyfilename} - EOM - end - desc "Generate a new keypair" - task :setup_keypair => [:initialize] do - Base.keypair ||= "#{File.basename(Dir.pwd)}" - run "ec2-delete-keypair #{Base.keypair}" if File.file?(Base.keypair_path) - puts "-- setting up keypair named #{Base.keypair} in #{Base.keypair_path}" - run <<-EOR - chmod 600 #{Base.keypair_path} 2>/dev/null - mkdir ~/.ec2/#{Base.keypair} 2>/dev/null - ec2-add-keypair #{Base.keypair} > #{Base.keypair_path} - EOR - end - desc "Setup pem keys" - task :setup_pemkeys => [:initialize] do - puts "Setting up stubbed pem keys in ~/.ec2/#{Base.keypair}" - run <<-EOR - mkdir -p ~/.ec2/#{Base.keypair} 2>/dev/null - echo 'UPDATE ME' > #{Base.ec2_dir}/#{Base.keypair}/cert-UPDATEME.pem - echo 'UPDATE ME' > #{Base.ec2_dir}/#{Base.keypair}/pk-UPDATEME.pem - EOR - puts "Don't forget to replace your ~/.ec2/#{Base.keypair}/*.pem keys with the real amazon keys" - end - desc "initialize setup" - task :init => [:setup_pemkeys] - desc "Authorize base ports for application" - task :authorize_ports => :initialize do - run <<-EOR - ec2-authorize -p 22 default - ec2-authorize -p 80 default - EOR - end - desc "Turn the gemspec into a yaml file" - task :gemspec_to_yaml => [:initialize, :gemspec] do - filepath = ::File.join(::File.dirname(__FILE__), "..", "poolparty.gemspec") - data = open(filepath).read - spec = eval("$SAFE = 3\n#{data}") - yml = YAML.dump spec - File.open(filepath, "w+") do |f| - f << yml + EOM + end + + desc "Generate a new keypair" + task :setup_keypair => [:initialize] do + Default.keypair ||= "#{File.basename(Dir.pwd)}" + run "ec2-delete-keypair #{Default.keypair}" if File.file?(Default.keypair_path) + puts "-- setting up keypair named #{Default.keypair} in #{Default.keypair_path}" + run <<-EOR + chmod 600 #{Default.keypair_path} 2>/dev/null + mkdir ~/.ec2/#{Default.keypair} 2>/dev/null + ec2-add-keypair #{Default.keypair} > #{Default.keypair_path} + EOR + end + + desc "Setup pem keys" + task :setup_pemkeys => [:initialize] do + puts "Setting up stubbed pem keys in ~/.ec2/#{Default.keypair}" + run <<-EOR + mkdir -p ~/.ec2/#{Default.keypair} 2>/dev/null + echo 'UPDATE ME' > #{Default.ec2_dir}/#{Default.keypair}/cert-UPDATEME.pem + echo 'UPDATE ME' > #{Default.ec2_dir}/#{Default.keypair}/pk-UPDATEME.pem + EOR + puts "Don't forget to replace your ~/.ec2/#{Default.keypair}/*.pem keys with the real amazon keys" + end + + desc "initialize setup" + task :init => [:setup_pemkeys] + desc "Authorize base ports for application" + task :authorize_ports => :initialize do + run <<-EOR + ec2-authorize -p 22 default + ec2-authorize -p 80 default + EOR + end + + desc "Turn the gemspec into a yaml file" + task :gemspec_to_yaml => [:initialize, :gemspec] do + filepath = ::File.join(::File.dirname(__FILE__), "..", "poolparty.gemspec") + data = open(filepath).read + spec = eval("$SAFE = 3\n#{data}") + yml = YAML.dump spec + File.open(filepath, "w+"){ |f|f << yml } end + end end \ No newline at end of file tasks/development.rake @@ -1,42 +1,44 @@ # Tasks to be run on the server -namespace(:server) do - task :init do - PoolParty::Coordinator.init(false) - end - # bundle, upload and register your bundle on the server - desc "Bundle, upload and register your ami" - task :all => [:bundle, :upload, :register] do - puts "== your ami is ready" - end - # Cleanup the /mnt directory - desc "Clean the /mnt directory" - task :clean_mnt do - `rm -rf /mnt/image* img*` - end - # Before we can bundle, we have to make sure we have the cert and pk files - desc "Ensure the required bundle files are present in /mnt" - task :check_bundle_files do - raise Exception.new("You must have a private key in your /mnt directory") unless File.exists?("/mnt/pk-*.pem") - raise Exception.new("You must have your access key in your /mnt directory") unless File.exists?("/mnt/cert-*.pem") - end - # Bundle the image - desc "Bundle this image into the /mnt directory" - task :bundle => [:clean_mnt, :check_bundle_files] do - puts `ec2-bundle-vol -k /mnt/pk-*.pem -u '#{Planner.user_id}' -d /mnt -c /mnt/cert-*.pem -r i386` - end - # Upload the bundle into the app_name bucket - desc "Upload the bundle to your bucket with a unique name: deletes old ami" - task :upload => [:init, :delete_bucket] do - puts `ec2-upload-bundle -b #{Planner.app_name} -m /mnt/image.manifest.xml -a #{Planner.access_key} -s #{Planner.secret_access_key}` - end - # Register the bucket with amazon and get back an ami - desc "Register the bundle with amazon" - task :register do - puts `ec2-register -K /mnt/pk-*.pem -C /mnt/cert-*.pem #{Planner.app_name}/image.manifest.xml` - end - # Delete the bucket - desc "Delete the bucket with the bundle under tha app name" - task :delete_bucket do - Planner.app_name.delete_bucket +namespace :poolparty do + namespace :server do + task :init do + PoolParty::Coordinator.init(false) + end + # bundle, upload and register your bundle on the server + desc "Bundle, upload and register your ami" + task :all => [:bundle, :upload, :register] do + puts "== your ami is ready" + end + # Cleanup the /mnt directory + desc "Clean the /mnt directory" + task :clean_mnt do + `rm -rf /mnt/image* img*` + end + # Before we can bundle, we have to make sure we have the cert and pk files + desc "Ensure the required bundle files are present in /mnt" + task :check_bundle_files do + raise Exception.new("You must have a private key in your /mnt directory") unless File.exists?("/mnt/pk-*.pem") + raise Exception.new("You must have your access key in your /mnt directory") unless File.exists?("/mnt/cert-*.pem") + end + # Bundle the image + desc "Bundle this image into the /mnt directory" + task :bundle => [:clean_mnt, :check_bundle_files] do + puts `ec2-bundle-vol -k /mnt/pk-*.pem -u '#{Planner.user_id}' -d /mnt -c /mnt/cert-*.pem -r i386` + end + # Upload the bundle into the app_name bucket + desc "Upload the bundle to your bucket with a unique name: deletes old ami" + task :upload => [:init, :delete_bucket] do + puts `ec2-upload-bundle -b #{Planner.app_name} -m /mnt/image.manifest.xml -a #{Planner.access_key} -s #{Planner.secret_access_key}` + end + # Register the bucket with amazon and get back an ami + desc "Register the bundle with amazon" + task :register do + puts `ec2-register -K /mnt/pk-*.pem -C /mnt/cert-*.pem #{Planner.app_name}/image.manifest.xml` + end + # Delete the bucket + desc "Delete the bucket with the bundle under tha app name" + task :delete_bucket do + Planner.app_name.delete_bucket + end end end \ No newline at end of file tasks/server.rake Manifest.txt bin/pool-console bin/server-list-responding config/hoe.rb lib/poolparty/dependency_resolutions/base.rb lib/poolparty/dependency_resolutions/puppet.rb lib/poolparty/modules/configurable.rb lib/poolparty/modules/method_missing_sugar.rb lib/poolparty/net/remote.rb lib/poolparty/net/remote_bases/ec2.rb lib/poolparty/net/remote_bases/ec2/ec2_response_object.rb lib/poolparty/net/remoter.rb lib/poolparty/plugins/line.rb lib/poolparty/poolparty/base.rb lib/poolparty/poolparty/resources/class_package.rb lib/poolparty/poolparty/resources/conditional.rb lib/poolparty/poolparty/resources/cron.rb lib/poolparty/poolparty/resources/custom_service.rb lib/poolparty/poolparty/resources/directory.rb lib/poolparty/poolparty/resources/exec.rb lib/poolparty/poolparty/resources/file.rb lib/poolparty/poolparty/resources/gem_package.rb 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/provisioners/capistrano/recipies/base.rb lib/poolparty/provisioners/capistrano/recipies/master.rb lib/poolparty/provisioners/capistrano/recipies/slave.rb lib/poolparty/server/agent.rb lib/poolparty/templates/puppet.conf lib/poolparty/templates/puppetcleaner lib/poolparty/templates/puppetrerun lib/poolparty/templates/puppetrunner pkg/poolparty.gem script/txt2html spec/poolparty/dependency_resolutions/base_spec.rb spec/poolparty/modules/configurable_spec.rb spec/poolparty/net/remote_bases/ec2_spec.rb spec/poolparty/poolparty/base_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 tasks/deployment.rake tasks/website.rake website/index.html website/index.txt website/javascripts/rounded_corners_lite.inc.js website/stylesheets/code.css website/stylesheets/screen.css website/template.html.erb c56fac32c7366f91ecae80e497c6fafe6d8f0121 fairchild fairchild@stimble.net http://github.com/jashmenn/poolparty/commit/9b872a0e26b000729d2928cbe1496222dd9d5309 9b872a0e26b000729d2928cbe1496222dd9d5309 2009-04-01T11:50:54-07:00 2009-04-01T11:50:54-07:00 merge deps_remoter_merge branch. This brings in the several core changes: # Provides a properties_hash which represents the defined state of our pool. # First phase of chef support # New, simpler bootstrapping and provisioning system # Redesigned remoter_bases to more easily add alternate remoter bases thru subclassing of the base RemoterBase class. # break out specific functionality into gems where possible ## dslify ## parenting ## Suitcase, a new gem for packaging up dependencies to a directory or tarball ddca6dd5c819282cf2260df6b1b3e88245d1a866 fairchild fairchild@stimble.net