fairchild-poolparty 1.1.4 → 1.1.5

data/lib/poolparty/verification/verify.rb

@@ -0,0 +1,74 @@
+=begin rdoc
+  Verification
+  
+  Add a verify block to a clouds.rb
+=end
+module PoolParty
+  module Verification
+
+    module ClassMethods
+      attr_reader :verifiers
+    end
+    
+    module InstanceMethods
+      def verifiers
+        @verifiers ||= []
+      end
+      def verify(&block)
+        v = Verify.new(&block)
+        v.verifiers.each {|v| verifiers << v}
+      end
+      def passing?
+        reset!
+        verifiers.each do |v|          
+          ip = nodes(:status => "running").first.ip rescue "127.0.0.1"
+          v.host = ip
+          raise "Verification failed at #{v.class}" unless v.passing?
+        end
+        return true
+      end
+    end
+    
+    def self.included(receiver)
+      receiver.extend         ClassMethods
+      receiver.send :include, InstanceMethods
+    end
+  end
+  
+  require "#{::File.dirname(__FILE__)}/verifier_base.rb"
+  Dir[::File.dirname(__FILE__)+"/verifiers/*"].each {|m| require m }  
+  
+  class Verify
+    def initialize(&block)
+      ::PoolParty.require_user_directory "verifiers"
+      
+      instance_eval &block if block
+    end
+    
+    def verifiers;@verifiers ||= [];end
+    
+    # Check in with the verifiers and make sure they are all passing?
+    def passing?
+      verifiers.each {|v| raise "Not working" unless v.passing? }
+    end
+    
+    # Take a string and return a ruby object if a match is found in the base_objects namespace.
+    def constantize(name, base_object=Monitors)
+      begin
+        const = base_object.constants.find{|cnst| cnst == name.camelcase }
+        base_object.module_eval const
+      rescue Exception => e
+        puts "#{name.camelcase} is not defined. #{e}"
+        nil
+      end
+    end
+    def method_missing m,*a,&block
+      begin
+        verifiers << constantize(m.to_s.capitalize, PoolParty::Verifiers).new(*a, &block)
+      rescue 
+        super
+      end
+    end
+    
+  end
+end

data/lib/poolparty.rb

@@ -64,13 +64,14 @@ $_poolparty_load_directories = [
   "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",
   "config",
-  "monitors",
+  "monitors/monitor_rack",
   "capistrano.rb",
   'provisioners/provisioner_base.rb',
   'provisioners/capistrano/capistrano.rb',
@@ -78,6 +79,7 @@ $_poolparty_load_directories = [
   "extra",
   "net",
   "helpers",
+  "verification",
   "poolparty/resource.rb",
   "poolparty/service.rb",
   "resources",
@@ -90,7 +92,7 @@ manifest_file_location = ::File.join(::File.dirname(__FILE__), '../config/manife
 
 if ::File.file?(manifest_file_location)
   ::File.readlines(manifest_file_location).each do |line| 
-    puts "#{::File.expand_path(line)}" if $DEBUGGING
+    dputs "#{::File.expand_path(line)}"
     require "#{line.gsub(/\n/, '')}"
   end
 else
@@ -99,7 +101,7 @@ else
   end  
 end
 
-Logging.init :debug, :info, :warn, :error, :fatal
+# Logging.init :debug, :info, :warn, :error, :fatal
 
 module PoolParty
   include FileWriter
@@ -109,12 +111,9 @@ module PoolParty
   end
   def reset!
     $pools = $clouds = $plugins = @describe_instances = nil
-  end  
+  end
+  
   class PoolParty
-    def initialize(spec)
-      reset!
-      Script.inflate(spec) if spec
-    end
   end
   
   private
@@ -145,4 +144,4 @@ module PoolParty
 end
 
 PoolParty.reset!
-puts "duration = #{Time.now-t}" if $DEBUGGING
+dputs "duration = #{Time.now-t}"

data/lib/poolpartycl.rb

@@ -4,4 +4,18 @@ end
 
 def help_array
   ["-h", "--help", "-V", "--version", "--debug", "-d"]
+end
+
+def are_you_sure?(msg)
+  puts msg
+  resp = gets.strip!
+
+  case resp
+  when "Y"
+  when "yes"
+  when "y"
+    return true
+  else
+    return false
+  end
 end

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

@@ -9,6 +9,8 @@ end
 describe "Server list active binary" do
   describe "with real cloud" do
     before(:each) do
+      Kernel::HaproxyClass.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

data/spec/poolparty/base_packages/haproxy_spec.rb

@@ -2,6 +2,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "haproxy base package" do
   it "should have the haproxy package defined" do
-    lambda {PoolpartyBaseHaproxyClass}.should_not raise_error
+    lambda {HaproxyClass}.should_not raise_error
   end
 end

data/spec/poolparty/core/array_spec.rb

@@ -37,10 +37,12 @@ describe "Array" do
         @remote_instances_list.select_with_hash( {:status => 'running'}).size.should == 2
         @remote_instances_list.select_with_hash( {:ip => 'not.assigned'}).should == [{:status => 'pending', :ip=>'not.assigned'},]
         @remote_instances_list.select_with_hash( {:bogus => nil}).size.should == 1
-        @remote_instances_list.select_with_hash().size.should == 0
     end
     it "should not raise an error if element does not have key" do
       @remote_instances_list.select_with_hash( {:snot => 'runny'}).size.should == 0
     end
+    it "should return all the instances if there are no values passed in" do
+      @remote_instances_list.select_with_hash.should == @remote_instances_list
+    end
   end
 end

data/spec/poolparty/core/ordered_hash_spec.rb

@@ -39,9 +39,9 @@ describe "Ordered Hash" do
     @oh.to_json.should == "{\"var1\":10,\"var2\":2,\"var3\":3,\"var4\":4,\"arr\":[1,2,3]}"
   end
   it "PoolParty Key" do
-      @oh[:keyy] = [Key.new, Key.new('path/to/nowhere')]
+      @oh[:key] = [Key.new, Key.new('path/to/nowhere')]
       expected=<<JSO
- {\"var1\":10,\"var2\":2,\"var3\":3,\"var4\":4,\"keyy\":[{\"basename\":\"id_rsa\",\n       \"full_filepath\": \"/etc/poolparty/id_rsa\"},{\"basename\":\"path/to/nowhere\",\n       \"full_filepath\": \"/etc/poolparty/path/to/nowhere\"}]}
+ {\"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

data/spec/poolparty/dependency_resolver/chef_resolver_spec.rb

@@ -5,23 +5,17 @@ describe "ChefResolver" do
     reset!
     @cloud_reference_hash = {
       :options => {:name => "dog", :keypair => "bob", :users => ["ari", "michael"]},
-      :resources => {
-        :file =>  [
-                    {:name => "/etc/motd", :content => "Welcome to the cloud"},
-                    {:name => "/etc/profile", :content => "profile info"}
-                  ],
-        :directory => [
-                        {:name => "/var/www"}
-                      ]    
-      },
+      :resources => [
+        {:name => "/etc/motd", :content => "Welcome to the cloud", :pp_type => "file"},
+        {:name => "/etc/profile", :content => "profile info", :pp_type => "file"},
+        {:name => "/var/www", :pp_type => "directory"}
+      ],
       :services => {
         :apache => [{
           :options => {:listen => "8080"},
-          :resources => {
-                          :file => [
-                              {:name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :content => "rendered template string"}
-                            ]
-                        },
+          :resources => [
+            {:name => "/etc/apache2/apache2.conf", :pp_type => "file", :template => "/absolute/path/to/template", :content => "rendered template string"}
+          ],
           :services => {}
         }]
       }
@@ -33,7 +27,7 @@ describe "ChefResolver" do
     # lambda { PoolParty::ChefResolver.compile }.should raise_error
   end
   it "accept a hash" do
-    lambda { PoolParty::ChefResolver.compile({})}.should_not raise_error
+    lambda { PoolParty::ChefResolver.compile(@cloud_reference_hash)}.should_not raise_error
   end
   
   describe "when passed a valid cloud hash" do

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -71,7 +71,7 @@ describe "Resolution spec" do
       # puts "<pre>#{@cloud.to_properties_hash.to_yaml}</pre>"
     end
     it "should have resources on the cloud as an array of hashes" do      
-      @cloud.to_properties_hash[:resources].class.should == OrderedHash
+      @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
@@ -109,20 +109,20 @@ describe "Resolution spec" do
     end
     it "should have resources on the cloud as an array of hashes" do
       # puts "<pre>#{cloud(:dog).to_properties_hash.to_yaml}</pre>"
-      @properties[:resources].class.should == OrderedHash
+      @properties[:resources].class.should == Array
     end
-    it "contain content in the template's hash" do      
-      @properties[:services][@apache_key].first.resources[:file].first[:content].should == "Hello bob on port 8080"
+    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
     end
     it "contain the files in a hash" do
       # puts "<pre>#{@properties.to_yaml}</pre>"
-      @properties[:resources][:file].map {|a| a[:name] }.include?("/etc/motd").should == true
+      @properties[:resources].select {|a| a[:name] == "/etc/motd" }.first.nil?.should == false
     end
     it "contain the directory named /var/www" do
-      @properties[:resources][:directory].map {|a| a[:name] }.include?("/var/www").should == true
+      @properties[:resources].select {|a| a[:name] == "/var/www" }.first.nil?.should == false
     end
   end
 end

data/spec/poolparty/dependency_resolver/puppet_resolver_spec.rb

@@ -1,124 +1,121 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "PuppetResolver" do
-  before :all do
-    @cloud_reference_hash = {
-      :options => {:name => "dog", :keypair => "bob", :users => ["ari", "michael"]},
-      :resources => {
-        :file =>  [
-                    {:name => "/etc/motd", :content => "Welcome to the cloud"},
-                    {:name => "/etc/profile", :content => "profile info"}
-                  ],
-        :directory => [
-                        {:name => "/var/www"}
-                      ]    
-      },
-      :services => {
-        :apache => [{
-          :options => {:listen => "8080"},
-          :resources => {
-                          :file => [
-                              {:name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :content => "rendered template string"}
-                            ]
-                        },
-          :services => {}
-        }]
-      }
-    }
-  end
-  
-  it "throw an exception if not given a hash" do
-    pending # odd error with should raise_error
-    # lambda { PoolParty::PuppetResolver.compile }.should raise_error
-  end
-  it "accept a hash" do
-    lambda { PoolParty::PuppetResolver.compile({})}.should_not raise_error
-  end
-  
-  describe "when passed a valid cloud hash" do
-    
-    before(:all) do
-      @dr = PuppetResolver.new(@cloud_reference_hash)
-      @compiled = @dr.compile
-    end
-    
-    # describe "variables" do
-    #   it "output options as puppet variables" do
-    #     @compiled.should match(/bob/)
-    #     @compiled.instance_of?(String).should == true
-    #     @compiled.should match(/\$users = \[ \".* \]/)
-    #   end
-    # end
-    
-    describe "resources" do
-      it "should print resources in the proper layout" do        
-        @compiled.should =~ /file \{ "\/etc\/motd"/
-      end
-    end
-    
-    describe "services" do
-      it "should print apache into a class definition" do
-        # puts "<pre>#{@compiled.to_yaml}</pre>"
-        @compiled.should =~ /class apache \{/
-      end
-    end
-    
-  end
-  
-  describe "with a cloud" do
-    before(:each) do
-      class PuppetResolverSpec
-        plugin :apache do
-        end
-      end
-      reset!
-      @cloud = cloud :hope do
-        keypair "bob"
-        has_file :name => "/etc/motd", :content => "Welcome to the cloud"        
-        has_file :name => "/etc/profile", :content => "profile info"        
-        
-        has_directory :name => "/var/www"
-        has_file :name => "/var/www/index.html", :content => "profile info", :requires => get_directory("/var/www")
-        
-        dependency_resolver "puppet"
-        # has_package :name => "bash"        
-        # parent == cloud
-        apache do
-          # parent == apache
-          listen "8080"
-          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
-      
-      # puts "<pre>#{@cloud_reference_hash.to_yaml}\n\n#{@properties.to_yaml}</pre>"
-      @dr = PuppetResolver.new(@properties)
-      @compiled = @dr.compile
-    end
-    it "should compile to a string" do
-      # puts "<pre>#{@compiled.to_yaml}</pre>"
-      @compiled.class.should == String
-    end
-    it "should include apache class" do
-      @compiled.should =~ /class apache \{/
-    end
-    it "should include the case statement" do
-      @compiled.should =~ /case \$hostname \{/
-      @compiled.should =~ /master : \{/
-    end
-    it "should require the file to have the directory (written as file)" do
-      @compiled.should =~ /require => File\[\"\/var\/www\"\]/
-    end
-    it "should ensure file" do
-      @compiled.should =~ /ensure => "present"/      
-    end
-  end
-  
-end
+# MOVED TO A TEST
+# require File.dirname(__FILE__) + '/../spec_helper'
+# 
+# describe "PuppetResolver" do
+#   before :all do
+#     reset!
+#     @cloud_reference_hash = {
+#       :options => {:name => "dog", :keypair => "bob", :users => ["ari", "michael"]},
+#       :resources => [
+#         {:name => "/etc/motd", :content => "Welcome to the cloud", :pp_type => "file"},
+#         {:name => "/etc/profile", :content => "profile info", :pp_type => "file"},
+#         {:name => "/var/www", :pp_type => "directory"}
+#       ],
+#       :services => {
+#         :apache => [{
+#           :options => {:listen => "8080"},
+#           :resources => [
+#             {:name => "/etc/apache2/apache2.conf", :pp_type => "file", :template => "/absolute/path/to/template", :content => "rendered template string"}
+#           ],
+#           :services => {}
+#         }]
+#       }
+#     }
+#   end
+#   
+#   it "throw an exception if not given a hash" do
+#     pending # odd error with should raise_error
+#     # lambda { PoolParty::PuppetResolver.compile }.should raise_error
+#   end
+#   it "accept a hash" do
+#     lambda { PoolParty::PuppetResolver.compile(@cloud_reference_hash)}.should_not raise_error
+#   end
+#   
+#   describe "when passed a valid cloud hash" do
+#     
+#     before(:all) do
+#       reset!
+#       @dr = PuppetResolver.new(@cloud_reference_hash)
+#       @compiled = @dr.compile
+#     end
+#     
+#     # describe "variables" do
+#     #   it "output options as puppet variables" do
+#     #     @compiled.should match(/bob/)
+#     #     @compiled.instance_of?(String).should == true
+#     #     @compiled.should match(/\$users = \[ \".* \]/)
+#     #   end
+#     # end
+#     
+#     describe "resources" do
+#       it "should print resources in the proper layout" do        
+#         @compiled.should =~ /file \{ "\/etc\/motd"/
+#       end
+#     end
+#     
+#     describe "services" do
+#       it "should print apache into a class definition" do
+#         # puts "<pre>#{@compiled.to_yaml}</pre>"
+#         @compiled.should =~ /class apache \{/
+#       end
+#     end
+#     
+#   end
+#   
+#   describe "with a cloud" do
+#     before(:each) do
+#       class PuppetResolverSpec
+#         plugin :apache do
+#         end
+#       end
+#       # reset!
+#       @cloud = cloud :hope do
+#         keypair "bob"
+#         has_file :name => "/etc/motd", :content => "Welcome to the cloud"        
+#         has_file :name => "/etc/profile", :content => "profile info"        
+#         
+#         has_directory :name => "/var/www"
+#         has_file :name => "/var/www/index.html", :content => "profile info", :requires => get_directory("/var/www")
+#         
+#         dependency_resolver "puppet"
+#         # has_package :name => "bash"        
+#         # parent == cloud
+#         apache do
+#           # parent == apache
+#           listen "8080"
+#           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
+#       
+#       # puts "<pre>#{@cloud_reference_hash.to_yaml}\n\n#{@properties}</pre>"
+#       @dr = PuppetResolver.new(@properties)
+#       @compiled = @dr.compile
+#     end
+#     it "should compile to a string" do
+#       # puts "<pre>#{@compiled.to_yaml}</pre>"
+#       @compiled.class.should == String
+#     end
+#     it "should include apache class" do
+#       @compiled.should =~ /class apache \{/
+#     end
+#     it "should include the case statement" do
+#       @compiled.should =~ /case \$hostname \{/
+#       @compiled.should =~ /master : \{/
+#     end
+#     it "should require the file to have the directory (written as file)" do
+#       @compiled.should =~ /require => File\[\"\/var\/www\"\]/
+#     end
+#     it "should ensure file" do
+#       @compiled.should =~ /ensure => "present"/      
+#     end
+#   end
+#   
+# end