auser-poolparty 0.2.63 → 0.2.64

data/Manifest.txt

@@ -49,7 +49,6 @@ config/requirements.rb
 examples/basic.rb
 examples/plugin_without_plugin_directory.rb
 examples/poolparty.rb
-examples/with_apache_plugin.rb
 generators/poolspec/USAGE
 generators/poolspec/poolspec_generator.rb
 generators/poolspec/templates/pool_spec_template.erb

data/bin/pool-list

@@ -14,7 +14,7 @@ o.loaded_pools.each do |pool|
   with_pool(pool) do
     puts header("Listing pool #{name}")
     clouds.each do |name, cloud|
-      puts subheader("Cloud: #{name}")
+      puts subheader("Cloud: #{name} (#{cloud.keypair})")
       with_cloud(cloud) do
         puts header("Listing cloud #{name}")
         puts subheader("Active instances")

data/bin/server-update-hosts

@@ -7,11 +7,17 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Update hosts for local pool named [name]')    { |p| optioner.poolname p }
 end
 
-o.loaded_pools.each do |pool|
+o.loaded_pools.each do |pool|  
   with_pool(pool) do
+    puts "Pool: #{name}"
     pool_clouds.each do |cl|
       
+      vputs "Cloud: #{cl.name}"
+      
       new_hosts_listing = returning Array.new do |arr|
+        
+        puts cl.list_of_running_instances
+        
         cl.list_of_running_instances.each do |ri|
           vputs ri.hosts_file_listing_for(cl)
           arr << ri.hosts_file_listing_for(cl)
@@ -24,6 +30,8 @@ o.loaded_pools.each do |pool|
         end
       end.join("\n")
       
+      puts new_hosts_listing
+      
       if testing
         puts new_hosts_listing
       else
@@ -33,7 +41,7 @@ o.loaded_pools.each do |pool|
           new_hosts_listing.split(/\n/).each do |line|
             parts = line.split(/\t/).map {|a| a.chomp }
             ip,hostname,aliases = parts[0], parts[1], parts[2..-1]
-            
+            puts "ip: #{ip} for #{hostname}"
             arr << PoolParty::Resources::Host.new(:ip => ip, :name => Resolv::DNS.new.getaddress(hostname), :alias => aliases).to_string
           end
         end

data/examples/plugin_without_plugin_directory.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + "/pool/test_plugins/webserver"
-
 pool :app do
+  require File.dirname(__FILE__) + "/pool/test_plugins/webserver"
   
   instances 2..10
   

data/lib/poolparty/base_packages/haproxy.rb

@@ -2,7 +2,7 @@ module PoolParty
   class Base
     plugin :haproxy do
       
-      def enable        
+      def enable
         execute_on_master do
           has_package({:name => "haproxy"})
 

data/lib/poolparty/base_packages/poolparty.rb

@@ -42,7 +42,7 @@ module PoolParty
         
         has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger")
         has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")
-        has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts")
+        has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
         
         # execute_on_node do
         has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
@@ -76,11 +76,11 @@ module PoolParty
           end
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty")
-            command(". /etc/profile && cloud-handle-load")
+            command(". /etc/profile && cloud-handle-load -n #{cloud.name}")
           end
           has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/2") do
             requires get_gempackage("poolparty")
-            command ". /etc/profile && cloud-ensure-provisioning"
+            command ". /etc/profile && cloud-ensure-provisioning -n #{cloud.name}"
           end
           # has_runit_service("client_server", "pm_client", File.join(File.dirname(__FILE__), "..", "templates/messenger/client/"))
           # has_runit_service("master_server", "pm_master", File.join(File.dirname(__FILE__), "..", "templates/messenger/master/"))

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -23,9 +23,6 @@ module PoolParty
             output << @prestring || ""
 
             if resources && !resources.empty?
-              # @cp = classpackage_with_self(self)
-              # output << @cp.to_string
-              # output << "include #{@cp.name.downcase.sanitize}"
               output << resources_string_from_resources(resources, pre)
             end
             

data/lib/poolparty/helpers/console.rb

@@ -17,11 +17,11 @@ module PoolParty
     end
     
     def extract_cloud_from_options(o)
-      o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : [clouds[clouds.keys.sort.first]]
+      o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds.collect {|n,cl| cl}
     end
     
     def extract_pool_from_options(o)
-      o.poolname ? [pool(o.poolname.downcase.to_sym)] : [pools[pools.keys.sort.first]]
+      o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools.collect {|n,pl| pl}
     end
     
     # Clear all the pools and reload the console

data/lib/poolparty/helpers/provisioners/master.rb

@@ -135,9 +135,7 @@ wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=tru
 echo "(Re)starting poolparty"
 . /etc/profile
 # /etc/init.d/puppetmaster stop #{unix_hide_string}
-ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/ssl;puppetmasterd --verbose
-# # Start it back up
-/etc/init.d/puppetmaster start
+ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
         EOS
       end
       
@@ -194,7 +192,7 @@ cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolpa
       def restart_puppetd
         <<-EOS
 echo "Running puppet manifest"
-/bin/sh /usr/bin/puppetrunner
+/bin/sh /usr/bin/puppetrerun
         EOS
       end
     end

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -10,12 +10,16 @@ module PoolParty
     
     # Store block
     def store_block(&block)
-      @stored_block ||= block
+      @stored_block ||= block ? block : nil
+    end
+    
+    def stored_block
+      @stored_block
     end
     
     # This will run the blocks after they are stored if there is a block
     # associated
-    def run_stored_block      
+    def run_stored_block
       self.run_in_context @stored_block if @stored_block
     end
     
@@ -80,6 +84,7 @@ module PoolParty
     def context_stack
       @@context_stack ||= []
     end
+    
     def run_setup(parent, should_set_parent=true, &block)
       context_stack.push parent
       
@@ -91,13 +96,13 @@ module PoolParty
     
     # Set the parent on the resource
     def set_parent(sink_options=true)
-      # unless context_stack.last == self
+      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
     end
             
     def number_of_resources
@@ -111,5 +116,17 @@ module PoolParty
       @parent ||= nil
     end
     
+    def plugin_store
+      @plugin_store ||= []
+    end
+    
+    def realize_plugins!
+      plugin_store.each {|plugin| plugin.realize! }
+    end
+    
+    def plugin_store
+      @plugins ||= []
+    end
+    
   end
 end

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

@@ -1,17 +1,18 @@
 class EC2ResponseObject
   def self.get_descriptions(resp)      
-    rs = get_response_from(resp)
-
+    rs = get_instance_from_response(resp)
+    group = get_group_from_response(resp)
+    
     # puts rs.methods.sort - rs.ancestors.methods
     out = begin
       if rs.respond_to?(:instancesSet)
-        [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item)]
+        [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item, group)]
       else
         rs.collect {|r| 
           if r.instancesSet.item.class == Array
-            r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t)}
+            r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t, group)}
           else
-            [EC2ResponseObject.get_hash_from_response(r.instancesSet.item)]
+            [EC2ResponseObject.get_hash_from_response(r.instancesSet.item, group)]
           end            
         }.flatten.reject {|a| a.nil? }
       end
@@ -22,7 +23,7 @@ class EC2ResponseObject
 
     out
   end
-  def self.get_response_from(resp)
+  def self.get_instance_from_response(resp)
     begin
       rs = resp.reservationSet.item unless resp.reservationSet.nil?
       rs ||= resp.DescribeInstancesResponse.reservationSet.item
@@ -33,7 +34,20 @@ class EC2ResponseObject
     end
     rs
   end
-  def self.get_hash_from_response(resp)      
+  def self.get_group_from_response(resp)
+    begin
+      resp = resp.reservationSet.item.first if resp.reservationSet.item.is_a?(Array)
+      group = resp.reservationSet.item.groupSet.item.groupId unless resp.reservationSet.nil?
+      group ||= resp.groupSet.item[0].groupId rescue nil
+      group ||= resp.DescribeInstancesResponse.reservationSet.item.groupSet.item.groupId
+      #rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
+      #rs.reject! {|a| a.nil? || a.empty? }
+    rescue Exception => e
+      resp
+    end
+    group
+  end
+  def self.get_hash_from_response(resp, group = 'default')
     begin
       {
         :instance_id => resp.instanceId,
@@ -42,8 +56,8 @@ class EC2ResponseObject
         :status => resp.instanceState.name,
         :launching_time => resp.launchTime.parse_datetime,
         :internal_ip => resp.privateDnsName,
-        :keypair => resp.keyName
-        # :security_group => resp.groupSet.item[0].groupId
+        :keypair => resp.keyName,
+        :security_group => group
       }        
     rescue Exception => e
       nil

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

@@ -24,11 +24,11 @@ begin
           :maxCount => num,
           :key_name => (keypair || Base.keypair),
           :availability_zone => nil,
-          :size => "#{size || Base.size}",
-          :group_id => ["#{security_group || 'default'}"])
+          :instance_type => "#{size || Base.size}",
+          :group_id => ["#{security_group || Base.security_group}"])
         begin
           h = EC2ResponseObject.get_hash_from_response(instance)
-          h = instance.instancesSet.item.first
+          #h = instance.instancesSet.item.first
         rescue Exception => e
           h = instance
         end
@@ -43,11 +43,11 @@ begin
         describe_instances.select {|a| a[:name] == id}[0] rescue nil
       end
       def describe_instances
-        @id = 0
+        id = 0
         get_instances_description.each_with_index do |h,i|
           if h[:status] == "running"
-            inst_name = @id == 0 ? "master" : "node#{@id}"
-            @id += 1
+            inst_name = id == 0 ? "master" : "node#{id}"
+            id += 1
           else
             inst_name = "#{h[:status]}_node#{i}"
           end
@@ -58,7 +58,7 @@ begin
             :index => i,
             :launching_time => (h[:launching_time])
           })
-        end.sort_by {|a| a[:index] }
+        end.sort {|a,b| a[:index] <=> b[:index] }
       end
       # Get the s3 description for the response in a hash format
       def get_instances_description

data/lib/poolparty/net/remoter_base.rb

@@ -70,17 +70,17 @@ module PoolParty
         name = (i.zero? ? "master" : "node#{i}")
         list.select {|i| i.name == name }.first
       end
-      def remote_instances_list
-        # puts "> #{@containing_cloud.name} - #{@containing_cloud.class}"
+      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)
-        key = keyp ? keyp : keypair
+        tmp_key = (keyp ? keyp : keypair).to_s
         unless @describe_instances
-          tmpInstanceList = describe_instances.select {|a| key ? a[:keypair] == key : true }
+          tmpInstanceList = describe_instances.select {|a| a if tmp_key ? a[:keypair] == tmp_key : true }
           has_master = !tmpInstanceList.select {|a| a[:name] == "master" }.empty?          
           if has_master
             @describe_instances = tmpInstanceList
@@ -111,7 +111,6 @@ module PoolParty
       # Reset the cache of descriptions
       def reset_remoter_base!
         @describe_instances = nil
-        reset_base!
       end
       def self.included(other)
         PoolParty.register_remote_base(self.class.to_s.downcase.to_sym)

data/lib/poolparty/plugins/deploydirectory.rb

@@ -28,9 +28,9 @@ module PoolParty
       end
       
       def sync_directories
-        # execute_on_master do
+        execute_on_node do
           has_rsyncmirror(:dir => cwd, :name => "deploydirectory-#{name}")
-        # end
+        end
       end
       
       def from(dir)

data/lib/poolparty/pool/base.rb

@@ -27,9 +27,10 @@ module PoolParty
       :proxy_mode => "http",
       # EC2 Options
       :ami => "ami-1cd73375",
+      :size => 'm1.small', # must be 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'
+      :security_group => ["default"],
       # Options that should not be touched pretty much ever
-      :manifest_path => "/etc/puppet/manifests",
-      :security_group => ["default"] 
+      :manifest_path => "/etc/puppet/manifests"
     })
         
     # Class methods

data/lib/poolparty/pool/cloud.rb

@@ -18,7 +18,7 @@ module PoolParty
     end
     
     class Cloud
-      attr_reader :name, :templates
+      attr_reader :templates
       include PoolParty::PluginModel
       include PoolParty::Resources      
       include PrettyPrinter
@@ -42,38 +42,41 @@ module PoolParty
         :polling_time => "30.seconds"
       })
       
-      def initialize(name, parent=self, &block)
-        @cloud_name = @name = name
-        
-        setup_defaults
+      def initialize(name, pare=self, &block)
+        @cloud_name = name
+        @cloud_name.freeze
+                
         plugin_directory "#{::Dir.pwd}/plugins"
-        
-        p = parent if parent.is_a?(PoolParty::Pool::Pool)        
+                
+        p = pare.is_a?(PoolParty::Pool::Pool) ? pare : nil
         run_setup(p, &block)
         
         # set_parent(parent) if parent && !@parent
-        # self.run_in_context parent, &block if block        
+        # self.run_in_context parent, &block if block
+        setup_defaults
+        reset_remoter_base!
+        realize_plugins!
       end
       
       def setup_defaults
         # this can be overridden in the spec, but ec2 is the default
-        self.using :ec2        
+        self.using :ec2
+        generate_keypair unless has_keypair?
       end
-                              
-      # Keypairs
-      # If the parent (pool) doesn't have a keypair defined on it, then generate one based on the 
-      # pool_name and the cloud_name
-      def keypair(*args)
-        has_keypair? ? options[:keypair] : generate_keypair(*args)
+      
+      def name
+        @cloud_name
       end
+                                    
+      # Keypairs
       # Let's just make sure that the keypair exists on the options
       def has_keypair?
-        options.has_key?(:keypair) && options[: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] = args.length > 0 ? args[0] : "#{@parent && @parent.respond_to?(:name) ? @parent.name : ""}_#{@name}"
+        options[:keypair] = "#{parent && parent.is_a?(PoolParty::Pool::Pool) ? parent.name : "poolparty"}_#{name}" unless has_keypair?
       end
       
       # Prepare to send the new configuration to the instances
@@ -149,14 +152,16 @@ module PoolParty
             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
-          
-          resources.each do |type, res|
-            str << "# #{type.to_s.pluralize}"
-            str << res.to_string
-          end          
 
           str << "# Custom functions"
           str << Resources::CustomResource.custom_functions_to_string

data/lib/poolparty/pool/plugin.rb

@@ -1,7 +1,7 @@
 module PoolParty
       
   module Plugin
-    
+        
     class Plugin
       include Configurable
       include CloudResourcer
@@ -11,9 +11,19 @@ module PoolParty
       
       default_options({})
       
-      def initialize(p=self, opts={}, &block)        
-        run_setup(p, &block)
-        enable unless block
+      def initialize(p=self, opts={}, &block)
+        store_block &block
+        run_setup(p)
+        realize! unless block
+      end
+            
+      def realize!(force=false)
+        force ? force_realize! : (@realized ? nil : force_realize!)
+      end
+      
+      def force_realize!
+        run_setup(parent, false, &stored_block)
+        enable unless stored_block
       end
       
       # Overwrite this method

data/lib/poolparty/pool/plugin_model.rb

@@ -27,7 +27,6 @@ module PoolParty
         klass = class_string_name.class_constant(PoolParty::Plugin::Plugin)
         mod = class_string_name.module_constant(&block)
         
-        # klass.extend PoolParty::Resources
         klass.send :include, mod
         
         # Store the name of the class for pretty printing later
@@ -35,7 +34,10 @@ module PoolParty
         # Add the plugin definition to the cloud as an instance method
         Cloud::Cloud.class_eval <<-EOE
           def #{name}(parent=self, &block)
-            @#{class_string_name.downcase} ||= #{class_string_name.class_constant}.new(parent, &block)
+            @pa = parent
+            @#{class_string_name.downcase} ||= returning #{class_string_name.class_constant}.new(parent, &block) do |pl|
+              @pa.plugin_store << pl
+            end
           end
         EOE
       end

data/lib/poolparty/pool/pool.rb

@@ -20,7 +20,6 @@ module PoolParty
     end
 
     class Pool
-      attr_accessor :name
       include PoolParty::Cloud
       include MethodMissingSugar
       # include PluginModel
@@ -37,11 +36,16 @@ module PoolParty
       def initialize(name,&block)
         setup_defaults
         
-        @name = name
+        @pool_name = name
+        @pool_name.freeze
         # run_in_context &block if block
         run_setup(self, &block)
       end
       
+      def name
+        @pool_name
+      end
+      
       def setup_defaults
         plugin_directory "#{::Dir.pwd}/plugins" 
       end

data/lib/poolparty/pool/resource.rb

@@ -60,7 +60,7 @@ module PoolParty
     def custom_file(path, str)
       write_to_file_in_storage_directory(path, str)
     end
-    
+        
     class Resource
       attr_accessor :prestring, :poststring
       
@@ -137,6 +137,14 @@ module PoolParty
       def loaded(opts={}, parent=self)
       end
       
+      def cloud
+        @pa = parent
+        while !(@pa.is_a?(PoolParty::Cloud::Cloud) || @pa.nil? || @pa == self)
+          @pa = @pa.parent
+        end
+        @pa
+      end      
+      
       # DSL Overriders
       include PoolParty::ResourcingDsl
       

data/lib/poolparty/pool/resources/class_package.rb

@@ -24,7 +24,6 @@ module PoolParty
     def classpackage_with_self(parent=self, &block)
       name = (parent.options.name || Classpackage.name(parent).to_s).sanitize
       if in_global_classpackages?(name)
-        puts "#{name} already a class in the global storage"
         returning get_from_global_classpackage_store(name) do |cls|
           cls.run_in_context(parent, &block) if block
         end
@@ -66,12 +65,21 @@ module PoolParty
       end
                         
       def to_string(pre="")
-        "" unless resources.size > 0
-        returning Array.new do |output|
-          output << "#{pre}class #{name.sanitize.downcase} {"
-          output << "#{pre}#{resources_string_from_resources(resources)}"
-          output << "#{pre}}"
-        end.join("\n")
+        if resources.size > 0 && not_printed?
+          returning Array.new do |output|
+            output << "#{pre}class #{name.sanitize.downcase} {"
+            output << "#{pre}#{resources_string_from_resources(resources)}"
+            output << "#{pre}}"
+            output << include_string
+            @not_printed = false
+          end.join("\n")
+        else
+          ""
+        end
+      end
+      
+      def not_printed?
+        @not_printed ||= true
       end
       
       def include_string

data/lib/poolparty/pool/resources/conditional.rb

@@ -2,16 +2,16 @@ module PoolParty
   module Resources
     
     def execute_on_master(parent=self, &block)
-      execute_if("$hostname", "==", "master", {}, parent, &block)
+      execute_if("$hostname", "master", {}, parent, &block)
     end
     
     def execute_on_node(parent=self, &block)
-      execute_if("$hostname", "!=", "master", {:notequal => true}, parent, &block)
+      execute_if("$hostname", "master", {:notequal => true}, parent, &block)
     end
     
-    def execute_if(attr_s="$hostname", comparison="==", str="", cust_opts={}, parent=self, &block)
+    def execute_if(attr_s="$hostname", str="", cust_opts={}, parent=self, &block)
       # parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
-      opts = {:attribute => attr_s, :equal => str, :comparison => comparison}.merge(cust_opts)
+      opts = {:attribute => attr_s, :equal => str}.merge(cust_opts)
       options = (parent.respond_to?(:options) && parent && parent != self) ? parent.options.merge!(opts) : opts
       # @c = PoolParty::Resources::Conditional.new(options, parent, &block)
       # conditional(options, parent, &block)
@@ -21,7 +21,7 @@ module PoolParty
     class Conditional < Resource
       
       def initialize(opts={}, parent=self, &block)
-        name "#{opts[:name] ? opts[:name] : opts[:attribute]} #{opts[:comparison]} #{opts[:equal]}"
+        name "#{opts[:name] ? opts[:name] : opts[:attribute]} #{opts[:equal]}"
         attribute opts[:attribute]
         equal opts[:equal]
         notequal opts.has_key?(:notequal) ? opts[:notequal] : false

data/lib/poolparty/pool/script.rb

@@ -22,12 +22,17 @@ module PoolParty
     
     def self.for_save_string(in_cloud=nil)
       returning Array.new do |out|
-        (in_cloud ? [in_cloud] : clouds.collect {|n,cl| cl }).each do |cl|
-          out << <<-EOE
-cloud :#{cl.name} do
-#{cl.minimum_runnable_options.map {|o| "\t#{o} #{cl.send(o).respec_string}"}.join("\n")}
+        pools.collect {|n,pl| pl}.each do |pl|
+          
+          (in_cloud ? [in_cloud] : clouds.collect {|n,cl| cl }).each do |cl|
+            out << <<-EOE
+pool :#{pl.name} do
+  cloud :#{cl.name} do
+    #{cl.minimum_runnable_options.map {|o| "#{o} #{cl.send(o).respec_string}"}.join("\n")}
+  end
 end
-          EOE
+            EOE
+          end          
         end
       end.join("\n")
     end

data/lib/poolparty/templates/puppetrerun

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 
 . /etc/profile
-/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master)]; then
+  echo "Run successfully"
+  else
+  ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
+  /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+fi

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.63
+  version: 0.2.64
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,6 @@ files:
 - examples/basic.rb
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
-- examples/with_apache_plugin.rb
 - generators/poolspec/USAGE
 - generators/poolspec/poolspec_generator.rb
 - generators/poolspec/templates/pool_spec_template.erb

data/spec/poolparty/pool/cloud_spec.rb

@@ -80,6 +80,13 @@ describe "Cloud" do
       it "should be able to pull the pool from the cloud" do
         @cloud.parent == @pool
       end
+      it "should have the outer pool listed as the parent of the inner cloud" do
+        @pool = pool :knick_knack do
+          cloud :paddy_wack do            
+          end
+        end
+        cloud(:paddy_wack).parent.should == pool(:knick_knack)
+      end
       it "should have services in an array" do
         @cloud.services.class.should == Array
       end
@@ -289,9 +296,6 @@ describe "Cloud" do
 
               File.open("test_manifest.pp", "w+") {|f| f << @manifest}
             end
-            it "should include the hosts for all the listed local instances" do
-              @manifest.should =~ /master \{/
-            end
           end
           describe "building with an existing manifest" do
             before(:each) do

data/spec/poolparty/pool/example_spec.rb

@@ -24,89 +24,5 @@ describe "basic" do
   end
   it "should set the minimum_instances on the db cloud to 3" do
     pool(:app).cloud(:db).minimum_instances.should == 3
-  end  
-  describe "with_apache_plugin" do
-    before(:each) do
-      reset!
-      PoolParty::Script.inflate(open(@example_dir + "/with_apache_plugin.rb").read, File.dirname(__FILE__))
-    end
-    it "should have one pool called :app" do
-      pool(:app).should_not be_nil
-    end
-    it "should have a cloud called :app" do
-      pool(:app).cloud(:app).should_not be_nil
-    end
-    it "should have a cloud called :db" do
-      pool(:app).cloud(:db).should_not be_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
-    end
-    it "should set the maximum_instances on the cloud to 10" do
-      pool(:app).cloud(:app).maximum_instances.should == 10
-    end
-    it "should set the minimum_instances on the db cloud to 2" do
-      pool(:app).cloud(:db).minimum_instances.should == 2
-    end
-    it "should have included the apache plugin and given the class a method by the name of the plugin" do
-      pool(:app).cloud(:app).methods.include?("apache").should == true
-    end
-    describe "apache plugin" do
-      before(:each) do
-        @c = pool(:app).cloud(:app)
-      end
-      it "should have apache as the ApacheClass" do
-        @c.apache.class.should == PoolPartyApacheClass
-      end
-      it "should set php == true on the apache plugin" do
-        @c.apache.php.should == true
-      end
-      it "should store the method in options if it's not defined on the plugin" do
-        @c.enable_asp true
-        @c.options[:enable_asp].should == true
-      end
-    end
-  end
-  describe "plugin_without_plugin_directory" do
-    before(:each) do
-      reset!
-      PoolParty::Script.inflate(open(@example_dir + "/plugin_without_plugin_directory.rb").read, File.dirname(__FILE__))
-    end
-    it "should have one pool called :app" do
-      pool(:app).should_not be_nil
-    end
-    it "should have a cloud called :app" do
-      pool(:app).cloud(:app).should_not be_nil
-    end
-    it "should have a cloud called :db" do
-      pool(:app).cloud(:db).should_not be_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
-    end
-    it "should set the maximum_instances on the cloud to 10" do
-      pool(:app).cloud(:app).maximum_instances.should == 10
-    end
-    it "should set the minimum_instances on the db cloud to 2" do
-      pool(:app).cloud(:db).minimum_instances.should == 2
-    end
-    it "should have included the apache plugin and given the class a method by the name of the plugin" do
-      pool(:app).cloud(:app).methods.include?("apache").should == true
-    end
-    describe "apache plugin" do
-      before(:each) do
-        @c = pool(:app).cloud(:app)
-      end
-      it "should have apache as the ApacheClass" do
-        @c.apache.class.should == PoolPartyApacheClass
-      end
-      it "should set php == true on the apache plugin" do
-        @c.apache.php.should == true
-      end
-      it "should store the method in options if it's not defined on the plugin" do
-        @c.enable_asp true
-        @c.options[:enable_asp].should == true
-      end
-    end
   end
 end

data/spec/poolparty/pool/plugin_model_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+include PoolParty::Resources
 require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 describe "Plugin" do

data/spec/poolparty/pool/plugin_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 include PoolParty::Resources
+require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 describe "Plugin" do
   before(:each) do
@@ -93,6 +93,19 @@ describe "Plugin" do
       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).and_return true
+          @cloud = cloud :app do
+            apache
+          end
+        end
+      end
     end
   end
 end

data/spec/poolparty/pool/resource_spec.rb

@@ -363,6 +363,21 @@ describe "Resource" do
                 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

data/spec/poolparty/pool/resources/conditional_spec.rb

@@ -9,17 +9,17 @@ describe "Conditional" do
   describe "wrapped" do
     before(:each) do
       @cloud = cloud :conditional_cloud_spec do
-          execute_if("$hostname", "==", "'master'", {}, self) do
+          execute_if("$hostname","'master'", {}, self) do
             has_file({:name => "/etc/apache2/puppetmaster2.conf"})
           end
       end
-      @cond = @cloud.get_resource(:conditional, "$hostname == 'master'")
+      @cond = @cloud.get_resource(:conditional, "$hostname 'master'")
     end
     it "should add the block of resources on the parent" do
       @cloud.resources.size.should == 1
     end
     it "should have a conditional in the resources" do
-      @cond.name.should == "$hostname == 'master'"
+      @cond.name.should == "$hostname 'master'"
     end
     it "should push the resources onto the conditional resource" do
       @cond.resources.size.should == 1
@@ -34,12 +34,12 @@ describe "Conditional" do
       it "should have execute_on_master with the string $hostname == 'master'" do
         str = execute_on_master do
           has_file(:name => "/etc/vars")
-        end.to_string.should =~ /\$hostname==master/
+        end.to_string.should =~ /\$hostnamemaster/
       end
       it "should have execute_on_node with the string $hostname != 'master'" do
         str = execute_on_node do
           has_file(:name => "/etc/vars")
-        end.to_string.should =~ /\$hostname!=master/
+        end.to_string.should =~ /\$hostnamemaster/
       end
     end
     describe "to_string" do
@@ -65,6 +65,13 @@ describe "Conditional" do
           @cloud.resource(:conditional).size.should == 2
         end
       end
+      describe "execute on node" do
+        it "should place the node in the default section" do
+          str = execute_on_node do
+            has_file(:name => "/etc/vars")
+          end.to_string.should =~ /default : \{/
+        end
+      end
     end
   end
 end

data/spec/poolparty/pool/script_spec.rb

@@ -49,7 +49,6 @@ describe "Script" do
             ami "ami-123456"
             
             cloud :app do
-              security_group "app"
               expand_when "cpu > 90", "memory > 80"
               contract_when "cpu < 10", "memory < 10"
               
@@ -64,9 +63,6 @@ describe "Script" do
         it "should save the ami" do
           @saved.should =~ /ami 'ami-123456'/
         end
-        it "should save the security group" do
-          @saved.should =~ /security_group 'app'/
-        end
         it "should save the expansions" do
           @saved.should =~ /expand_when 'cpu>90', 'memory>80'/
         end

data/spec/poolparty/pool/test_plugins/webserver.rb

@@ -1,5 +1,6 @@
 class WebServers
   plugin :apache do
+    include PoolParty::Resources
     
     attr_accessor :php
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.63
+  version: 0.2.64
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,6 @@ files:
 - examples/basic.rb
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
-- examples/with_apache_plugin.rb
 - generators/poolspec/USAGE
 - generators/poolspec/poolspec_generator.rb
 - generators/poolspec/templates/pool_spec_template.erb

data/examples/with_apache_plugin.rb

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-pool :app do
-  
-  plugin_directory File.join(File.dirname(__FILE__), "pool", "test_plugins")
-  instances 2..10
-  
-  cloud :app do
-    # minimum 2 instances
-    # maximum 10 instances
-    apache do
-      enable_php
-    end    
-  end
-  
-  cloud :db do
-    # minimum 2 instances
-    # maximum 10 instances
-    mysql # default mysql setup    
-  end
-  
-end