poolparty 0.2.84 → 1.2.2

data/spec/poolparty/poolparty/resource_spec.rb

@@ -6,9 +6,7 @@ require File.dirname(__FILE__) + '/test_plugins/webserver'
 
 class MyResource < PoolParty::Resources::Resource
   # Just to give some options for the test class
-  def options(h={})
-    @options ||= {:a => 1,:b => 2,:c => 3}
-  end
+  default_options(:a => 1,:b => 2,:c => 3)
 end
 describe "Resource" do
   before(:each) do
@@ -29,17 +27,12 @@ describe "Resource" do
     it "should not wipe out the rest of the default options" do
       @resource.c.should == 3    
     end
-    describe "to_s" do
-      it "should be able to coalesce the instances" do
-        @resource.to_string.should =~ /resource \{/
-      end
-    end
     describe "class methods" do
       it "should have an array of available resources" do
         PoolParty::Resources::Resource.available_resources.class.should == Array
       end
       it "should not be empty" do
-        PoolParty::Resources::Resource.available_resources.should_not be_empty
+        PoolParty::Resources::Resource.available_resources.empty?.should == false
       end
     end
     describe "instance methods" do
@@ -63,344 +56,151 @@ describe "Resource" do
         @resource.respond_to?(:ensures).should == true
       end
       it "should push the option ensure onto the options" do
-        @resource.options.has_key?(:ensure).should == false
-        @resource.ensures("nibbles")
-        @resource.options.has_key?(:ensure).should == true
+        @resource.options.has_key?(:ensures).should == false
+        @resource.ensures :absent
+        @resource.options.has_key?(:ensures).should == true
       end
       it "should write the option ensures as present with is_present" do
-        @resource.options.has_key?(:ensure).should == false
+        @resource.options.has_key?(:ensures).should == false
         @resource.is_present
-        @resource.options[:ensure].should == "present"
+        @resource.options.has_key?(:ensures).should == true
       end
       it "should write the option ensures as absent with is_absent" do
-        @resource.options.has_key?(:ensure).should == false
+        @resource.options.has_key?(:ensures).should == false
         @resource.is_absent
-        @resource.options[:ensure].should == "absent"
+        @resource.options.has_key?(:ensures).should == true
       end
       it "should write the option unless for ifnot" do
         @resource.options.has_key?(:unless).should == false
         @resource.ifnot "str"
         @resource.options[:unless].should == "str"
       end
-      describe "templating" do
-        before(:each) do
-          FileUtils.stub!(:cp).and_return true        
-        end
-        it "should have the method template" do
-          @resource.respond_to?(:template).should == true
-        end
-        it "should raise an exception if no file is given" do
-          lambda {
-            @resource.template
-          }.should raise_error
-        end
-        it "should raise an excepton if the file cannot be found" do
-          lambda {
-            @resource.template("radar")
-          }.should raise_error
-        end
-        it "should not raise an exception if there is a file passed and the file is found" do
-          File.should_receive(:file?).with("radar").and_return true
-          lambda {
-            @resource.template("radar")
-          }.should_not raise_error
-        end
-        # it "should push the template option on to the options" do
-        #   File.stub!(:file?).with("radar").and_return true
-        #   @resource.options.has_key?(:template).should == false
-        #   @resource.template("radar")
-        #   @resource.options.has_key?(:template).should == true
-        # end
-      end
     end
     describe "command" do
-      include PoolParty::Resources
       before(:each) do
-        @cloud = cloud :command_cloud do; end
+        @tc = TestBaseClass.new do
+          has_file(:name => "frank")
+        end
+        @cloud = @tc
       end
       describe "add_resource" do
         it "should call add_resource when creating using the command: file" do
-          @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud)
+          @cloud.should_receive(:add_resource).with(:file, {:name => "frank"})
           @cloud.instance_eval do
-            file(:name => "frank")
+            __file(:name => "frank")
           end
         end
         it "should return a resource when the resource does not exist" do
-          file(:name => "/etc/frank.txt").class.should == PoolParty::Resources::File
+          @cloud.resource(:file).first.class.should == PoolParty::Resources::File
         end
         it "should return a resource when the resource does exist" do
-          file(:name => "frank")
-          file(:name => "frank").class.should == PoolParty::Resources::File
+          @cloud.instance_eval do
+            resources[:file] = nil
+            has_file({:name => "frank"})
+          end
+          @cloud.resource(:file).first.class.should == PoolParty::Resources::File
         end
       end
       it "should create the new 'resource' as a resource" do
-        resource(:file).class.should == Array
-      end
-      it "should receive << when adding a new one" do
-        resource(:file).should_receive(:<<).once
-        has_file({:name => "pop"})
+        @tc.resource(:file).class.should == Array
       end
       it "should contain 3 instances after calling resource 3 times" do
-        file({:name => "red"})
-        file({:name => "hot"})
-        file({:name => "summer"})
-        resource(:file).size.should == 3
+        @cloud.instance_eval do
+          resources[:file] = nil
+          has_file({:name => "red"})
+          has_file({:name => "hot"})
+          has_file({:name => "summer"})
+        end
+        @tc.resource(:file).size.should == 3
       end
       describe "adding" do
         before(:each) do
-          @a = file({:name => "red"})
-          @b = file({:name => "hot"})
-          @c = file({:name => "summer"})
+          @cloud.instance_eval do
+            resources[:file] = nil
+            has_file({:name => "red"})
+            has_file({:name => "hot"})
+            has_file({:name => "summer"})
+          end
         end
         it "should contain file named with 'red'" do
-          get_resource(:file, "red").nil?.should == false
+          @cloud.get_resource(:file, "red").nil?.should == false
         end
       end
       describe "method_missing" do
         before(:each) do
-          file({:name => "red"})
-          file({:name => "hot"})
-          file({:name => "summer"})
+          @cloud.instance_eval do
+            resources[:file] = nil
+            has_file({:name => "red"})
+            has_file({:name => "hot"})
+            has_file({:name => "summer"})
+          end
         end
         it "should be able to pick out methods with the phrase has_" do
           lambda {
-            has_file
+            @cloud.instance_eval do
+              has_file({:name => "summer"})
+            end
           }.should_not raise_error
         end
-        it "should not have a method prepended with crabs_" do
-          lambda {
-            crabs_file
-          }.should raise_error
-        end
         it "should pick out methods with the phrase does_not_" do
           lambda {
-            does_not_have_file({:name => "red"})
+            @cloud.instance_eval do
+              does_not_have_file({:name => "summer"})
+            end
           }.should_not raise_error
         end
-        it "should set the has_file to present ensure" do
-          has_file({:name => "redface"})
-          resource(:file).get_named("redface").first.options[:ensure].should == "present"
-        end
-        it "should set the does_not_have_file to absent ensure" do
-          does_not_have_file({:name => "net"})
-          resource(:file).get_named("net").first.options[:ensure].should == "absent"
-        end
-        it "should be able to have_service as well" do
-          has_service({:name => "apache"})
-          resource(:service).get_named("apache").first.options[:ensure].should == "running"
-        end      
       end
       describe "get_resource" do
         before(:each) do
-          reset_resources!
-          @cloud_get_resource = cloud :get_resource do
-            file(:name => "red")
-            file(:name => "hot")
-            file(:name => "tamales")
+          @tc.instance_eval do
+            resources[:file] = nil
+            has_file(:name => "red")
+            has_file(:name => "hot")
+            has_file(:name => "tamales")
           end
         end
         it "should return a type of resource when looking for a resource that exists" do
-          @cloud_get_resource.get_resource(:file, "hot").class.should == PoolParty::Resources::File
+          @tc.get_resource(:file, "hot").class.should == PoolParty::Resources::File
         end
         it "should return the resource of the name requested" do
-          @cloud_get_resource.get_resource(:file, "hot").name.should == "hot"
+          @tc.get_resource(:file, "hot").name.should == "hot"
         end
         it "should return nil if the resource requested is not there" do
-          @cloud_get_resource.get_resource(:file, "smarties").should be_nil
+          @tc.get_resource(:file, "smarties").nil?.should == true
         end
         it "should not have created any more resources" do
-          @cloud_get_resource.resource(:file).size.should == 3
-        end
-      end
-      describe "parent" do
-        before(:each) do
-          @cloud = cloud :orange do
-            tangerine "orange"
-            file(:name => "file.txt")
-          end
-          @file = @cloud.resources[:file].first
-        end
-        it "should take the options of the parent" do        
-          @file.parent.tangerine.should_not == nil
-        end
-        it "should set the option as the same from the parent" do
-          @file.parent.tangerine.should == "orange"
+          @tc.resource(:file).size.should == 3
         end
       end
       describe "appending to resource" do
         before(:each) do
-          @cloud1 = cloud :apples do
-            directory(:name => "/var/www") do
-              file(:name => "/var/www/file.html")
+          @tc = TestBaseClass.new do
+            has_directory(:name => "/var/www") do
+              has_file(:name => "/var/www/file.html")
             end
           end
-          @dir = @cloud1.get_resource(:directory, "/var/www")
-          @file = @dir.get_resource(:file, "/var/www/file.html")
+          @dir = @tc.resource(:directory).first
+          @file = @tc.resource(:file).first
         end
         it "should say there is 1 resource because the lower-level resources should be contained on the parenting resource" do
-          @cloud1.resources.size.should == 1
-        end
-        it "should set the exec to notify apache2" do
-          has_service("apache2")
-          has_exec(:name => "reload-page", :notify => get_service("apache2"))
-          resource(:exec).get_named("reload-page").first.options[:notify].to_s.should == "Service['apache2']"
+          @tc.resources.size.should == 2
         end
         it "should say there is one resource on the outer resource" do
-          @dir.resources.size.should == 1
+          @dir.resources.size.should == 2
         end
         it "should contain the file as a resource" do
-          @dir.resource(:file)[0].to_s.should == @file.to_s
-        end
-        it "should set the parent as the parenting resource" do
-          @file.parent.to_s.should == @dir.to_s
-        end
-      end
-      describe "handle_option_value" do
-        it "should turn a string into a hash with the string as the key name" do
-          handle_option_values("vat of cats").should == {:name => "vat of cats"}
-        end
-        it "should not change a hash into anything" do
-          handle_option_values({:name => "poe"}).should == {:name => "poe"}
+          @dir.resource(:file)[0].class.should == PoolParty::Resources::File
         end
       end
       describe "fetching" do
         before(:each) do
-          @file = file(:name => "pancakes")
-        end
-        it "should not create a new resource if the same resource exists" do
-          PoolParty::Resources::File.should_not_receive(:new)
-          file(:name => "pancakes")
-        end
-        it "should return the file preiously created" do
-          get_resource(:file, "pancakes").options.keys.sort.should == @file.options.keys.sort
-        end
-        it "should be able to use the helper to grab the file" do
-          PoolParty::Resources::File.should_not_receive(:new)
-          self.stub!(:key).and_return "false"
-          file(:name => "pancakes").name.should == @file.name
-        end
-        it "should turn the resource into a string" do
-          @file.to_s.should == "File['pancakes']"
-        end
-        describe "cancelled" do
-          it "should make a resource not cancelled by default" do
-            @file.cancelled?.should == false
-          end
-          it "should say cancelled? is true if it has been cancelled" do
-            @file.cancel
-            @file.cancelled?.should == true
-          end
-          it "should be able to get the file from the helper" do
-            get_file("pancakes").options.keys.sort.should == @file.options.keys.sort
-          end
-        end
-        describe "virtual_resources" do
-          before(:each) do
-            @virtual_resource = git(:at => "/var/paint/cans", :name => "tank", :source => "git://github.com/auser/testgit.git")
-          end
-          it "should fetch a virtual resource the same" do
-            git(:at => "/var/paint/cans", :name => "tank", :source => "git://github.com/auser/testgit.git").to_s.should == @virtual_resource.to_s
+          @tc = TestBaseClass.new do
+            has_file(:name => "pancakes")
           end
+          @file = @tc.resource(:file).first
         end
-      end
-      describe "global resources" do
-        describe "setting" do
-          before(:each) do        
-            @cloud2 = cloud :applepie do          
-              directory(:name => "/var/www") do
-                file(:name => "/var/www/file.html")
-              end
-            end
-            @cloud2 = cloud(:applepie)
-          end
-          it "should have a global_resources_store available as an Array" do
-            @cloud2.global_resources_store.class.should == Array
-          end
-          it "should have stored the two resources from the cloud into the global_resources_store" do
-            @cloud2.global_resources_store.size.should >= 2
-          end
-          it "should be an array of resources" do
-            @cloud2.global_resources_store.first.is_a?(PoolParty::Resources::Resource).should == true
-          end
-          it "should say that the type directory of name /var/www is in the global_resources_store" do
-            @cloud2.in_global_resource_store?(:directory, "/var/www").should == true
-          end
-          it "should say that the type file of the name /var/www/file.html is in the global_resources_store" do
-            @cloud2.in_global_resource_store?(:file, "/var/www/file.html").should == true
-          end
-          it "should say tht the type exec of the name echo 'hello' is not in the global_resources_store" do
-            @cloud2.in_global_resource_store?(:exec, "echo 'hello'").should == false
-          end
-          it "should say that the resource is in the global_resources_store when put in the global_resources_store" do
-            @file1 = PoolParty::Resources::File.new(:name => "/var/tmp.txt")
-            @cloud2.store_into_global_resource_store(@file1)
-            @cloud2.in_global_resource_store?(:file, "/var/tmp.txt")
-          end
-          it "should put the resource into the global_resources_store when calling store_into_global_resource_store" do
-            @file2 = PoolParty::Resources::File.new({:name => "/var/bunk.txt"})
-            @cloud2.global_resources_store.should_receive(:<<).with(@file2)
-            @cloud2.store_into_global_resource_store(@file2)
-          end
-          it "should not put a resource into the global_resources_store if it's already there" do
-            @file3 = PoolParty::Resources::File.new({:name => "/var/www/file.html"})
-            @cloud2.global_resources_store.should_not_receive(:<<).with(@file3)
-            @cloud2.store_into_global_resource_store(@file3)
-          end
-          it "should be able to get the resource from the global_resources_store by the name and type" do
-            @cloud2.get_from_global_resource_store(:directory, "/var/www").key.should == "/var/www"
-          end
-          describe "adding to global resource store" do
-            before(:each) do
-              @cloud3 = cloud :pumpkinpie do          
-                file(:name => "/var/www/pumpkinfile.html")
-                file(:name => "/var/www/pumpkinfile.html")
-                apache do
-                  file(:name => "/var/www/pumpkinfile.html")
-                end
-              end
-              @cloud3 = cloud(:pumpkinpie)
-            end
-            it "should not have 2 of the same resources" do
-              @cloud3.resource(:file).size.should == 1
-            end
-          end
-          describe "grabbing after already instantiated" do
-            before(:each) do
-              @cloud2.instance_eval do
-                has_package(:name => "apache2") do
-                  has_exec(:name => "Add apache2 module") do
-                    command "a2enmod mpm_worker"
-                  end
-                end
-                has_package(:name => "boxers") do
-                  has_file(:name => "/var/list_of_boxers.txt", :requires => (get_package("apache2")) )
-                end
-              end
-            end
-            describe "same_resources_of" do
-              it "should say that two resources are the same" do
-                has_file(:name => "tanks")
-                has_file(:name => "tanks").same_resources_of(:file, "tanks").should == true
-              end
-              it "should say that two resources are the same regardless of their context" do
-                @cloud2.instance_eval do
-                  has_file(:name => "mighty_mighty_bosstones")
-                end
-                @cloud2.resource(:file).first.same_resources_of(:file, "mighty_mighty_bosstones").should == true
-              end
-              it "should say that two resources are not the same if they are not the same" do
-                has_file(:name => "trees").same_resources_of(:file, "timber").should == false
-              end
-            end
-            it "should grab the resource when called in in a block"# do
-            #   @cloud2.resources_string_from_resources(@cloud2.resources).should =~ /\[ Package\['apache2'\], Package\['boxers'\] \]/
-            # end
-          end
-          describe "inherited" do
-            it "should turn passengersite_with_ssl into PassengerSiteWithSsl" do
-              "PassengersiteWithSsl".to_s.split("::")[-1].underscore.should == "passengersite_with_ssl"
-            end
-          end
+        it "should return the file preiously created" do
+          @tc.resource(:file).first.options.keys.sort.should == @file.options.keys.sort
         end
       end
     end    

data/spec/poolparty/poolparty/script_spec.rb

@@ -4,7 +4,7 @@ include PoolParty::Resources
 
 describe "Script" do
   before(:each) do
-    reset_resources!
+    
     setup
   end
   describe "wrapped" do
@@ -14,59 +14,36 @@ describe "Script" do
     it "should have inflate_file as an instance method" do
       Script.respond_to?(:inflate_file).should == true
     end
-    it "should have inflate as an instance method" do
-      Script.new.respond_to?(:inflate).should == true
-    end
 
     describe "with a script" do
-      before(:each) do
-        @script = 'script'
-        @filename = 'filename'
-
-        @pool = Script.new
-        Script.stub!(:new).and_return(@pool)
-        @pool.stub!(:inflate).and_return true
-      end
-
-      it "should create a new Script when calling on the class method" do
-        Script.should_receive(:new).and_return @pool      
-      end    
-      it "should instance eval the script" do
-        @pool.should_receive(:instance_eval).with(@script, @filename).and_return true
-      end
-      it "should call inflate on itself" do
-        @pool.should_receive(:inflate).and_return true
-      end
-      after do
-        Script.inflate(@script, @filename)
-      end
-      describe "save!" do
-        before(:each) do
-          reset!
-          reset_resources!
-          pool :appdotcomcoo do
-            keypair "snoodle"
-            ami "ami-123456"
-            
-            cloud :app do
-              expand_when "cpu > 90", "memory > 80"
-              contract_when "cpu < 10", "memory < 10"
-              
-              has_file :name => "/etc/httpd/httpd.conf"
-            end
-          end
-          @saved = Script.save!(false)
-        end
-        it "should save the keypair" do
-          @saved.should =~ /keypair 'snoodle'/
-        end
-        it "should save the ami" do
-          @saved.should =~ /ami 'ami-123456'/
-        end
-        it "should save the expansions" do
-          @saved.should =~ /expand_when 'cpu>90', 'memory>80'/
-        end
-      end
+      # describe "save!" do
+      #   before(:each) do
+      #     reset!
+      # 
+      #     pool :appdotcomcool do
+      #       ami "ami-123456"
+      #       
+      #       cloud :app do
+      #         expand_when "cpu > 90", "memory > 80"
+      #         contract_when "cpu < 10", "memory < 10"
+      #         
+      #         has_file :name => "/etc/httpd/httpd.conf"
+      #       end
+      #     end
+      #     @saved = Script.save!(false)
+      #   end
+      #   it "should save the full keypair" do
+      #     @saved.should =~ /keypair ([\w -\/]+)+id_rsa'/
+      #   end
+      #   it "should save the ami" do
+      #     @saved.should =~ /ami 'ami-123456'/
+      #   end
+      #   it "should save the expansions" do
+      #     @saved.should =~ /expand_when 'cpu>90', 'memory>80'/
+      #   end
+      # end
+      # NOT ENTIRELY CERTAIN THIS SHOULD WORK THE SAME WAY IT WORKED BEFORE
+      # AL
     end
   end
-end
+end

data/spec/poolparty/poolparty/service_spec.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Service" do
+  
+end

data/spec/poolparty/poolparty/template_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Template" do
+  describe "of string" do
+    before(:each) do
+      @template_string = "Hello <%= name %>"
+    end
+    it "should have a method compile on Template class" do
+      Template.respond_to?(:compile_string).should == true
+    end
+    it "should return rendered content" do
+      Template.compile_string(@template_string, {:name => "bob"}).should == "Hello bob"
+    end
+  end
+  describe "of file" do
+    before(:each) do
+      @template_file = ::File.dirname(__FILE__) + "/../fixtures/test_template.erb"
+    end
+    it "have the method compile_file on the Template class" do
+      Template.respond_to?(:compile_file).should == true
+    end
+    it "return the rendered content into a string" do
+      Template.compile_file(@template_file, {:friends => "bob"}).should == "Hello bob"
+    end
+  end
+end

data/spec/poolparty/poolparty/test_plugins/webserver.rb

@@ -1,19 +1,20 @@
 class WebServers
-  plugin :apache do
-    include PoolParty::Resources
-    
+  plugin :apachetest do    
     attr_accessor :php
     
-    def enable      
+    def loaded(o={}, &block)
+      @loaded ||= true
+    end
+    
+    def enable
     end
     
     def enable_php
       @php = true
-      php
     end
     
     def php
-      @php
+      @php ||= false
     end
     
     def site(name=:domain1, opts={})
@@ -24,24 +25,6 @@ class WebServers
       opts = {
         :document_root => opts[:document_root] || "/www/#{name}/"
       }
-      call_function "virtual_host()"
-    end
-        
-    custom_function <<-EOE
-define virtual_host($docroot, $ip, $order = 500, $ensure = "enabled") { 
-    $file = "/etc/sites-available/$name.conf" 
-    file { $file: 
-        content => template("virtual_host.erb"), 
-        notify => Service[apache] 
-    } 
-    file { "/etc/sites-enabled/$order-$name.conf": 
-        ensure => $ensure ? { 
-            enabled => $file, 
-            disabled => absent 
-        } 
-    } 
-}
-    EOE
-        
+    end        
   end
 end