auser-poolparty 0.2.61 → 0.2.62

data/lib/poolparty/base_packages/poolparty.rb

@@ -37,17 +37,21 @@ module PoolParty
           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_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_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_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts")
+        
         # execute_on_node do
         has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
           requires get_gempackage("poolparty")
           command "/usr/bin/puppetrunner"
         end
+        has_cron(:name => "update_hosts", :user => Base.user, :minute => "0") do
+          command ". /etc/profile && server-update-hosts"
+        end
         has_remotefile(:name => "/usr/bin/puppetrunner") do
           mode 744
           template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner")
@@ -73,7 +77,7 @@ module PoolParty
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty")
             command(". /etc/profile && cloud-handle-load")
-          end          
+          end
           has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/2") do
             requires get_gempackage("poolparty")
             command ". /etc/profile && cloud-ensure-provisioning"

data/lib/poolparty/core/symbol.rb

@@ -11,4 +11,7 @@ class Symbol
   def sanitize
     self.to_s.sanitize
   end
+  def <=>(b)
+    "#{self}" <=> "#{b}"
+  end
 end

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -21,18 +21,18 @@ module PoolParty
         returning Array.new do |output|
           unless cancelled?
             output << @prestring || ""
-          
+
             if resources && !resources.empty?
-              @cp = classpackage_with_self(self)
-              output << @cp.to_string
-              output << "include #{@cp.name.sanitize}"
+              # @cp = classpackage_with_self(self)
+              # output << @cp.to_string
+              # output << "include #{@cp.name.downcase.sanitize}"
+              output << resources_string_from_resources(resources, pre)
             end
             
             unless virtual_resource?
-              output << "#{pre}#{class_type_name.downcase} {"
-              output << "#{pre}\"#{self.key}\":"
+              output << "#{pre}#{class_type_name.downcase} { #{pre}\"#{self.key}\":"
               output << opts.flush_out("#{pre*2}").join(",\n")
-              output << "#{pre}}"            
+              output << "#{pre}}"
             end
           
             output << @poststring || ""
@@ -40,6 +40,22 @@ module PoolParty
         end.join("\n")
       end
       
+      def resources_string_from_resources(res, pre="\t")
+        @variables = res.extract! {|name,resource| name == :variable}
+        returning Array.new do |str|
+          unless @variables.empty?
+            str << "\n# Variables"
+            @variables.each do |name, variable|
+              str << variable.to_string("#{pre}")
+            end          
+          end
+
+          res.each do |type, resource|
+            str << resource.to_string("#{pre*2}")
+          end
+        end.join("\n")
+      end
+      
       def to_s
         "#{class_type_name.capitalize}['#{key}']"
       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.first]]
+      o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : [clouds[clouds.keys.sort.first]]
     end
     
     def extract_pool_from_options(o)
-      o.poolname ? [pool(o.poolname.downcase.to_sym)] : [pools[pools.keys.first]]
+      o.poolname ? [pool(o.poolname.downcase.to_sym)] : [pools[pools.keys.sort.first]]
     end
     
     # Clear all the pools and reload the console

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

@@ -150,7 +150,6 @@ cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrerun /usr/bin/p
 cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrunner /usr/bin/puppetrunner
 chmod +x /usr/bin/puppetrerun
 chmod +x /usr/bin/puppetrunner
-/bin/sh /usr/bin/server-update-hosts
 EOE
       end
 
@@ -167,7 +166,7 @@ node default {
 node "#{ri.name}" inherits default {}
            EOS
          end
-"echo '#{str}' > #{Base.manifest_path}/../nodes/nodes.pp"
+"echo '#{str}' > #{Base.manifest_path}/nodes/nodes.pp"
       end
 
       def move_templates

data/lib/poolparty/net/remoter.rb

@@ -183,7 +183,7 @@ module PoolParty
         vputs ""
         vputs "Waiting for there to be no pending instances..."
         when_no_pending_instances do
-          wait "20.seconds"
+          when_all_assigned_ips {wait "20.seconds"}
           vputs ""
           vputs "Provisioning master..."
           

data/lib/poolparty/net/remoter_base.rb

@@ -73,7 +73,7 @@ module PoolParty
       def remote_instances_list
         # puts "> #{@containing_cloud.name} - #{@containing_cloud.class}"
         @containing_cloud = self
-        @remote_instances_list ||= list_of_instances(keypair).collect {|h| PoolParty::Remote::RemoteInstance.new(h, @containing_cloud) }
+        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

data/lib/poolparty/plugins/deploydirectory.rb

@@ -21,8 +21,8 @@ module PoolParty
         execute_on_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
-            command "cd #{parent.cwd}; tar -zxf #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz; rm #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz"
-            onlyif "test -f #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz"
+            command "cd #{cwd}; tar -zxf #{Base.remote_storage_path}/#{name.dir_safe}.tar.gz; rm #{Base.remote_storage_path}/#{name.dir_safe}.tar.gz"
+            onlyif "test -f #{Base.remote_storage_path}/#{name.dir_safe}.tar.gz"
           end
         end
       end

data/lib/poolparty/plugins/git.rb

@@ -8,17 +8,18 @@ module PoolParty
       end
             
       def has_git_repos
-        has_package(:name => "git-core")
-        
-        has_exec({:name => "git-#{name}", :requires => get_package("git-core"), :requires => [get_directory("#{cwd}"), get_package("git-core")]}) do          
-          command parent.user ? "git clone #{parent.user}@#{parent.source} #{parent.path}" : "git clone #{parent.source} #{parent.to ? parent.to : ""}"
-          cwd "#{parent.cwd if parent.cwd}"
-          creates "#{::File.join( (parent.cwd ? parent.cwd : cwd), ::File.basename(parent.source, ::File.extname(parent.source)) )}/.git"
-        end
-        has_exec(:name => "update-#{name}", :requires => get_exec("git-#{name}")) do
-          cwd ::File.dirname(get_exec("git-#{parent.name}").creates)
-          command "git pull"
-        end
+        has_package(:name => "git-core") do
+          has_exec({:requires => get_package("git-core"), :requires => [get_directory("#{cwd}")]}) do
+            name key
+            command user ? "git clone #{user}@#{source} #{path}" : "git clone #{source} #{to ? to : ""}"
+            cwd "#{cwd if cwd}"
+            creates "#{::File.join( (cwd), ::File.basename(source, ::File.extname(source)) )}/.git"
+          end
+          has_exec(:name => "update-#{name}") do
+            cwd ::File.dirname( get_exec(key).creates )
+            command "git pull"
+          end          
+        end                
       end
       
       def at(dir)

data/lib/poolparty/pool/cloud.rb

@@ -89,7 +89,7 @@ module PoolParty
         make_base_directory
         copy_misc_templates
         Base.store_keys_in_file
-        Script.save!
+        Script.save!(self)
         copy_ssh_key # not my favorite...
       end
       
@@ -145,12 +145,18 @@ module PoolParty
           # Refactor this into the resources method
           # TODO
           services.each do |service|
-            @cp = classpackage_with_self(service)
-            str << @cp.to_string
-            str << @cp.include_string
+            service.options.merge!(:name => service.name)
+            classpackage_with_self(service)
           end
           
-          str << resources_string_from_resources(resources)
+          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
@@ -158,7 +164,7 @@ module PoolParty
       end
       
       def build_from_existing_file
-        ::FileTest.file?("/etc/puppet/manifests/classes/poolparty.pp") ? open("/etc/puppet/manifests/classes/poolparty.pp").read : nil
+        ::FileTest.file?("#{Base.manifest_path}/classes/poolparty.pp") ? open("#{Base.manifest_path}/classes/poolparty.pp").read : nil
       end
       
       # To allow the remote instances to do their job,

data/lib/poolparty/pool/resource.rb

@@ -19,13 +19,14 @@ module PoolParty
     
     def add_resource(type, opts={}, parent=self, &block)      
       if in_resources?(type, opts[:name])        
-        get_resource(type, opts[:name], parent)
+        @res = get_resource(type, opts[:name], parent)
       else
-        returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|                    
+        @res = returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|                    
           store_into_global_resource_store(o)
           resource(type) << o          
         end
       end
+      @res
     end    
     def get_resource(ty, key, parent=self)
       resource(ty).select {|r| r.key == key }.first || get_from_global_resource_store(ty, key)
@@ -47,7 +48,7 @@ module PoolParty
     end
     #:nodoc:
     def reset_resources!
-      $global_resources = @resources = nil
+      $global_resources = $global_classpackage_store = @resources = nil
     end
         
     # def resources_string(pre="")
@@ -104,25 +105,31 @@ 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)
+      def initialize(opts={}, parent=self, &block)                        
+        run_setup(parent, &block)
         # Take the options of the parents
         set_vars_from_options(opts) unless opts.empty?
-        set_resource_parent(parent)
         
-        run_setup(parent, false, &block) if block
-        # self.run_in_context &block if block
+        set_resource_parent
+        
         loaded(opts, @parent)
       end
       
       # Helper to set the containing parent on the resource
-      def set_resource_parent(parent=nil)
-        if parent && parent != self
-          @parent = parent
-          if @parent.is_a?(PoolParty::Resources::Resource) && @parent.printable? && @parent.name != name
+      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)
+      end
             
       # Stub, so you can create virtual resources
       # This is called after the resource is initialized

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

@@ -1,12 +1,51 @@
 module PoolParty    
   module Resources
     
+    def global_classpackages
+      $global_classpackage_store ||= []
+    end
+    
+    def in_global_classpackages?(name)
+      !get_from_global_classpackage_store(name).nil?
+    end
+    
+    def get_from_global_classpackage_store(key)
+      global_classpackages.select {|a| a if key == a.name }.first
+    end
+    
+    def store_into_global_classpackage_store(r)
+      arr = r.is_a?(Array) ? r : [r]
+      arr.each do |a|
+        global_classpackages << a unless in_global_classpackages?(a.name)
+      end
+    end
+    
     # Wrap all the resources into a class package from 
     def classpackage_with_self(parent=self, &block)
-      @cp = PoolParty::Resources::Classpackage.new(parent.options, parent, &block)
-      @cp.run_in_context {@resources = parent.resources}
-      # parent.instance_eval {@resources = nil}
-      @cp
+      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
+      else
+        @@parent_resources = parent.resources
+        @@cp = parent.add_resource(:classpackage, parent.options.merge(:name => name), parent, &block)
+        @@cp = @@cp.is_a?(Array) ? @@cp[-1] : @@cp
+        
+        @@cp.run_in_context(parent) do
+          @@parent_resources.each do |ty, res|
+            resources[ty] = res unless ty == :classpackage
+          end
+        end
+        parent.instance_eval do
+          @resources = {:classpackage => [@@cp]}
+        end
+        @@cp.instance_eval &block if block
+        
+        store_into_global_classpackage_store(@@cp)
+      end      
+      return @@cp
     end
                 
     class Classpackage < Resource
@@ -22,48 +61,36 @@ module PoolParty
         # self.instance_eval &block if block
         run_setup(parent, &block) if block
         # self.run_in_context &block if block
-        # store_block(&block)        
+        # store_block(&block)
         loaded
       end
                         
-      def to_string
-        returning String.new do |output|
-          output << "# #{name.sanitize}"
-          output << "\nclass #{name.sanitize.downcase} {\n"
-          output << resources_string_from_resources(resources)
-          output << "\n}\n"
-        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")
       end
       
       def include_string
         "include #{name.sanitize.downcase}"
       end
       
-      def name(*args)
-        args.empty? ? (@name || (!parent.nil? && parent.name) || "custom_#{Time.now.to_i}") : @name ||= args.first
+      def virtual_resource?
+        true
       end
+      
       def printable?
         false
       end
+      
+      def self.name(parent=nil)
+        "custom_#{parent ? parent.object_id.to_s : "parent"}"
+      end
 
     end
     
-    def resources_string_from_resources(resources, pre="\t")
-      @variables = resources.extract! {|name,resource| name == :variable}
-      returning Array.new do |str|
-        unless @variables.empty?
-          str << "\n# Variables \n"
-          @variables.each do |name, variable|
-            str << variable.to_string("#{pre}")
-          end          
-        end
-        
-        resources.each do |type, resource|
-          str << "\n#{pre*2}# #{type}\n"
-          str << resource.to_string("#{pre*2}")
-        end        
-      end.join("\n")
-    end
-    
   end
 end

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

@@ -12,9 +12,10 @@ module PoolParty
     def execute_if(attr_s="$hostname", comparison="==", 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)
-      options = (parent.respond_to?(:options) && parent) ? parent.options.merge!(opts) : 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)
+      # conditional(options, parent, &block)
+      add_resource(:conditional, options, parent, &block)
     end
     
     class Conditional < Resource

data/lib/poolparty/pool/script.rb

@@ -20,22 +20,20 @@ module PoolParty
       blk.to_ruby(opts)
     end
     
-    def self.for_save_string
+    def self.for_save_string(in_cloud=nil)
       returning Array.new do |out|
-        clouds.each do |name, cl|
-          with_cloud(cl) do
-            out << <<-EOE
-cloud :#{name} do
+        (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")}
 end
-            EOE
-          end  
+          EOE
         end
       end.join("\n")
     end
     
-    def self.save!(to_file=true)
-      write_to_file_in_storage_directory(Base.default_specfile_name, for_save_string) if to_file
+    def self.save!(cl=nil,to_file=true)
+      write_to_file_in_storage_directory(Base.default_specfile_name, for_save_string(cl)) if to_file
       for_save_string
     end
     

data/lib/poolparty/templates/puppetcleaner

@@ -3,7 +3,4 @@
 # /var/lib/puppet/state/puppetdlock
 . /etc/profile
 ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
-/etc/init.d/puppetmaster stop
-rm -rf /etc/puppet/ssl
-/etc/init.d/puppetmaster start
-puppetmasterd --verbose
+/etc/init.d/puppetmaster stop;rm -rf /etc/puppet/ssl;/etc/init.d/puppetmaster start;puppetmasterd --verbose

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 61
+    TINY  = 62
 
     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.61
+  version: 0.2.62
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-17 00:00:00 -08:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/spec/poolparty/helpers/provisioner_base_spec.rb

@@ -102,9 +102,10 @@ describe "ProvisionerBase" do
         @cloud.stub!(:keypair_path).and_return "~/.ec2/fake_keypair"
         @cloud.stub!(:other_clouds).and_return []
         @cloud.stub!(:expand_when).and_return "cpu > 10"
-        Provisioner::Master.stub!(:new).and_return @provisioner
         @cloud.stub!(:copy_file_to_storage_directory).and_return true
         @cloud.stub!(:rsync_storage_files_to).and_return true
+        @cloud.stub!(:minimum_runnable_options).and_return []
+        Provisioner::Master.stub!(:new).and_return @provisioner
         @provisioner.stub!(:build_and_store_new_config_file).and_return true
         @provisioner.stub!(:process_clean_reconfigure_for!).and_return true
       end

data/spec/poolparty/plugins/git_spec.rb

@@ -14,7 +14,7 @@ describe "Remote Instance" do
       @tc = TestClass.new
     end
     it "should be a string" do
-      @tc.has_git(:name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec \{/
+      @tc.has_git(:name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec/
     end
     it "should included the flushed out options" do
       @tc.has_git({:name => "git.git", :source => "git://source.git", :user => "finger"}).to_string.should =~ /finger@git:/
@@ -25,7 +25,7 @@ describe "Remote Instance" do
     describe "in resource" do
       before(:each) do
         @tc.instance_eval do
-          git(:name => "gittr") do
+          has_git(:name => "gittr") do
             source "git://source.git"
             path "/var/www/xnot.org"
             symlink "/var/www/xnot.org/public"
@@ -33,7 +33,7 @@ describe "Remote Instance" do
         end
       end
       it "should have the path set within the resource" do
-        @tc.resource(:git).first.to_string.should =~ /exec \{/
+        @tc.resource(:git).first.to_string.should =~ /exec \{ "gittr"/
       end
     end
   end

data/spec/poolparty/pool/cloud_spec.rb

@@ -290,7 +290,7 @@ 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 :/
+              @manifest.should =~ /master \{/
             end
           end
           describe "building with an existing manifest" do

data/spec/poolparty/pool/resource_spec.rb

@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 include PoolParty::Resources
 
+require File.dirname(__FILE__) + '/test_plugins/webserver'
+
 class MyResource < PoolParty::Resources::Resource
   # Just to give some options for the test class
   def options(h={})
@@ -30,28 +31,7 @@ describe "Resource" do
     end
     describe "to_s" do
       it "should be able to coalesce the instances" do
-        @resource.to_string.should =~ /resource \{\n/
-      end
-      describe "with resources" do
-        before(:each) do
-          self.stub!(:options).and_return(:name => "cook")
-
-          @obj = PoolParty::Resources::Resource.new
-          @obj.stub!(:name).and_return "cook"
-
-          @resource2 = MyResource.new do
-            file(:name => "shulie")
-          end
-        end
-        it "should call classpackage_with_self when it has resources" do
-          @resource2.should_receive(:classpackage_with_self).and_return @obj
-          @resource2.to_string
-        end
-        it "should call to_string on the class package" do
-          @obj.should_receive(:to_string).and_return "wee"
-          @resource2.should_receive(:classpackage_with_self).and_return @obj
-          @resource2.to_string
-        end
+        @resource.to_string.should =~ /resource \{/
       end
     end
     describe "class methods" do
@@ -138,10 +118,19 @@ describe "Resource" do
       before(:each) do
         @cloud = cloud :command_cloud do; end
       end
-      it "should call add_resource when creating using the command: file" do
-        @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud)
-        @cloud.instance_eval do
+      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.instance_eval do
+            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
+        end
+        it "should return a resource when the resource does exist" do
           file(:name => "frank")
+          file(:name => "frank").class.should == PoolParty::Resources::File
         end
       end
       it "should create the new 'resource' as a resource" do
@@ -346,6 +335,21 @@ describe "Resource" do
           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

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

@@ -69,21 +69,52 @@ describe "File" do
       end
     end
     describe "from a collection of resources to another" do
-      before(:each) do
-        self.stub!(:options).and_return({:name => "cook"})
-        file(:name => "franksfile")
-        exec(:name => "get file", :command => "kill frank for file")
+      before(:each) do 
+        reset_resources!       
+        cloud :bunkers do
+          file(:name => "franksfile")
+          exec(:name => "get file", :command => "kill frank for file")
+        end
+        @cloud = cloud(:bunkers)
+        @class2 = classpackage_with_self(@cloud)
       end
       it "should have the method classpackage_with_self" do
         self.respond_to?(:classpackage_with_self).should == true
       end
       it "should transfer the resources to the class" do
-        @class2 = classpackage_with_self(self)
-        @class2.resources.should_not be_empty
+        @class2.resources.size.should == 2
+      end
+      it "should have the file resource in the classpackage" do
+        @class2.resource(:file).first.name.should == "franksfile"
+      end
+      it "should have the exec resource in the classpackage" do
+        @class2.resource(:exec).first.name.should == "get file"
+      end
+      it "should have the resources on the new classpackage" do
+        @cloud.resources.size.should == 1
+      end
+      it "should have the conditional classpackage on the resources" do
+        @cloud.resource(:classpackage).first.should == @class2
+      end
+      describe "to_string" do
+        before(:each) do
+          @output = @class2.to_string
+        end
+        it "should have the file in the string" do
+          @output.should =~ /franksfile/
+        end
+        it "should contain just the two resources in the string" do
+          @output.match(/(\w+) \{/).size.should == 2
+        end
+        describe "from within the cloud" do
+          before(:each) do
+            reset_resources!
+            @output = @cloud.build_short_manifest
+          end
+          it "should have one class" do
+            @output.match(/class (\w+) \{/).size.should == 2
+          end
+        end
       end
-      # it "should leave zero resources on the parent" do
-      #   @class2 = classpackage_with_self(self)
-      #   resources.should be_empty
-      # end
   end
 end

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

@@ -49,6 +49,22 @@ describe "Conditional" do
       it "should have a case statement for the hostname" do
         @string.should =~ /case \$hostname/
       end
+      describe "multiple" do
+        before(:each) do
+          reset!
+          @cloud = cloud :multiple_conditionals do
+            execute_on_master do
+              has_file(:name => "/etc/frank.txt")
+            end
+            execute_on_master do
+              has_exec(:name => "feed frank")
+            end
+          end
+        end
+        it "should have two conditional resources" do
+          @cloud.resource(:conditional).size.should == 2
+        end
+      end
     end
   end
 end

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

@@ -19,17 +19,18 @@ describe "Cron" do
     end
     describe "as included" do            
       before(:each) do
+        reset_resources!
         @cron = cron({:rent => "low"}) do
           name "/www/conf/httpd.conf"
           hour 23
           minute 5
-          weekday 1
+          weekday 1          
         end
       end
       it "should use default values" do
         @cron.name.should == "/www/conf/httpd.conf"
       end
-      it "should keep the default values for the file" do
+      it "should keep the default values for the cron" do
         @cron.user.should == "root"
       end
       it "should also set options through a hash" do

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

@@ -8,7 +8,7 @@ describe "Exec" do
   end
   describe "instances" do
     it "should turn the one hash instance into a string" do
-      @exec.to_string.should =~ /exec \{\n"\/usr\/bin\/ifconfig"/
+      @exec.to_string.should =~ /exec \{ "\/usr\/bin\/ifconfig"/
     end
     it "should turn the two hash instance into a string" do
       @exec = exec({:name => "/usr/bin/ping 127.0.0.1"})

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

@@ -19,7 +19,7 @@ describe "Gem" do
     @gem.name.should == "activesupport"
   end
   it "should have the 'rails' gem in the packages" do
-    @cloud.get_resource(:gempackage, "activesupport").to_string.should =~ /activesupport/
+    @gem.to_string.should =~ /activesupport/
   end
   describe "with parent options" do
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.61
+  version: 0.2.62
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-17 00:00:00 -08:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency