auser-poolparty 0.2.90 → 0.2.91

data/Manifest.txt

@@ -276,6 +276,7 @@ lib/poolparty/provisioners/capistrano/recipies/base.rb
 lib/poolparty/provisioners/capistrano/recipies/master.rb
 lib/poolparty/provisioners/capistrano/recipies/slave.rb
 lib/poolparty/provisioners/provisioner_base.rb
+lib/poolparty/spec.rb
 lib/poolparty/spec/core/string.rb
 lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 lib/poolparty/spec/matchers/have_cron.rb
@@ -319,7 +320,6 @@ lib/poolparty/templates/puppetrunner
 lib/poolparty/templates/yaws.conf
 lib/poolparty/version.rb
 lib/poolpartycl.rb
-lib/poolpartyspec.rb
 log/pool.log
 poolparty.gemspec
 script/destroy

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:28 12/18/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
 
 To get started, run the generator:
 

data/README.txt

@@ -39,15 +39,14 @@ COMING SOON
 sudo gem install auser-poolparty
 
 == TODO:
-* Rewrite the disallowed_options to whitelist allowed_options on resources
+* Update hot reloading of puppet (force-reload?)
 * Add pingback for nodes to master when failure occurs
 * Add become master for the nodes
-* Add soft-stop to haproxy while reconfiguring
+* Add hot reload to haproxy while reconfiguring
 * Replace services with Runit
-* Add more granular spec helpers
 * Refactor provisioning to use erlang
 * Add queuing of tasks on the messenger
-* Add list of latest loads to the messenger
+* Add syntax checker on the manifests
 
 == LICENSE:
 

data/bin/cloud-handle-load

@@ -11,13 +11,13 @@ o.loaded_clouds.each do |cloud|
 
   with_cloud(cloud) do
     vputs header("Load handling cloud #{name}")
-    vputs "should_expand_cloud: #{should_contract_cloud?}"
-    if should_expand_cloud?
+    vputs "can_expand_cloud: #{can_contract_cloud?}"
+    if can_expand_cloud?
       vputs "Expanding cloud based on load"
       log.debug "Expanding cloud based on load"
       log.debug rules_values
       expand_cloud_if_necessary
-    elsif should_contract_cloud?
+    elsif can_contract_cloud?
       vputs "Contracting cloud based on load"
       log.debug rules_values
       contract_cloud_if_necessary

data/bin/server-build-messenger

@@ -24,5 +24,5 @@ EOE
 vputs "** Building messenger **", o
 vputs "Running command #{cmd.runnable}", o
 
-beams_not_running = %x[ps aux | grep beam | grep master].nil?
+beams_not_running = %x[ps aux | grep beam | grep master | grep -v grep].empty?
 out = %x[#{cmd.runnable}] if beams_not_running

data/lib/poolparty/base_packages/haproxy.rb

@@ -23,7 +23,9 @@ module PoolParty
           has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
           has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => get_service("sysklogd")})
           
-          has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
+          has_exec(:name => "reloadhaproxy", 
+            :command => "/etc/init.d/haproxy reload", 
+            :requires => get_package("haproxy"))
           # Service is required
           has_service(:name => "haproxy", :ensures => "running", :hasrestart => true, :notify => get_exec("reloadhaproxy"))
 

data/lib/poolparty/core/object.rb

@@ -80,13 +80,13 @@ class Object
     meta_undef name rescue ""
   end
   def vputs(m="", o=self)
-    puts m if o.verbose
-  end
-  def dputs(m="", o=self)
-    vputs(">#{::File.basename(__FILE__)} (#{__LINE__}) #{m}", o)
+    puts m if o.verbose rescue ""
   end
   def vprint(m="", o=self)
-    print m if o.verbose
+    print m if o.verbose rescue ""
+  end
+  def dputs(m="", o=self)
+    puts m if o.debugging rescue ""
   end
   def unix_hide_string
     "2>&1 > /dev/null"

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -25,12 +25,14 @@ module PoolParty
       # Generic to_s
       # Most Resources won't need to extend this
       def to_string(pre="")
+        return "" if printed?
         opts = get_modified_options
+        
         returning Array.new do |output|
           unless cancelled?
             output << @prestring || ""
 
-            if resources && !resources.empty?
+            if resources && !resources.empty? 
               output << resources_string_from_resources(resources, pre)
             end
             
@@ -39,13 +41,15 @@ module PoolParty
               output << opts.flush_out("#{pre*2}").join(",\n")
               output << "#{pre}}"
             end
-          
+            
+            printed
             output << @poststring || ""
           end
         end.join("\n")
       end
       
       def resources_string_from_resources(res, pre="\t")
+        return nil if res.keys == [:classpackage] && res.size == 1
         @variables = res.extract! {|name,resource| name == :variable}
         
         returning Array.new do |str|

data/lib/poolparty/helpers/binary.rb

@@ -3,7 +3,8 @@ module PoolParty
   
   # Load a file that contains a pool into memory
   def load_pool(filename=nil)
-    filename = Dir["#{Dir.pwd}/**/*.rb"].select {|f| ::File.basename(f) == "clouds.rb" }.first unless filename
+    filename = Binary.get_existing_spec_location#Dir["#{Dir.pwd}/**/*.rb"].select {|f| ::File.basename(f) == "clouds.rb" }.first unless filename
+    dputs "Using spec at #{filename}"
     
     unless filename && ::File.readable?(filename)
       puts "Please specify your cloud with -s, move it to ./clouds.rb or in your POOL_SPEC environment variable"

data/lib/poolparty/helpers/optioner.rb

@@ -83,7 +83,7 @@ module PoolParty
         @opts.separator "Options:"
         
         @opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
-        @opts.on('', "--debug", "Debug setting") {self.debug true}
+        @opts.on('', "--debug", "Debug setting") {self.debugging true}
         @opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file.chomp }
         @opts.on('-t', '--test', 'Testing mode')    { self.testing true }
         

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -1,3 +1,11 @@
+=begin rdoc
+  CloudResourcer provides the cloud with convenience methods
+  that you can call on your cloud. This is where the 
+  
+    instances 2..10
+    
+  method is stored, for instance. It's also where the key convenience methods are written
+=end
 require "ftools"
 
 module PoolParty
@@ -50,6 +58,25 @@ module PoolParty
       # end
     end
     
+    # Keypairs
+    def keypair(*args)
+      if args && !args.empty? && !has_keypair?
+        options[:keypair] = args.first
+      else
+        options[:keypair] ||= generate_keypair
+      end
+    end
+        
+    # Let's just make sure that the keypair exists on the options
+    def has_keypair?
+      options.has_key?(:keypair) && options[:keypair] && !options[:keypair].empty?
+    end
+    # Generate a keypair based on the parent's name (if there is a parent)
+    # and the cloud's name
+    def generate_keypair(*args)
+      options[:keypair] = "#{parent && parent.is_a?(PoolParty::Pool::Pool) ? parent.name : "poolparty"}_#{name}" unless has_keypair?
+    end
+    
     def full_keypair_path
       unless keypair_path
         raise RuntimeException.new("Keypair cannot be found")        
@@ -102,8 +129,8 @@ module PoolParty
     def keypair_paths
       [
         Base.base_keypair_path,
-        Base.remote_storage_path,
-        Base.base_config_directory
+        Base.base_config_directory,
+        Base.remote_storage_path        
       ]
     end
     

data/lib/poolparty/modules/resourcing_dsl.rb

@@ -41,6 +41,12 @@ module PoolParty
     def cancelled?
       options[:cancelled] || false
     end
+    def printed(*args)
+      options[:printed] = true
+    end
+    def printed?
+      options[:printed] || false
+    end
     # Give us a template to work with on the resource
     # Make sure this template is moved to the tmp directory as well
     # 

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

@@ -105,15 +105,19 @@ end
         when_all_assigned_ips {wait "5.seconds"}
       end
       
+      # Attach a volume to the instance
       def attach_volume(instance=nil)
         vputs "Attaching volume #{ebs_volume_id} to the master at #{ebs_volume_device}"
         instance = master        
         ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instance_id, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
       end
+      # Associate an address with the instance using ec2
       def associate_address(instance=nil)
-        vputs "Associating master with #{set_master_ip_to}"
-        instance = master
-        ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to
+        if set_master_ip_to
+          dputs "Associating master with #{set_master_ip_to}"
+          instance = master
+          ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to
+        end
       end
 
       # Help create a keypair for the cloud
@@ -140,12 +144,9 @@ end
                               )
       end
       
+      # These are tasks that run before the configuration runs
       def before_configuration_tasks
-        if has_cert_and_key?
-          # copy_file_to_storage_directory(pub_key)
-          # copy_file_to_storage_directory(private_key)
-        end
-        if set_master_ip_to && master.ip.to_s != set_master_ip_to.to_s
+        if set_master_ip_to && master.ip && master.ip.to_s != set_master_ip_to.to_s
           associate_address(master)
           reset_remoter_base!
         

data/lib/poolparty/net/remoter.rb

@@ -144,9 +144,9 @@ module PoolParty
       # A convenience method for waiting until there are no more
       # pending instances and then running the block
       def when_no_pending_instances(&block)
-        reset!        
-        if list_of_pending_instances.size == 0
-          vputs ""
+        reset!
+        if list_of_pending_instances && list_of_pending_instances.size == 0
+          vputs "" # Clear the terminal with a newline
           block.call if block
         else
           vprint "."
@@ -236,14 +236,14 @@ module PoolParty
         !list_of_running_instances.select {|a| a.name == "master"}.first.nil?
       end
       # Stub method for the time being to handle expansion of the cloud
-      def should_expand_cloud?(force=false)
+      def can_expand_cloud?(force=false)
         (are_too_few_instances_running? || are_expansion_rules_valid? ) || force || false
       end
       def are_expansion_rules_valid?
         valid_rules?(:expand_when)
       end
       # Stub method for the time being to handle the contraction of the cloud
-      def should_contract_cloud?(force=false)
+      def can_contract_cloud?(force=false)
         return true if force
         ((are_any_nodes_exceeding_minimum_runtime? and are_too_many_instances_running?) || are_contraction_rules_valid?) || false
       end
@@ -257,7 +257,7 @@ module PoolParty
       # online, then provision it as a slave, this way, it is ready for action from the
       # get go
       def expand_cloud_if_necessary(force=false)
-        if can_start_a_new_instance? && should_expand_cloud?(force)
+        if can_start_a_new_instance? && can_expand_cloud?(force)
           vputs "Expanding the cloud based on load"
           @num = 1
           @num.times do |i|
@@ -273,7 +273,7 @@ module PoolParty
       # If we can shutdown an instnace and the load allows us to contract
       # the cloud, then we should request_termination_of_non_master_instance
       def contract_cloud_if_necessary(force=false)
-        if can_shutdown_an_instance? && should_contract_cloud?(force)
+        if can_shutdown_an_instance? && can_contract_cloud?(force)
           vputs "Shrinking the cloud by 1"
           before_shutdown
           request_termination_of_non_master_instance

data/lib/poolparty/plugins/git.rb

@@ -1,14 +1,20 @@
 module PoolParty    
   class GitResource
-        
+    
     virtual_resource(:git) do
+      def loaded(*args)
+        has_package(:name => "git-core")
+      end
+    end
+    
+    virtual_resource(:git_repos) do
       
-      def loaded(opts={}, parent=self)
+      def loaded(opts={}, parent=self, &block)
+        has_git
         has_git_repos
       end
             
-      def has_git_repos
-        has_package(:name => "git-core")
+      def has_git_repos        
         has_exec({:name => key, :requires => [get_directory("#{working_dir}"), get_package("git-core")] }) do
           command requires_user ? "git clone #{requires_user}@#{source} #{working_dir}" : "cd #{working_dir} && git clone #{source}"
           cwd "#{working_dir if working_dir}"

data/lib/poolparty/plugins/rsyncmirror.rb

@@ -4,8 +4,11 @@ module PoolParty
     virtual_resource(:rsyncmirror) do
       
       def loaded(opts={}, parent=self)
-        @parent = parent
-        has_exec(opts.merge({:command => "#{cloud.remote_rsync_command} --no-implied-dirs --delete-excluded #{Base.user}@master:#{dir}/ #{dir}/".safe_quote, :name => "rsync-#{name}"}))
+        @parent = parent        
+        execute_on_node do
+          @dir = dir || name
+          has_exec(opts.merge({:command => "#{cloud.remote_rsync_command} --no-implied-dirs --delete-excluded #{Base.user}@master:#{@dir}/ #{@dir}/".safe_quote, :name => "rsync-#{name}"}))
+        end
       end
             
       # Since git is not a native type, we have to say which core resource

data/lib/poolparty/poolparty/cloud.rb

@@ -71,17 +71,6 @@ module PoolParty
       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[:keypair].empty?
-      end
-      # Generate a keypair based on the parent's name (if there is a parent)
-      # and the cloud's name
-      def generate_keypair(*args)
-        options[:keypair] = "#{parent && parent.is_a?(PoolParty::Pool::Pool) ? parent.name : "poolparty"}_#{name}" unless has_keypair?
-      end
             
       # Prepare to send the new configuration to the instances
       # First, let's make sure that our base directory is made

data/lib/poolparty/poolparty/resource.rb

@@ -17,17 +17,23 @@ module PoolParty
       resources[type] ||= []
     end
     
+    # Add resource
+    # When we are looking to add a resource, we want to make sure the
+    # resources isn't already added. This way we prevent duplicates 
+    # as puppet can be finicky about duplicate resource definitions. 
+    # We'll look for the resource in either a local or global store
+    # If the resource appears in either, return that resource, we'll just append
+    # to the resource config, otherwise instantiate a new resource of the type
+    # and store it into the global and local resource stores
+    # 
+    # A word about stores, the global store stores the entire list of stored
+    # resources. The local resource store is available on all clouds and plugins
+    # which stores the instance variable's local resources. 
     def add_resource(type, opts={}, parent=self, &block)
-      if opts[:name] && in_a_resource_store?(type, opts[:name])
-        @res = get_from_local_resource_store(type, opts[:name], parent)
-        @res ||= get_from_global_resource_store(type, opts[:name])
-        # if should_duplicate_resource?(type, @res, parent, opts)
-        # unless @res.parent == parent
-        #   @pa = parent
-        #   @res.instance_eval {@parent = @pa}
-        # end
-          # parent.resource(type) << @res
-        # end
+      temp_name = (opts[:name] || "#{type}_#{type.to_s.keyerize}")
+      if in_a_resource_store?(type, temp_name)
+        @res = get_from_local_resource_store(type, temp_name, parent)
+        @res ||= get_from_global_resource_store(type, temp_name)
       else
         @res = returning "PoolParty::Resources::#{type.to_s.camelize}".camelize.constantize.new(opts, parent, &block) do |o|                    
           store_into_global_resource_store(o)
@@ -89,10 +95,22 @@ module PoolParty
       # For the time being, we'll make puppet the only available dependency resolution
       # base, but in the future, we can rip this out and make it an option
       include PoolParty::DependencyResolutions::Puppet
+      # DSL Overriders
+      include PoolParty::ResourcingDsl
       
       extend PoolParty::Resources
       include PoolParty::Resources
       
+      # When we subclass Resource, we want to add a few methods to the Resources class
+      # This will anable us to call out to these resources in our DSLified manner
+      # When we call a method from the subclass, say it's the File class
+      # then we want to be able to have the method file() available.
+      # We also want to be able to fetch the resource with a get_file method.
+      # This will just call out to get the resource. If the resource isn't available
+      # in a resource store, we expect to return a nil result. 
+      # Finally, the has_ and does_not_have_ methods are appended. See below for 
+      # 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)
         subclass = subclass.to_s.split("::")[-1] if subclass.to_s.index("::")
         lowercase_class_name = subclass.to_s.underscore.downcase || subclass.downcase
@@ -104,13 +122,8 @@ module PoolParty
               add_resource(:#{lowercase_class_name}, opts, parent, &blk)
             end
             def get_#{lowercase_class_name}(n, opts={}, parent=self, &block)
-              res = in_a_resource_store?(:#{lowercase_class_name}, n) ?
-                get_resource(:#{lowercase_class_name}, n) :
-                nil
-                # PoolParty::Resources::Resource.resource_string_name(#{lowercase_class_name}, n)
-                # add_resource(:#{lowercase_class_name}, opts, parent, &blk)
-              # res ||= PoolParty::Resources::Resource.resource_string_name(#{lowercase_class_name}, n)
-              res
+              in_a_resource_store?(:#{lowercase_class_name}, n) ?
+                get_resource(:#{lowercase_class_name}, n) : nil
             end
           EOE
           PoolParty::Resources.module_eval method
@@ -120,14 +133,12 @@ module PoolParty
         end
       end
       
+      # Keep track of the resources that are available. This way we can show some pretty output
+      # later and ensure that we are only calling available resources
       def self.available_resources
         @available_resources ||= []
       end
       
-      def self.available_resource_methods
-        available_resources.map {|a| a.my_methods }
-      end
-      
       # This is set in order of descending precedence
       # The options are overwritten from the bottom up
       # and the resource will use those as the values
@@ -141,7 +152,7 @@ module PoolParty
         
         set_resource_parent
         
-        loaded(opts, @parent)
+        loaded(opts, @parent, &block)
       end
       
       # Helper to set the containing parent on the resource
@@ -184,9 +195,6 @@ module PoolParty
         end
       end
       
-      # DSL Overriders
-      include PoolParty::ResourcingDsl
-      
       def same_resources_of(t, k)
         key == k && class_name_sym == t
       end

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

@@ -20,9 +20,21 @@ module PoolParty
       end
     end
     
-    # Wrap all the resources into a class package from 
+    # Wrap all the resources into a class package.
+    # This method will first check to see if a class has already been declared
+    # and run the containing block on it to attach the new resources on to the new block
+    # If the class does not exist, then it is the responsibility of this method to pull
+    # the resources from the parent into the new class package resource and remove them
+    # from the parent. This way we can conveniently write classes into the manifest, 
+    # giving us separation for variables and the like.
+    # Finally, the method will remove the all resources from the contianing parent and add
+    # the class package as the resource. 
+    # Note that it only removes resources that are not class packages, so this method will
+    # not remove other classes that have been attached to the same resource.
+    # TODO CLEAN THIS UP
     def classpackage_with_self(parent=self, &block)
       name = (parent && parent.options.name || Classpackage.name(parent).to_s).sanitize
+      
       if in_global_classpackages?(name)
         returning get_from_global_classpackage_store(name) do |cls|
           cls.run_in_context(parent, &block) if block
@@ -55,13 +67,8 @@ module PoolParty
       })
       
       def initialize(opts={}, parent=self, &block)
-        # Take the options of the parents
-        # set_parent(parent, false) if parent
         set_vars_from_options(opts) unless opts.empty?
-        # self.instance_eval &block if block
         run_setup(parent, &block) if block
-        # self.run_in_context &block if block
-        # store_block(&block)
         loaded
       end
                         

data/lib/poolparty/poolparty/resources/symlink.rb

@@ -11,8 +11,10 @@ module PoolParty
         [:name, :source]
       end
       
+      # We can set the source several ways, with either source or from
+      # in the manifest
       def present
-        source
+        source || from
       end
       
       def printable?

data/lib/{poolpartyspec.rb → poolparty/spec.rb}

@@ -1,5 +1,5 @@
 ["core", "spec"].each do |dir|
-  Dir[File.join(File.dirname(__FILE__), "poolparty", "spec", dir, "*.rb")].each {|f| require f}
+  Dir[File.join(File.dirname(__FILE__), "spec", dir, "*.rb")].each {|f| require f}
 end
 
 class TestCloudClass < PoolParty::Cloud::Cloud  

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 90
+    TINY  = 91
 
     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.90
+  version: 0.2.91
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2008-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -392,6 +392,7 @@ files:
 - lib/poolparty/provisioners/capistrano/recipies/master.rb
 - lib/poolparty/provisioners/capistrano/recipies/slave.rb
 - lib/poolparty/provisioners/provisioner_base.rb
+- lib/poolparty/spec.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 - lib/poolparty/spec/matchers/have_cron.rb
@@ -435,7 +436,6 @@ files:
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
-- lib/poolpartyspec.rb
 - log/pool.log
 - poolparty.gemspec
 - script/destroy
@@ -535,7 +535,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:28 12/18/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
   
   To get started, run the generator:
   

data/spec/poolparty/bin/console_spec.rb

@@ -9,7 +9,7 @@ describe "Console" do
     ::File.stub!(:readable?).and_return true
     Dir.stub!(:pwd).and_return "/flop"
     Dir.stub!(:[]).and_return []
-    Dir.stub!(:[]).with("/flop/**/*.rb").and_return ["clouds.rb"]
+    Dir.stub!(:[]).with("/flop/*/*.rb").and_return ["clouds.rb"]    
   end
   describe "load_pool" do
     before(:each) do
@@ -69,6 +69,7 @@ describe "Console" do
       ::File.stub!(:readable?).with(@filename).and_return true
       @filename.stub!(:read).and_return "spec contents"
       self.stub!(:open).with(@filename).and_return @filename
+      Binary.stub!(:get_existing_spec_location).and_return @filename
     end
     it "should call readable on the string sent in to load_pool" do      
       lambda {

data/spec/poolparty/helpers/binary_spec.rb

@@ -32,7 +32,7 @@ describe "Binary" do
       Dir.stub!(:pwd).and_return "/flop"
     end
     it "should call Dir[Dir.pwd] if there is no filename given" do      
-      Dir.should_receive(:[]).with("#{Dir.pwd}/**/*.rb").and_return ["clouds.rb"]
+      Dir.should_receive(:[]).with("#{Dir.pwd}/*/clouds.rb").and_return ["clouds.rb"]
       Binary.load_pool
     end
   end

data/spec/poolparty/net/remote_spec.rb

@@ -229,14 +229,14 @@ describe "Remote" do
           @tc.should_receive(:can_start_a_new_instance?).once
         end
         it "should see if we should expand the cloud" do
-          @tc.should_receive(:should_expand_cloud?).once.and_return false
+          @tc.should_receive(:can_expand_cloud?).once.and_return false
         end
-        it "should call request_launch_new_instances if we should_expand_cloud?" do
-          @tc.should_receive(:should_expand_cloud?).once.and_return true
+        it "should call request_launch_new_instances if we can_expand_cloud?" do
+          @tc.should_receive(:can_expand_cloud?).once.and_return true
           @tc.should_receive(:request_launch_one_instance_at_a_time).once.and_return [{:ip => "127.0.0.5", :name => "node2"}]
         end
         it "should call a new slave provisioner" do
-          @tc.stub!(:should_expand_cloud?).once.and_return true
+          @tc.stub!(:can_expand_cloud?).once.and_return true
           @provisioner.should_receive(:install).at_least(1)
         end
         after(:each) do
@@ -255,10 +255,10 @@ describe "Remote" do
           @tc.should_receive(:can_shutdown_an_instance?).once
         end
         it "should see if we should contract the cloud" do
-          @tc.should_receive(:should_contract_cloud?).once.and_return false
+          @tc.should_receive(:can_contract_cloud?).once.and_return false
         end
-        it "should call request_termination_of_non_master_instance if we should_contract_cloud?" do
-          @tc.stub!(:should_contract_cloud?).and_return true
+        it "should call request_termination_of_non_master_instance if we can_contract_cloud?" do
+          @tc.stub!(:can_contract_cloud?).and_return true
           @tc.should_receive(:request_termination_of_non_master_instance).once.and_return true
         end
         after(:each) do

data/spec/poolparty/plugins/git_spec.rb

@@ -18,18 +18,18 @@ describe "Remote Instance" do
       @tc = TestGitClass.new
     end
     it "should be a string" do
-      @tc.has_git(:at => "/var/www/", :name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec/
+      @tc.has_git_repos(:at => "/var/www/", :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", :requires_user => "finger", :at => "/var/www/"}).to_string.should =~ /finger@git:/
+      @tc.has_git_repos({:name => "git.git", :source => "git://source.git", :requires_user => "finger", :at => "/var/www/"}).to_string.should =~ /finger@git:/
     end
     it "should not include the user if none is given" do
-      @tc.has_git({:name => "git.git", :source => "git://source.git",:at => "/var/www/"}).to_string.should =~ /git clone git:/
+      @tc.has_git_repos({:name => "git.git", :source => "git://source.git",:at => "/var/www/"}).to_string.should =~ /git clone git:/
     end
     describe "in resource" do
       before(:each) do
         @tc.instance_eval do
-          has_git(:name => "gittr") do
+          has_git_repos(:name => "gittr") do
             source "git://source.git"
             path "/var/www/xnot.org"
             symlink "/var/www/xnot.org/public"
@@ -38,7 +38,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 \{ \"git-gittr/
+        @tc.resource(:git_repos).first.to_string.should =~ /exec \{ \"git-gittr/
       end
     end
   end

data/spec/poolparty/poolparty/resources/user_spec.rb

@@ -15,8 +15,9 @@ describe "User" do
         name "bob"
         home "/home/bob"
       end
-      @user.to_string.should =~ /"bob":/
-      @user.to_string.should =~ /home => '\/home\/bob'/
+      @string = @user.to_string
+      @string.should =~ /"bob":/
+      @string.should =~ /home => '\/home\/bob'/
     end
     describe "as included" do            
       before(:each) do

data/spec/poolparty/poolparty_spec.rb

@@ -26,6 +26,9 @@ describe "PoolParty" do
       PoolParty.write_to_file_in_storage_directory("/usr/bin/happydayz", "write this text")
       File.open(@path).read.should == "write this text"
     end
+    after(:each) do
+      ::FileUtils.rm @path rescue ""
+    end
   end
   it "should have a logger" do
     PoolParty.log.should_not be_nil

data/spec/poolparty/spec_helper.rb

@@ -16,6 +16,9 @@ ENV["POOL_SPEC"] = nil
 include PoolParty
 extend PoolParty
 
+def debugging
+  false
+end
 def are_too_many_instances_running?  
 end
 def are_any_nodes_exceeding_minimum_runtime?  
@@ -119,6 +122,8 @@ def stub_remoting_methods_for(o)
   o.stub!(:before_install).and_return true
   o.stub!(:process_install).and_return true
   o.stub!(:after_install).and_return true
+  o.stub!(:can_contract_cloud?).and_return false
+  o.stub!(:can_expand_cloud?).and_return false
 end
 def stub_list_of_instances_for(o)  
   # o.stub!(:list_of_running_instances).once.and_return running_remote_instances

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.90</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.91</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.90
+  version: 0.2.91
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2008-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -392,6 +392,7 @@ files:
 - lib/poolparty/provisioners/capistrano/recipies/master.rb
 - lib/poolparty/provisioners/capistrano/recipies/slave.rb
 - lib/poolparty/provisioners/provisioner_base.rb
+- lib/poolparty/spec.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 - lib/poolparty/spec/matchers/have_cron.rb
@@ -435,7 +436,6 @@ files:
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
-- lib/poolpartyspec.rb
 - log/pool.log
 - poolparty.gemspec
 - script/destroy
@@ -535,7 +535,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:28 12/18/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
   
   To get started, run the generator: