fairchild-poolparty 1.1.5 → 1.2.12

data/lib/poolparty/verification/verifier_base.rb

@@ -1,9 +1,19 @@
 module PoolParty
   module Verifiers
+    @available_verifiers =[]
+    def self.available
+      @available_verifiers
+    end
     
     class VerifierBase
       attr_reader :host
       
+      def self.inherited(subclass)
+        unless Verifiers.available.include?(subclass)
+          Verifiers.available << subclass
+        end
+      end
+      
       def host=(h=nil)
         @host ||= h
       end

data/lib/poolparty/verification/verifiers/http_match.rb

@@ -0,0 +1,43 @@
+module PoolParty
+  module Verifiers
+    
+=begin
+
+== HttpMatch Verifier
+
+Verify the body of an HTTP call matches a regular expression
+
+== Usage 
+
+  http_match url, response_code
+
+== Example
+
+  verify do
+    http_match  "http://host/index.html", /Welcome to your/
+    http_match  "http://host/index.html", /new poolparty instance/
+  end
+
+=end
+
+    class HttpMatch < VerifierBase
+      require 'open-uri'
+      
+      attr_reader :uri, :regexp
+      def initialize(uri, regexp)
+        @uri    = URI.parse(uri)
+        @regexp = regexp
+      end
+
+      def passing?
+        @regexp.match(@uri.read) ? true : false
+      end
+
+      def to_s
+        "<#{self.class.to_s} uri:#{uri} regexp:#{regexp}>"
+      end
+
+    end
+    
+  end
+end

data/lib/poolparty/verification/verifiers/http_status.rb

@@ -0,0 +1,59 @@
+module PoolParty
+  module Verifiers
+    
+=begin
+
+== HttpStatus Verifier
+
+Verify the HTTP response code from a particular url
+
+== Usage 
+
+  http_status url, response_code
+
+== Example
+
+  verify do
+    http_status "http://host/index.html", 200
+    http_status "http://host/index.html", :success
+    http_status "http://host/asdfasdfads.html", 404
+  end
+
+=end
+
+    class HttpStatus < VerifierBase
+      require 'net/http'
+      require 'uri'
+      
+      attr_reader :uri, :status
+      def initialize(uri, status)
+        @uri    = URI.parse(uri)
+        @status = status
+      end
+
+      def passing?
+        http = Net::HTTP.new(@uri.host)
+        response = http.request_get(@uri.path && !@uri.path.empty? ? @uri.path : "/")
+
+        return case true
+               when status.kind_of?(Numeric)
+                 response.code == @status.to_s 
+               when status.kind_of?(Symbol)
+                 case status
+                 when :success then response.kind_of?(Net::HTTPSuccess)
+                 else 
+                   raise "unknown symbol #{status}"
+                 end
+               else
+                 raise "unknown status type #{status}"
+               end
+      end
+
+      def to_s
+        "<#{self.class.to_s} uri:#{uri} status:#{status}>"
+      end
+
+    end
+    
+  end
+end

data/lib/poolparty/verification/verifiers/ping.rb

@@ -1,6 +1,18 @@
 module PoolParty
   module Verifiers
-    
+=begin
+== Ping
+
+Open a TCPSocket and verify you can connect.
+
+== Example:
+
+    verify do
+      ping
+      ping(22)
+    end
+
+=end
     class Ping < VerifierBase
       include ::PoolParty::Pinger
       
@@ -11,6 +23,11 @@ module PoolParty
       def passing?
         ping_port(host, port, 3)
       end
+
+      def to_s
+        "<#{self.class.to_s} host:#{host} port:#{port}>"
+      end
+
     end
     
   end

data/lib/poolparty/verification/verify.rb

@@ -16,13 +16,18 @@ module PoolParty
       end
       def verify(&block)
         v = Verify.new(&block)
+        # ugly, todo fix
+        ip = nodes(:status => "running").first.ip rescue "127.0.0.1"
+        v.host = ip
         v.verifiers.each {|v| verifiers << v}
       end
       def passing?
         reset!
+        vputs "Starting cloud verification"
         verifiers.each do |v|          
           ip = nodes(:status => "running").first.ip rescue "127.0.0.1"
           v.host = ip
+          vputs "  checking #{v} on #{ip}"
           raise "Verification failed at #{v.class}" unless v.passing?
         end
         return true
@@ -39,6 +44,7 @@ module PoolParty
   Dir[::File.dirname(__FILE__)+"/verifiers/*"].each {|m| require m }  
   
   class Verify
+    attr_accessor :host
     def initialize(&block)
       ::PoolParty.require_user_directory "verifiers"
       

data/lib/poolparty.rb

@@ -2,7 +2,7 @@ $LOAD_PATH<< File.dirname(__FILE__)
 # Load required gems
 #TODO: remove activesupport
 @required_software = Array.new
-%w(rubygems activesupport ftools logging resolv ruby2ruby digest/sha2 json pp).each do |lib|
+%w(rubygems fileutils resolv digest/sha2 json pp).each do |lib|
   begin
     require lib
   rescue Exception => e
@@ -32,23 +32,24 @@ unless @required_software.empty?
   exit(0)
 end
 
-Dir.glob(File.join(File.dirname(__FILE__),'..', 'vendor/gems/*/lib/*.rb')).each do |d|
-  require d
+Dir.glob(File.join(File.dirname(__FILE__),'..', 'vendor/gems/*/lib')).each do |d|
+  $LOAD_PATH.unshift(d)
 end
 
+require "dslify"
+require "parenting"
+require "suitcase"
+
 t=Time.now
 ## Load PoolParty
-%w(version).each do |f|
-  require "#{File.dirname(__FILE__)}/poolparty/#{f}"
+module PoolParty
 end
 
 def PoolParty.require_directory(dir)
   if ::File.file?(dir)
-    puts "#{::File.expand_path(dir)}" if $DEBUGGING || $GENERATING_MANIFEST
     require dir
   else
     Dir["#{dir}/*.rb"].sort.each do |file|
-       puts "#{::File.expand_path(file)}" if $DEBUGGING || $GENERATING_MANIFEST
        require "#{file}" if ::File.file?(file)
     end
     Dir["#{dir}/*"].sort.each do |dir|
@@ -61,17 +62,20 @@ end
 $_poolparty_load_directories = [
   "core",
   "dependencies.rb",
+  "modules/searchable_paths.rb",
+  "modules/pinger.rb",
+  "modules",
+  "poolparty/key.rb",
   "dependency_resolver/dependency_resolver_cloud_extensions.rb",
   "dependency_resolver/dependency_resolver.rb",
   "poolparty/poolparty_base_class.rb",
   "poolparty/default.rb",
-  "modules",
   "exceptions",
   'poolparty/key.rb',
   "dependency_resolver",
-  "aska",
+  "aska.rb",
   "config",
-  "monitors/monitor_rack",
+  "monitors/monitor_rack.rb", 
   "capistrano.rb",
   'provisioners/provisioner_base.rb',
   'provisioners/capistrano/capistrano.rb',
@@ -128,14 +132,9 @@ class Object
   include PoolParty
   include PoolParty::Pool
   include PoolParty::Cloud
-  
   include PoolParty::DefinableResource
 end
 
-class Class
-  include PoolParty::PluginModel
-end
-
 ## Load PoolParty Plugins and package
 module PoolParty
   %w(plugins base_packages).each do |dir|

data/lib/poolpartycl.rb

@@ -8,7 +8,7 @@ end
 
 def are_you_sure?(msg)
   puts msg
-  resp = gets.strip!
+  resp = STDIN.gets.chomp
 
   case resp
   when "Y"

data/spec/bin/bin_spec_helper.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "spec"
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib')

data/spec/bin/fixtures/bin_cloud_for_test.rb

@@ -10,10 +10,4 @@ cloud :binary_testing_cloud do
     listen "8080"
     has_file :name => "/etc/apache2/apache2.conf"
   end
-  
-  case_of "hostname" do
-    when_is 'master' do            
-      has_package :name=>'haproxy'
-    end
-  end
 end

data/spec/bin/server-list-active_spec.rb

@@ -2,23 +2,21 @@ require File.dirname(__FILE__) + '/bin_spec_helper'
 require "poolparty"
 
 class PuppetResolverSpec
-  plugin :apache do
-  end
 end
 
 describe "Server list active binary" do
   describe "with real cloud" do
     before(:each) do
-      Kernel::HaproxyClass.stub!(:new).and_return nil
+      ::PoolParty::Plugin::Haproxy.stub!(:new).and_return nil
       $pool_specfile = __FILE__
       @p = PoolParty::Pool::Pool.load_from_file "#{::File.dirname(__FILE__)}/fixtures/bin_cloud_for_test.rb"
       @pool_hash = @p.to_properties_hash
     end
     it "should have the name on the schema" do
-      @pool_hash.options.name.should == :binary_testing_cloud
+      @pool_hash[:options][:name].should == :binary_testing_cloud
     end
     it "should have the remoter base available" do
-      @pool_hash.options.remote_base.nil?.should == false  
+      @pool_hash[:options][:remoter_base].should_not be_nil
     end
   end
-end
+end

data/spec/poolparty/core/object_spec.rb

@@ -4,65 +4,4 @@ describe "Object" do
   it "should respond to to_os" do
     Object.new.respond_to?(:to_os).should == true
   end
-  describe "methodable object" do
-    before(:each) do
-      @obj.stub!(:run).and_return "true"
-    end
-    it "should run the method :run because it exists" do
-      @obj.send_if_method(:run).should == "true"
-    end
-    it "should not run the method :bah because it doesn't exist" do
-      @obj.send_if_method("bah").should == "bah"
-    end
-    it "should not run the method if it is sent nil" do
-      @obj.send_if_method(nil).should == nil
-    end
-    it "should not run an empty string method" do
-      @obj.send_if_method("").should == ""
-    end
-    it "should not run a method that is an integer" do
-      @obj.send_if_method(2).should == 2
-    end
-  end
-  describe "with_options" do
-    before(:each) do
-      @obj = Class.new
-    end
-    it "should respond to with_options" do
-      @obj.respond_to?(:with_options).should == true
-    end
-    it "should set the options on the parent" do
-      allow_message_expectations_on_nil
-      @a.should_receive(:clone).and_return @a
-      @a.stub!(:options).and_return({})
-      with_options({:nick => "name"}, @a) do
-      end
-    end
-    
-    describe "running" do
-      before(:each) do
-        Class.stub!(:default_options).and_return({})
-        Class.send :include, Dslify
-        @a = Class.new        
-        @b = Class.new
-        
-        with_options({:nick => "name", :b => @b}, @a) do
-          b.dude "totally"
-        end
-        
-      end
-      it "should set the options on the child in the instance eval" do
-        @b.dude.should == "totally"
-      end
-    end
-    describe "contextual running" do
-      before(:each) do
-        @obj.stub!(:default_options).and_return {}
-        @a = @obj.instance_eval { @a = "hello world" }
-      end
-      it "should have the method meta_eval" do
-        @obj.respond_to?(:meta_eval).should == true
-      end
-    end
-  end
-end
+end

data/spec/poolparty/core/ordered_hash_spec.rb

@@ -38,11 +38,11 @@ describe "Ordered Hash" do
     @oh[:arr] = [1,2,3]
     @oh.to_json.should == "{\"var1\":10,\"var2\":2,\"var3\":3,\"var4\":4,\"arr\":[1,2,3]}"
   end
-  it "PoolParty Key" do
-      @oh[:key] = [Key.new, Key.new('path/to/nowhere')]
-      expected=<<JSO
- {\"var1\":10,\"var2\":2,\"var3\":3,\"var4\":4,\"key\":[{\"basename\":\"id_rsa\",\"full_filepath\": \"/etc/poolparty/id_rsa\"},{\"basename\":\"path/to/nowhere\",\"full_filepath\": \"/etc/poolparty/path/to/nowhere\"}]}
-JSO
-      @oh.to_json.should == expected.strip
-  end
+  it "PoolParty Key" #do
+#       @oh[:key] = [Key.new, Key.new('path/to/nowhere')]
+#       expected=<<JSO
+#  {\"var1\":10,\"var2\":2,\"var3\":3,\"var4\":4,\"key\":[{\"basename\":\"id_rsa\",\"full_filepath\": \"/etc/poolparty/id_rsa\"},{\"basename\":\"path/to/nowhere\",\"full_filepath\": \"/etc/poolparty/path/to/nowhere\"}]}
+# JSO
+#       @oh.to_json.should == expected.strip
+  # end
 end

data/spec/poolparty/core/string_spec.rb

@@ -72,7 +72,7 @@ listen web_proxy 127.0.0.1:3000
       @str = "prok"
     end
     it "should be able to turn itself into constant" do
-      @str.class_constant.should == PoolPartyProkClass
+      @str.class_constant.should == PoolPartyProk
     end
     it "should turn itself into a class constant" do
       @str.class_constant.class.should == Class

data/spec/poolparty/dependency_resolver/chef_resolver_spec.rb

@@ -64,8 +64,6 @@ describe "ChefResolver" do
   describe "with a cloud" do
     before(:each) do
       class ChefResolverSpec
-        plugin :apache do
-        end
       end
       @cloud = cloud :hope do
         keypair "bob"
@@ -81,12 +79,6 @@ describe "ChefResolver" do
           has_file :name => "/etc/apache2/apache2.conf", :template => "#{::File.dirname(__FILE__)}/../fixtures/test_template.erb", :friends => "bob"
           has_exec :command => "ls /etc/apache2"
         end
-        
-        case_of "hostname" do
-          when_is 'master' do            
-            has_package :name=>'haproxy'
-          end
-        end
       end
       @properties = @cloud.to_properties_hash
       

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -8,56 +8,62 @@ end
 class DependencyResolverSpecTestResource
   include Dslify
   include PoolParty::DependencyResolverResourceExtensions
+  
+  dsl_methods :name, :template, :content
 end
 
 # plugins, base_packages
 class DependencyResolverSpecTestService < DependencyResolverCloudExtensionsSpecBase
-  
+  dsl_methods :listen
 end
 
 # clouds, duh
 class DependencyResolverSpecTestCloud < DependencyResolverCloudExtensionsSpecBase
+  dsl_methods :keypair, :name
 end
 
-class JunkClassForDefiningPlugin
-  plugin :apache_plugin do
-    def loaded(o={},&block)
-    end
-  end  
-end
+# class JunkClassForDefiningPlugin
+#   apache_plugin do
+#     default_options(
+#       :listen => 80
+#     )
+#     def loaded(o={},&block)
+#     end
+#   end  
+# end
 
 describe "Resolution spec" do
   before(:each) do
     @apache_file = DependencyResolverSpecTestResource.new
-    @apache_file.name "/etc/apache2/apache2.conf"
-    @apache_file.template "/absolute/path/to/template"
-    @apache_file.content "rendered template string"
+    @apache_file.name = "/etc/apache2/apache2.conf"
+    @apache_file.template = "/absolute/path/to/template"
+    @apache_file.content = "rendered template string"
     
     @apache = DependencyResolverSpecTestService.new :apache_file
-    @apache.listen "8080"
+    @apache.listen = "8080"
     @apache.resources[:file] = []
     @apache.resources[:file] << @apache_file
         
     @cloud = DependencyResolverSpecTestCloud.new :cloud
-    @cloud.keypair "bob"
-    @cloud.name "dog"
+    @cloud.keypair = "bob"
+    @cloud.name = "dog"
     
-    (@cloud.services[:apache] ||= []) << @apache
+    (@cloud.resources[:apache] ||= []) << @apache
 
     @cloud_file_motd = DependencyResolverSpecTestResource.new
-    @cloud_file_motd.name "/etc/motd"
-    @cloud_file_motd.content "Welcome to the cloud"
+    @cloud_file_motd.name = "/etc/motd"
+    @cloud_file_motd.content = "Welcome to the cloud"
     
     @cloud_file_profile = DependencyResolverSpecTestResource.new
-    @cloud_file_profile.name "/etc/profile"
-    @cloud_file_profile.content "profile info"
+    @cloud_file_profile.name = "/etc/profile"
+    @cloud_file_profile.content = "profile info"
         
     @cloud.resources[:file] = []
     @cloud.resources[:file] << @cloud_file_motd
     @cloud.resources[:file] << @cloud_file_profile
     
     @cloud_directory_var_www = DependencyResolverSpecTestResource.new
-    @cloud_directory_var_www.name "/var/www"
+    @cloud_directory_var_www.name = "/var/www"
     
     @cloud.resources[:directory] = []
     @cloud.resources[:directory] << @cloud_directory_var_www    
@@ -67,21 +73,18 @@ describe "Resolution spec" do
   end
   describe "to_properties_hash" do
     it "should output a hash" do
-      @cloud.to_properties_hash.class.should == OrderedHash
-      # puts "<pre>#{@cloud.to_properties_hash.to_yaml}</pre>"
+      @cloud.to_properties_hash.class.should == Hash
     end
     it "should have resources on the cloud as an array of hashes" do      
       @cloud.to_properties_hash[:resources].class.should == Array
     end
-    it "should have services on the cloud as an array of hashes" do
-      @cloud.to_properties_hash[:services].class.should == OrderedHash
-    end
   end
 
   describe "defined cloud" do
     before(:each) do
       reset!
-      @file = "Hello <%= friends %> on port <%= listen %>"
+      ::File.stub!(:basename).and_return "template"
+      @file = "Hello <%= friends %> on port <%= port %>"
       @file.stub!(:read).and_return @file
       Template.stub!(:open).and_return @file
 
@@ -92,16 +95,19 @@ describe "Resolution spec" do
         has_directory :name => "/var/www"
         has_package :name => "bash"
         # parent == nil
-        apache_plugin do
+        apache do
           # parent == TestClass
           # puts "<pre>#{parent}</pre> on <pre>#{context_stack.map {|a| a.class }.join(", ")} from #{self.class}</pre>"
           listen "8080"
-          has_file :name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :friends => "bob", :render_as => :erb
+          has_file :name => "/etc/apache2/apache2.conf", 
+                   :template => "/absolute/path/to/template", 
+                   :friends => "bob", 
+                   :render_as => :erb
         end
       end
       @cloud = clouds[:dog_for_test]
       @properties = @cloud.to_properties_hash
-      @apache_key = @properties[:services].keys.select{|k| k.to_s =~ /apache/ }.first
+      @apache_key = @properties[:resources].select {|hsh| hsh[:name] =~ /apache/ }.first
     end
     
     it "should have the method to_properties_hash on the cloud" do
@@ -112,10 +118,7 @@ describe "Resolution spec" do
       @properties[:resources].class.should == Array
     end
     it "contain content in the template's hash" do
-      @properties[:services][@apache_key].first.resources.select_with_hash(:pp_type => "file").last[:content].should == "Hello bob on port 8080"
-    end
-    it "should have services" do
-      @properties[:services][@apache_key].empty?.should == false
+      @apache_key.resources.select_with_hash(:pp_type => "file").first[:content].should == "Hello bob on port 8080"
     end
     it "contain the files in a hash" do
       # puts "<pre>#{@properties.to_yaml}</pre>"