auser-poolparty 1.2.8 → 1.2.9

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/spec/bin/server-list-active_spec.rb

@@ -2,14 +2,12 @@ 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

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"

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -22,15 +22,15 @@ class DependencyResolverSpecTestCloud < DependencyResolverCloudExtensionsSpecBas
   dsl_methods :keypair, :name
 end
 
-class JunkClassForDefiningPlugin
-  plugin :apache_plugin do
-    default_options(
-      :listen => 80
-    )
-    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
@@ -84,7 +84,7 @@ describe "Resolution spec" do
     before(:each) do
       reset!
       ::File.stub!(:basename).and_return "template"
-      @file = "Hello <%= friends %> on port <%= listen %>"
+      @file = "Hello <%= friends %> on port <%= port %>"
       @file.stub!(:read).and_return @file
       Template.stub!(:open).and_return @file
 
@@ -95,11 +95,14 @@ 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]
@@ -115,7 +118,7 @@ describe "Resolution spec" do
       @properties[:resources].class.should == Array
     end
     it "contain content in the template's hash" do
-      @apache_key.resources.select_with_hash(:pp_type => "file").last[:content].should == "Hello bob on port 8080"
+      @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>"

data/spec/poolparty/extra/deployments_spec.rb

@@ -1,68 +1,68 @@
-#TODO: Reimplement
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "deployments" do
-  describe "class" do
-    before(:each) do
-      @klass = PoolParty::Extra::Deployments
-      @file = "hanky_danky_ranky.pool"
-      ::File.stub!(:file?).with(@file).and_return false
-    end
-    it "should have the singleton method include_deployment" do
-      @klass.respond_to?(:include_deployment).should == true
-    end
-    it "should return nil if the file doesn't exist" do
-      @klass.include_deployment(@file).should == nil
-    end
-    describe "existing file" do
-      before(:each) do
-        ::File.stub!(:file?).and_return true
-        @contents = "'hello goober'"
-        @klass.stub!(:open).with(@file).and_return @file
-        @file.stub!(:read).and_return @contents
-        @klass.include_deployment(@file).should_not == nil
-      end
-      it "should not be nil if the file does exist" do        
-        @klass.include_deployment(@file).should_not == nil
-      end
-      it "should create a class called PoolPartyHankyDankyRankyClass" do
-        @klass.include_deployment(@file).nil?.should == false
-        Object.const_defined?(:HankyDankyRankyClass).should == true
-      end
-      it "should create a method on the class called enable" do
-        HankyDankyRankyClass.new.respond_to?(:enable).should == true
-      end
-      it "should add the contents of the file to be eval'd on the method" do
-        # puts HankyDankyRankyClass.new.enable
-        # HankyDankyRankyClass.new.enable.should == "hello goober"
-        pending
-      end
-    end
-    describe "include_deployments" do
-      before(:each) do
-        ::File.stub!(:directory?).and_return false
-        @dir = "/deployments"
-      end
-      it "should have the method include_deployments" do
-        @klass.respond_to?(:include_deployments).should == true
-      end
-      it "should return nil if the directory does not exist" do
-        @klass.include_deployments(@dir).should == nil
-      end
-      describe "existing directory" do
-        before(:each) do          
-          ::File.stub!(:directory?).and_return true
-          @contents = []
-          Dir.stub!(:[]).and_return @contents
-        end
-        it "should not be nil if the directory exists" do
-          @klass.include_deployments(@dir).nil?.should == false
-        end
-        it "should call Dir.[] on the directory" do
-          Dir.should_receive(:[]).with("#{@dir}/*").and_return []
-          @klass.include_deployments(@dir)
-        end
-      end
-    end
-  end
-end
+# #TODO: Reimplement
+# require File.dirname(__FILE__) + '/../spec_helper'
+# 
+# describe "deployments" do
+#   describe "class" do
+#     before(:each) do
+#       @klass = PoolParty::Extra::Deployments
+#       @file = "hanky_danky_ranky.pool"
+#       ::File.stub!(:file?).with(@file).and_return false
+#     end
+#     it "should have the singleton method include_deployment" do
+#       @klass.respond_to?(:include_deployment).should == true
+#     end
+#     it "should return nil if the file doesn't exist" do
+#       @klass.include_deployment(@file).should == nil
+#     end
+#     describe "existing file" do
+#       before(:each) do
+#         ::File.stub!(:file?).and_return true
+#         @contents = "'hello goober'"
+#         @klass.stub!(:open).with(@file).and_return @file
+#         @file.stub!(:read).and_return @contents
+#         @klass.include_deployment(@file).should_not == nil
+#       end
+#       it "should not be nil if the file does exist" do        
+#         @klass.include_deployment(@file).should_not == nil
+#       end
+#       it "should create a class called PoolPartyHankyDankyRankyClass" do
+#         @klass.include_deployment(@file).nil?.should == false
+#         Object.const_defined?(Plugin::HankyDankyRanky).should == true
+#       end
+#       it "should create a method on the class called enable" do
+#         HankyDankyRanky.new.respond_to?(:enable).should == true
+#       end
+#       it "should add the contents of the file to be eval'd on the method" do
+#         # puts HankyDankyRankyClass.new.enable
+#         # HankyDankyRankyClass.new.enable.should == "hello goober"
+#         pending
+#       end
+#     end
+#     describe "include_deployments" do
+#       before(:each) do
+#         ::File.stub!(:directory?).and_return false
+#         @dir = "/deployments"
+#       end
+#       it "should have the method include_deployments" do
+#         @klass.respond_to?(:include_deployments).should == true
+#       end
+#       it "should return nil if the directory does not exist" do
+#         @klass.include_deployments(@dir).should == nil
+#       end
+#       describe "existing directory" do
+#         before(:each) do          
+#           ::File.stub!(:directory?).and_return true
+#           @contents = []
+#           Dir.stub!(:[]).and_return @contents
+#         end
+#         it "should not be nil if the directory exists" do
+#           @klass.include_deployments(@dir).nil?.should == false
+#         end
+#         it "should call Dir.[] on the directory" do
+#           Dir.should_receive(:[]).with("#{@dir}/*").and_return []
+#           @klass.include_deployments(@dir)
+#         end
+#       end
+#     end
+#   end
+# end

data/spec/poolparty/net/remoter_bases/ec2_spec.rb

@@ -130,4 +130,5 @@ describe "ec2 remote base" do
       @tr.create_snapshot.should == nil
     end
   end
+
 end

data/spec/poolparty/plugins/deploydirectory_spec.rb

@@ -1,51 +1,64 @@
-# require File.dirname(__FILE__) + '/../spec_helper'
-# 
-# include PoolParty::Resources
-# 
-# class TestClass
-#   include PoolParty::Resources
-# end
-# describe "Remote Instance" do
-#   before(:each) do
-#     Kernel.stub!(:system).and_return true
-#   end
-#   describe "wrapped" do
-#     before(:each) do
-#       @tc = TestClass.new      
-#       @cloud = MyOpenStruct.new(:keypair => "keys", :remote_keypair_path => "/keypair_path", :name => "cloudcloud")
-#       @cloud.stub!(:is_a?).with(PoolParty::Cloud::Cloud).and_return true
-#       @tc.stub!(:parent).and_return @cloud
-#       
-#       @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false}
-#     end
-#     it "should be a string" do
-#       @tc.has_deploydirectory(@options).to_string.should =~ /exec \{/
-#     end
-#     it "should included the flushed out options" do
-#       @tc.has_deploydirectory(@options).to_string.should =~ /command/
-#     end
-#     describe "in resource" do
-#       before(:each) do
-#         @tc.instance_eval do
-#           has_deploydirectory do
-#             name "deploydirectory"
-#             from ::File.dirname(__FILE__)
-#             to "/var/www/deploydirectory"
-#           end
-#         end
-#       end
-#       it "should have the path set within the resource" do
-#         @tc.resource(:deploydirectory).first.to_string.should =~ /exec \{/
-#       end
-#       it "should not have the from in the to_string" do
-#         @tc.resource(:deploydirectory).first.to_string.should_not =~ /from /
-#       end
-#       it "should not have the to in the to_string" do
-#         @tc.resource(:deploydirectory).first.to_string.should_not =~ /to /
-#       end
-#       it "should have onlyif in the to_string" do
-#         @tc.resource(:deploydirectory).first.to_string.should =~ /onlyif/
-#       end
-#     end
-#   end
-# end
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class TestDeployDirectoryClass < PoolParty::Cloud::Cloud
+end
+
+describe "Remote Instance" do
+  describe "wrapped" do
+    before(:each) do
+      reset!
+      @tc = cloud :test_deploy_directory_class_cloud do
+         has_deploy_directory("map-experiments", 
+                              :from => "~/projects/westfield/map-experiments", 
+                              :to => "/var/www/wifi-maps", 
+                              :mode => "755",
+                              :owner => "www-data")
+
+         has_deploy_directory("map-experiments-two", 
+                              :from => "~/projects/westfield/map-experiments", 
+                              :to => "/var/www/wifi-maps-two", 
+                              :mode => "755",
+                              :owner => "www-data")
+
+      end
+      @compiled = ChefResolver.new(@tc.to_properties_hash).compile
+    end
+
+    describe "when being listed the first time" do
+      it "should be a string" do
+        @compiled.should =~ /execute/
+      end
+
+      it "should create the directory specified in 'to'" do
+        @compiled.should =~ %r{directory "/var/www/wifi-maps"}
+      end
+
+      it "should copy from the deploy directory" do
+        #@compiled.should =~ %r{command "cp \-R /var/poolparty/dr_configure/user_directory/map-experiments/map-experiments/\* /var/www/wifi-maps"}
+        @compiled.should =~ %r{command "cp \-R /var/poolparty/dr_configure/user_directory/map-experiments/\* /var/www/wifi-maps"}
+      end
+
+      it "should chown if needed" do
+        @compiled.should =~ %r{command "chown www-data \-R /var/www/wifi-maps"}
+      end
+
+      it "should chmod if needed" do
+        @compiled.should =~ %r{command "chmod 755 /var/www/wifi-maps"}
+      end
+    end
+
+    describe "when being listed a second time with the same source" do
+      it "should create the directory specified in 'to'" do
+        @compiled.should =~ %r{directory "/var/www/wifi-maps-two"}
+      end
+
+      it "should copy from the right deploy directory" do
+        #@compiled.should =~ %r{command "cp \-R /var/poolparty/dr_configure/user_directory/map-experiments-two/map-experiments/\* /var/www/wifi-maps-two"}
+        @compiled.should =~ %r{command "cp \-R /var/poolparty/dr_configure/user_directory/map-experiments/\* /var/www/wifi-maps-two"}
+      end
+    end
+ 
+  end
+end
+
+# it should be able to have a different name and from

data/spec/poolparty/poolparty/cloud_spec.rb

@@ -1,13 +1,15 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class TestService
-  plugin :test_service do
-    def initialize(o={}, e=nil, &block)
-      super(&block)
-    end
-    def enable(o={})
-      has_file(:name => "/etc/poolparty/lobos")
-    end                  
+module PoolParty
+  module Plugin
+   class  TestService < Plugin
+      def initialize(o={}, e=nil, &block)
+        super(&block)
+      end
+      def enable(o={})
+        has_file(:name => "/etc/poolparty/lobos")
+      end
+    end 
   end
 end
 
@@ -214,14 +216,14 @@ describe "Cloud" do
               @cloud.instance_eval do
                 @heartbeat = nil
               end
-              @hb = PoolpartyBaseHeartbeatClass.new
+              @hb = PoolParty::Plugin::Heartbeat.new
             end
             it "should call enable on the plugin call" do
-              @hb = PoolpartyBaseHeartbeatClass.new
-              PoolpartyBaseHeartbeatClass.stub!(:new).and_return @hb
+              @hb = PoolParty::Plugin::Heartbeat.new
+              PoolParty::Plugin::Heartbeat.stub!(:new).and_return @hb
               
               @cloud.send :add_poolparty_base_requirements
-              @cloud.poolparty_base_heartbeat.should == @hb
+              @cloud.heartbeat.should == @hb
             end
             describe "after adding" do
               before(:each) do
@@ -231,22 +233,22 @@ describe "Cloud" do
               describe "resources" do
                 before(:each) do
                   reset!
-                  @cloud8 = cloud :tester do
+                  cloud :tester do
                     test_service
                   end
-                  @service = clouds[:tester].ordered_resources.select {|hsh| hsh.class == TestServiceClass }.first
+                  @service = clouds[:tester].ordered_resources.select {|hsh|
+                    hsh.to_properties_hash.name == "test_service"
+                    }.first
                   @files = @service.resource(:file)
                 end
                 it "should have a file resource" do
-                  # @files.first.nil?.should == false
-                  pending
+                  @files.first.nil?.should == false
                 end
                 it "should have an array of lines" do
                   @files.class.should == Array
                 end
-                it "should not be empty" do
-                  # @files.should_not be_empty
-                  pending
+                it "should have the file /etc/poolparty/lobos" do
+                  @files.first.name.should == "/etc/poolparty/lobos"
                 end
               end
             end

data/spec/poolparty/poolparty/configurers/files/ruby_basic.rb

@@ -4,7 +4,7 @@ pool :poolpartyrb do
     # Configuration
     minimum_instances 1
     
-    apachetest do
+    apache_test do
       enable_php
       site("poolpartyrb.com")
     end