poolparty 1.3.13 → 1.3.14

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 13
+:patch: 14
 :major: 1

data/bin/cloud-compile

@@ -19,6 +19,7 @@ EOS
   run do |command|
     
     @loaded_clouds.each do |cld|
+      ENV["POOLPARTY_NO_VALIDATION"] = "true"
       
       cld.compile
       

data/lib/cloud_providers/connections.rb

@@ -41,10 +41,11 @@ module  CloudProviders
     # {'-i'=>'keyfile, '-l' => 'fred' } would become
     # "-i keyfile -o StrictHostKeyChecking=no -i keypair.to_s -l fred"
     def ssh_options(opts={})
-      o = {"-i" => keypair.full_filepath,
+      return @ssh_options if @ssh_options && opts.empty?
+      ssh_options = {"-i" => keypair.full_filepath,
            "-o" =>"StrictHostKeyChecking=no"
            }.merge(opts)
-      o.collect{ |k,v| "#{k} #{v}"}.join(' ')
+      @ssh_options = ssh_options.collect{ |k,v| "#{k} #{v}"}.join(' ')
     end
     
     def rsync( opts={} )

data/lib/cloud_providers/ec2/ec2.rb

@@ -102,11 +102,12 @@ module CloudProviders
     
     # Start a new instance with the given options
     def run_instance(o={})
+      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
       response_array = ec2(o).run_instances(image_id,
                                       min_count,
-                                      max_count,
+                                      number_of_instances,
                                       security_group,
                                       keypair.basename,
                                       user_data,
@@ -123,7 +124,6 @@ module CloudProviders
       
       after_run_instance(instances)
       
-      #FIXME: This needs to deal with the case when an array is returned if max_instances > 1
       instances.first
     end
     

data/lib/cloud_providers/vmware/vmware.rb

@@ -122,6 +122,9 @@ module CloudProviders
       end
       @vmx_file = "'#{o}'"
     end
+
+    def before_compile(args); end
+    def after_compile(args); end
     
   end
 end

data/lib/poolparty/cloud.rb

@@ -14,7 +14,8 @@ module PoolParty
       :cloud_provider_name      => :ec2,
       :dependency_resolver_name => nil,
       :os                       => nil,
-      :bootstrap_script         => nil
+      :bootstrap_script         => nil,
+      :ssh_options              => {}
     )
     
     # Define what gets run on the callbacks
@@ -29,7 +30,7 @@ module PoolParty
     def before_compile
       add_monitoring_stack_if_needed
       
-      validate_all_resources
+      validate_all_resources unless ENV["POOLPARTY_NO_VALIDATION"]
     end
     
     # Freeze the cloud_name so we can't modify it at all, set the plugin_directory
@@ -59,7 +60,8 @@ module PoolParty
     def using(provider_symbol, o={}, &block)
       return @cloud_provider if @cloud_provider
       self.cloud_provider_name = provider_symbol
-      cloud_provider(o, &block)
+      cloud_provider(ssh_options.merge(o), &block)
+      cloud_provider.keypair(keypair)
     end
     
     # Cloud provider methods
@@ -79,7 +81,7 @@ module PoolParty
       return @cloud_provider if @cloud_provider
       klass_name = "CloudProviders::#{cloud_provider_name}".classify
       if provider_klass = CloudProviders.all.detect {|k| k.to_s == klass_name }
-        opts.merge!(:cloud => self, :keypair_name => self.keypair.basename)
+        opts.merge!(:cloud => self, :keypair_name => self.keypair.full_filepath)
         @cloud_provider = provider_klass.new(dsl_options.merge(opts), &block)
       else
         raise PoolParty::PoolPartyError.create("UnknownCloudProviderError", "Unknown cloud_provider: #{cloud_provider_name}")

data/lib/poolparty/installers/ec2.rb

@@ -4,7 +4,7 @@ module PoolParty
       
       def steps
         [
-          :find_ec2_directory, :ask_for_access_key, :ask_for_private_access_key,
+          :ask_for_ec2_directory, :ask_for_access_key, :ask_for_private_access_key,
           :show_env_setup
         ]
       end
@@ -16,19 +16,7 @@ module PoolParty
       def self.description
         "Ec2 installer"
       end
-      
-      def find_ec2_directory
-        msg = "We found the following vmware files in the default vmware directory.\nChoose one of these to use as your vmrun file or select other\n<line>"
-        
-        directories = {}
-        default_ec2_directories.each_with_index do |file,idx|
-          directories.merge!(idx+1 => file)
-        end
-        
-        base = choose(msg, directories)
-        @ec2_directory = base == :other ? ask_for_ec2_directory : base
-      end
-      
+            
       def ask_for_access_key
         access_key_help =<<-EOV
 EC2 uses an access key to identify you and allows you to start and stop instances.

data/lib/poolparty/plugins/apache.rb

@@ -7,7 +7,7 @@ module PoolParty
       default_options :port               => 80,
                       :www_user           => 'www-data',
                       :www_dir            => "/var/www",                      
-                      :passenger_version  => "2.2.4"
+                      :passenger_version  => "2.2.5"
       
       def before_load
         installed_as_worker
@@ -39,6 +39,13 @@ module PoolParty
       def install_passenger
         enable_passenger
       end
+
+
+   # LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/passenger-2.2.5/ext/apache2/mod_passenger.so
+   # PassengerRoot /usr/lib/ruby/gems/1.8/gems/passenger-2.2.5
+   # PassengerRuby /usr/bin/ruby1.8
+   #
+   # creating this thing below may not be being run b/c it checks for the passenger.conf which isn't really a good test
       
       def enable_passenger
         unless @enable_passenger
@@ -46,7 +53,7 @@ module PoolParty
           has_package     "build-essential"
           has_package     "apache2-prefork-dev"
           has_gem_package "fastthread"
-          has_gem_package "passenger"
+          has_gem_package "passenger", :version => passenger_version
           passenger_configs
           
           has_exec "install_passenger_script" do
@@ -55,8 +62,8 @@ module PoolParty
             requires get_exec("restart-apache2")
             requires get_package("apache2")
             requires get_gem_package("passenger")
-            not_if "test -f /etc/apache2/mods-available/passenger.conf && test -s /etc/apache2/mods-available/passenger.conf "
-            creates lambda { "@node[:apache][:passenger_module_path]" }
+            not_if "test -e \#{node[:passenger_site][:passenger_module_path]}"
+            # creates lambda { "passenger_site[:passenger_module_path]" }
             end
           
           @enable_passenger = true
@@ -65,15 +72,26 @@ module PoolParty
       
       def passenger_configs
         unless @passenger_configs
+
+          # requires doesn't work for has_variable?
           
+          # has_variable("passenger_version",     passenger_version)
+          # has_variable("passenger_root_path",   "\#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger_version}",
+          #             :requires => get_variable("passenger_version"))
+          # has_variable("passenger_module_path", "\#{passenger_site[:passenger_root_path]}/ext/apache2/mod_passenger.so", 
+          #              :requires => get_variable("passenger_root_path"))
+
           has_variable("passenger_version",     passenger_version)
-          has_variable("passenger_root_path",   "\#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger_version}")
-          has_variable("passenger_module_path", "\#{passenger_site[:passenger_root_path]}/ext/apache2/mod_passenger.so")
+          has_variable("passenger_root_path",   "\#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger_version}",
+                      :requires => get_variable("passenger_version"))
+          has_variable("passenger_module_path", "\#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger_version}/ext/apache2/mod_passenger.so", 
+                       :requires => get_variable("passenger_root_path"))
           
           has_file(:name => "/etc/apache2/mods-available/passenger.load") do
             content <<-eof
 LoadModule passenger_module <%= @node[:passenger_site][:passenger_module_path] %>
             eof
+            requires get_exec("install_passenger_script")
           end
           
           has_file(:name => "/etc/apache2/mods-available/passenger.conf") do
@@ -81,9 +99,10 @@ LoadModule passenger_module <%= @node[:passenger_site][:passenger_module_path] %
 PassengerRoot <%= @node[:passenger_site][:passenger_root_path] %>
 PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
             eof
+            requires get_exec("install_passenger_script")
           end
           
-          present_apache_module(:passenger)
+          present_apache_module(:passenger, {:requires => get_file("/etc/apache2/mods-available/passenger.load")})
           @passenger_configs = true
         end
       end
@@ -159,9 +178,9 @@ PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
       def install_site(name, opts={})
         sitename = name
 
-        opts.merge!(:name => "/etc/apache2/sites-available/#{sitename}")
+        opts.merge!(:name => "/etc/apache2/sites-available/#{sitename}", :requires => get_package("apache2"))
         has_directory(:name => "/etc/apache2/sites-available")
-        has_file(opts) unless opts[:no_file]
+        has_file(opts, :requires => get_package("apache2")) unless opts[:no_file]
         has_exec(:name => "/usr/sbin/a2ensite #{sitename}") do
           notifies get_exec("reload-apache2"), :run
           requires get_exec("reload-apache2")
@@ -175,12 +194,14 @@ PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
       end
       
       def present_apache_module(*names)
+        opts = names.pop if names.last.kind_of?(::Hash)
         names.each do |name|
           has_exec(:name => "mod-#{name}", :command => "/usr/sbin/a2enmod #{name}") do            
             not_if "/bin/sh -c \'[ -L /etc/apache2/mods-enabled/#{name}.load ] && [ /etc/apache2/mods-enabled/#{name}.load -ef /etc/apache2/mods-available/#{name}.load ]\'"
             requires get_package("apache2")
             notifies get_exec("force-reload-apache2"), :run
             requires get_exec("force-reload-apache2")
+            requires opts[:requires] if opts && opts[:requires]
           end
         end
       end

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

@@ -34,7 +34,7 @@ module PoolParty
           # setup an initial symlink so apache will start even if there have not been any deploys yet
             #has_site_directory "releases/initial/public"
             #FIXME  the following line is chef specific.  It will fail with puppet
-            has_link(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
+            has_link(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial", :requires => get_directory(site_directory))
           end
           log_dir = "#{site_directory}/shared/log"
           appended_path "current"

data/lib/poolparty/pool.rb

@@ -155,7 +155,7 @@ module PoolParty
       $:.unshift("#{File.dirname(filepath)}/lib")
       $:.unshift("#{File.dirname(filepath)}/plugins")
       
-      Dir["#{File.dirname(filepath)}/lib/*"].each {|lib_path| require lib_path }
+      Dir["#{File.dirname(filepath)}/lib/*.rb"].each {|lib_path| require lib_path }
       Dir["#{File.dirname(filepath)}/plugins/*"].each do |plugin_path|
         if File.directory?(plugin_path)
           $:.unshift(plugin_path)

data/test/fixtures/clouds/fake_clouds.rb

@@ -1,7 +1,7 @@
 pool :boxed do
   
-  cloud :app do
-    keypair 'test_key'
+  cloud :fake_cloud do
+    keypair File.dirname(__FILE__)+"/../keys/test_key"
     using :ec2 do
     end
   end

data/test/fixtures/clouds/simple_cloud.rb

@@ -4,7 +4,7 @@ pool :poolparty do
   
   instances 1
     
-  cloud :app do
+  cloud :simple_cloud do
     os :centos
     keypair File.dirname(__FILE__)+"/../keys/test_key"
     has_file "/etc/motd", :content => "Simple"

data/test/fixtures/resources/fake_subclassed_plugin.rb

@@ -0,0 +1,19 @@
+module PoolParty
+  module Resources
+    
+    class FakeSubclassedPlugin < Resource
+      
+      def self.has_method_name
+        "subclassed"
+      end
+      
+      def after_loaded
+        has_file "/etc/my_configs/special_config" do
+          requires get_directory("/etc/my_configs")
+        end
+      end
+      
+    end
+    
+  end
+end

data/test/lib/cloud_providers/ec2/ec2_instance_test.rb

@@ -1,11 +1,20 @@
 require "#{File.dirname(__FILE__)}/../../../test_helper"
 require File.dirname(__FILE__)+"/ec2_test.rb"
 
+stub_keypair_searchable_paths
+
 class Ec2InstanceTest < Test::Unit::TestCase
   include CloudProviders
-
+  
+  def setup
+    clear!
+    @filepath = fixtures_dir/"clouds/simple_cloud.rb"
+    @pool = PoolParty::Pool.load_from_file(@filepath)
+    @cloud = @pool.clouds[@pool.clouds.keys.first]
+  end
+  
   def inst
-    @inst ||= clouds['app'].describe_instances.first
+    @inst ||= @cloud.describe_instances.first
   end
   
   def test_has_cloud_provider
@@ -20,18 +29,18 @@ class Ec2InstanceTest < Test::Unit::TestCase
   def test_to_s
     vals = inst.to_s.split("\t")
     assert_equal 3, vals.size
-    assert_equal 'app', vals.first
+    assert_equal 'simple_cloud', vals.first
   end
   
   def test_has_cloud_set_when_created_from_cloud
-    assert_equal clouds['app'], clouds['app'].cloud_provider.cloud
-    assert_equal clouds['app'], inst.cloud
-    assert_equal 'app', inst.dsl_options[:cloud_name]
-    assert_equal 'app', inst.to_hash[:cloud_name]
+    assert_equal @cloud, @cloud.cloud_provider.cloud
+    assert_equal @cloud, inst.cloud
+    assert_equal 'simple_cloud', inst.dsl_options[:cloud_name]
+    assert_equal 'simple_cloud', inst.to_hash[:cloud_name]
   end
   
   def test_cloud_keypair
-    assert_equal  clouds['app'].keypair.to_s,  inst.keypair.to_s
+    assert_equal  @cloud.keypair.to_s,  inst.keypair.to_s
   end
 
   def test_refresh!

data/test/lib/cloud_providers/ec2/ec2_test.rb

@@ -5,7 +5,7 @@ stub_ec2_calls
 class Ec2ProviderTest < Test::Unit::TestCase
   
   def ec2
-    @ec2 ||= clouds['app'].cloud_provider
+    @ec2 ||= @cloud.cloud_provider
   end
   
   def setup
@@ -13,11 +13,15 @@ class Ec2ProviderTest < Test::Unit::TestCase
                   :image_id => "ami-abc123", 
                   :keypair => fixtures_dir/'keys/test_key'
                 )
+                
+    @filepath = fixtures_dir/"clouds/simple_cloud.rb"
+    @pool = PoolParty::Pool.load_from_file(@filepath)
+    @cloud = @pool.clouds[@pool.clouds.keys.first]
   end
   
   def test_setup
-    assert_not_nil clouds['app']
-    assert_not_nil clouds['app'].keypair
+    assert_not_nil @cloud
+    assert_not_nil @cloud.keypair
   end
   
   
@@ -67,9 +71,9 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
   
   def test_basic_setup
-    assert_equal :ec2, clouds['app'].cloud_provider_name
-    assert_instance_of CloudProviders::Ec2, clouds['app'].cloud_provider
-    assert_instance_of RightAws::Ec2, clouds['app'].cloud_provider.ec2
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_instance_of CloudProviders::Ec2, @cloud.cloud_provider
+    assert_instance_of RightAws::Ec2, @cloud.cloud_provider.ec2
   end
   
   def test_that_test_ec2_env_variables_are_set
@@ -89,7 +93,7 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
   
   def test_cloud_is_set_when_created_from_a_cloud
-    assert_equal clouds['app'], clouds['app'].cloud_provider.cloud
+    assert_equal @cloud, @cloud.cloud_provider.cloud
   end
   
   def test_inherited_default_options
@@ -98,10 +102,10 @@ class Ec2ProviderTest < Test::Unit::TestCase
   end
    
    def amazon?
-     stub(clouds['app'].cloud_provider).ec2_url  {'http://example.com'}
-     assert clouds['app'].cloud_provider.eucalyptus?
-     stub(clouds['app'].cloud_provider).ec2_url  {'https://ec2.amazonaws.com'}
-     assert !clouds['app'].cloud_provider.eucalyptus?
+     stub(@cloud.cloud_provider).ec2_url  {'http://example.com'}
+     assert @cloud.cloud_provider.eucalyptus?
+     stub(@cloud.cloud_provider).ec2_url  {'https://ec2.amazonaws.com'}
+     assert !@cloud.cloud_provider.eucalyptus?
    end
    
    def test_aws_hash

data/test/lib/poolparty/cloud_test.rb

@@ -34,106 +34,121 @@ class CloudTest < Test::Unit::TestCase
   end
   
   def test_have_a_keypair
-    assert_not_nil clouds['app'].keypair
-    assert_equal 'test_key', clouds['app'].keypair.basename
+    assert_not_nil @cloud.keypair
+    assert_equal 'test_key', @cloud.keypair.basename
   end
   
   def test_set_the_dependency_resolver
-    clouds['app'].dependency_resolver(:chef)
-    assert_equal DependencyResolvers::Chef, clouds['app'].dependency_resolver
+    @cloud.dependency_resolver(:chef)
+    assert_equal DependencyResolvers::Chef, @cloud.dependency_resolver
   end
   
   def test_can_use_basic_resources
-    clouds['app'].instance_eval do
+    @cloud.instance_eval do
       has_file "/etc/motd"
     end
-    assert_equal "/etc/motd", clouds['app'].files.first.name
+    assert_equal "/etc/motd", @cloud.files.first.name
   end
   
   def test_have_a_temp_path_of_the_name_as_Default_tmp_path_pool_name_cloud_name
-    assert_equal PoolParty::Default.tmp_path/"poolparty"/"app", @cloud.tmp_path
+    assert_equal PoolParty::Default.tmp_path/"poolparty"/"simple_cloud", @cloud.tmp_path
   end
   
   def test_be_using_ec2_cloud_provider_by_default
-    assert_equal :ec2, clouds['app'].cloud_provider_name
-    assert_kind_of ::CloudProviders::Ec2, clouds['app'].cloud_provider
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_kind_of ::CloudProviders::Ec2, @cloud.cloud_provider
   end
   
   def test_raise_if_the_cloud_provider_is_not_a_known_type
     PoolParty::PoolPartyError.create("UnknownCloudProviderError")
     assert_raises UnknownCloudProviderError do
-      clouds["app"].cloud_provider_name = :not_a_cloud_provider
-      clouds["app"].cloud_provider
+      @cloud.cloud_provider_name = :not_a_cloud_provider
+      @cloud.cloud_provider
     end
   end
     
   def test_set_the_cloud_provider_cloud_and_keypair_with_cloud_provider
-    assert_equal clouds["app"], clouds["app"].cloud_provider.cloud
-    assert_equal clouds["app"].keypair.basename, clouds["app"].cloud_provider.keypair_name
+    assert_equal @cloud, @cloud.cloud_provider.cloud
+    assert_equal @cloud.keypair.basename, @cloud.cloud_provider.keypair_name
   end
   
   def test_set_the_cloud_provider_with_a_using_block
-    clouds["app"].instance_eval do
+    @cloud.instance_eval do
+      keypair "test_key"
       using :ec2 do
         image_id 'emi-39921602'
       end
     end
-    assert_equal :ec2, clouds["app"].cloud_provider_name
-    assert_equal CloudProviders::Ec2, clouds["app"].cloud_provider.class
-    assert_equal "emi-39921602", clouds["app"].cloud_provider.image_id
+    assert_equal :ec2, @cloud.cloud_provider_name
+    assert_equal CloudProviders::Ec2, @cloud.cloud_provider.class
+    assert_equal "emi-39921602", @cloud.cloud_provider.image_id
   end
   
   def test_nodes
-    assert_respond_to clouds['app'], :nodes
-    assert_respond_to clouds['app'].nodes, :each
-    assert clouds['app'].nodes.size>1
+    assert_respond_to @cloud, :nodes
+    assert_respond_to @cloud.nodes, :each
+    assert @cloud.nodes.size>1
   end
   
   def test_terminate!
-    assert clouds['app'].nodes.size > 0
-    result = clouds['app'].terminate!
+    assert @cloud.nodes.size > 0
+    result = @cloud.terminate!
     assert_respond_to result, :each
     assert_equal 'shutting-down', result.first.status
   end
   
   def test_run
     # WHAT?
-    # result = clouds['app'].run('uptime')
+    # result = @cloud.run('uptime')
     # assert_match /uptime/, result["app"]
   end
   
   def test_os
-    assert_equal :centos, clouds['app'].os
+    assert_equal :centos, @cloud.os
   end
   
   def test_expansion
     #TODO: improve this test
-    # size = clouds["app"].nodes.size
-    # assert_equal size+1, clouds["app"].expand.nodes.size
-    # assert_nothing_raised clouds['app'].expand
+    # size = @cloud.nodes.size
+    # assert_equal size+1, @cloud.expand.nodes.size
+    # assert_nothing_raised @cloud.expand
   end
   
   def test_contract!
     #TODO: need to better mock the terminate! ec2 call
-    # size = clouds['app'].nodes.size
-    # result = clouds['app'].contract!
+    # size = @cloud.nodes.size
+    # result = @cloud.contract!
     # assert_equal 'shuttin-down',  result.status
-    # assert_equal size-1, clouds['app'].nodes.size
+    # assert_equal size-1, @cloud.nodes.size
   end
   
   def test_change_ssh_port
     clear!
     pool "ssh_port" do
       cloud "babity" do
+        keypair "test_key"
         ssh_port 1922
       end
-      cloud "noneity" do
-      end
     end
     assert_equal 1922, clouds["babity"].ssh_port
     assert_equal 22, clouds["noneity"].ssh_port
   end
   
+  def test_change_ssh_port
+    clear!
+    pool "ssher" do
+      cloud "custom" do
+        keypair "test_key"
+        ssh_options("-P" => "1992")
+      end
+      cloud "noneity" do
+        keypair "test_key"
+      end
+    end
+    assert_equal "1992", clouds["custom"].ssh_options["-P"]
+  end
+  
+  
   def test_children_getting_parent_options
     clear!
     pool "outside" do

data/test/lib/poolparty/pool_test.rb

@@ -11,9 +11,9 @@ class PoolTest < Test::Unit::TestCase
     should "load the file with load_from_file on Pool" do
       PoolParty::Pool.load_from_file(@filepath)
       assert_equal PoolParty::Pool, pools["poolparty"].class
-      assert_equal PoolParty::Cloud, pools["poolparty"].clouds["app"].class
-      assert_equal "test_key", pools["poolparty"].clouds["app"].keypair.basename
-      assert_equal "/etc/motd", pools["poolparty"].clouds["app"].files.first.name
+      assert_equal PoolParty::Cloud, pools["poolparty"].clouds["simple_cloud"].class
+      assert_equal "test_key", pools["poolparty"].clouds["simple_cloud"].keypair.basename
+      assert_equal "/etc/motd", pools["poolparty"].clouds["simple_cloud"].files.first.name
     end
     
     should "find_and_load_default_clouds_dot_rb in Pool" do

data/test/lib/provision/bootstrapper_test.rb

@@ -16,29 +16,4 @@ class BootstrapperTest < Test::Unit::TestCase
     end
   end
   
-  context "configure_script" do
-    setup do
-      clear!
-      @filepath = fixtures_dir/"clouds/simple_cloud.rb"
-      @pool = PoolParty::Pool.load_from_file(@filepath)
-      @cloud = @pool.clouds[@pool.clouds.keys.first]
-      @outfile = test_dir/"configure_script.sh"
-    end
-    
-    should "get the script for ubuntu" do
-      assert_equal File.expand_path(@outfile), Provision::Bootstrapper.configure_script(@cloud, :ubuntu, @outfile)
-    end
-    
-    should "output some stuffies" do
-      assert_match /echo app > \/etc\/poolparty\/cloud_name/, open(@outfile).read
-      assert_match /echo poolparty > \/etc\/poolparty\/pool_name/, open(@outfile).read
-    end
-    
-    should "raise an exception if the os isn't supported yet" do
-      assert_raises StandardError do
-        Provision::Bootstrapper.configure_script(@cloud, :non_existant_os)
-      end
-    end
-  end
-  
 end

data/test/test_helper.rb

@@ -27,4 +27,3 @@ require "shoulda"
 require 'git-style-binary/command'
 
 GitStyleBinary.run = true
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -276,6 +276,7 @@ files:
 - test/fixtures/keys/test_pub_key
 - test/fixtures/resources/fake_plugin.rb
 - test/fixtures/resources/fake_resource.rb
+- test/fixtures/resources/fake_subclassed_plugin.rb
 - test/fixtures/resources/random_proc_file.rb
 - test/fixtures/templates/apache_conf.erb
 - test/fixtures/test_template.erb