auser-poolparty 1.3.16 → 1.3.17

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 16
+:patch: 17
 :major: 1

data/bin/cloud

@@ -33,6 +33,7 @@ EOS
     $DEBUGGING      = true if command[:debug]
     $VERY_DEBUGGING = true if command[:very_debug]
     
+    PoolParty::Pool.command = command
     @loaded_pool = PoolParty::Pool.find_and_load_default_clouds_dot_rb(command[:clouds_dot_rb])
     @loaded_clouds = command[:name] ? [clouds[command[:name]]] : @loaded_pool.clouds.map {|name,cld|cld}
     @loaded_clouds.map do |cld| 

data/bin/cloud-show

@@ -16,6 +16,7 @@ shows output about the clouds.rb
 EOS
 
   short_desc "shows output about the clouds.rb"
+  opt :generate_graph, "Generate the dependency tree graph", :type => :string, :default => nil
 
   run do |command|
 
@@ -30,7 +31,18 @@ EOS
         "Running on: #{cld.cloud_provider_name}"
       ]
       
-      print_msg(msg)
+      if verbose?
+        msg << [
+          "Keypair: #{cld.keypair.basename}"
+        ]
+      end
+      
+      if command[:generate_graph]
+        vputs "Generating dependency graph at: #{command[:generate_graph]}"
+        cld.output_resources_graph('png', command[:generate_graph], {"fontsize" => 30})
+      end
+            
+      print_msg(msg.flatten)
       
     end
     

data/lib/cloud_providers/connections.rb

@@ -42,10 +42,10 @@ module  CloudProviders
     # "-i keyfile -o StrictHostKeyChecking=no -i keypair.to_s -l fred"
     def ssh_options(opts={})
       return @ssh_options if @ssh_options && opts.empty?
-      ssh_options = {"-i" => keypair.full_filepath,
+      ssh_opts = {"-i" => keypair.full_filepath,
            "-o" =>"StrictHostKeyChecking=no"
            }.merge(opts)
-      @ssh_options = ssh_options.collect{ |k,v| "#{k} #{v}"}.join(' ')
+      @ssh_options = ssh_opts.collect{ |k,v| "#{k} #{v}"}.join(' ')
     end
     
     def rsync( opts={} )
@@ -88,9 +88,12 @@ module  CloudProviders
           err = stderr.readlines
           $stderr.write_nonblock(err)
         rescue SystemCallError => error
-          $stderr.write_nonblock(stderr)
+          err = stderr.readlines
+          $stderr.write_nonblock(err)
         rescue EOFError => error
-           # nothing
+          err = stderr.readlines
+          $stderr.write_nonblock(err)
+          # used to do nothing
         end
       end
       buf

data/lib/cloud_providers/ec2/ec2.rb

@@ -105,6 +105,12 @@ module CloudProviders
       number_of_instances = o[:number_of_instances] || 1
       set_vars_from_options o
       raise StandardError.new("You must pass a keypair to launch an instance, or else you will not be able to login. options = #{o.inspect}") if !keypair_name
+      vputs("--- Launching ec2 instances")
+      vputs({
+        "image_id" => image_id,
+        "security_group" => security_group,
+        "keypair" => keypair.basename
+      })
       response_array = ec2(o).run_instances(image_id,
                                       min_count,
                                       number_of_instances,

data/lib/cloud_providers/ec2/ec2_helpers.rb

@@ -45,6 +45,7 @@ module CloudProviders
     # public ip
     def associate_address(instance_id)
       new_ip = next_unused_elastic_ip
+      vputs("Assigning #{new_ip} to the ec2 instance #{instance_id}")
       ec2.associate_address(instance_id, new_ip)
       loop do
         if describe_instance(:instance_id => instance_id).public_ip == new_ip
@@ -62,20 +63,21 @@ module CloudProviders
     # intersection of the unused ips and those, find the first one available
     # and return that.
     def next_unused_elastic_ip
-      if unusued_elastic_ips.empty?
+      if unused_elastic_ips.empty?
         nil
       else
-        unusued_elastic_ips.first
+        vputs("Found an unused elastic ip: #{unused_elastic_ips.first}")
+        unused_elastic_ips.first
       end
     end
     
     private
     
     def all_elastic_ips
-      elastic_ips.empty? ? [] : ec2.describe_addresses & elastic_ips
+      elastic_ips.empty? ? [] : ec2.describe_addresses.map {|a| a[:public_ip]} & elastic_ips
     end
     
-    def unusued_elastic_ips
+    def unused_elastic_ips
       all_elastic_ips.select {|i| i[:instance_id] == nil }
     end
     

data/lib/core/object.rb

@@ -68,7 +68,7 @@ class Object
   # MESSAGES
   # Debugging output helpers
   def vputs(m="")
-    puts "[INFO] -- #{m}" if verbose?
+    puts "[INFO] -- #{m.is_a?(String) ? m : m.inspect}" if verbose?
   end
   def dputs(m="")
     puts "[DEBUG] -- #{m.is_a?(String) ? m : m.inspect}" if debugging?

data/lib/dependency_resolvers/chef.rb

@@ -109,10 +109,10 @@ module DependencyResolvers
       end
       
       def apply_meta_notifies(resource, add)
-        # The meta_notifies is a hash that looks like: {:file => [["pool_name", :reload]]}
+        # The meta_notifies is a hash that looks like: {:file => [["pool_name", :reload, :immediately]]}
         resource.meta_notifies.each do |ty, arr|
-          arr.each do |nm, action|
-            add << "  notifies :#{action}, resources(:#{chef_safe_resource(ty)} => \"#{nm}\")"
+          arr.each do |nm, action, at_time|
+            add << "  notifies :#{action}, resources(:#{chef_safe_resource(ty)} => \"#{nm}\"), :#{at_time}"
           end
         end
       end

data/lib/keypair.rb

@@ -7,10 +7,12 @@ class Keypair
   has_searchable_paths(:prepend_paths => [Dir.pwd, '/etc/poolparty/keys', "#{ENV["HOME"]}/.ssh/", "#{ENV["HOME"]}/.ec2/", ENV['EC2_CONFIG_DIR']])
   
   attr_accessor :filepath
+  attr_reader :extra_paths
   
   # Create a new key that defaults to id_rsa as the name. 
-  def initialize(fpath)
+  def initialize(fpath, extra_paths=[])
     @filepath = fpath
+    @extra_paths = extra_paths.map {|a| File.expand_path(a) }
     valid?
   end
   
@@ -27,10 +29,10 @@ class Keypair
   # Returns the full_filepath of the key. If a full filepath is passed, we just return the expanded filepath
   # for the keypair, otherwise query where it is against known locations
   def full_filepath
-    @full_filepath ||= if File.file?(::File.expand_path(filepath))
+    @full_filepath ||= if File.file?(File.expand_path(filepath))
       ::File.expand_path(filepath)
       else
-        search_in_known_locations(filepath)
+        search_in_known_locations(filepath, extra_paths)
       end
   end
   alias :to_s :full_filepath

data/lib/poolparty/base.rb

@@ -128,47 +128,70 @@ module PoolParty
     # to create edges on the graph
     def resources_graph(force=false)
       return @resources_graph if @resources_graph && !force
-      result = Digraph.new      
+      result = Digraph.new
       
       create_graph(resources, nil, result)
       
-      add_ordered_resources_to_result(resources, result)
-      
       @resources_graph = result
     end
     
-    # Add all the resources as edges of each other
-    def add_ordered_resources_to_result(resources, result)
-      arr_of_resources = resources.zip_offset(1)
-      
-      arr_of_resources.each do |first, second|
-        result.add_edge!(first, second) unless result.edge?(first, second) or result.edge?(second, first)
-        add_ordered_resources_to_result(first.resources, result)
-      end
-    end
-    
     # Create the graph of resources. Blow up if a resource isn't found
     # that is required. If it is found, add it as an edge to the 
     # dependency graph
     def create_graph(resources, on, result)
-      resources.each_with_index do |resource, idx|
+      # add_ordered_resources_to_result(without_dependencies, result)
+      first_layer_of_ordered_resources = resources_without_dependencies.zip_offset(1)
+      first_layer_of_ordered_resources.each do |first, second|
+        result.add_edge!(first, second) unless second.nil? or result.edge?(first, second) or result.edge?(second, first)
+      end
+      
+      resources_with_dependencies.each do |r|
         
-        resource.dependencies.each do |dep_type, deps_array|
+        r.dependencies.each do |dep_type, deps_array|
           deps_array.each do |dep_name|
             dep = get_resource(dep_type, dep_name)
-            raise PoolPartyError.create("ResourceNotFound", "A resource required for #{resource.has_method_name}(#{resource.name}) was not found: #{dep_type}(#{dep_name}). Please make sure you've specified this in your configuration.") unless dep
-            result.add_edge!(dep, resource, dep.name) unless result.edge?(dep, resource) or result.edge?(resource, dep)
+            raise PoolPartyError.create("ResourceNotFound", "A resource required for #{dep_type}(#{dep_name}) was not found: #{dep_type}(#{dep_name}). Please make sure you've specified this in your configuration.") unless dep
+            
+            unless result.edge?(dep, r) and result.edge?(r, dep)
+              existing_connections = result.adjacent(dep)
+              existing_connections.each {|c| result.remove_edge!(r, c) }
+              
+              result.add_edge!(dep, r, dep.name)
+              
+              existing_connections.each {|c| result.add_edge!(dep, c) }
+            end
+            
           end
         end
-        
+      end
+      
+      all_resources.each_with_index do |resource, idx|
         if on
           result.add_edge!(resource, on, resource.name) unless result.edge?(resource, on) or result.edge?(on, resource)
         else
-          result.add_vertex!(resource)
+          result.add_vertex!(resource) unless result.vertex?(resource)
         end
-        
-        create_graph(resource.resources, resource, result)
       end
+      
+      result
+    end
+    
+    # Add all the resources as edges of each other
+    def add_ordered_resources_to_result(resources, result)
+      arr_of_resources = resources.zip_offset(1)
+      
+      arr_of_resources.each do |first, second|
+        result.add_edge!(first, second) unless result.edge?(first, second) or result.edge?(second, first)
+        add_ordered_resources_to_result(first.resources, result)
+      end
+    end
+        
+    def resources_without_dependencies(r=all_resources)
+      r.reject {|a| !a.dependencies.empty? }
+    end
+    
+    def resources_with_dependencies(r=all_resources)
+      r - resources_without_dependencies(r)
     end
     
     # All the dependencies that are required by this resource

data/lib/poolparty/cloud.rb

@@ -14,8 +14,7 @@ module PoolParty
       :cloud_provider_name      => :ec2,
       :dependency_resolver_name => nil,
       :os                       => nil,
-      :bootstrap_script         => nil,
-      :ssh_options              => {}
+      :bootstrap_script         => nil
     )
     
     # Define what gets run on the callbacks
@@ -51,8 +50,8 @@ module PoolParty
     # returns an instance of Keypair
     # You can pass either a filename which will be searched for in ~/.ec2/ and ~/.ssh/
     # Or you can pass a full filepath
-    def keypair(n=nil)
-      @keypair ||= Keypair.new(n)
+    def keypair(n=nil, extra_paths=[])
+      @keypair ||= Keypair.new(n, extra_paths)
     end
     
     # Declare the CloudProvider for a cloud
@@ -290,17 +289,23 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
       if resources_graph.cyclic?
         cycles = []
         
-        resources_graph.edges.each do |edge|
-          if resources_graph.adjacent?(edge.source, edge.target) && resources_graph.adjacent?(edge.target, edge.source) && !cycles.include?(edge.source)
-            cycles << "#{edge.source.class}(#{edge.source.name}) depends on #{edge.target.class}(#{edge.target.name})"
-          end
+        cycles = resources_graph.find_cycle
+        cycle_string = cycles.map do |k,v|
+          "#{k} -> #{v}"
         end
+        
+        filepath = "/tmp"
+        format = "png"
+        dotpath = "#{filepath}/dot.#{format}"
+        resources_graph.write_to_graphic_file(format, filepath)
+        
+        `open #{dotpath}`
         msg =<<-EOE
       
         Your resource graph is cyclic. Two resources depend on each other, Cannot decide which resource
         to go first. Dying instead. Correct this and then try again.
       
-          #{cycles.join("\n          ")}
+          #{dotpath}
       
         Hint: You can see the resource graph by generating it with:
           cloud compile -g name
@@ -325,4 +330,25 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
     end    
     
   end
-end
+end
+
+module GRATR
+  class Digraph
+    
+    # Crappy n*n
+    def find_cycle(from=self)
+      return [] unless cyclic?
+      cyclic_cycle = []
+      forward_edge = Proc.new {|e| }
+      back_edge    = Proc.new do |b| 
+        cyclic_cycle = dfs_tree_from_vertex(b)
+      end
+      from.dfs({ 
+       :forward_edge  => forward_edge,
+       :back_edge    => back_edge
+      })
+      cyclic_cycle
+    end
+    
+  end
+end

data/lib/poolparty/installer.rb

@@ -14,8 +14,8 @@ module PoolParty
         self.__send__ :welcome_message
         steps.each {|c| self.__send__ c.to_sym }
         self.__send__ :closing_message
+      rescue SystemExit => e
       rescue Exception => e
-        colored_say e.inspect
         colored_say exit_msg
       ensure
         Colors.reset!

data/lib/poolparty/installers/ec2.rb

@@ -2,9 +2,11 @@ module PoolParty
   module Installers
     class Ec2 < Installer
       
+      attr_reader :access_key, :secret_access_key, :ec2_directory
+      
       def steps
         [
-          :ask_for_ec2_directory, :ask_for_access_key, :ask_for_private_access_key,
+          :check_for_access_keys,
           :show_env_setup
         ]
       end
@@ -16,6 +18,30 @@ module PoolParty
       def self.description
         "Ec2 installer"
       end
+      
+      def check_for_access_keys
+        msg = "
+I've detected the following for your ec2 setup.
+<line>
+access key: #{CloudProviders::Ec2.default_access_key}
+secret access key: #{CloudProviders::Ec2.default_secret_access_key}
+certificate: #{CloudProviders::Ec2.default_cert}
+private key: #{CloudProviders::Ec2.default_private_key}
+
+<yellow>Are these values correct?</yellow>
+"
+        v = choose msg, %W(Yes No)
+        if v == "Yes"
+          puts "Using the values above"
+          @access_key = CloudProviders::Ec2.default_access_key
+          @secret_access_key = CloudProviders::Ec2.default_secret_access_key
+          @ec2_directory = File.dirname(CloudProviders::Ec2.default_cert)
+        else
+          [
+            :ask_for_ec2_directory, :ask_for_access_key, :ask_for_private_access_key
+          ].each {|meth| self.send meth}
+        end
+      end
             
       def ask_for_access_key
         access_key_help =<<-EOV
@@ -25,7 +51,7 @@ EC2 uses an access key to identify you and allows you to start and stop instance
         access_key = <<-EOE
 What is your access key?
         EOE
-        ask_with_help :message => access_key, :help => access_key_help do |k|
+        ask_with_help :message => access_key, :no_value => true, :help => access_key_help do |k|
           @access_key = k
         end
       end
@@ -62,11 +88,11 @@ What's path to your ec2 directory with your cert and pk files?
   
   Setup your environment:
   
-  export EC2_ACCESS_KEY=#{@access_key}
-  export EC2_SECRET_KEY=#{@secret_access_key}
+  export EC2_ACCESS_KEY=#{access_key}
+  export EC2_SECRET_KEY=#{secret_access_key}
 
-  export EC2_PRIVATE_KEY=$(ls #{@ec2_directory}/pk-*.pem)
-  export EC2_CERT=$(ls #{@ec2_directory}/cert-*.pem)
+  export EC2_PRIVATE_KEY=$(ls #{ec2_directory}/pk-*.pem)
+  export EC2_CERT=$(ls #{ec2_directory}/cert-*.pem)
   
 <line>
         EOE

data/lib/poolparty/plugins/apache.rb

@@ -9,6 +9,11 @@ module PoolParty
                       :www_dir            => "/var/www",                      
                       :passenger_version  => "2.2.5"
       
+      
+      def name
+        "apache"
+      end
+      
       def before_load
         installed_as_worker
         configs
@@ -146,7 +151,7 @@ PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
       
       def enable_default
         listen 80 # assumes no haproxy
-        site "default-site", :template => File.dirname(__FILE__)/:apache2/"default-site.conf.erb"
+        site "default-site", :template => File.dirname(__FILE__)/:apache2/"default-site.conf.erb", :notifies => get_exec("reload-apache2"), :requires => get_exec("reload-apache2")
       end
       
       def config(name, temp)
@@ -169,7 +174,7 @@ PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
         else
           has_exec(:command => "/usr/sbin/a2dissite #{name}") do
             notifies get_exec("reload-apache2"), :run
-            requires get_package("apache2")
+            requires get_exec("reload-apache2")
             only_if "/bin/sh -c \"[ -L /etc/apache2/sites-enabled/#{name} ] && [ /etc/apache2/sites-enabled/#{name} -ef /etc/apache2/sites-available/#{name}]\""
           end
         end

data/lib/poolparty/plugins/apache2/virtual_host.rb

@@ -3,6 +3,7 @@ module PoolParty
     class VirtualHost < Apache
       
       default_options(
+        :name     => nil,
         :port     => 80,
         :www_dir  => "/var/www",
         :www_user => "www-data"

data/lib/poolparty/plugins/hermes.rb

@@ -60,14 +60,13 @@ module PoolParty
           :requires => get_package("erlang-dev")
           
         has_link  :name => "collectd_dir", 
-                  :to => "/var/lib/collectd/rrd/\#{`hostname -f`.chomp}", :source => "/var/lib/collectd/localhost",
-                  :requires => [get_package("collectd")]
+                  :to => "/var/lib/collectd/rrd/\#{`hostname -f`.chomp}", :source => "/var/lib/collectd/localhost"
       end
 
       def run_if_needed
         has_exec "env GEN_CLUSTER_SEED_CONFIG=/etc/poolparty/seeds.conf HERMES_RRD_DIRECTORY=/var/lib/collectd/localhost #{remote_hermes_deployed_dir}/bin/erl -boot #{remote_hermes_deployed_dir}/releases/#{hermes_release_version}/start -noshell -detached", 
           :not_if => "ps aux | grep -v grep | grep hermes | grep beam",
-          :requires => [get_exec("install_hermes"), get_link("collectd_dir")]
+          :requires => [get_exec("install_hermes")]
       end
 
       private

data/lib/poolparty/pool.rb

@@ -27,6 +27,11 @@ module PoolParty
       end
     end
     
+    class << self;attr_accessor :command;end
+    def command
+      self.class.command
+    end
+    
     # cloud
     # Define a cloud by a name and a block
     def cloud(name, o={}, &block)

data/lib/poolparty/resource.rb

@@ -40,11 +40,11 @@ module PoolParty
     
     # META FUNCTIONS
     # ALL RESOURCES HAVE THESE METHODS AVAILABLE
-    def notifies(other_resources_hash, action_to_take=:reload)
+    def notifies(other_resources_hash, action_to_take=:reload, at_time=:delayed)
       @meta_notifies ||= {}
       other_resources_hash.each do |k,v|
         notifies_array = (@meta_notifies[k] ||= [])
-        notifies_array << [v, action_to_take] unless notifies_array.include?([v, action_to_take])
+        notifies_array << [v, action_to_take, at_time] unless notifies_array.include?([v, action_to_take, at_time])
         # Implicitly add a require
         # requires(k => v)
       end

data/test/fixtures/clouds/simple_cloud.rb

@@ -6,7 +6,7 @@ pool :poolparty do
     
   cloud :simple_cloud do
     os :centos
-    keypair File.dirname(__FILE__)+"/../keys/test_key"
+    keypair "test_key", PoolParty.lib_dir+"/../test/fixtures/keys"
     has_file "/etc/motd", :content => "Simple"
   end
   

data/test/fixtures/resources/fake_plugin.rb

@@ -7,10 +7,15 @@ module PoolParty
         "fake_plugin"
       end
       
+      def name
+        "fake_plugin"
+      end
+      
       def after_loaded
         has_file "/etc/my_configs/special_config" do
           requires get_directory("/etc/my_configs")
         end
+        has_directory("/etc/my_configs")
       end
       
     end

data/test/lib/core/array_test.rb

@@ -42,7 +42,11 @@ class ArrayTest < Test::Unit::TestCase
     arr = %w(a b c d e f)
     assert_equal [["a","b"],["b","c"],["c","d"],["d","e"],["e","f"]], arr.zip_offset(1)
     assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], arr.zip_offset(2)
+    assert_equal [["a","b"],["b","c"],["c","d"]], arr.zip_offset(3)
     assert_equal [["a","b"]], arr.zip_offset(5)
+    
+    assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], %w(a b c d e).zip_offset(1)
+    assert_equal [["a","b"],["b","c"],["c","d"]], %w(a b c d e).zip_offset(2)
   end
   
   def test_rotate

data/test/lib/poolparty/base_test.rb

@@ -29,7 +29,7 @@ class BaseTest < Test::Unit::TestCase
     assert_equal %w(c), @b.all_resources.map {|r| r.name }
   end
   
-  def test_resource_graph
+  def test_resource_graph_generation
     assert_equal GRATR::Digraph, inst.resources_graph.class
   end
   

data/test/lib/poolparty/cloud_test.rb

@@ -1,6 +1,7 @@
 require "#{File.dirname(__FILE__)}/../../test_helper"
 # require 'rr'
 stub_ec2_calls
+include_fixture_resources
 
 class CloudTest < Test::Unit::TestCase
   # include RR::Adapters::TestUnit
@@ -97,6 +98,50 @@ class CloudTest < Test::Unit::TestCase
     assert_equal 'shutting-down', result.first.status
   end
   
+  def test_resource_graph_generation
+    pool "resource" do
+      cloud "graph" do
+        
+        has_file "a", :content => "a"
+        has_file "g", :content => "g", :requires => get_file("c")
+        has_file "b", :content => "b"
+        has_file "c", :content => "c"
+        has_file "d", :content => "d"
+        has_file "e", :content => "e"
+        has_file "f", :content => "f"
+
+      end
+    end
+    
+    # p clouds["graph"].ordered_resources.map {|a| a.name }
+    assert_equal %w(g), clouds["graph"].resources_with_dependencies.map {|a| a.name}
+    assert_equal %w(a b c d e f), clouds["graph"].resources_without_dependencies.map {|a| a.name }
+    assert_equal %w(a b c g d e f), clouds["graph"].ordered_resources.map {|a| a.name }
+    
+  end
+  
+  def test_deep_resources_graph_generation
+    pool "resource" do
+      cloud "graph2" do
+        
+        os :ubuntu
+        
+        keypair "test_key", fixtures_dir/"keys"
+        
+        has_fake_plugin do
+          has_exec "a", :requires => get_file("b")
+        end
+        has_exec "c", :requires => get_exec("a")
+        has_file "b", :content => "b"
+        has_file "q", :requires => get_exec("a")
+
+      end
+    end
+    
+    # Non-deterministic... figure out fix
+    # assert_equal ["fake_plugin", "/etc/my_configs", "/etc/my_configs/special_config", "b", "a", "q", "c"], clouds["graph2"].ordered_resources.map {|a| a.name}
+  end
+  
   def test_run
     # WHAT?
     # result = @cloud.run('uptime')
@@ -139,13 +184,13 @@ class CloudTest < Test::Unit::TestCase
     pool "ssher" do
       cloud "custom" do
         keypair "test_key"
-        ssh_options("-P" => "1992")
+        # ssh_options("-P" => "1992")
       end
       cloud "noneity" do
         keypair "test_key"
       end
     end
-    assert_equal "1992", clouds["custom"].ssh_options["-P"]
+    # assert_equal "1992", clouds["custom"].ssh_options["-P"]
   end
   
   
@@ -197,7 +242,7 @@ class CloudTest < Test::Unit::TestCase
     clear!
     pool "monitoring2" do
       cloud "app_cloud" do
-        keypair "test_key"
+        keypair "test_key", fixtures_dir/"keys"
         platform :ubuntu
         monitor "cpu-idle" do |c|
           vote_for(:expand) if c > 0.8
@@ -213,6 +258,6 @@ class CloudTest < Test::Unit::TestCase
     recipe_file = compile_dir/"recipes"/"default.rb"
     recipe_contents = open(recipe_file).read
     
-    assert_match /install hermes/, recipe_contents
+    assert_match /install_hermes/, recipe_contents
   end
 end

data/test/lib/poolparty/plugins/apache_test.rb

@@ -32,4 +32,9 @@ class ApacheTest < Test::Unit::TestCase
     @base.compile_to(@cloud, test_dir)
   end
   
+  def test_resource_graph
+    # @cloud.resources_graph.write_to_graphic_file("png", "/tmp/graph")
+    assert !@cloud.resources_graph.cyclic?
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.16
+  version: 1.3.17
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []