auser-poolparty 1.2.8 → 1.2.9

data/lib/poolparty/{base_packages → plugins}/haproxy.rb

@@ -2,8 +2,8 @@
   Enables haproxy for a cloud
 =end
 module PoolParty
-  class Base
-    plugin :haproxy do
+  module Plugin
+    class Haproxy < Plugin
       
       default_options(
         :port => 80,

data/lib/poolparty/{base_packages → plugins}/heartbeat.rb

@@ -1,16 +1,16 @@
 module PoolParty
-  class Base
-    plugin :poolparty_base_heartbeat do
+  module Plugin
+    class Heartbeat < Plugin
       
-      def enable        
-
+      def enable
+        
         has_package({:name => "heartbeat-2"})
         has_package({:name => "heartbeat-2-dev"})
         
         has_service("heartbeat")
-          
+        
       end
-
-    end  
+      
+    end 
   end
 end

data/lib/poolparty/plugins/line_in_file.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

data/lib/poolparty/plugins/plugin_template.rb

@@ -0,0 +1,13 @@
+module PoolParty
+  module Plugin
+    # Usage: 
+    # 
+    # plugin_name :optional=>'option if any'  do
+    #   extras :cli, :pspell, :mysql
+    # end
+    
+    class EmptyPlugin < Plugin
+    end
+  end
+  
+end

data/lib/poolparty/{base_packages/poolparty.rb → plugins/poolparty_base_packages.rb}

@@ -1,6 +1,6 @@
 module PoolParty
-  class Base
-    plugin :poolparty_base_packages do
+  module Plugin
+    class PoolPartyBasePackages < Plugin
       
       def enable        
         has_cron "/usr/bin/server-manage-election" do

data/lib/poolparty/plugins/rails_deploy.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
       

data/lib/poolparty/{base_packages → plugins}/ruby.rb

@@ -1,6 +1,6 @@
 module PoolParty
-  class Base
-    plugin :poolparty_base_ruby do
+  module Plugin
+    class Ruby < Plugin
       
       def enable
         install_base_packages
@@ -8,7 +8,7 @@ module PoolParty
       
       def install_base_packages
         has_package(:name => "libreadline-ruby1.8")
-        has_package(:name => "libruby1.8")                
+        has_package(:name => "libruby1.8")
         has_package(:name => "ruby1.8-dev")
         has_package(:name => "ruby1.8")
         

data/lib/poolparty/{base_packages → plugins}/runit.rb

@@ -3,8 +3,8 @@
   NOT IMPLEMENTED YET
 =end
 module PoolParty
-  class Base
-    plugin :poolparty_base_runit do
+  module Plugin
+    class PoolPartyBaseRunit < Plugin
       
       def enable
         unless enabled
@@ -13,7 +13,7 @@ module PoolParty
           has_exec(:name => "/sbin/start runsvdir", :cwd => "/var/service")
           # has_remotefile(:name => "/etc/event.d/runsvdir", :notify => get_exec("/sbin/start runsvdir"))
           enabled true
-        end          
+        end
       end
       
     end

data/lib/poolparty/plugins/svn.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)}"))

data/lib/poolparty/poolparty/cloud.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + "/plugin_model"
 require File.dirname(__FILE__) + "/resource"
 
 module PoolParty    
@@ -42,14 +41,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
@@ -95,7 +93,7 @@ module PoolParty
         
         setup_callbacks
         
-        plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins"        
+        plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins"
         before_create
         super
         after_create
@@ -277,7 +275,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 +375,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

data/lib/poolparty/poolparty/default.rb

@@ -3,7 +3,7 @@
   This handles user interaction, loading the parameters, etc.
 =end
 require "open-uri"
-require "ftools"
+require "fileutils"
 module PoolParty
   class Default
     include Dslify

data/lib/poolparty/poolparty/plugin.rb

@@ -3,36 +3,34 @@ require "#{::File.dirname(__FILE__)}/../provision/boot_strapper.rb"
 
 module PoolParty
   module Plugin
+    
+    def self.available
+      @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
+        run_in_context {  before_load(opts, &block) }
         
-        block = Proc.new {enable} unless 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
@@ -70,9 +68,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

data/lib/poolparty/poolparty/pool.rb

@@ -44,8 +44,13 @@ module PoolParty
         super(&block)
       end
       
+      
       def self.load_from_file(filename=nil)
         # a = new ::File.basename(filename, ::File.extname(filename))
+        #TODO: load any user defined monitors plugins verifiers before the cloud spec is evaled
+        #%w(monitors plugins verifiers).each do |lib|
+        #  Dir[File.join(::File.dirname(::File.basename(filename)), lib, '*')].each{|f| require f }
+        # end
         File.open(filename, 'r') do |f|
           instance_eval f.read, pool_specfile
         end
@@ -58,8 +63,7 @@ module PoolParty
 
       def parent;nil;end
       
-      def setup_defaults        
-        PoolParty::Extra::Deployments.include_deployments "#{Dir.pwd}/deployments"
+      def setup_defaults
       end
       
       def pool_clouds

data/lib/poolparty/poolparty/poolparty_base_class.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
@@ -120,7 +113,8 @@ module PoolParty
         opts = (opts.is_a?(Hash) ? extra_opts.merge(opts) : extra_opts).merge(:name => temp_name)
         
         # opts.merge!(:name => temp_name) unless opts.has_key?(:name)
-        res = if PoolParty::Resources::Resource.available_resources.include?(ty.to_s.camelize)
+        res = if (PoolParty::Resources::Resource.available_resources.include?(ty.to_s.camelize) || 
+                  PoolParty::Resources::Resource.available_resources.include?("PoolParty::Resources::#{ty.to_s.camelize}".camelize.constantize))
           "PoolParty::Resources::#{ty.to_s.camelize}".camelize.constantize.new(opts, &block)
         else
           "#{ty.to_s.camelize}".camelize.constantize.new(opts.merge(:name), &block)

data/lib/poolparty/poolparty/resource.rb

@@ -37,6 +37,7 @@ module PoolParty
       # those methods. Then we make sure we add these resources as available_resources
       # onto the class so we know it's available as a resource
       def self.inherited(subclass)
+        original_subclass = 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
@@ -59,7 +60,7 @@ module PoolParty
           PoolParty::PoolPartyBaseClass.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym)
           PoolParty::PoolPartyBaseClass.add_resource_lookup_method(lowercase_class_name)
           
-          available_resources << subclass
+          available_resources << original_subclass
         end
       end
       

data/lib/poolparty/poolparty/service.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 => (dsl_options[:name] ? dsl_options[:name] : self.class.to_s.split('::').pop.snake_case),
         :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

data/lib/poolparty/provision/dr_configure.rb

@@ -52,7 +52,7 @@ module PoolParty
      
      def prescribe_configuration
        ::FileUtils.mkdir_p "#{cloud.tmp_path}/dr_configure" unless ::File.directory?("#{cloud.tmp_path}/dr_configure")
-      ::File.cp $pool_specfile, "#{cloud.tmp_path}/dr_configure/clouds.rb"
+      ::FileUtils.cp $pool_specfile, "#{cloud.tmp_path}/dr_configure/clouds.rb"
       ::File.open "#{cloud.tmp_path}/dr_configure/clouds.json", "w" do |f|
         f << cloud.to_json
       end
@@ -99,7 +99,7 @@ module PoolParty
          'chmod 644 /var/poolparty/dr_configure/clouds.rb',
          'cp /var/poolparty/dr_configure/clouds.json /etc/poolparty',
          'cp /var/poolparty/dr_configure/clouds.rb /etc/poolparty',
-         'server-manage-election', #ensures that the monitor gets some data
+         # 'server-manage-election', #ensures that the monitor gets some data
          'echo "configure" >> /var/poolparty/POOLPARTY.PROGRESS'
          ]
        commands << self.class.class_commands unless self.class.class_commands.empty?
@@ -131,7 +131,7 @@ module PoolParty
        # cookie = (1..16).collect { chars[rand(chars.size)] }.pack("C*")
        cookie =  (1..65).collect {rand(9)}.join()
        cookie_file = ::File.open("#{cloud.tmp_path}/dr_configure/erlang.cookie", 'w+'){|f| f << cookie }
-       ::File.cp "#{::File.dirname(__FILE__)}/../templates/erlang_cookie_maker", "#{cloud.tmp_path}/dr_configure/"
+       ::FileUtils.cp "#{::File.dirname(__FILE__)}/../templates/erlang_cookie_maker", "#{cloud.tmp_path}/dr_configure/"
      end
      
      def self.class_commands