auser-poolparty 0.2.9 → 0.2.15

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

@@ -43,19 +43,19 @@ module PoolParty
 
     end
     
-    def resources_string_from_resources(resources, prev="\t")
+    def resources_string_from_resources(resources, pre="\t")
       @variables = resources.extract! {|name,resource| name == :variable}
       returning Array.new do |str|
         unless @variables.empty?
           str << "\n# Variables \n"
           @variables.each do |name, variable|
-            str << variable.to_string("#{prev}")
+            str << variable.to_string("#{pre}")
           end          
         end
         
         resources.each do |type, resource|
-          str << "\n#{prev*2}# #{type}\n"
-          str << resource.to_string("#{prev*2}")
+          str << "\n#{pre*2}# #{type}\n"
+          str << resource.to_string("#{pre*2}")
         end        
       end.join("\n")
     end

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

@@ -25,7 +25,11 @@ module PoolParty
         true
       end
       
-      def to_string(prev="")
+      def printable?
+        false
+      end
+      
+      def to_string(pre="")
         returning Array.new do |output|
           output << "# #{name.sanitize}"
           output << "case #{attribute} {"

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

@@ -1,14 +1,28 @@
 module PoolParty    
   module Resources
-    
-    def gem(opts={}, parent=self, &block)
-      add_resource(:package, opts.merge({
-        :provider => "gem",
-        :requires => "Package[rubygems]"
-      }), parent, &block)
+        
+    class Gempackage < Resource
+      
+      # 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={}, parent=self)
+        has_exec(opts.merge({:name => name, :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"}), parent) do          
+          command "gem install -y --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name}"
+          ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
+        end
+      end
+      def virtual_resource?
+        true
+      end
+      def printable?
+        true
+      end
+      def class_type_name
+        "Exec"
+      end
+      
     end
     
-    add_has_and_does_not_have_methods_for(:gem)
-    
   end
 end

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

@@ -2,17 +2,21 @@ module PoolParty
   module Resources
         
     class Symlink < Resource
-      
-      def from(*args)
-        options.merge!(:ensure => args[0])
-      end
-      
+            
       def class_type_name
         "file"
       end
       
       def disallowed_options
-        [:name]
+        [:name, :source]
+      end
+      
+      def present
+        source
+      end
+      
+      def printable?
+        true
       end
       
     end

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

@@ -8,7 +8,7 @@ module PoolParty
         :value => ""
       })
       
-      def to_string(prev="\t")
+      def to_string(pre="\t")
         "$#{name} = #{value_string}"
       end
       

data/lib/poolparty/templates/ha.cf

@@ -10,10 +10,10 @@ bcast eth0
 crm on
 logfile /var/log/ha.log
 
-<% ha_node_ips.each_with_index do |ip,index| -%>
-  <% if $hostname != ha_nodenames[index] -%>
+<% ha_node_ips.chomp.split(/\t/).each_with_index do |ip,index| -%>
+  <% if $hostname != ha_nodenames.chomp.split(/\t/)[index] -%>
   ucast eth0 <%= ip %>
   <% end %>
 <% end %>
 
-node <%= ha_nodenames.join(" ") %>
+node <%= ha_nodenames %>

data/lib/poolparty/templates/haproxy.conf

@@ -30,7 +30,7 @@ defaults
 
 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 -%>
+    <%- node_ips_haproxy.chomp.split(/\t/).each_with_index do |ip, index| -%>    
+    server <%= index == 0 ? "master" : "node#{index}" %> <%= ip %>:<%= forwarding_port %> weight 1 check cookie
+    <%- end -%>

data/lib/poolparty/templates/puppet.conf

@@ -1,7 +1,7 @@
 [main]
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
-  pluginsync=true
+  pluginsync=false
   factsync=false
  
 [puppetd]

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 9
+    TINY  = 15
 
     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.9"
+  s.version = "0.2.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-16}
+  s.date = %q{2008-10-20}
   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-refresh", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor", "server-list-active"]
+  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", "server-get-load", "server-list-active", "server-rerun"]
   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", "bin/server-list-active", "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/symlink.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodeips.rb", "lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodenames.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/haresources", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/poolparty.monitor", "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/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/symlink_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.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", "bin/server-get-load", "bin/server-list-active", "bin/server-rerun", "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/messenger/Makefile", "lib/erlang/messenger/README", "lib/erlang/messenger/Rakefile", "lib/erlang/messenger/control", "lib/erlang/messenger/ebin/erl_crash.dump", "lib/erlang/messenger/ebin/load_app.beam", "lib/erlang/messenger/ebin/pm_cluster.beam", "lib/erlang/messenger/ebin/pm_master.beam", "lib/erlang/messenger/ebin/pm_master_supervisor.beam", "lib/erlang/messenger/ebin/pm_node.beam", "lib/erlang/messenger/ebin/pm_node_supervisor.beam", "lib/erlang/messenger/ebin/tmp/templates/apache2.conf", "lib/erlang/messenger/ebin/tmp/templates/base.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/browser_fixes.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/mime-minimal.conf.erb", "lib/erlang/messenger/ebin/tmp/templates/virtual_host.conf.erb", "lib/erlang/messenger/lib/load_app.app", "lib/erlang/messenger/src/load_app.erl", "lib/erlang/messenger/src/pm_cluster.erl", "lib/erlang/messenger/src/pm_master.erl", "lib/erlang/messenger/src/pm_master_supervisor.erl", "lib/erlang/messenger/src/pm_node.erl", "lib/erlang/messenger/src/pm_node_supervisor.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/dependency_resolutions/base.rb", "lib/poolparty/dependency_resolutions/puppet.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/resourcing_dsl.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/monitors/monitors/cpu_monitor.rb", "lib/poolparty/monitors/monitors/memory_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/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/symlink.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/haresources", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/poolparty.monitor", "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/dependency_resolutions/base_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/monitors/base_monitor_spec.rb", "spec/poolparty/monitors/monitors/cpu_monitor_spec.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/symlink_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!
@@ -21,7 +21,9 @@ To get started, run the generator:
 Please check out the documentation for any questions or check out the google groups at
   http://groups.google.com/group/poolpartyrb
 
-Don't forget to check out the plugin tutorial @ http://poolpartyrb.com for extending PoolParty!
+Tutorials are at http://poolpartyrb.com
+
+Don't forget to check out the plugin tutorial @ http://poolpartyrb.com to extend PoolParty for your needs!
 
 For more information, check http://PoolPartyrb.com
 On IRC: 

data/setup.rb

@@ -1363,7 +1363,7 @@ class Installer
 
   def install_dir_conf(rel)
     # FIXME: should not remove current config files
-    # (rename previous file to .old/.org)
+    # (rename preious file to .old/.org)
     install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
   end
 
@@ -1542,12 +1542,12 @@ class Installer
 
     dir = File.basename(rel)
     Dir.mkdir dir unless File.dir?(dir)
-    prevdir = Dir.pwd
+    predir = Dir.pwd
     Dir.chdir dir
     $stderr.puts '---> ' + rel if verbose?
     @currdir = rel
     yield
-    Dir.chdir prevdir
+    Dir.chdir predir
     $stderr.puts '<--- ' + rel if verbose?
     @currdir = File.dirname(rel)
   end

data/spec/poolparty/core/hash_spec.rb

@@ -30,7 +30,7 @@ describe "Hash" do
   it "should be able to flush out into a string into an array" do
     @a.flush_out.should == ["a => '10'","b => '20'","c => '30'"]
   end
-  it "should be able to flush out with prev and posts" do
+  it "should be able to flush out with pre and posts" do
     @a.flush_out("hi", "ho").should == ["hia => '10'ho","hib => '20'ho","hic => '30'ho"]
   end
   describe "select" do
@@ -60,4 +60,22 @@ describe "Hash" do
       }.should_not raise_error
     end
   end
+  describe "append" do
+    before(:each) do
+      @hash = {:game => "token", :required => "for_play"}
+    end
+    it "should not destroy an option salready on the hash" do
+      @hash.append(:required => "to_play")[:game].should == "token"
+    end
+    it "should change the entry to an array if it already exists" do
+      @hash.append(:game => "coin")[:game].class.should == Array
+    end
+    it "should append the other hash's key to the end of the array" do
+      @hash.append(:game => "coin")[:game][-1].should == "coin"
+    end
+    it "should change the hash with the append(bang) option" do
+      @hash.append!(:game => "coin")
+      @hash[:game][-1].should == "coin"
+    end
+  end
 end

data/spec/poolparty/dependency_resolutions/base_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Resolution spec" do
+  before(:each) do
+    @base = Class.new
+    @base.extend(DependencyResolutions::Base)
+  end
+  %w(to_s to_string).each do |meth|
+    eval "it 'should have the method #{meth} defined' do; @base.respond_to?(:#{meth}).should == true; end"
+  end
+end

data/spec/poolparty/modules/file_writer_spec.rb

@@ -43,6 +43,15 @@ describe "FileWriter" do
       @test.write_to_file_in_storage_directory(@filepath, "STRING TO WRITE")
     end
   end
+  describe "trying to copy the same file" do
+    before(:each) do
+      @filepath = @path
+    end
+    it "should not try to copy a file if they are the same file" do
+      FileUtils.should_not_receive(:cp)
+      @test.copy_file_to_storage_directory(@filepath)
+    end
+  end
   after(:all) do
     ::File.unlink @path if ::File.file? @path
   end

data/spec/poolparty/monitors/base_monitor_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+include PoolParty::Monitors
+
+describe "Monitors" do
+  it "should have a list of available monitors" do
+    PoolParty::Monitors.available_monitors.empty?.should == false
+  end
+  it "should register a module and append it to the available monitors" do
+    size = PoolParty::Monitors.available_monitors.size
+    PoolParty::Monitors.register_monitor :fake
+    size.should == PoolParty::Monitors.available_monitors.size - 1
+  end
+end
+describe "BaseMonitor" do
+  it "should have the singleton method run defined" do
+    BaseMonitor.respond_to?(:run).should == true
+  end
+end

data/spec/poolparty/monitors/monitors/cpu_monitor_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+include PoolParty::Monitors
+
+describe "CpuMonitor" do
+  before(:each) do
+    @mon = CpuMonitor.new
+    CpuMonitor.stub!(:new).and_return @mon
+  end
+  it "should have the singleton method run defined" do
+    CpuMonitor.respond_to?(:run).should == true
+  end
+  it "should call the method new" do
+    CpuMonitor.should_receive(:new).and_return @mon
+    CpuMonitor.run
+  end
+end

data/spec/poolparty/net/remote_instance_spec.rb

@@ -65,6 +65,11 @@ describe "Remote Instance" do
       @ri.responding.should_not be_nil
       @ri.responding?.should == true
     end
-    
+    it "should have the puppet_runner_command" do
+      @ri.respond_to?(:puppet_runner_command).should == true
+    end
+    it "should return the puppet_runner_command with puppetd" do
+      @ri.puppet_runner_command.should =~ /puppetd/
+    end
   end
 end

data/spec/poolparty/net/remoter_spec.rb

@@ -48,7 +48,7 @@ describe "Remoter" do
       @tc.rsync_command.should == "rsync --delete -azP --exclude cache -e '#{@tc.ssh_string}'"
     end
     it "should be able to rsync storage commands" do
-      @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Dir.pwd}/tmp 192.168.0.22:/var/poolparty"
+      @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Dir.pwd}/tmp/ 192.168.0.22:/var/poolparty"
     end
   end
   describe "launch_and_configure_master!" do
@@ -188,4 +188,5 @@ describe "Remoter" do
       end
     end
   end
+
 end

data/spec/poolparty/pool/cloud_spec.rb

@@ -170,7 +170,7 @@ describe "Cloud" do
                 hello my lady
               EOE
             end
-            has_gem(:name => "poolparty")
+            has_gempackage(:name => "poolparty")
             has_package(:name => "dummy")            
           end
         end
@@ -310,5 +310,19 @@ describe "Cloud" do
       end
     end
     
+    describe "provisioning" do
+      it "should be able to tell that it is provisioning when setting the provisioning flag" do
+        @cloud.provisioning?.should == false
+      end
+      it "should be able to set it as provisioning" do
+        @cloud.provisioning_in_progress
+        @cloud.provisioning?.should == true
+      end
+      it "should be able to unset itself as provisioning" do
+        @cloud.provisioning_in_progress
+        @cloud.provisioning_complete
+        @cloud.provisioning?.should == false
+      end
+    end
   end
 end

data/spec/poolparty/pool/custom_resource_spec.rb

@@ -80,10 +80,10 @@ describe "Custom Resource" do
         end
         it "should create a new CallFunction instance when calling call_function with a string" do
           PoolParty::Resources::CallFunction.should_receive(:new).and_return "bunk"
-          add_resource(:call_function, "line")
+          add_resource(:call_function, :name => "line")
         end
         it "should create a call function in the function call array" do
-          add_resource(:call_function, @cloud, "heyyohey")
+          add_resource(:call_function, {:name => "custom_function"}, @cloud)
           resource(:call_function).size.should == 1
         end
         describe "defining" do

data/spec/poolparty/pool/plugin_spec.rb

@@ -39,7 +39,7 @@ describe "Plugin" do
       before(:each) do
         @plugin.instance_eval do
           enable_php
-          has_gem(:name => "aska")
+          has_gempackage(:name => "aska")
         end
       end
       it "should call enable_php on the class" do
@@ -49,13 +49,13 @@ describe "Plugin" do
         @plugin.resources.class.should == Hash
       end
       it "should have an array of gem resources" do
-        @plugin.resource(:package).class.should == Array
+        @plugin.resource(:gempackage).class.should == Array
       end
       it "should have 1 gem in the resources defined" do
-        @plugin.resource(:package).size.should == 1
+        @plugin.resource(:gempackage).size.should == 1
       end
       it "should have the gem named aska in the gem resource" do
-        @plugin.resource(:package).first.name.should == "aska"
+        @plugin.resource(:gempackage).first.name.should == "aska"
       end
       it "should have its resources visible to its parent" do
         @plugin.parent = @c

data/spec/poolparty/pool/resource_spec.rb

@@ -131,6 +131,13 @@ describe "Resource" do
     include PoolParty::Resources
     before(:each) do
       reset_resources!
+      @cloud = cloud :command_cloud do; end
+    end
+    it "should call add_resource when creating using the command: file" do
+      @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud)
+      @cloud.instance_eval do
+        file(:name => "frank")
+      end
     end
     it "should create the new 'resource' as a resource" do
       resource(:file).class.should == Array
@@ -220,6 +227,29 @@ describe "Resource" do
         @file.parent.tangerine.should == "orange"
       end
     end
+    describe "appending to resource" do
+      before(:each) do
+        @cloud1 = cloud :apples do
+          directory(:name => "/var/www") do
+            file(:name => "/var/www/file.html")
+          end
+        end        
+        @dir = @cloud1.get_resource(:directory, "/var/www")
+        @file = @dir.get_resource(:file, "/var/www/file.html")
+      end
+      it "should say there is 1 resource because the lower-level resources should be contained on the parenting resource" do
+        @cloud1.resources.size.should == 1
+      end
+      it "should say there is one resource on the outer resource" do
+        @dir.resources.size.should == 1
+      end
+      it "should contain the file as a resource" do
+        @dir.resource(:file)[0].to_s.should == @file.to_s
+      end
+      it "should set the parent as the parenting resource" do
+        @file.parent.to_s.should == @dir.to_s
+      end
+    end
     describe "fetching" do
       before(:each) do
         @file = file(:name => "pancakes")
@@ -228,7 +258,7 @@ describe "Resource" do
         PoolParty::Resources::File.should_not_receive(:new)
         file(:name => "pancakes")
       end
-      it "should return the file previously created" do
+      it "should return the file preiously created" do
         get_resource(:file, "pancakes").should == @file
       end
       it "should be able to use the helper to grab the file" do
@@ -247,6 +277,14 @@ describe "Resource" do
           @file.cancelled?.should == true
         end
       end
+      describe "virtual_resources" do
+        before(:each) do
+          @virtual_resource = git(:name => "tank", :source => "git://github.com/auser/testgit.git")
+        end
+        it "should fetch a virtual resource the same" do
+          git(:name => "tank", :source => "git://github.com/auser/testgit.git").to_s.should == @virtual_resource.to_s
+        end
+      end
     end
   end
 end