auser-poolparty 0.2.6 → 0.2.8

data/Manifest.txt

@@ -103,6 +103,7 @@ 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
@@ -174,6 +175,7 @@ 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

data/bin/cloud

@@ -3,18 +3,27 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-# Get the git-style program action
+# # Get the git-style program action
 # o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
 #   opts.on('-n [name]','--name [name]', 'Binary to run')    { |o| optioner.name o }
+#   
+#   opts.banner = <<-EOB
+#   Usage: cloud <specfile> <action> <options>
+#   Cloud actions:
+#   #{Binary.list_binaries_for("cloud")}
+#   EOB
 # end
 
 name = ARGV.shift
 
 # If there was no program action given
 if !name || name == "-h" || name == "--help"
-  puts "Usage: cloud <specfile> <action> <options>"
-  puts "Cloud actions:"
-  puts Binary.list_binaries_for("cloud")
+  puts "Binary required"
+  puts <<-EOB
+    Usage: cloud <specfile> <action> <options>
+    Cloud actions:
+    #{Binary.list_binaries_for("cloud")}
+    EOB
   exit
 end
 

data/bin/cloud-ssh

@@ -8,11 +8,6 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
 end
 load_pool(o.spec || Binary.get_existing_spec_location)
 
-unless o.cloudname && clouds.keys.size > 1
-  @cloud = cloud(o.cloudname.downcase.to_sym)
-else
-  puts "Error: You must indicate a cloud from which your instance is from"
-  exit(0)
-end
+@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
 
-instance = @cloud.ssh_into_instance_number( o.num.to_i || 0 )
+instance = @cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud

data/bin/cloud-start

@@ -23,7 +23,6 @@ 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/heartbeat.rb

@@ -14,8 +14,9 @@ module PoolParty
           # 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_timeout",  :value => (self.respond_to?(:timeout) ? timeout : "5s")})
           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

data/lib/poolparty/base_packages/poolparty.rb

@@ -5,10 +5,10 @@ module PoolParty
       def enable        
         has_package(:name => "erlang")
         # These should be installed automagically by poolparty, but just in case
-        has_gempackage(:name => "activesupport")
-        has_gempackage(:name => "logging")
-        has_gempackage(:name => "hoe")
-        has_gempackage(:name => "xml-simple")
+        has_gempackage(:name => "activesupport", :requires => package(:name => "rubygems"))
+        has_gempackage(:name => "logging", :requires => package(:name => "rubygems"))
+        has_gempackage(:name => "hoe", :requires => package(:name => "rubygems"))
+        has_gempackage(:name => "xml-simple", :requires => package(:name => "rubygems"))
         has_gempackage(:name => "ParseTree", :version => "2.2.0", :requires => gempackage(:name => "hoe"))
         
         has_gempackage(:name => "RubyInline", :requires => gempackage(:name => "ParseTree"))
@@ -24,8 +24,9 @@ module PoolParty
           has_host({:name => "#{ri.name}", :ip => ri.ip })
         end
         
-        has_cron({:command => "cloud-maintain"}) do
-          minute "*/5"
+        #  -n #{parent.name}
+        has_cron({:command => ". /etc/profile && which cloud-maintain | /bin/sh"}) do
+          minute "*/2"
         end
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end

data/lib/poolparty/base_packages/ruby.rb

@@ -11,7 +11,7 @@ module PoolParty
         has_package(:name => "libruby1.8")                
         has_package(:name => "ruby1.8-dev")
         has_package(:name => "ruby1.8")
-        has_package(:name => "rubygems")
+        # has_package(:name => "rubygems")
         
         has_line_in_file("export PATH=$PATH:/var/lib/gems/1.8/bin/", "/etc/profile")
         

data/lib/poolparty/core/string.rb

@@ -30,6 +30,8 @@ class String
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")
   end
+  # This is the method we use to turn the options into a string to build the main 
+  # manifests
   def to_option_string(ns=[])
     a_template = (self =~ /template/) == 0
     a_service = self =~ /^[A-Z][a-zA-Z]*\[[a-zA-Z0-9\-\.\"\'_\$\{\}\/]*\]/

data/lib/poolparty/helpers/provisioner_base.rb

@@ -74,7 +74,7 @@ module PoolParty
           puts "Logging on to #{@instance.ip}"
           @cloud.rsync_storage_files_to(@instance)
           
-          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh && rm -rf *"
+          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh && rm install_#{name}.sh"
           hide_output do
             @cloud.run_command_on(cmd, @instance)
           end          
@@ -96,7 +96,7 @@ module PoolParty
         unless testing
           @cloud.rsync_storage_files_to(@instance)
 
-          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm -rf *"
+          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
           @cloud.run_command_on(cmd, @instance)
         end
       end
@@ -136,6 +136,7 @@ module PoolParty
       def default_install_tasks
         [
           upgrade_system,
+          fix_rubygems,
           install_puppet_master,
           custom_install_tasks
         ] << install_tasks
@@ -203,6 +204,10 @@ module PoolParty
       def template_directory
         File.join(File.dirname(__FILE__), "..", "templates")
       end
+      
+      def fix_rubygems
+        "echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem"
+      end
 
       def create_local_node
         str = <<-EOS
@@ -238,7 +243,7 @@ module PoolParty
 
       def create_poolparty_manifest
         <<-EOS
-          mv #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes
+          cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes
         EOS
       end
     end

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

@@ -59,7 +59,7 @@ echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp
 echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp
 mkdir -p /etc/puppet/manifests/nodes 
 mkdir -p /etc/puppet/manifests/classes
-mv #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
+cp #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
         EOS
       end
 
@@ -104,16 +104,16 @@ node "#{ri.name}" inherits default {}
       def move_templates
         <<-EOS
 mkdir -p #{Base.template_path}
-mv #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
+cp #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
         EOS
       end
 
       def create_poolparty_manifest
         <<-EOS
-mv #{Base.remote_storage_path}/#{Base.tmp_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
-mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
-mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
-mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}
+cp #{Base.remote_storage_path}/#{Base.tmp_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
+cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
+cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
+cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}
         EOS
       end
 
@@ -127,8 +127,7 @@ puppetmasterd --verbose
 
       def restart_puppetd
         <<-EOS
-          puppetd --test
-          puppetd --listen --fqdn=#{@instance.name}
+          puppetd --listen --fqdn #{@instance.name}
         EOS
       end
     end

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

@@ -17,7 +17,6 @@ module PoolParty
 
       def setup_puppet
         <<-EOE
-          puppetd --mkusers
           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
@@ -25,13 +24,14 @@ module PoolParty
 
       def setup_configs
         <<-EOS
+          /etc/init.d/puppetmasterd stop
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf        
         EOS
       end
 
       def start_puppet
         <<-EOS
-puppetd --listen --fqdn=#{@instance.name}
+puppetd --listen --fqdn #{@instance.name}
         EOS
       end
       

data/lib/poolparty/plugins/git.rb

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

data/lib/poolparty/pool/base.rb

@@ -23,8 +23,7 @@ module PoolParty
       :default_specfile_name => "pool.spec",
       :port => "80",
       :forwarding_port => "8080",
-      :proxy_mode => "http",
-      :pool_logger_location => File.join(Dir.pwd, "logs"),
+      :proxy_mode => "http",      
       # EC2 Options
       :ami => "ami-1cd73375" 
     })
@@ -70,6 +69,10 @@ module PoolParty
         ]
       end
       
+      def pool_logger_location
+        File.join(Dir.pwd, "logs")
+      end
+      
     end
   end    
 end

data/lib/poolparty/pool/cloud.rb

@@ -107,10 +107,11 @@ module PoolParty
       
       # Configuration files
       def build_manifest
+        @build_manifest ||= build_from_existing_file
         unless @build_manifest
           reset_resources!
           add_poolparty_base_requirements
-
+          
           @build_manifest = returning Array.new do |str|
 
             str << resources_string_from_resources(resources)
@@ -130,6 +131,14 @@ module PoolParty
         @build_manifest
       end
       
+      def build_from_existing_file
+        if ::FileTest.file?("/etc/puppet/manifests/classes/poolparty.pp")
+          open("/etc/puppet/manifests/classes/poolparty.pp").read
+        else
+          nil
+        end
+      end
+      
       # To allow the remote instances to do their job,
       # they need a few options to run, these are the required options
       # to be saved on the remote "master" machine

data/lib/poolparty/pool/resource.rb

@@ -134,6 +134,12 @@ module PoolParty
       def absent
         "absent"
       end
+      def cancel(*args)
+        options[:cancelled] = args.empty? ? true : args[0]
+      end
+      def cancelled?
+        options[:cancelled] || false
+      end
       
       # Give us a template to work with on the resource
       # Make sure this template is moved to the tmp directory as well
@@ -206,24 +212,24 @@ module PoolParty
       def to_string(prev="")
         opts = get_modified_options
         returning Array.new do |output|
+          unless cancelled?
+            output << @prestring || ""
           
-          output << @prestring || ""
+            if resources && !resources.empty?
+              @cp = classpackage_with_self(self)
+              output << @cp.to_string
+              output << "include #{@cp.name.sanitize}"
+            end
           
-          if resources && !resources.empty?
-            @cp = classpackage_with_self(self)
-            output << @cp.to_string
-            output << "include #{@cp.name.sanitize}"
-          end
+            unless virtual_resource?
+              output << "#{prev}#{class_type_name} {"
+              output << "#{prev}\"#{self.key}\":"
+              output << opts.flush_out("#{prev*2}").join(",\n")
+              output << "#{prev}}"            
+            end
           
-          unless virtual_resource?
-            output << "#{prev}#{class_type_name} {"
-            output << "#{prev}\"#{self.key}\":"
-            output << opts.flush_out("#{prev*2}").join(",\n")
-            output << "#{prev}}"            
+            output << @poststring || ""
           end
-          
-          output << @poststring || ""
-                    
         end.join("\n")
       end
       

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

@@ -1,7 +1,7 @@
 module PoolParty    
   module Resources
         
-    class Remotefile < File
+    class Remotefile < Resource
       # Not really my favorite of lines
       include PoolParty::Configurable
       
@@ -16,6 +16,10 @@ module PoolParty
         "file"
       end
       
+      def source(arg=nil)
+        arg ? options[:source] = arg : "#{Base.fileserver_base}/#{::File.basename(name)}"
+      end
+      
     end
     
   end

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

@@ -0,0 +1,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]
+      end
+      
+    end
+    
+  end
+end

data/lib/poolparty/templates/cib.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<cib admin_epoch="0" epoch="0" num_updates="0">
+	<configuration>
+		<crm_config>
+			<cluster_property_set id="cib-bootstrap-options">
+				<attributes>
+					<nvpair id="cib-bootstrap-options-symmetric-cluster" name="symmetric-cluster" value="true"/>
+					<nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="stop"/>
+					<nvpair id="cib-bootstrap-options-default-resource-stickiness" name="default-resource-stickiness" value="0"/>
+					<nvpair id="cib-bootstrap-options-default-resource-failure-stickiness" name="default-resource-failure-stickiness" value="0"/>
+					<nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
+					<nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
+					<nvpair id="cib-bootstrap-options-startup-fencing" name="startup-fencing" value="true"/>
+					<nvpair id="cib-bootstrap-options-stop-orphan-resources" name="stop-orphan-resources" value="true"/>
+					<nvpair id="cib-bootstrap-options-stop-orphan-actions" name="stop-orphan-actions" value="true"/>
+					<nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
+					<nvpair id="cib-bootstrap-options-short-resource-names" name="short-resource-names" value="true"/>
+					<nvpair id="cib-bootstrap-options-transition-idle-timeout" name="transition-idle-timeout" value="5min"/>
+					<nvpair id="cib-bootstrap-options-default-action-timeout" name="default-action-timeout" value="20s"/>
+					<nvpair id="cib-bootstrap-options-is-managed-default" name="is-managed-default" value="true"/>
+					<nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
+					<nvpair id="cib-bootstrap-options-pe-error-series-max" name="pe-error-series-max" value="-1"/>
+					<nvpair id="cib-bootstrap-options-pe-warn-series-max" name="pe-warn-series-max" value="-1"/>
+					<nvpair id="cib-bootstrap-options-pe-input-series-max" name="pe-input-series-max" value="-1"/>
+				</attributes>
+			</cluster_property_set>
+		</crm_config>
+		<nodes/>
+		<resources>
+		<% ha_nodenames.each_with_index do |name, index| %>		
+			<primitive class="ocf" id="IPaddr_<%= name %>" provider="heartbeat" type="IPaddr">
+				<operations>
+					<op id="IPaddr_<%= name %>_mon" interval="5s" name="monitor" timeout="<%= ha_timeout %>"/>
+				</operations>
+				<instance_attributes id="IPaddr_<%= name %>_inst_attr">
+					<attributes>
+						<nvpair id="IPaddr_<%= name %>_attr_0" name="ip" value="<%= ha_node_ips[index] %>"/>
+					</attributes>
+				</instance_attributes>
+			</primitive>
+		<% end %>
+		</resources>
+		<constraints>
+		  <% ha_nodenames.each_with_index do |name, index| %>
+			<rsc_location id="rsc_location_IPaddr_<%= name %>" rsc="IPaddr_<%= name %>">
+				<rule id="prefered_location_IPaddr_<%= name %>" score="100">
+					<expression attribute="#uname" id="prefered_location_IPaddr_<%= name %>_expr" operation="eq" value="<%= name %>"/>
+				</rule>
+			</rsc_location>
+			<% end %>
+		</constraints>
+	</configuration>
+	<status/>
+</cib>

data/lib/poolparty/templates/ha.cf

@@ -3,8 +3,10 @@ keepalive 2 # Time inbetween heartbeats
 deadtime 32 # wait 32 seconds before declaring dead
 warntime 16 # issue a warning halfway through
 initdead 60 # Don't boot instances between 60 seconds of each other
-auto_failback on
+logfacility daemon         # Log to syslog as facility "daemon"
+auto_failback off
 use_logd yes
-crm on
+bcast eth0
+crm respawn
 
 node <%= ha_nodenames.join(" ") %>

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 6
+    TINY  = 8
 
     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.6"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-14}
+  s.date = %q{2008-10-15}
   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"]
   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/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", "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/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/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!

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

@@ -22,7 +22,7 @@ describe "Slave provisioner" do
       @slave.install
     end
   end
-  it "should return install_puppet as apt-get install puppet factor" do
-    @slave.setup_puppet.should =~ /puppetd/
+  it "should return setup_puppet with the master" do
+    @slave.setup_puppet.should =~ /master/
   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 =~ /exec \{/
   end
   it "should included the flushed out options" do
     @tc.has_git({:name => "git.git", :source => "git://source.git", :user => "finger"}).to_string.should =~ /finger@git:/
@@ -27,7 +27,7 @@ describe "Remote Instance" do
       end
     end
     it "should have the path set within the resource" do
-      @tc.resource(:git).first.to_string.should =~ /file \{/
+      @tc.resource(:git).first.to_string.should =~ /exec \{/
     end
   end
 end

data/spec/poolparty/pool/cloud_spec.rb

@@ -279,6 +279,21 @@ describe "Cloud" do
             @manifest.should =~ /host \{\n\t\t"master":/
           end
         end
+        describe "building with an existing manifest" do
+          before(:each) do
+            @file = "/etc/puppet/manifests/nodes/nodes.pp"
+            @file.stub!(:read).and_return "nodes"
+            ::FileTest.stub!(:file?).with("/etc/puppet/manifests/classes/poolparty.pp").and_return true
+            @cloud.stub!(:open).with("/etc/puppet/manifests/classes/poolparty.pp").and_return @file
+          end
+          it "should not call resources_string_from_resources if the file /etc/puppet/manifests/nodes/nodes.pp exists" do
+            @cloud.should_not_receive(:add_poolparty_base_requirements)
+            @cloud.build_manifest
+          end
+          it "should build from the existing file" do
+            @cloud.build_manifest.should == "nodes"
+          end
+        end
       end
     end
     

data/spec/poolparty/pool/resource_spec.rb

@@ -238,6 +238,15 @@ describe "Resource" do
       it "should turn the resource into a string" do
         @file.to_s.should == "File['pancakes']"
       end
+      describe "cancelled" do
+        it "should make a resource not cancelled by default" do
+          @file.cancelled?.should == false
+        end
+        it "should say cancelled? is true if it has been cancelled" do
+          @file.cancel
+          @file.cancelled?.should == true
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+include PoolParty::Resources
+
+describe "Symlink" do
+  before(:each) do
+    reset_resources!
+    @cloud = cloud :symlink_test do
+      has_symlink(:name => "/etc/apache2/puppetmaster.conf", :from => "/etc/http/puppetmaster.conf")
+    end
+    @symlink = @cloud.resource(:symlink).first
+  end
+  it "should create a file" do
+    @cloud.resource(:symlink).empty?.should == false
+  end
+  it "should create a file { resource" do
+    @symlink.to_string.should =~ /file \{/
+  end
+end

data/website/index.html

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -07:00
+date: 2008-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - 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
@@ -268,6 +269,7 @@ files:
 - 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