auser-poolparty 0.2.3 → 0.2.4

data/Manifest.txt

@@ -13,7 +13,7 @@ bin/cloud-list
 bin/cloud-maintain
 bin/cloud-osxcopy
 bin/cloud-provision
-bin/cloud-reconfigure
+bin/cloud-refresh
 bin/cloud-ssh
 bin/cloud-start
 bin/cloud-terminate
@@ -108,6 +108,7 @@ lib/poolparty/pool/script.rb
 lib/poolparty/templates/authkeys
 lib/poolparty/templates/cib.xml
 lib/poolparty/templates/fileserver.conf
+lib/poolparty/templates/gem
 lib/poolparty/templates/ha.cf
 lib/poolparty/templates/haproxy.conf
 lib/poolparty/templates/namespaceauth.conf

data/bin/cloud-configure

@@ -15,21 +15,17 @@ include Remote
 @clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
 
 @clouds.each do |name, cloud|
+  
+  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class}) do
     
-  with_cloud(cloud, {:testing => o.testing, :provision_class => @provision_class}) do
-    logger.info header("Provisioning cloud #{name}")
-    prepare_to_configuration
-    
-    logger.info subheader("Building configuration file")
-    build_and_store_new_config_file
-    
-    if provision_class == "master" || provision_class == "all"
-      Provisioner.configure_master(self, testing)
-    end
-    if provision_class == "slave" || provision_class == "all"
-      Provisioner.configure_slaves(self, testing)
-    end
-
+    hide_output do
+      if provision_class == "master" || provision_class == "all"
+        Provisioner.configure_master(self, testing)
+      end
+      if provision_class == "slave" || provision_class == "all"
+        Provisioner.configure_slaves(self, testing)
+      end
+    end    
     clear_base_directory unless testing
-  end
+  end    
 end

data/bin/cloud-maintain

@@ -18,7 +18,7 @@ include Remote
 
 @clouds.each do |name, cloud|
 
-  with_cloud(cloud, {:location => @location}) do
+  with_cloud(cloud, {:location => @location, :testing => o.testing}) do
     logger.info header("Maintaining cloud #{name}")
     if !minimum_number_of_instances_are_running?
       logger.warn "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"

data/bin/{cloud-reconfigure → cloud-refresh}

@@ -17,7 +17,7 @@ include Remote
 @clouds.each do |name, cloud|
   
   with_cloud(cloud, {:testing => o.testing}) do
-    cmd = "puppetca --clean --all && puppetrun --host puppet #{list_of_node_names.join(", --host ")}"
+    cmd = "puppetrun --host #{list_of_node_names.join(", --host ")}"
     run_command_on(cmd, master)
   end
   

data/bin/cloud-start

@@ -23,6 +23,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
         puts("\tNot launching while in testing mode")
       else
         launch_and_configure_master!
+        # run_command_on("puppetd --test", master)
       end
     end
     clear_base_directory unless testing

data/lib/poolparty/base_packages/poolparty.rb

@@ -5,18 +5,22 @@ module PoolParty
       def enable        
         has_package(:name => "erlang")
         # These should be installed automagically by poolparty, but just in case
-        has_gempackage(:name => "open4")
-        has_gempackage(:name => "activesupport")
-        has_gempackage(:name => "logging")
-        
-        has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com")
-        has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com")
-                
+        with_options(:requires => 'Package["update-rubygems"]') do
+          has_gempackage(:name => "open4")
+          has_gempackage(:name => "activesupport")
+          has_gempackage(:name => "logging")
+          has_gempackage(:name => "hoe")
+          has_gempackage(:name => "xml-simple")
+
+          has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com", :requires => 'Package["xml-simple"]')
+          has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com", :requires => 'Package["activesupport", "logging", "hoe", "open4"]')          
+        end                
         # Build hostsfile
         # TODO: COME BACK AND CLEAN THIS UP
         (self.respond_to?(:list_of_running_instances) ? self : parent).list_of_running_instances.each do |ri|
           has_host({:name => "#{ri.name}", :ip => ri.ip })
         end
+        # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end
       
     end  

data/lib/poolparty/base_packages/ruby.rb

@@ -3,6 +3,10 @@ module PoolParty
     plugin :ruby do
       
       def enable                
+        install_base_packages
+      end
+      
+      def install_base_packages
         has_package(:name => "libreadline-ruby1.8")
         has_package(:name => "libruby1.8")                
         has_package(:name => "ruby1.8-dev")
@@ -11,12 +15,12 @@ module PoolParty
         
         # exec(:name => "update-rubygems") do
         #   command "gem update --system"
-        #   ifnot "gem -v | grep 1."
-        #   notify "Exec[fix-updated-rubygems]"
+        #   onlyif "gem -v | grep 1."
+        #   notify 'Exec["fix-updated-rubygems"]'
         # end
         # exec(:name => "fix-updated-rubygems") do
         #   command "awk \'{print} NR == 9 {print \"require \"rubygems/gem_runner\"\"}\' /usr/bin/gem"
-        #   ifnot "awk \'/gem_runner/\' /usr/bin/gem"
+        #   ifnot "awk \"/gem_runner/\" /usr/bin/gem"
         # end
       end
       

data/lib/poolparty/helpers/provisioner_base.rb

@@ -90,8 +90,8 @@ module PoolParty
       end
       def process_configure!(testing=false)
         error unless valid?
-        setup_runner(@cloud)
         write_configure_file
+        setup_runner(@cloud)        
         
         unless testing
           @cloud.rsync_storage_files_to(@instance)
@@ -112,7 +112,7 @@ module PoolParty
       end
       # Gather all the tasks into one string
       def install_string
-        (default_install_tasks << custom_install_tasks).each do |task|
+        (default_install_tasks).each do |task|
           case task.class
           when String
             task
@@ -122,7 +122,7 @@ module PoolParty
         end.nice_runnable
       end
       def configure_string
-        (default_configure_tasks << custom_configure_tasks).each do |task|
+        (default_configure_tasks).each do |task|
           case task.class
           when String
             task
@@ -135,13 +135,16 @@ module PoolParty
       # These are run on all the provisioners, master or slave
       def default_install_tasks
         [
-          
+          upgrade_system,
+          install_puppet_master,
+          custom_install_tasks
         ] << install_tasks
       end
       # Tasks with default configuration tasks
       # This is run on the provisioner, regardless
       def default_configure_tasks
         [
+          custom_configure_tasks
         ] << configure_tasks
       end
       # Build a list of the tasks to run on the instance
@@ -195,7 +198,8 @@ module PoolParty
       def self.configure(instance, cl=self)
         new(instance, cl).configure
       end
-
+      
+      # Template directory from the provisioner base
       def template_directory
         File.join(File.dirname(__FILE__), "..", "templates")
       end
@@ -213,6 +217,24 @@ module PoolParty
          end
         "echo '#{str}' > /etc/puppet/manifests/nodes/nodes.pp"
       end
+      
+      def upgrade_system
+        case @os
+        when :ubuntu
+          "          
+          touch /etc/apt/sources.list
+          echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
+          apt-get update --fix-missing -y
+          apt-get upgrade -y
+          "
+        else
+          "# No system upgrade needed"
+        end
+      end
+      
+      def install_puppet_master
+        "#{installer_for( puppet_packages )}"
+      end
 
       def create_poolparty_manifest
         <<-EOS

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

@@ -3,7 +3,8 @@ module PoolParty
     class Master < ProvisionerBase
       
       def initialize(cloud=self, os=:ubuntu)
-        super(cloud.master, cloud)
+        super(cloud.master, cloud, os)
+        @master_ip = cloud.master.ip
       end
 
       def valid?
@@ -16,8 +17,6 @@ module PoolParty
 
       def install_tasks
         [
-          upgrade_system,
-          install_puppet_master,
           install_haproxy,
           install_heartbeat,
           create_local_hosts_entry,
@@ -38,34 +37,17 @@ module PoolParty
         ]
       end
       
-      def upgrade_system
-        case @os
-        when :ubuntu
-          "
-          touch /etc/apt/sources.list
-          echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
-          apt-get update --fix-missing -y
-          apt-get upgrade -y"
-        else
-          "# No system upgrade needed"
-        end
-      end
-
-      def install_puppet_master
-        "#{installer_for( puppet_packages )}"
-      end
-      
-      def install_haproxy
-        "#{installer_for( "haproxy" )}"
-      end
-      
-      def install_heartbeat        
-        "#{installer_for( "heartbeat-2" )}"
-      end
+      # def install_haproxy
+      #   "#{installer_for( "haproxy" )}"
+      # end
+      # 
+      # def install_heartbeat        
+      #   "#{installer_for( "heartbeat-2" )}"
+      # end
 
       def create_local_hosts_entry
         <<-EOS
-if [ -z "grep -v '#' /etc/hosts | grep 'puppet'" ]; then echo '#{@master_ip}           puppet master' >> /etc/hosts; fi
+if [ -z \"$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo '#{@master_ip}           puppet master' >> /etc/hosts; fi
         EOS
       end
 
@@ -135,18 +117,17 @@ mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@c
         EOS
       end
 
+      # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
+      # rm -rf /etc/puppet/ssl
       def start_puppetmaster
         <<-EOS
-ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
-rm -rf /etc/puppet/ssl
 puppetmasterd
         EOS
-      end    
+      end
 
       def restart_puppetd
         <<-EOS
-          puppetd --test
-          puppetd --listen
+          puppetd --listen --fqdn=#{@cloud.master.name}
         EOS
       end
     end

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

@@ -3,8 +3,7 @@ module PoolParty
     class Slave < ProvisionerBase
 
       def install_tasks
-        [
-          install_puppet,        
+        [ 
           setup_puppet
         ] << configure_tasks
       end
@@ -16,13 +15,6 @@ module PoolParty
         ]
       end
 
-      def install_puppet
-        <<-EOE        
-          #{installer_for( puppet_packages )}
-          echo 'DAEMON_OPTS="-w 120 --server puppet"' > /etc/default/puppet
-        EOE
-      end
-
       def setup_puppet
         <<-EOE
           puppetd --mkusers
@@ -39,7 +31,7 @@ module PoolParty
 
       def start_puppet
         <<-EOS
-puppetd --listen
+puppetd --listen --fqdn=#{@instance.name}
         EOS
       end
       

data/lib/poolparty/modules/method_missing_sugar.rb

@@ -1,6 +1,19 @@
+=begin rdoc
+  Using method missing gives us the ability to set any attribute on the object into the options
+  such that it can be retrieved later
+=end
 module PoolParty
   module MethodMissingSugar
-
+    # Method_Missing
+    # When a method cannot be found on the current object
+    # it is sent to method_missing
+    # First, we check if there is a block given and if the block
+    # is given with a class of the same type, then it is a block to be evaluated on 
+    # itself, so we instantiate it here, otherwise, don't handle it here and let
+    # the super class worry about it.
+    # If the block is not given, then we are going to look for it on the 
+    # options of itself or its parent.
+    # See get_from_options for more information
     def method_missing(m, *args, &block)
       if block_given?
         (args[0].class == self.class) ? args[0].instance_eval(&block) : super
@@ -9,12 +22,27 @@ module PoolParty
       end
     end
     
+    # Get the method from the options
+    # First, we check to see if any options are being sent to the method
+    # of the form:
+    # name "Fred"
+    # If there are args sent to it, check to see if it is an array
+    # If it is, we want to send it an array only if the array is contains more than one element.
+    # This becomes important when we are building the manifest
+    # If it is not an array of more than one element, then we just send it the first of the args
+    # If there are no args sent to it, then we check to see if the method is already in the options
+    # which means we are retrieving the property
+    # of the form
+    # @cloud.name => @cloud.options[:name]
+    # Finally, if the method name is not in the options, then we check to make sure it's not set on the 
+    # parent, we don't want the parent's set option and that the parent isnot itself and send it
+    # to the parent to handle. Otherwise, we'll say it's nil instead
     def get_from_options(m, *args, &block)
       if args.empty?
         if options.has_key?(m)
           options[m]
         else
-          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options) || parent.options.has_key?(m)) ? nil : parent.send(m, *args, &block)
+          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options)) ? nil : parent.send(m, *args, &block)
         end        
       else
         options[m] = (args.is_a?(Array) && args.size > 1) ? args : args[0]

data/lib/poolparty/net/remoter.rb

@@ -152,8 +152,8 @@ module PoolParty
         request_launch_new_instances(1) if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         
         when_no_pending_instances do
-          wait "5.seconds"
-          Provisioner.provision_master(self, testing)
+          wait "10.seconds"
+          hide_output { Provisioner.provision_master(self, testing) }
         end
         
       end

data/lib/poolparty/plugins/gem_package.rb

@@ -3,10 +3,10 @@ module PoolParty
         
     virtual_resource(:gempackage) do
       
-      def loaded
+      def loaded(opts={})
         has_exec(:name => "gem-package-#{name}", :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin") do
-          command "gem install --no-ri --no-rdoc #{"--version \"#{version}\"" if respond_to?(:version)} #{"--source \"#{source}\"" if respond_to?(:source)} #{@parent.name}"
-          ifnot "gem list --local #{@parent.name} | grep #{@parent.name} #{"| grep #{version}" if respond_to?(:version)}"
+          command "gem install -y --no-ri --no-rdoc #{"--version \"#{version}\"" if @parent.version} #{"--source #{@parent.source}" if @parent.source} #{@parent.name}"
+          ifnot "gem list --local #{@parent.name} | grep #{@parent.name} #{"| grep #{@parent.version}" if @parent.version}"
         end
       end
       

data/lib/poolparty/plugins/git.rb

@@ -3,19 +3,36 @@ module PoolParty
         
     virtual_resource(:git) do
       
-      def loaded
-        
-        has_directory(:name => "#{name}", :path => "#{path}", :user => "#{user || Base.user}")
+      def loaded(opts={})
+        install_git
+        has_git_repos
+      end
+      
+      def install_git
+        has_package(:name => "git-core")
+      end
+      
+      def has_git_repos        
+        has_directory(:name => "#{path}")
         
-        exec({:name => "git-#{name}", :command => (user ? "git clone #{user}@#{source}" : "git clone #{source}")}) do
-          cwd "#{path}"
-          requires "File[#{name}]"
+        exec({:name => "git-#{name}"}) do
+          command @parent.user ? "git clone #{@parent.user}@#{@parent.source} #{@parent.path}" : "git clone #{@parent.source} #{@parent.path}"
+          cwd "#{::File.dirname(@parent.path) if @parent.path}"
+          creates "#{@parent.path}/.git"
         end
         
         exec(:name => "git-update-#{name}", :cwd => "#{path}") do
-          requires "Exec['git-#{name}']"
-        end        
+          command "git pull"
+          requires "Exec['git-#{@parent.name}']"
+        end
+        
+        if symlink
+          has_file(:name => "#{symlink}") do
+            ensures @parent.path
+          end
+        end
       end
+      
     end
     
   end

data/lib/poolparty/pool/resource.rb

@@ -88,11 +88,11 @@ module PoolParty
         @parent = parent
         set_vars_from_options(opts) unless opts.empty?
         self.instance_eval &block if block
-        loaded
+        loaded(opts)
       end
       
       # Stub, so you can create virtual resources
-      def loaded
+      def loaded(opts={})
       end
       
       # DSL Overriders
@@ -105,7 +105,11 @@ module PoolParty
         options.merge!(:require => str)
       end 
       def ensures(str="running")
-        str == "absent" ? is_absent : is_present
+        if %w(absent running).map {|a| self.send a.to_sym}.include?(str)
+          str == "absent" ? is_absent : is_present
+        else
+          options.merge!(:ensure => str)
+        end        
       end
       # Allows us to send an ensure to ensure the presence of a resource
       def is_present(*args)

data/lib/poolparty/templates/gem

@@ -0,0 +1,25 @@
+#! /usr/bin/ruby1.8
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+# /usr/bin/gem is broken, so... have to use this until it is fixed
+#++
+
+
+require "rubygems"
+require "rubygems/gem_runner"
+Gem.manage_gems
+
+required_version = Gem::Version::Requirement.new(">= 1.8.0")
+unless  required_version.satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  puts "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
+  exit(1)
+end
+
+# We need to preserve the original ARGV to use for passing gem options
+# to source gems.  If there is a -- in the line, strip all options after
+# it...its for the source building process.
+args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
+
+Gem::GemRunner.new.run(args)

data/lib/poolparty/templates/haproxy.conf

@@ -25,8 +25,8 @@ defaults
   
   # Stats
   stats enable
-  stats uri /haproxy
-  stats realm Statistics\ for\ <%= name %>
+  stats uri /poolparty
+  stats realm Statistics\ for\ PoolParty
 
 listen <%= name %> 
     bind 0.0.0.0:<%= ports.join(",0.0.0.0:") %>

data/lib/poolparty/templates/puppet.conf

@@ -2,14 +2,16 @@
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
   templatepath = /var/lib/puppet/templates
-  server = master
  
 [puppetd]
   localconfig = $vardir/localconfig
-  pluginsync=false
+  pluginsync=true
   factsync=false
   report=true
-  server = master
+  server=master
 
+[puppetrun]
+  certname = master
+  
 [puppetmasterd]
   certname = master

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-13}
+  s.date = %q{2008-10-14}
   s.description = %q{Self-healing, auto-scaling cloud computing tool}
   s.email = ["ari.lerner@citrusbyte.com"]
-  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-reconfigure", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor"]
+  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-reconfigure", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/pool-start-monitor", "config/hoe.rb", "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", "lib/erlang/eb_server.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "lib/poolparty/helpers/optioner.rb", "lib/poolparty/helpers/provisioner_base.rb", "lib/poolparty/helpers/provisioners/master.rb", "lib/poolparty/helpers/provisioners/slave.rb", "lib/poolparty/modules/cloud_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/net/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/gem_package.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "lib/poolparty/pool/resources/sshkey.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/fileserver.conf", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/helpers/provisioner_base_spec.rb", "spec/poolparty/helpers/provisioners/master_spec.rb", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/modules/tmp/willy/nilly.rb", "spec/poolparty/net/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/pool-start-monitor", "config/hoe.rb", "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", "lib/erlang/eb_server.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "lib/poolparty/helpers/optioner.rb", "lib/poolparty/helpers/provisioner_base.rb", "lib/poolparty/helpers/provisioners/master.rb", "lib/poolparty/helpers/provisioners/slave.rb", "lib/poolparty/modules/cloud_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/net/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/gem_package.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "lib/poolparty/pool/resources/sshkey.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/fileserver.conf", "lib/poolparty/templates/gem", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/helpers/provisioner_base_spec.rb", "spec/poolparty/helpers/provisioners/master_spec.rb", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/modules/tmp/willy/nilly.rb", "spec/poolparty/net/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb"]
   s.has_rdoc = true
   s.homepage = %q{http://poolparty.rubyforge.org}
   s.post_install_message = %q{Get ready to jump in the pool, you just installed PoolParty!

data/spec/poolparty/helpers/provisioners/slave_spec.rb

@@ -16,13 +16,13 @@ describe "Slave provisioner" do
   end
   describe "install_tasks" do
     it "should call install_puppet_slave" do
-      @slave.should_receive(:install_puppet)
+      @slave.should_receive(:install_puppet_master)
     end
     after do
       @slave.install
     end
   end
   it "should return install_puppet as apt-get install puppet factor" do
-    @slave.install_puppet.should =~ /        apt-get install -y puppet puppetmaster/
+    @slave.setup_puppet.should =~ /puppetd/
   end
 end

data/spec/poolparty/plugins/git_spec.rb

@@ -8,7 +8,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 =~ /file \{/
+    @tc.has_git(:name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /file \{/
   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:/
@@ -16,4 +16,18 @@ describe "Remote Instance" do
   it "should not include the user if none is given" do
     @tc.has_git({:name => "git.git", :source => "git://source.git"}).to_string.should =~ /git clone git:/
   end
+  describe "in resource" do
+    before(:each) do
+      @tc.instance_eval do
+        git(:name => "gittr") do
+          source "git://source.git"
+          path "/var/www/xnot.org"
+          symlink "/var/www/xnot.org/public"
+        end
+      end
+    end
+    it "should have the path set within the resource" do
+      @tc.resource(:git).first.to_string.should =~ /file \{/
+    end
+  end
 end

data/tasks/ec2.rake

@@ -1,6 +1,6 @@
 namespace(:ec2) do        
   task :init do
-    Base.options
+    %x[ec2-authorize default -P icmp -t -1:-1 -s 0.0.0.0/0]
   end
   # Start a new instance in the cloud
   desc "Add and start an instance to the pool"

data/website/index.html

@@ -33,7 +33,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.3</a>
+      <a href="http://rubyforge.org/projects/PoolParty" class="numbers">0.2.4</a>
     </div>
     <h1>&amp;#x2192; &#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.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2008-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ executables:
 - cloud-maintain
 - cloud-osxcopy
 - cloud-provision
-- cloud-reconfigure
+- cloud-refresh
 - cloud-ssh
 - cloud-start
 - cloud-terminate
@@ -98,7 +98,7 @@ files:
 - bin/cloud-maintain
 - bin/cloud-osxcopy
 - bin/cloud-provision
-- bin/cloud-reconfigure
+- bin/cloud-refresh
 - bin/cloud-ssh
 - bin/cloud-start
 - bin/cloud-terminate
@@ -193,6 +193,7 @@ files:
 - lib/poolparty/templates/authkeys
 - lib/poolparty/templates/cib.xml
 - lib/poolparty/templates/fileserver.conf
+- lib/poolparty/templates/gem
 - lib/poolparty/templates/ha.cf
 - lib/poolparty/templates/haproxy.conf
 - lib/poolparty/templates/namespaceauth.conf