.rdebugrc lib/poolparty/plugins/apache2/passenger_site.rb lib/poolparty/plugins/apache2/php5.rb lib/poolparty/plugins/apache2/virtual_host.rb lib/poolparty/plugins/haproxy.rb lib/poolparty/plugins/heartbeat.rb lib/poolparty/plugins/plugin_template.rb lib/poolparty/plugins/poolparty_base_packages.rb lib/poolparty/plugins/ruby.rb lib/poolparty/plugins/runit.rb spec/poolparty/poolparty/haproxy_spec.rb spec/poolparty/poolparty/heartbeat_spec.rb @@ -135,10 +135,6 @@ class Object include PoolParty::DefinableResource end -class Class - include PoolParty::PluginModel -end - ## Load PoolParty Plugins and package module PoolParty %w(plugins base_packages).each do |dir| lib/poolparty.rb @@ -60,7 +60,7 @@ class String # 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) - symc = ((opts && opts[:preserve]) ? ("#{self.camelcase}Class") : "PoolParty#{self.camelcase}Class").classify + symc = ((opts && opts[:preserve]) ? ("#{self.camelcase}") : "PoolParty#{self.camelcase}").classify kla=<<-EOE class #{symc} #{"< #{superclass}" if superclass} lib/poolparty/core/string.rb @@ -40,15 +40,15 @@ module PoolParty # Which sets the virtual host's name as xnot.org # # An example is included in the poolparty-apache-plugin - def virtual_resource(name=:virtual_resource, opts={}, &block) - 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 - end + # def virtual_resource(name=:virtual_resource, opts={}, &block) + # 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 + # end end end \ No newline at end of file lib/poolparty/modules/definable_resource.rb @@ -1,5 +1,5 @@ module PoolParty - class Base + module Plugin =begin rdoc @@ -11,9 +11,11 @@ default host. =end - plugin :apache do + class Apache < Plugin dsl_methods :passenger_version + default_options :port => 80 + def loaded(opts={}, &block) configs has_service("apache2", :requires => get_package("apache2")) @@ -168,6 +170,7 @@ default host. def listen(p="80") has_variable(:name => "port", :value => p) + self.port = p @listen = true end @@ -219,117 +222,7 @@ default host. end - virtual_resource(:virtualhost) do - def listen(port="80") - has_variable(:name => "port", :value => port) - port port - end - - def virtual_host_entry(file) - @virtual_host_entry = true - if ::File.file?(file) - has_file(dsl_options.merge({:name => "/etc/apache2/sites-available/#{name}", - :template => file, - :requires => get_package("apache2")})) - else - has_file(dsl_options.merge({:content => file, - :name => "/etc/apache2/sites-available/#{name}", - :requires => get_package("apache2")})) - end - end - - - def loaded(opts={}, parent=self) - has_directory(:name => "/var/www", :owner => www_user, :mode=>'0744') - has_directory(:name => "/var/www/#{name}", :owner => www_user, :mode=>'0744') - has_directory(:name => "/var/www/#{name}/logs", :owner => www_user, :mode=>'0744') - - has_variable(:name => "sitename", :value => "#{name}") - - unless @virtual_host_entry - virtual_host_entry <<-eof -<VirtualHost *:#{port}> -ServerName #{name} -DocumentRoot /var/www/#{name} -</VirtualHost> -eof - end - - has_exec(:name => "insert-site-#{name}", - :command => "/usr/sbin/a2ensite #{name}", - :calls => get_exec("reload-apache2"), - :requires => get_file("/etc/apache2/sites-available/#{name}")) do - requires get_package("apache2") - if_not "/bin/sh -c '[ -L /etc/apache2/sites-enabled/#{parent.name} ] && [ /etc/apache2/sites-enabled/#{parent.name} -ef /etc/apache2/sites-available/#{parent.name} ]'" - end - end - - end - virtual_resource(:passengersite) do # {{{ - - default_options( - :dir => "/var/www", - :appended_path => nil, - :owner => 'www-data', - :mode =>'0744', - :enviornment => 'production' - ) - - def loaded(opts={}, prnt=nil) - enable_passenger - port "80" unless self.port - - has_directory(:name => dir, :owner => www_user, :mode => '0744') - has_directory(:name => "#{site_directory}", :owner => www_user, :mode => '0744') - has_directory(:name => "#{site_directory}/logs", :owner => www_user, :mode => '0744') - if opts[:with_deployment_directories] - has_directory(:name => "#{site_directory}/shared", :owner => www_user, :mode=>'0744') - has_directory(:name => "#{site_directory}/shared/public", :owner => www_user, :mode=>'0744') - has_directory(:name => "#{site_directory}/shared/config", :owner => www_user, :mode=>'0744') - has_directory(:name => "#{site_directory}/shared/log", :owner => www_user, :mode=>'0744') - has_directory(:name => "#{site_directory}/releases", :owner => www_user, :mode=>'0744') - do_once do |variable| - # setup an initial symlink so apache will start even if there have not been any deploys yet - has_directory(:name => "#{site_directory}/releases/initial/public", :owner => www_user, :mode=>'0744') - #FIXME the following line is chef specific. It will fail with puppet - - # has_symlink(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial") - end - log_dir = "#{site_directory}/shared/log" - appended_path "current" - else - log_dir = "#{site_directory}/log" - end - - passenger_entry <<-EOE -<VirtualHost *:#{port}> - ServerName #{name} - DocumentRoot #{site_directory}/public - RailsEnv #{enviornment} - ErrorLog #{log_dir}/error_log - CustomLog #{log_dir}/access_log common -</VirtualHost> - EOE - - # has_directory(:name => "/var/www") - # has_directory(:name => "/var/www/#{name}") - # has_directory(:name => "/var/www/#{name}/log") - parent.install_site(name, :no_file => true) # we already created the file with #passenger_entry - end - - def passenger_entry(file) - if ::File.file?(file) - has_file({:name => "/etc/apache2/sites-available/#{name}", :template => file}) - else - has_file({:content => file, :name => "/etc/apache2/sites-available/#{name}" }) - end - end - - def site_directory - "#{dir}/#{name}%s" % [appended_path ? "/" + appended_path : ""] - end - end # virtual_resource(:passengersite_with_ssl) do# {{{ # def loaded(opts={}, parent=self) @@ -374,40 +267,6 @@ eof # end # }}} - # Usage: - # - # enable_php5 do - # extras :cli, :pspell, :mysql - # end - virtual_resource(:enable_php5) do - def loaded(opts={}, parent=self) - has_package(:name => "php5") - has_package(:name => "libapache2-mod-php5") - present_apache_module("php5") - has_file({:name => "/etc/php5/apache2/php.ini", - :template => "apache2/php.ini.erb", - :mode => 755, - :requires => get_package("libapache2-mod-php5"), - :calls => get_exec("reload-apache2")}) - - has_file(:name => "/etc/apache2/conf.d/enable-php.conf", - :mode => 755, - :calls => get_exec("reload-apache2"), - :content => <<-eos - AddHandler php5-script php - AddType text/html php - eos - ) - end - - def extras(*names) - names.each do |name| - has_package(:name => "php5-#{name}", :requires => get_package("php5")) - end - end - - end - end end \ No newline at end of file lib/poolparty/plugins/apache2/apache.rb @@ -6,8 +6,8 @@ :public_key_file => "/Users/alerner/.ssh/id_rsa.pub" =end module PoolParty - class Base - plugin :authorized_key do + module Plugin + class AuthorizedKey < Plugin default_options( :for_user => "root", lib/poolparty/plugins/authorized_key.rb @@ -1,11 +1,10 @@ module PoolParty - class Base - plugin :bind do - + module Plugin + + class Bind < Plugin def enable - end - end + end -end \ No newline at end of file +end lib/poolparty/plugins/bind.rb @@ -1,17 +1,21 @@ require "tempfile" # BIG TODO: Slim the place where the content is gathered from module PoolParty - class ChefRecipe - include Dslify + + class ::PoolParty::Resources::ChefRecipe < ::PoolParty::Resources::Resource dsl_methods :recipes end - class Chef - define_resource :chef_recipe do - end - define_resource :chef_library do - end + + class ::PoolParty::Resources::ChefLibrary < ::PoolParty::Resources::Resource + end - plugin :include_chef_recipe do + module Plugin + # class ChefRecipe + # include Dslify + # dsl_methods :recipes + # end + + class IncludeChefRecipe < Plugin def loaded(opts={}, &block) has_chef_recipe ::File.basename(name) end @@ -20,7 +24,7 @@ module PoolParty end end - plugin :chef do + class Chef < Plugin def before_load(o, &block) end @@ -90,7 +94,7 @@ module PoolParty else unless @recipe @recipe = ChefRecipe.new - @recipe.instance_eval &block if block + @recipe.instance_eval(&block) if block @recipe.recipes(recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"]) ::Suitcase::Zipper.add_content_as(@recipe.dsl_options.to_json, "dna.json", "chef") lib/poolparty/plugins/chef.rb @@ -16,28 +16,29 @@ =end module PoolParty - class ChefDeploy + module Plugin - define_resource :chef_deploy_definition do + class ChefDeploy < Plugin - dsl_methods :repo - - default_options( - :branch => "HEAD", - :enable_submodules => true, - :migrate => true, - :environment => "production", - :shallow_clone => true, - :user => "www-data", - :restart_command => "touch tmp/restart.txt", - :migration_command => "rake db:migrate" - ) - def present - :deploy + define_resource :chef_deploy_definition do + + dsl_methods :repo + + default_options( + :branch => "HEAD", + :enable_submodules => true, + :migrate => true, + :environment => "production", + :shallow_clone => true, + :user => "www-data", + :restart_command => "touch tmp/restart.txt", + :migration_command => "rake db:migrate" + ) + def present + :deploy + end end - end - - plugin :chef_deploy do + dsl_methods :branch, :enable_submodules, :migrate, :environment, :shallow_clone, :user, :restart_command, :migration_command, :repo lib/poolparty/plugins/chef_deploy.rb @@ -16,9 +16,8 @@ The deploy directory will copy the source directory from the developer machine ( This will place the contents of ~/path/to/my/site from your machine to /mnt/bob on the cloud instances virtual_resource(:deploy_directory) =end - - class DeployDirectory - virtual_resource(:deploy_directory) do + module Plugin + class DeployDirectory < Plugin dsl_methods :from, :to, :owner, :mode, :git_pull_first lib/poolparty/plugins/deploy_directory.rb @@ -29,11 +29,9 @@ Gempackages describe distributed gems on the cloud. The gem is only downloaded o == Examples has_gempackage(:name => 'rake', :download_url => 'http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem') -=end - - class GempackageResource - - virtual_resource(:gem_package) do +=end + module Plugin + class GemPackage < Plugin dsl_methods :name, # Name of the gem :download_url, # Url to download the gem. If not set, it will try to grab the latest gem available on gems.github.com or rubyforge lib/poolparty/plugins/gem_package.rb @@ -1,13 +1,13 @@ -module PoolParty - class GitResource - - plugin :git do +module PoolParty + module Plugin + class Git < Plugin + def loaded(*args) has_package(:name => "git-core") end end - plugin :git_repo do + class GitRepo < Plugin dsl_methods :name, :repo, :dir, @@ -75,6 +75,7 @@ module PoolParty end end + class DirectoryMissingError < StandardError def initialize super("You must include a directory for the git repo set by to") lib/poolparty/plugins/git.rb @@ -15,19 +15,21 @@ Ensures that the line given is in the file has_line_in_file("ENABLED=1", "/etc/default/haproxy") =end - class LineInFile + module Plugin + class LineInFile < Plugin - plugin :line_in_file do dsl_methods :file, :line default_options( :line => "" ) + def loaded(opts={}, &block) has_exec "line_in_#{file}" do command "grep -q \'#{line.safe_quote}\' #{file} || echo \'#{line.safe_quote}\' >> #{file}" not_if "grep -q \'#{line.safe_quote}\' #{file}" end end + end end lib/poolparty/plugins/line_in_file.rb @@ -13,9 +13,8 @@ chef-deploy to deploy the application =end module PoolParty - class Rails - - plugin :rails_deploy do + module Plugin + class RailsDeploy< Plugin dsl_methods :shared, :database_yml, :repo, :user, :user_dir lib/poolparty/plugins/rails_deploy.rb @@ -1,13 +1,15 @@ -module PoolParty - class SvnResource - - virtual_resource :svn do +module PoolParty + module Plugin + + class Svn < Plugin + def loaded(*args) has_package :name => "subversion" end + end - virtual_resource :svn_repos do + class SvnRepos < Plugin dsl_methods :creates, :command, :cwd, :source, :working_dir, :at @@ -15,7 +17,7 @@ module PoolParty has_package("subversion") has_svn_repository end - + def has_svn_repository has_directory(::File.dirname(working_dir)) has_directory(:name => "#{working_dir}", :requires => get_directory("#{::File.dirname(working_dir)}")) lib/poolparty/plugins/svn.rb @@ -42,14 +42,13 @@ module PoolParty ) include CloudResourcer - include PoolParty::PluginModel include PoolParty::Resources include PoolParty::Callbacks include PoolParty::DependencyResolverCloudExtensions include PrettyPrinter # Net methods - include ::PoolParty::Remote + include PoolParty::Remote include PoolParty::CloudDsl include PoolParty::Verification # include PoolParty::Monitors @@ -277,7 +276,6 @@ module PoolParty def to_hash hsh = to_properties_hash hsh[:options].merge!({:remote_base => remote_base.to_hash}) - # hsh.reject{|k,v| k == :remote_base || k == :cloud} hsh end @@ -378,15 +376,15 @@ module PoolParty end # Add all the poolparty requirements here - # NOTE: These are written as plugins in the lib/poolparty/base_packages directory + # NOTE: These are written as plugins in the lib/poolparty/plugins 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 # poolparty_base_heartbeat - poolparty_base_ruby - poolparty_base_packages + ruby + pool_party_base_packages end end lib/poolparty/poolparty/cloud.rb @@ -4,40 +4,33 @@ require "#{::File.dirname(__FILE__)}/../provision/boot_strapper.rb" module PoolParty module Plugin - @available_plugins = [] def self.available - @available_plugins + @available_plugins ||= [] end - + class Plugin < PoolParty::Service include CloudResourcer include PoolParty::DependencyResolverCloudExtensions include PoolParty::Callbacks - default_options( - :name => nil - ) + dsl_methods :name - def initialize(opts={}, extra_opts={}, prnt=nil, &block) + def initialize(opts={}, extra_opts={}, prnt=nil, &block) setup_callbacks - - run_in_context do - before_load(opts, &block) - end - - block = Proc.new {enable} unless block - + + run_in_context { before_load(opts, &block) } + + block = Proc.new {enable} unless block + super(opts, &block) - - run_in_context do - loaded opts, &block - end - + + run_in_context { loaded opts, &block } + after_create end # Overwrite this method - def before_load(o={}, &block) + def before_load(o={}, &block) end def loaded(o={}, &block) end @@ -60,6 +53,14 @@ module PoolParty end end + def name(n=nil) + if n + self.name = n + else + self.name ||= self.class.to_s.split('::').pop.snake_case + end + end + def bootstrap_gems *gems gems.each do |g| Provision::BootStrapper.gem_list << g unless Provision::BootStrapper.gem_list.include?(g) @@ -75,9 +76,32 @@ module PoolParty end 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) - add_resource_lookup_method(method_name) + + klass = subclass.to_s.split('::').pop.to_s + add_has_and_does_not_have_methods_for(klass.snake_case) + add_resource_lookup_method(klass.snake_case) + + # Add the plugin definition to the cloud as an instance method + # For example apache do; apache option and method; end + meth = <<-EOM + def #{klass.snake_case}(opts={}, &block) + i = plugin_store.select {|i| i if i.class.to_s =~ /#{klass}/ }.first if plugin_store + if i + i + else + inst = ::PoolParty::Plugin::#{klass}.new(opts, parent, &block) + plugin_store << inst if plugin_store + inst + end + end + EOM + + ::PoolParty::PoolPartyBaseClass.module_eval meth + + # Store the plugins so they will be availble in an array at Plugin.available + ::PoolParty::Plugin.available << subclass + super + end end lib/poolparty/poolparty/plugin.rb @@ -3,45 +3,53 @@ require File.join(File.dirname(__FILE__), "resource") module PoolParty module PluginModel - def plugin(name=:plugin, cloud=nil, &block) - plugins[name] ||= PluginModel.new(name, &block) - end - alias_method :register_plugin, :plugin - - def plugins - $plugins ||= {} - end + # def plugin(name=:plugin, cloud=nil, &block) + # # plugins[name] ||= PluginModel.new(name, &block) + # return plugins[name] if plugins[name] + # PoolParty::Plugin.module_eval <<-EOM + # class #{name.to_s.camelcase} < Plugin + # end + # EOM + # "PoolParty::Plugin::#{name.to_s.camelcase}".constantize.module_eval &block + # + # end + # alias_method :register_plugin, :plugin + # alias_method :virtual_resource, :plugin + # + # def plugins + # $plugins ||= {} + # end class PluginModel attr_accessor :klass def initialize(name,&block) - 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 - # Add the plugin definition to the cloud as an instance method - 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) - plugin_store << inst if plugin_store - inst - end - end - EOM - - PoolParty::Cloud::Cloud.class_eval meth - PoolParty::Service.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym) - - # Store the plugins so they will be availble in an array at Plugin.available - ::PoolParty::Plugin.available << klass + # 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 + # # Add the plugin definition to the cloud as an instance method + # meth = <<-EOM + # def #{lowercase_class_name}(opts={}, &block) + # i = plugin_store.select {|i| i if i.class == #{lowercase_class_name.camelcase} }.first if plugin_store + # if i + # i + # else + # inst = #{lowercase_class_name.camelcase}.new(opts, parent, &block) + # plugin_store << inst if plugin_store + # inst + # end + # end + # EOM + # + # PoolParty::Cloud::Cloud.class_eval meth + # PoolParty::Service.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym) + # + # # Store the plugins so they will be availble in an array at Plugin.available + # ::PoolParty::Plugin.available << klass end lib/poolparty/poolparty/plugin_model.rb @@ -13,7 +13,7 @@ module PoolParty $context_stack ||= [] end - class PoolPartyBaseClass + class PoolPartyBaseClass attr_reader :init_opts include Parenting, Dslify @@ -72,16 +72,10 @@ module PoolParty end # Add to the services pool for the manifest listing - def add_service(serv, extra_name="") - subclass = "#{serv.class.to_s.top_level_class.underscore.downcase}#{extra_name}" - lowercase_class_name = subclass.to_s.underscore.downcase || subclass.downcase - - # (services[lowercase_class_name.to_sym] ||= []) << serv if serv && !serv.empty? + def add_service(serv) ordered_resources << serv - # services.merge!({lowercase_class_name.to_sym => serv}) end - # Container for the services - + def inspect to_properties_hash.inspect end @@ -92,7 +86,6 @@ module PoolParty def to_json to_hash.to_json - # JSON.generate(to_hash) end def resources lib/poolparty/poolparty/poolparty_base_class.rb @@ -6,7 +6,7 @@ module PoolParty def to_properties_hash { :pp_type => "plugin", :options => dsl_options, - :name => self.class.to_s.top_level_class, + # :name => self.class.to_s.top_level_class, :resources => ordered_resources.map {|a| a.to_properties_hash }} end @@ -17,20 +17,18 @@ module PoolParty nil end - def self.add_has_and_does_not_have_methods_for(typ=:file) - lowercase_class_name = typ.to_s.top_level_class.downcase - + def self.add_has_and_does_not_have_methods_for(typ=:file) meth = <<-EOM - def __#{lowercase_class_name}(opts={}, &block) - i = PoolParty::#{lowercase_class_name.camelcase}Class.new(opts, &block) + def __#{typ}(opts={}, &block) + i = ::PoolParty::Plugin::#{typ.camelcase}.new(opts, &block) plugin_store << i if respond_to?(:plugin_store) i end - alias :#{lowercase_class_name} :__#{lowercase_class_name} + alias :#{typ} :__#{typ} EOM PoolParty::PoolPartyBaseClass.module_eval meth - PoolParty::PoolPartyBaseClass.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym) + PoolParty::PoolPartyBaseClass.add_has_and_does_not_have_methods_for(typ.to_sym) end end lib/poolparty/poolparty/service.rb @@ -2,14 +2,12 @@ require File.dirname(__FILE__) + '/bin_spec_helper' require "poolparty" class PuppetResolverSpec - plugin :apache do - end end describe "Server list active binary" do describe "with real cloud" do before(:each) do - Kernel::HaproxyClass.stub!(:new).and_return nil + ::PoolParty::Plugin::Haproxy.stub!(:new).and_return nil $pool_specfile = __FILE__ @p = PoolParty::Pool::Pool.load_from_file "#{::File.dirname(__FILE__)}/fixtures/bin_cloud_for_test.rb" @pool_hash = @p.to_properties_hash spec/bin/server-list-active_spec.rb @@ -72,7 +72,7 @@ listen web_proxy 127.0.0.1:3000 @str = "prok" end it "should be able to turn itself into constant" do - @str.class_constant.should == PoolPartyProkClass + @str.class_constant.should == PoolPartyProk end it "should turn itself into a class constant" do @str.class_constant.class.should == Class spec/poolparty/core/string_spec.rb @@ -64,8 +64,6 @@ describe "ChefResolver" do describe "with a cloud" do before(:each) do class ChefResolverSpec - plugin :apache do - end end @cloud = cloud :hope do keypair "bob" spec/poolparty/dependency_resolver/chef_resolver_spec.rb @@ -22,15 +22,15 @@ class DependencyResolverSpecTestCloud < DependencyResolverCloudExtensionsSpecBas dsl_methods :keypair, :name end -class JunkClassForDefiningPlugin - plugin :apache_plugin do - default_options( - :listen => 80 - ) - def loaded(o={},&block) - end - end -end +# class JunkClassForDefiningPlugin +# apache_plugin do +# default_options( +# :listen => 80 +# ) +# def loaded(o={},&block) +# end +# end +# end describe "Resolution spec" do before(:each) do @@ -84,7 +84,7 @@ describe "Resolution spec" do before(:each) do reset! ::File.stub!(:basename).and_return "template" - @file = "Hello <%= friends %> on port <%= listen %>" + @file = "Hello <%= friends %> on port <%= port %>" @file.stub!(:read).and_return @file Template.stub!(:open).and_return @file @@ -95,11 +95,14 @@ describe "Resolution spec" do has_directory :name => "/var/www" has_package :name => "bash" # parent == nil - apache_plugin do + apache do # parent == TestClass # puts "<pre>#{parent}</pre> on <pre>#{context_stack.map {|a| a.class }.join(", ")} from #{self.class}</pre>" listen "8080" - has_file :name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :friends => "bob", :render_as => :erb + has_file :name => "/etc/apache2/apache2.conf", + :template => "/absolute/path/to/template", + :friends => "bob", + :render_as => :erb end end @cloud = clouds[:dog_for_test] @@ -115,7 +118,7 @@ describe "Resolution spec" do @properties[:resources].class.should == Array end it "contain content in the template's hash" do - @apache_key.resources.select_with_hash(:pp_type => "file").last[:content].should == "Hello bob on port 8080" + @apache_key.resources.select_with_hash(:pp_type => "file").first[:content].should == "Hello bob on port 8080" end it "contain the files in a hash" do # puts "<pre>#{@properties.to_yaml}</pre>" spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb @@ -1,68 +1,68 @@ -#TODO: Reimplement -require File.dirname(__FILE__) + '/../spec_helper' - -describe "deployments" do - describe "class" do - before(:each) do - @klass = PoolParty::Extra::Deployments - @file = "hanky_danky_ranky.pool" - ::File.stub!(:file?).with(@file).and_return false - end - it "should have the singleton method include_deployment" do - @klass.respond_to?(:include_deployment).should == true - end - it "should return nil if the file doesn't exist" do - @klass.include_deployment(@file).should == nil - end - describe "existing file" do - before(:each) do - ::File.stub!(:file?).and_return true - @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).nil?.should == false - Object.const_defined?(:HankyDankyRankyClass).should == true - end - it "should create a method on the class called enable" do - HankyDankyRankyClass.new.respond_to?(:enable).should == true - end - it "should add the contents of the file to be eval'd on the method" do - # puts HankyDankyRankyClass.new.enable - # HankyDankyRankyClass.new.enable.should == "hello goober" - pending - end - end - describe "include_deployments" do - before(:each) do - ::File.stub!(:directory?).and_return false - @dir = "/deployments" - end - it "should have the method include_deployments" do - @klass.respond_to?(:include_deployments).should == true - end - it "should return nil if the directory does not exist" do - @klass.include_deployments(@dir).should == nil - end - describe "existing directory" do - before(:each) do - ::File.stub!(:directory?).and_return true - @contents = [] - Dir.stub!(:[]).and_return @contents - end - it "should not be nil if the directory exists" do - @klass.include_deployments(@dir).nil?.should == false - end - it "should call Dir.[] on the directory" do - Dir.should_receive(:[]).with("#{@dir}/*").and_return [] - @klass.include_deployments(@dir) - end - end - end - end -end \ No newline at end of file +# #TODO: Reimplement +# require File.dirname(__FILE__) + '/../spec_helper' +# +# describe "deployments" do +# describe "class" do +# before(:each) do +# @klass = PoolParty::Extra::Deployments +# @file = "hanky_danky_ranky.pool" +# ::File.stub!(:file?).with(@file).and_return false +# end +# it "should have the singleton method include_deployment" do +# @klass.respond_to?(:include_deployment).should == true +# end +# it "should return nil if the file doesn't exist" do +# @klass.include_deployment(@file).should == nil +# end +# describe "existing file" do +# before(:each) do +# ::File.stub!(:file?).and_return true +# @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).nil?.should == false +# Object.const_defined?(Plugin::HankyDankyRanky).should == true +# end +# it "should create a method on the class called enable" do +# HankyDankyRanky.new.respond_to?(:enable).should == true +# end +# it "should add the contents of the file to be eval'd on the method" do +# # puts HankyDankyRankyClass.new.enable +# # HankyDankyRankyClass.new.enable.should == "hello goober" +# pending +# end +# end +# describe "include_deployments" do +# before(:each) do +# ::File.stub!(:directory?).and_return false +# @dir = "/deployments" +# end +# it "should have the method include_deployments" do +# @klass.respond_to?(:include_deployments).should == true +# end +# it "should return nil if the directory does not exist" do +# @klass.include_deployments(@dir).should == nil +# end +# describe "existing directory" do +# before(:each) do +# ::File.stub!(:directory?).and_return true +# @contents = [] +# Dir.stub!(:[]).and_return @contents +# end +# it "should not be nil if the directory exists" do +# @klass.include_deployments(@dir).nil?.should == false +# end +# it "should call Dir.[] on the directory" do +# Dir.should_receive(:[]).with("#{@dir}/*").and_return [] +# @klass.include_deployments(@dir) +# end +# end +# end +# end +# end \ No newline at end of file spec/poolparty/extra/deployments_spec.rb @@ -1,13 +1,15 @@ require File.dirname(__FILE__) + '/../spec_helper' -class TestService - plugin :test_service do - def initialize(o={}, e=nil, &block) - super(&block) - end - def enable(o={}) - has_file(:name => "/etc/poolparty/lobos") - end +module PoolParty + module Plugin + class TestService < Plugin + def initialize(o={}, e=nil, &block) + super(&block) + end + def enable(o={}) + has_file(:name => "/etc/poolparty/lobos") + end + end end end @@ -214,14 +216,14 @@ describe "Cloud" do @cloud.instance_eval do @heartbeat = nil end - @hb = PoolpartyBaseHeartbeatClass.new + @hb = PoolParty::Plugin::Heartbeat.new end it "should call enable on the plugin call" do - @hb = PoolpartyBaseHeartbeatClass.new - PoolpartyBaseHeartbeatClass.stub!(:new).and_return @hb + @hb = PoolParty::Plugin::Heartbeat.new + PoolParty::Plugin::Heartbeat.stub!(:new).and_return @hb @cloud.send :add_poolparty_base_requirements - @cloud.poolparty_base_heartbeat.should == @hb + @cloud.heartbeat.should == @hb end describe "after adding" do before(:each) do @@ -234,19 +236,19 @@ describe "Cloud" do @cloud8 = cloud :tester do test_service end - @service = clouds[:tester].ordered_resources.select {|hsh| hsh.class == TestServiceClass }.first + @service = clouds[:tester].ordered_resources.select {|hsh| + hsh.name == "test_service" + }.first @files = @service.resource(:file) end it "should have a file resource" do - # @files.first.nil?.should == false - pending + @files.first.nil?.should == false end it "should have an array of lines" do @files.class.should == Array end - it "should not be empty" do - # @files.should_not be_empty - pending + it "should have the file /etc/poolparty/lobos" do + @files.first.name.should == "/etc/poolparty/lobos" end end end spec/poolparty/poolparty/cloud_spec.rb @@ -4,7 +4,7 @@ pool :poolpartyrb do # Configuration minimum_instances 1 - apachetest do + apache_test do enable_php site("poolpartyrb.com") end spec/poolparty/poolparty/configurers/files/ruby_basic.rb @@ -9,7 +9,7 @@ pool :poolpartyrb do :document_root => "/www/domain2", :server_name => "domain2.com" }) - end + end end spec/poolparty/poolparty/configurers/files/ruby_plugins.rb @@ -5,34 +5,27 @@ describe "Plugin" do before(:each) do reset! @c = cloud :test_plugin_model_cloud do - apachetest do + apache_test do site("heady", { :document_root => "/root" }) end end 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 = @c.apachetest + @plugin = @c.apache_test end - describe "storage" do - it "should be able to retrieve the plugin as a name" do - @c.plugin("apachetest").should_not be_nil - end - end - it "be of the class apachetesttestClass on the Kernel" do - @plugin.class.should == Kernel::ApachetestClass + it "be of the class apache_testtestClass on the Kernel" do + @plugin.class.should == PoolParty::Plugin::ApacheTest end it "should store the regsitered plugins in an array" do @plugin.should_not be_nil end it "should have the plugin name as a method on the cloud " do - @c.respond_to?(:apachetest).should == true + @c.respond_to?(:apache_test).should == true end describe "methods" do spec/poolparty/poolparty/plugin_model_spec.rb @@ -8,33 +8,33 @@ describe "Plugin" do before(:each) do reset! cloud :app_for_plugin do - apachetest do + apache_test do enable_php site("heady", { :document_root => "/root" }) end - apachetest do + apache_test do site("boob") end end - @plugin = clouds[:app_for_plugin].apachetest + @plugin = clouds[:app_for_plugin].apache_test end it "should not be empty" do - clouds[:app_for_plugin].apachetest.class.should == ApachetestClass + clouds[:app_for_plugin].apache_test.class.should == ::PoolParty::Plugin::ApacheTest end it "should set loaded == true" do - clouds[:app_for_plugin].apachetest.loaded.should == true + clouds[:app_for_plugin].apache_test.loaded.should == true end it "should have enable_php as a method" do - ApachetestClass.new.respond_to?(:enable_php).should == true + ::PoolParty::Plugin::ApacheTest.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[-2].class.should == @plugin.class - clouds[:app_for_plugin].apachetest + clouds[:app_for_plugin].apache_test clouds[:app_for_plugin].plugin_store[-2].class.should == @plugin.class end end spec/poolparty/poolparty/plugin_spec.rb @@ -1,28 +1,32 @@ -class WebServers - plugin :apachetest do - def loaded(o={}, &block) - @loaded ||= true - end - - def enable - end - - def enable_php - @php = true - end - - def php - @php ||= false - end +module PoolParty + module Plugin - def site(name=:domain1, opts={}) - virtual_host name, opts + class ApacheTest < Plugin + def loaded(o={}, &block) + @loaded ||= true + end + + def enable + end + + def enable_php + @php = true + end + + def php + @php ||= false + end + + def site(name=:domain1, opts={}) + virtual_host name, opts + end + + def virtual_host(name, opts={}) + opts = { + :document_root => opts[:document_root] || "/www/#{name}/" + } + end end - def virtual_host(name, opts={}) - opts = { - :document_root => opts[:document_root] || "/www/#{name}/" - } - end end end spec/poolparty/poolparty/test_plugins/webserver.rb @@ -1,10 +1,5 @@ require "#{::File.dirname(__FILE__)}/../../test_helper" -class PuppetResolverSpec - plugin :apache do - end -end - class TestPuppetResolver < Test::Unit::TestCase context "from a hash" do setup do test/poolparty/dependency_resolver/puppet_resolver_test.rb @@ -52,7 +52,7 @@ class TestCloudDsl < Test::Unit::TestCase should "call haproxy when adding enabled serivces" do @cloud.add_optional_enabled_services klasses = @cloud.plugin_store.map {|a| a.class.to_s.split("::")[-1] } - klasses.include?("HaproxyClass").should == true + klasses.include?("Haproxy").should == true end end test/poolparty/modules/cloud_dsl_test.rb @@ -15,7 +15,7 @@ class TestChefDeploy < Test::Unit::TestCase end should "place a resource on the cloud" do - @cloud.ordered_resources.first.class.should == ChefDeployClass + assert_equal PoolParty::Plugin::ChefDeploy, @cloud.ordered_resources.first.class end should "raise if :repo is not passed" do assert_raise ReposMissingError do test/poolparty/plugins/chef_deploy_test.rb @@ -15,7 +15,7 @@ class TestRailsDeploy < Test::Unit::TestCase end should "place a resource on the cloud" do - @cloud.ordered_resources.first.class.should == RailsDeployClass + assert_equal PoolParty::Plugin::RailsDeploy, @cloud.ordered_resources.first.class end should "raise if :repo is not passed" do assert_raise PoolParty::ReposMissingError do test/poolparty/plugins/rails_deploy_test.rb @@ -1,23 +1,18 @@ require "#{::File.dirname(__FILE__)}/../../test_helper" -class PluginClass - plugin :box do +module PoolParty + module Plugin + class Box < Plugin + end end end class TestPlugins < Test::Unit::TestCase context "services" do - # setup do - # reset! - # @tbc = TestBaseClass.new do - # box do - # end - # end - # end should " have array of availble plugins" do - assert Plugin.available.include?(Kernel::BoxClass) - assert Plugin.available.include?(Kernel::GitClass) + assert Plugin.available.include?(PoolParty::Plugin::Box) + assert Plugin.available.include?(PoolParty::Plugin::Git) end end test/poolparty/poolparty/plugin_test.rb @@ -1 +1 @@ -Subproject commit d24758aaf5fa642d858f7fc26cb93a61d9e8da99 +Subproject commit fe05bb0bb74c047e6a59fbe64fdb1bd54ec10d22 vendor/gems/rest-client 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 spec/poolparty/base_packages/haproxy_spec.rb spec/poolparty/base_packages/heartbeat_spec.rb d9f0af4a20ad2d110990ae64c8f3ef7a71935c8e fairchild fairchild@stimble.net http://github.com/auser/poolparty/commit/3209c62695e9456e07f926a3e6cf3db0721ebe2a 3209c62695e9456e07f926a3e6cf3db0721ebe2a 2009-05-28T21:02:44-07:00 2009-05-28T21:02:44-07:00 Move base_packages/* files to plugins/* Eliminate the plugin do method, just use class < Plugin to create plugins Remove all uses of virtual_resource, replaced with class < Plugin Break Apache plugin into multiple files FIXME: name on plugins Add an .rdebugrc 15e6a3e0988057913218062fc8dce3ef6cd05548 fairchild fairchild@stimble.net