auser-poolparty 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.6 2008-10-14
+  * Maintaining the cloud
+  
 == 0.2 2008-09-02
   * Finished new syntax rewrite
   

data/Manifest.txt

@@ -198,5 +198,6 @@ test_manifest.pp
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/code.css
 website/stylesheets/screen.css
 website/template.html.erb

data/PostInstall.txt

@@ -12,6 +12,6 @@ Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for exten
 For more information, check http://PoolPartyrb.com
 On IRC: 
   irc.freenode.net
-  #PoolPartyrb
+  #poolpartyrb
   
 *** Ari Lerner @ <arilerner@mac.com> ***

data/bin/cloud-refresh

@@ -17,8 +17,10 @@ include Remote
 @clouds.each do |name, cloud|
   
   with_cloud(cloud, {:testing => o.testing}) do
-    cmd = "puppetrun --host #{list_of_node_names.join(", --host ")}"
-    run_command_on(cmd, master)
+    cmd = <<-EOE
+puppetrun --host #{list_of_node_names.join(", --host ")}
+    EOE
+    run_command_on(cmd.runnable, master)
   end
   
 end

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe newgem rubigen ruby2ruby].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/lib/poolparty/base_packages/haproxy.rb

@@ -20,10 +20,10 @@ module PoolParty
           has_service(:name => "haproxy")
 
           # Tempalte variables
-          variable(:name => "name", :value => "#{@parent.name}")
-          variable(:name => "nodenames", :value => list_of_node_names)
-          variable(:name => "node_ips",  :value => list_of_node_ips)
-          variable(:name => "ports", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
+          variable(:name => "name_haproxy", :value => "#{@parent.name}")
+          variable(:name => "nodenames_haproxy", :value => list_of_node_names)
+          variable(:name => "node_ips_haproxy",  :value => list_of_node_ips)
+          variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
           variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))
           variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode))
 

data/lib/poolparty/base_packages/heartbeat.rb

@@ -2,40 +2,42 @@ module PoolParty
   class Base
     plugin :heartbeat do
       
-      def enable        
-        has_package(:name => "heartbeat-2", :ensure => "installed")
-        has_service(:name => "heartbeat", :hasstatus => true) do
-          ensures "running"
-        end
+      def enable
+        execute_if("$hostname", "master") do
+          has_package(:name => "heartbeat-2", :ensure => "installed")
+          has_service(:name => "heartbeat", :hasstatus => true) do
+            ensures "running"
+          end
         
-        has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true)
+          has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true)
         
-        # variables for the templates
-        has_variable({:name => "nodenames", :value => list_of_node_names})
-        has_variable({:name => "node_ips",  :value => list_of_node_ips})
-        has_variable({:name => "port", :value => (self.respond_to?(:port) ? port : Base.port)})
+          # variables for the templates
+          has_variable({:name => "ha_nodenames", :value => list_of_node_names})
+          has_variable({:name => "ha_node_ips",  :value => list_of_node_ips})
+          has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Base.port)})
         
-        # These can also be passed in via hash
-        has_remotefile(:name => "/etc/ha.d/ha.cf") do
-          mode 444
-          requires 'Package["heartbeat-2"]'
-          notify 'Service["heartbeat"]'
-          template File.join(File.dirname(__FILE__), "..", "templates/ha.cf")
-        end
+          # These can also be passed in via hash
+          has_remotefile(:name => "/etc/ha.d/ha.cf") do
+            mode 444
+            requires 'Package["heartbeat-2"]'
+            notify 'Service["heartbeat"]'
+            template File.join(File.dirname(__FILE__), "..", "templates/ha.cf")
+          end
         
-        has_remotefile(:name => "/etc/ha.d/authkeys") do
-          mode 400
-          requires 'Package["heartbeat-2"]'
-          notify 'Service["heartbeat"]'
-          template File.join(File.dirname(__FILE__), "..", "templates/authkeys")
-        end
+          has_remotefile(:name => "/etc/ha.d/authkeys") do
+            mode 400
+            requires 'Package["heartbeat-2"]'
+            notify 'Service["heartbeat"]'
+            template File.join(File.dirname(__FILE__), "..", "templates/authkeys")
+          end
         
-        has_remotefile(:name => "/etc/ha.d/cib.xml") do
-          mode 444
-          requires 'Package["heartbeat-2"]'
-          notify 'Exec["heartbeat-update-cib"]'
-          template File.join(File.dirname(__FILE__), "..", "templates/cib.xml")
-        end                
+          has_remotefile(:name => "/etc/ha.d/cib.xml") do
+            mode 444
+            requires 'Package["heartbeat-2"]'
+            notify 'Exec["heartbeat-update-cib"]'
+            template File.join(File.dirname(__FILE__), "..", "templates/cib.xml")
+          end
+        end
         
       end
     end  

data/lib/poolparty/base_packages/poolparty.rb

@@ -5,22 +5,28 @@ module PoolParty
       def enable        
         has_package(:name => "erlang")
         # These should be installed automagically by poolparty, but just in case
-        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 => "ruby2ruby")
+        has_gempackage(:name => "activesupport")
+        has_gempackage(:name => "logging")
+        has_gempackage(:name => "hoe")
+        has_gempackage(:name => "xml-simple")
+        has_gempackage(:name => "ParseTree", :version => "2.2.0", :requires => gempackage(:name => "hoe"))
+        
+        has_gempackage(:name => "RubyInline", :requires => gempackage(:name => "ParseTree"))
+        has_gempackage(:name => "open4", :requires => gempackage(:name => "hoe"))
+        has_gempackage(:name => "ruby2ruby", :requires => gempackage(:name => "ParseTree"))
 
-          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                
+        has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com", :requires => gempackage(:name => "xml-simple"))
+        has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com", :requires => [gempackage(:name => "activesupport"), gempackage(:name => "ParseTree")])
+        
         # 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_cron({:command => "cloud-maintain"}) do
+          minute "*/5"
+        end
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end
       

data/lib/poolparty/core/array.rb

@@ -21,4 +21,7 @@ class Array
   def get_named(str="")
     map {|a| a.name == str ? a : nil }.reject {|a| a.nil? }
   end
+  def to_option_string(ns=[])
+    "[ #{map {|e| e.to_option_string }.join(", ")} ]"
+  end
 end

data/lib/poolparty/core/kernel.rb

@@ -10,8 +10,11 @@ module Kernel
     block.in_context(klass_or_obj).call
   end
   def load_p(dir)
-    Dir["#{dir}/**"].each do |file|
-      ::File.directory?(file) ? load_p(file) : (require "#{file}")
+    Dir["#{dir}/*.rb"].each do |file|
+      require "#{file}" if ::FileTest.file?(file)
+    end
+    Dir["#{dir}/*"].each do |dir|
+      load_p(dir) if ::FileTest.directory?(dir)
     end
   end
   def with_warnings_suppressed

data/lib/poolparty/core/string.rb

@@ -33,7 +33,11 @@ class String
   def to_option_string(ns=[])
     a_template = (self =~ /template/) == 0
     a_service = self =~ /^[A-Z][a-zA-Z]*\[[a-zA-Z0-9\-\.\"\'_\$\{\}\/]*\]/
-    (a_service || a_template) ? "#{self}" : "'#{self}'"
+    if is_a?(PoolParty::Resources::Resource)
+      self.to_s
+    else
+      (a_service || a_template) ? "#{self}" : "'#{self}'"
+    end    
   end
   # Refactor this guy to get the class if the class is defined, and not always create a new one
   # although, it doesn't really matter as ruby will just reopen the class

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

@@ -23,13 +23,13 @@ module PoolParty
           setup_basic_structure,
           setup_configs,        
           setup_fileserver,
-          setup_autosigning,
-          start_puppetmaster
+          setup_autosigning,          
         ] << configure_tasks
       end
 
       def configure_tasks
         [
+          start_puppetmaster,
           create_local_node,
           move_templates,
           create_poolparty_manifest,
@@ -121,13 +121,14 @@ mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@c
         <<-EOS
 ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
 rm -rf /etc/puppet/ssl
-puppetmasterd
+puppetmasterd --verbose
         EOS
       end
 
       def restart_puppetd
         <<-EOS
-          puppetd --listen --fqdn=#{@cloud.master.name}
+          puppetd --test
+          puppetd --listen --fqdn=#{@instance.name}
         EOS
       end
     end

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

@@ -18,7 +18,7 @@ module PoolParty
       def setup_puppet
         <<-EOE
           puppetd --mkusers
-          if [ -z "$(grep -v '#' /etc/hosts | grep 'puppet')" ]; then echo "#{master_ip} puppet" >> /etc/hosts; else echo "host already set"; fi
+          if [ -z "$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo "#{master_ip} puppet master" >> /etc/hosts; else echo "host already set"; fi
           mv #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
         EOE
       end

data/lib/poolparty/plugins/gem_package.rb

@@ -3,13 +3,27 @@ module PoolParty
         
     virtual_resource(:gempackage) do
       
+      # When we call gempackage, we want the exec to run on the directory we suggest
+      # we also only want it to run if there is NOT a local gem already installed with
+      # the package details (version and name)
       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 -y --no-ri --no-rdoc #{"--version \"#{version}\"" if @parent.version} #{"--source #{@parent.source}" if @parent.source} #{@parent.name}"
+        has_exec(opts.merge({: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 -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
       
+      # Because we are only running this one command, we want to make sure that when we
+      # require it in another resource, that it is appropriately labeled
+      def class_type_name
+        "Exec"
+      end
+      # Additionally, because we change the name in the exec when required, we have to reflect
+      # it here in the key. This is just so poolparty is aware of the resource when looking for 
+      # it in a requires statement
+      def key
+        "gem-package-#{name}"
+      end
     end
     
   end

data/lib/poolparty/plugins/git.rb

@@ -12,23 +12,25 @@ module PoolParty
         has_package(:name => "git-core")
       end
       
-      def has_git_repos        
-        has_directory(:name => "#{path}")
-        
-        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
-          command "git pull"
-          requires "Exec['git-#{@parent.name}']"
-        end
-        
-        if symlink
-          has_file(:name => "#{symlink}") do
-            ensures @parent.path
+      def has_git_repos
+        with_options(:requires => 'Package["git-core"]') do
+          has_directory(:name => "#{path}")
+
+          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}"
+          end
+
+          exec(:name => "git-update-#{name}", :cwd => "#{path}") do
+            command "git pull"
+            requires "Exec['git-#{@parent.name}']"
+          end
+
+          if symlink
+            has_file(:name => "#{symlink}") do
+              ensures @parent.path
+            end
           end
         end
       end

data/lib/poolparty/pool/resource.rb

@@ -18,8 +18,13 @@ module PoolParty
     end
     
     def add_resource(type, opts={}, parent=self, &block)
-      returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|
-        resource(type) << o
+      resource = get_resource(type, opts[:name])
+      if resource
+        return resource 
+      else
+        returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|
+          resource(type) << o
+        end
       end
     end
     
@@ -99,7 +104,7 @@ module PoolParty
       # Overrides for syntax
       # Allows us to send require to require a resource
       def require(str="")
-        options[:require]        
+        options[:require]
       end
       def requires(str="")
         options.merge!(:require => str)
@@ -221,6 +226,10 @@ module PoolParty
                     
         end.join("\n")
       end
+      
+      def to_s
+        "#{class_type_name.capitalize}['#{key}']"
+      end
     end
     
     # Adds two methods to the module
@@ -245,6 +254,4 @@ module PoolParty
     end
     
   end
-end
-
-Kernel.load_p File.dirname(__FILE__) + "/resources/*"
+end

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

@@ -27,14 +27,14 @@ module PoolParty
       def to_string
         returning String.new do |output|
           output << "# #{name.sanitize}"
-          output << "\nclass #{name.sanitize} {\n"
+          output << "\nclass #{name.sanitize.downcase} {\n"
           output << resources_string_from_resources(resources)
           output << "\n}\n"
         end
       end
       
       def include_string
-        "include #{name.sanitize}"
+        "include #{name.sanitize.downcase}"
       end
       
       def name(*args)

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

@@ -7,9 +7,13 @@ module PoolParty
         :path => "/usr/bin:/bin:/usr/local/bin:$PATH"
       })
       
-      
+      # Execs cannot have the following parameters
+      # We use version in the gempackage resource
+      # So we have to exclude it here. Alternatively, we could
+      # exclude it in the gempackage, but this is an example
+      # of how to exclude it as well
       def disallowed_options
-        [:ensure, :name]
+        [:ensure, :name, :source, :version]
       end
       
       def key

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

@@ -1,8 +1,8 @@
 module PoolParty    
   module Resources
         
-    class File < Resource
-            
+    class File < Resource      
+      
       default_options({
         :ensure => "file",
         :mode => 644,

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

@@ -2,7 +2,9 @@ module PoolParty
   module Resources
         
     class Remotefile < File
-            
+      # Not really my favorite of lines
+      include PoolParty::Configurable
+      
       default_options({
         :ensure => "present",
         :mode => 644,

data/lib/poolparty/templates/cib.xml

@@ -1 +0,0 @@
-<!-- cib.xml -->

data/lib/poolparty/templates/ha.cf

@@ -7,4 +7,4 @@ auto_failback on
 use_logd yes
 crm on
 
-node <%= nodenames.join(" ") %>
+node <%= ha_nodenames.join(" ") %>

data/lib/poolparty/templates/haproxy.conf

@@ -28,9 +28,9 @@ defaults
   stats uri /poolparty
   stats realm Statistics\ for\ PoolParty
 
-listen <%= name %> 
-    bind 0.0.0.0:<%= ports.join(",0.0.0.0:") %>
-    <% node_ips.each_with_index do |ip, index| -%>
+listen <%= name_haproxy %> 
+    bind 0.0.0.0:<%= ports_haproxy.join(",0.0.0.0:") %>
+    <% node_ips_haproxy.each_with_index do |ip, index| -%>
     cookie POOLPARTYPARTY
     server node<%= index %> <%= ip %>:<%= forwarding_port %> weight 1 check cookie
   <% end -%>

data/lib/poolparty/templates/puppet.conf

@@ -5,7 +5,7 @@
  
 [puppetd]
   localconfig = $vardir/localconfig
-  pluginsync=true
+  pluginsync=false
   factsync=false
   report=true
   server=master

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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-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-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.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/code.css", "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 poolpartyrb!
@@ -23,10 +23,10 @@ Please check out the documentation for any questions or check out the google gro
 
 Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!
 
-For more information, check http://poolpartyrb.com
+For more information, check http://PoolPartyrb.com
 On IRC: 
   irc.freenode.net
-  #PoolPartyrb
+  #poolpartyrb
   
 *** Ari Lerner @ <arilerner@mac.com> ***}
   s.rdoc_options = ["--main", "README.txt"]

data/script/txt2html

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-GEM_NAME = 'PoolParty' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'PoolParty'
+GEM_NAME = 'poolparty' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'poolparty'
 
 require 'rubygems'
 begin

data/spec/poolparty/core/array_spec.rb

@@ -23,4 +23,9 @@ describe "Array" do
       @array.to_os
     end
   end
+  describe "to_option_string" do
+    it "should map the to_option_strings in an array of strings" do
+      ["hi", "be"].to_option_string.should == "[ 'hi', 'be' ]"
+    end
+  end
 end

data/spec/poolparty/core/string_spec.rb

@@ -129,6 +129,13 @@ listen web_proxy 127.0.0.1:3000
     it "should return File['/etc/apache2/conf.d/base.conf'] as a string" do
       'File["/etc/apache2/conf.d/base.conf"]'.to_option_string.should == "File[\"/etc/apache2/conf.d/base.conf\"]"
     end
+    it "should turn a resource into a requires file" do
+      @cloud = cloud :app do
+        file(:name => "franke")
+      end
+      @file = @cloud.resource(:file).first
+      @file.to_option_string.should == "File['franke']"
+    end    
   end
   describe "sanitize" do
     it "should remove the periods from the string" do

data/spec/poolparty/pool/cloud_spec.rb

@@ -179,7 +179,7 @@ describe "Cloud" do
         end
         it "should have 3 resources" do
           @cloud.add_poolparty_base_requirements
-          @cloud.number_of_resources.should == 4
+          @cloud.number_of_resources.should > 3
         end
         it "should receive add_poolparty_base_requirements before building the manifest" do
           @cloud.should_receive(:add_poolparty_base_requirements).once

data/spec/poolparty/pool/resource_spec.rb

@@ -220,5 +220,24 @@ describe "Resource" do
         @file.parent.tangerine.should == "orange"
       end
     end
+    describe "fetching" do
+      before(:each) do
+        @file = file(:name => "pancakes")
+      end
+      it "should not create a new resource if the same resource exists" do
+        PoolParty::Resources::File.should_not_receive(:new)
+        file(:name => "pancakes")
+      end
+      it "should return the file previously created" do
+        get_resource(:file, "pancakes").should == @file
+      end
+      it "should be able to use the helper to grab the file" do
+        PoolParty::Resources::File.should_not_receive(:new)
+        file(:name => "pancakes").should == @file
+      end
+      it "should turn the resource into a string" do
+        @file.to_s.should == "File['pancakes']"
+      end
+    end
   end
 end

data/website/index.html

@@ -8,6 +8,7 @@
       PoolParty
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
+  <link href="stylesheets/code.css" media="screen" rel="stylesheet" type="text/css" />
 <style>
 
 </style>
@@ -31,46 +32,71 @@
 <div id="main">
 
     <h1>PoolParty</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/PoolParty"; return false'>
+    <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.5</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.6</a>
     </div>
-    <h1>&amp;#x2192; &#8216;Easy cloud computing&#8217;</h1>
+    <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>
+<p>A self-healing, load-balanced cloud computing solution. Combined with the power of <a href="http://reductivelabs.com/trac/puppet/">Puppet</a>, the <a href="http://www.linux-ha.org/">High Availability</a> project, ruby and erlang, PoolParty makes it easy and fun to set up your cloud! Currently, you can use it with ec2, but it&#8217;s not tied to any particular service. You can use PoolParty to manage and monitor your home network!</p>
 <h2>Installing</h2>
-<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="constant">PoolParty</span></pre></p>
+<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="punct">--</span><span class="ident">source</span> <span class="ident">http</span><span class="punct">:/</span><span class="regex"></span><span class="punct">/</span><span class="ident">gems</span><span class="punct">.</span><span class="ident">github</span><span class="punct">.</span><span class="ident">com</span> <span class="ident">auser</span><span class="punct">-</span><span class="ident">poolparty</span></pre></p>
 <h2>The basics</h2>
 <h2>Demonstration of usage</h2>
+<pre>
+cloud spec [name]
+</pre>
+<p>This will create a basic spec for you in the spec directory. Then, write your spec file. There are examples in the repos as well as the one below:</p>
+<p><pre class='syntax'>
+  <span class="comment"># Basic poolparty template with apache plugin</span>
+  <span class="ident">require</span> <span class="punct">&quot;</span><span class="string">poolparty-apache2-plugin</span><span class="punct">&quot;</span>
+
+  <span class="ident">pool</span> <span class="symbol">:app</span> <span class="keyword">do</span>
+
+    <span class="ident">instances</span> <span class="number">2</span><span class="punct">..</span><span class="number">5</span>
+    <span class="ident">port</span> <span class="number">80</span>
+    <span class="ident">ami</span> <span class="punct">&quot;</span><span class="string">ami-1cd73375</span><span class="punct">&quot;</span> <span class="comment"># Alestic Ubuntu AMI</span>
+
+    <span class="ident">cloud</span> <span class="symbol">:app</span> <span class="keyword">do</span>
+
+      <span class="ident">apache</span> <span class="keyword">do</span>
+        <span class="ident">installed_as_worker</span>      
+
+        <span class="ident">has_virtualhost</span> <span class="keyword">do</span>
+
+          <span class="ident">name</span> <span class="punct">&quot;</span><span class="string">poolpartyrb.com</span><span class="punct">&quot;</span>
+          <span class="ident">listen</span><span class="punct">(&quot;</span><span class="string">8080</span><span class="punct">&quot;)</span>
+          <span class="ident">virtual_host_entry</span> <span class="punct">::</span><span class="constant">File</span><span class="punct">.</span><span class="ident">join</span><span class="punct">(</span><span class="constant">File</span><span class="punct">.</span><span class="ident">dirname</span><span class="punct">(</span><span class="constant">__FILE__</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">templates</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">virtual_host.conf.erb</span><span class="punct">&quot;)</span>
+
+          <span class="ident">has_git</span><span class="punct">(</span><span class="symbol">:name</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">poolpartyrepos</span><span class="punct">&quot;,</span> <span class="symbol">:source</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">git://github.com/auser/xnot.org.git</span><span class="punct">&quot;,</span> <span class="symbol">:path</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">/var/www/xnot.org/public</span><span class="punct">&quot;)</span>
+
+        <span class="keyword">end</span>
+      <span class="keyword">end</span>
+
+    <span class="keyword">end</span>
+
+  <span class="keyword">end</span>
+</pre></p>
 <h2>Forum</h2>
 <p><a href="http://groups.google.com/group/PoolParty">http://groups.google.com/group/PoolParty</a></p>
 <h2>How to submit patches</h2>
 <p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-<p>The trunk repository is <code>svn://rubyforge.org/var/svn/PoolParty/trunk</code> for anonymous access.</p>
-<p><span class="caps">OOOORRRR</span></p>
+<p>The trunk repository is <code>http://github.com/auser/poolparty</code> for anonymous access.</p>
 <p>You can fetch the source from either:</p>
-<ul>
-	<li>rubyforge: <span class="caps">MISSING</span> IN <span class="caps">ACTION</span></li>
-</ul>
-<p>When you do this, this message will magically disappear!</p>
-<p>Or you can hack website/index.txt and make it all go away!!</p>
 <ul>
 	<li>github: <a href="http://github.com/auser/PoolParty/tree/master">http://github.com/auser/PoolParty/tree/master</a></li>
 </ul>
 <pre>git clone git://github.com/auser/PoolParty.git</pre>
-<ul>
-	<li>gitorious: <a href="git://gitorious.org/PoolParty/mainline.git">git://gitorious.org/PoolParty/mainline.git</a></li>
-</ul>
-<pre>git clone git://gitorious.org/PoolParty/mainline.git</pre>
 <h3>Build and test instructions</h3>
-<pre>cd PoolParty
+<p><pre class='syntax'>cd PoolParty
 rake test
-rake install_gem</pre>
+rake install_gem</pre></p>
 <h2>License</h2>
 <p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:ari.lerner@citrusbyte.com">Ari Lerner</a> email via the <a href="http://groups.google.com/group/PoolParty">forum</a></p>
     <p class="coda">
-      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 17th September 2008<br>
+      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 14th October 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -1,21 +1,58 @@
 h1. PoolParty
 
-h1. → 'Easy cloud computing'
+h1. 'Easy cloud computing'
 
 
 h2. What
 
+A self-healing, load-balanced cloud computing solution. Combined with the power of <a href="http://reductivelabs.com/trac/puppet/">Puppet</a>, the <a href="http://www.linux-ha.org/">High Availability</a> project, ruby and erlang, PoolParty makes it easy and fun to set up your cloud! Currently, you can use it with ec2, but it's not tied to any particular service. You can use PoolParty to manage and monitor your home network!
+
 
 h2. Installing
 
-<pre syntax="ruby">sudo gem install PoolParty</pre>
+<pre syntax="ruby">sudo gem install --source http://gems.github.com auser-poolparty</pre>
 
 h2. The basics
 
 
 h2. Demonstration of usage
 
+<pre>
+cloud spec [name]
+</pre>
+
+This will create a basic spec for you in the spec directory. Then, write your spec file. There are examples in the repos as well as the one below:
+
+<pre syntax="ruby">
+  # Basic poolparty template with apache plugin
+  require "poolparty-apache2-plugin"
+
+  pool :app do
+
+    instances 2..5
+    port 80
+    ami "ami-1cd73375" # Alestic Ubuntu AMI
+
+    cloud :app do
+
+      apache do
+        installed_as_worker      
+
+        has_virtualhost do
+
+          name "poolpartyrb.com"
+          listen("8080")
+          virtual_host_entry ::File.join(File.dirname(__FILE__), "templates", "virtual_host.conf.erb")
+
+          has_git(:name => "poolpartyrepos", :source => "git://github.com/auser/xnot.org.git", :path => "/var/www/xnot.org/public")
 
+        end
+      end
+
+    end
+
+  end
+</pre>
 
 h2. Forum
 
@@ -25,9 +62,7 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is <code>svn://rubyforge.org/var/svn/PoolParty/trunk</code> for anonymous access.
-
-OOOORRRR
+The trunk repository is <code>http://github.com/auser/poolparty</code> for anonymous access.
 
 You can fetch the source from either:
 
@@ -37,27 +72,15 @@ You can fetch the source from either:
 
 <pre>git clone git://rubyforge.org/PoolParty.git</pre>
 
-<% else %>
-
-* rubyforge: MISSING IN ACTION
-
-When you do this, this message will magically disappear!
-
-Or you can hack website/index.txt and make it all go away!!
-
 <% end %>
 
 * github: "http://github.com/auser/PoolParty/tree/master":http://github.com/auser/PoolParty/tree/master
 
 <pre>git clone git://github.com/auser/PoolParty.git</pre>
 
-* gitorious: "git://gitorious.org/PoolParty/mainline.git":git://gitorious.org/PoolParty/mainline.git
-
-<pre>git clone git://gitorious.org/PoolParty/mainline.git</pre>
-
 h3. Build and test instructions
 
-<pre>cd PoolParty
+<pre syntax="bash">cd PoolParty
 rake test
 rake install_gem</pre>
 

data/website/stylesheets/code.css

@@ -0,0 +1,29 @@
+pre {
+    background-color: #f1f1f3;
+    color: #112;
+    padding: 10px;
+    font-size: 0.9em;
+    overflow: auto;
+    margin: 4px 0px;
+          width: 95%;
+}
+
+/* Syntax highlighting */
+pre .normal {}
+pre .comment { color: #005; font-style: italic; }
+pre .keyword { color: #A00; font-weight: bold; }
+pre .method { color: #077; }
+pre .class { color: #074; }
+pre .module { color: #050; }
+pre .punct { color: #447; font-weight: bold; }
+pre .symbol { color: #099; }
+pre .string { color: #944; }
+pre .char { color: #F07; }
+pre .ident { color: #004; }
+pre .constant { color: #07F; }
+pre .regex { color: #B66; background: #FEF; }
+pre .number { color: #A11; }
+pre .attribute { color: #5bb; }
+pre .global { color: #7FB; }
+pre .expr { color: #227; }
+pre .escape { color: #277; }

data/website/stylesheets/screen.css

@@ -77,24 +77,34 @@ td {
 .unknown {
 	color: #995000;
 }
-pre, code {
-  font-family: monospace;
-  font-size: 90%;
-  line-height: 1.4em;
-  color: #ff8;
-  background-color: #111;
-  padding: 2px 10px 2px 10px;
+pre {
+    background-color: #f1f1f3;
+    color: #112;
+    padding: 10px;
+    font-size: 1.1em;
+    overflow: auto;
+    margin: 4px 0px;
 }
-.comment { color: #aaa; font-style: italic; }
-.keyword { color: #eff; font-weight: bold; }
-.punct { color: #eee; font-weight: bold; }
-.symbol { color: #0bb; }
-.string { color: #6b4; }
-.ident { color: #ff8; }
-.constant { color: #66f; }
-.regex { color: #ec6; }
-.number { color: #F99; }
-.expr { color: #227; }
+
+/* Syntax highlighting */
+pre .normal {}
+pre .comment { color: #005; font-style: italic; }
+pre .keyword { color: #A00; font-weight: bold; }
+pre .method { color: #077; }
+pre .class { color: #074; }
+pre .module { color: #050; }
+pre .punct { color: #447; font-weight: bold; }
+pre .symbol { color: #099; }
+pre .string { color: #944; }
+pre .char { color: #F07; }
+pre .ident { color: #004; }
+pre .constant { color: #07F; }
+pre .regex { color: #B66; background: #FEF; }
+pre .number { color: #A11; }
+pre .attribute { color: #5bb; }
+pre .global { color: #7FB; }
+pre .expr { color: #227; }
+pre .escape { color: #277; }
 
 #version {
   float: right;
@@ -135,4 +145,3 @@ pre, code {
 	cursor:	pointer; 
 	cursor:	hand;
 }
-

data/website/template.html.erb

@@ -8,6 +8,7 @@
       <%= title %>
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
+  <link href="stylesheets/code.css" media="screen" rel="stylesheet" type="text/css" />
 <style>
 
 </style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Ari Lerner
@@ -292,6 +292,7 @@ files:
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
+- website/stylesheets/code.css
 - website/stylesheets/screen.css
 - website/template.html.erb
 has_rdoc: true
@@ -308,10 +309,10 @@ post_install_message: |-
   
   Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!
   
-  For more information, check http://poolpartyrb.com
+  For more information, check http://PoolPartyrb.com
   On IRC: 
     irc.freenode.net
-    #PoolPartyrb
+    #poolpartyrb
   
   *** Ari Lerner @ <arilerner@mac.com> ***
 rdoc_options: