auser-poolparty 1.2.0 → 1.2.1

data/lib/poolparty/templates/apache2/server-status.erb

@@ -0,0 +1,19 @@
+# create a virtual host which provides statistics
+ExtendedStatus on
+NameVirtualHost <%= 127.0.0.1 %>
+<VirtualHost <%= 127.0.0.1 %>>
+	# hide this a little bit from "normal" accesses
+	# This expects that external users only use the fqdn to access a service
+	ServerName <%= hostname %>
+	<Directory />
+		Order deny,allow
+		Deny from all
+	</Directory>
+	<Location /server-status>
+		SetHandler server-status
+		Order deny,allow
+		Deny from all
+		Allow from <%= 127.0.0.1 %>
+	</Location>
+</VirtualHost>
+

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
       

data/lib/poolparty.rb

@@ -68,7 +68,7 @@ $_poolparty_load_directories = [
   "exceptions",
   'poolparty/key.rb',
   "dependency_resolver",
-  "aska",
+  "aska.rb",
   "config",
   "monitors/monitor_rack",
   "capistrano.rb",

data/lib/poolpartycl.rb

@@ -6,6 +6,57 @@ def help_array
   ["-h", "--help", "-V", "--version", "--debug", "-d"]
 end
 
+def ask_with_help(opts={}, &block)
+  help_str = opts[:help]
+  message = opts[:message]
+  
+  o = ask("#{message} (h for help)") do |q|    
+    q.validate = opts[:validate] if opts.has_key?(:validate)
+  end
+  
+  if %w(h H).include?(o)
+    colored_say help_str, :help
+    ask_with_help(opts, &block)
+  else
+    block.call(o)
+  end
+  o
+end
+
+def rescued_ask(m, r)
+  begin
+    t = colored_ask m
+  rescue Exception => e
+    say r
+  end
+end
+
+def colored_ask(str, color = :notice)
+  setup_colors
+  ask("<%= color(\"#{str}\", :#{color}) %>")
+end
+
+def colored_say(str, color = :headline)
+  setup_colors
+  say("<%= color(\"#{str}\", :#{color}) %>") 
+end
+
+def setup_colors
+    unless @setup_colors
+    ft = HighLine::ColorScheme.new do |cs|
+      cs[:headline]         = [ :bold, :yellow, :on_black ]
+      cs[:horizontal_line]  = [ :bold, :white, :on_blue]
+      cs[:critical]         = [ :yellow, :on_red  ]
+      cs[:error]            = [ :bold, :red  ]
+      cs[:help]             = [ :bold, :white, :on_blue]
+      cs[:notice]           = [ :blue, :on_white]
+    end
+
+    HighLine.color_scheme = ft
+    @setup_colors = true
+  end
+end
+
 def are_you_sure?(msg)
   puts msg
   resp = gets.strip!

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -42,7 +42,7 @@ describe "Resolution spec" do
     @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"
@@ -67,20 +67,17 @@ 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.stub!(:basename).and_return "template"
       @file = "Hello <%= friends %> on port <%= listen %>"
       @file.stub!(:read).and_return @file
       Template.stub!(:open).and_return @file
@@ -101,7 +98,7 @@ describe "Resolution spec" do
       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 +109,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").last[: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/modules/searchable_paths_spec.rb

@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+PATH_TEST_ROOT = Default.storage_directory / "path_test"
+PATH_ONE       = PATH_TEST_ROOT / "one"
+PATH_TWO       = PATH_TEST_ROOT / "two"
+
+class TestFile
+  include SearchablePaths
+  has_searchable_paths(:dir => "templates", :paths => [PATH_ONE, PATH_TWO])
+end
+
+class TestFile2
+  include SearchablePaths
+  has_searchable_paths(:dirs => ["clouds", "/"], :prepend_paths => [PATH_ONE, PATH_TWO])
+end
+
+def File.write_to_file(name, content="")
+  open(name, "w") {|f| f.print content}
+end
+
+describe "FileWriter" do
+  before(:each) do
+    # create path one
+    [PATH_ONE/:clouds, PATH_ONE/:templates, PATH_ONE/:foo].each {|dir| FileUtils.mkdir_p(dir) }
+    [PATH_ONE/'clouds.rb', PATH_ONE/:clouds/'special.rb', PATH_ONE/:templates/'apache.conf'].each do |f|
+      File.write_to_file(f)
+    end
+
+    # create path two
+    [PATH_TWO/:clouds, PATH_TWO/:templates, PATH_TWO/:foo].each {|dir| FileUtils.mkdir_p(dir) }
+    [PATH_TWO/'swing.rb', PATH_TWO/'clouds.rb', PATH_TWO/:clouds/'common.rb', PATH_TWO/:templates/'mysql.conf'].each do |f|
+      File.write_to_file(f)
+    end
+    
+    @template = TestFile.new
+    @cloud    = TestFile2.new
+  end
+
+  describe "class methods" do
+    it "should have class options set" do
+      TestFile.searchable_paths_dir.should   == "templates"
+      TestFile.searchable_paths_dirs.should  == ["templates"]
+      TestFile2.searchable_paths_dirs.should == ["clouds", "/"]
+    end
+  end
+
+  describe "#find_file" do
+    it "should be able to find a template" do
+      @template.find_file("apache.conf").should_not be_nil
+      @template.find_file("apache.conf").should == PATH_ONE/:templates/'apache.conf'
+      @template.find_file("mysql.conf").should == PATH_TWO/:templates/'mysql.conf'
+    end
+
+    it "shouldn't find a template that doesn't exist" do
+      @template.find_file("post-office.conf").should be_nil
+    end
+
+    it "should find something with prepended paths" do
+      @cloud.find_file("clouds.rb").should == PATH_ONE/'clouds.rb'
+      @cloud.find_file("swing.rb").should == PATH_TWO/'swing.rb'
+    end
+
+    it "should find things in the right order" do
+      @cloud.find_file("clouds.rb").should == PATH_ONE/'clouds.rb'
+    end
+
+
+
+
+
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(PATH_TEST_ROOT)
+  end
+end

data/spec/poolparty/plugins/git_spec.rb

@@ -8,12 +8,13 @@ describe "Remote Instance" do
     before(:each) do
       reset!
       @tc = cloud :test_git_class_cloud do
+        has_file "/var/www/bino"
         has_git_repos :at => "/var/www/", :name => "gitrepos.git", :source => "git://git/repos/source.git", :requires_user => "finger"
       end
-      @compiled = PuppetResolver.new(@tc.to_properties_hash).compile
+      @compiled = ChefResolver.new(@tc.to_properties_hash).compile
     end
     it "should be a string" do
-      @compiled.should =~ /exec/
+      @compiled.should =~ /execute/
     end
     it "should included the flushed out options" do
       @compiled.should =~ /finger@git:/
@@ -33,7 +34,7 @@ describe "Remote Instance" do
         end
       end
       it "should have the path set within the resource" do
-        PuppetResolver.new(@tc.to_properties_hash).compile.should =~ /exec \{ \"git-gittr/
+        ChefResolver.new(@tc.to_properties_hash).compile.should =~ /execute \"git-gittr/
       end
     end
   end

data/spec/poolparty/poolparty/cloud_spec.rb

@@ -100,12 +100,6 @@ describe "Cloud" do
         end
         cloud(:paddy_wack).parent.should == pool(:knick_knack)
       end
-      it "should have services in an OrderedHash" do
-        @cloud.services.class.should == OrderedHash
-      end
-      it "should have no services (other than the base ones) in the array when there are no services defined" do
-        @cloud.services.size.should > 2
-      end
       it "should respond to a options method (from Dslify)" do
         @cloud.respond_to?(:options).should == true
       end
@@ -207,9 +201,9 @@ describe "Cloud" do
             @cloud.should_receive(:haproxy)
             @cloud.add_optional_enabled_services
           end
-          it "should have 3 resources" do            
+          it "should have at least 3 resources" do            
             @cloud.add_poolparty_base_requirements
-            @cloud.services.size.should > 2
+            @cloud.ordered_resources.size.should > 2
           end
           it "should receive add_poolparty_base_requirements before building the manifest" do
             @cloud.should_receive(:add_poolparty_base_requirements).once
@@ -241,23 +235,13 @@ describe "Cloud" do
                 stub_list_from_remote_for(@cloud)
                 @cloud.add_poolparty_base_requirements
               end
-              it "should add resources onto the heartbeat class inside the cloud" do
-                @cloud.services.size.should > 0
-              end
-              it "should store the class heartbeat" do
-                @cloud.services.keys.include?(:poolparty_base_heartbeat_class).should == true
-              end
-              it "should have an array of services on the heartbeat" do
-                @cloud.services.class.should == OrderedHash
-              end
               describe "resources" do
                 before(:each) do
                   reset!
                   @cloud8 = cloud :tester do
                     test_service
                   end
-                  @tskey = clouds[:tester].services.keys.first
-                  @service = clouds[:tester].services[@tskey].first
+                  @service = clouds[:tester].ordered_resources.select {|hsh| hsh.class == TestServiceClass }.first
                   @files = @service.resource(:file)
                 end
                 it "should have a file resource" do

data/spec/poolparty/resources/file_spec.rb

@@ -21,6 +21,7 @@ describe "File" do
     end
     describe "template" do
       before(:each) do
+        ::File.stub!(:basename).and_return "template"
         @file = "<%= friends %> <%= runner %>"
         @file.stub!(:read).and_return @file
         Template.stub!(:open).and_return @file

data/spec/poolparty/resources/service_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe "Service" do
   describe "instances" do
     before(:each) do
-      @tc = TestBaseClass.new do
+      @tc = TestBaseClass.new :test_base_class_cloud do
         has_service("apache2", {:hasrestart => true})
       end
       @service = @tc.resource(:service).first

data/test/poolparty/dependency_resolver/puppet_resolver_test.rb

@@ -14,18 +14,12 @@ class TestPuppetResolver < Test::Unit::TestCase
         :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"}
+          {:name => "/var/www", :pp_type => "directory"},
+          {:name => "apache_class", :pp_type => "plugin", :resources => [
+            {:name => "/etc/apache2/apache2.conf", :pp_type => "file", :template => "/absolute/path/to/template", :content => "rendered template string"}
+          ]}
         ],
-        :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
 
     should "throw an exception if not given a hash" do

data/test/poolparty/poolparty/poolparty_base_class_test.rb

@@ -12,7 +12,7 @@ class TestBaseClassTest < Test::Unit::TestCase
       end
     end
     should "should add a service when a service is called" do
-      @tbc.services.size.should == 1
+      @tbc.ordered_resources.size.should == 1
     end
   end
   context "context_stack" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ executables:
 - cloud-start
 - cloud-terminate
 - cloud-verify
+- install-poolparty
 - server-butterfly
 - server-cloud-elections
 - server-ensure-provisioning
@@ -111,8 +112,7 @@ files:
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
 - lib/poolparty
-- lib/poolparty/aska
-- lib/poolparty/aska/aska.rb
+- lib/poolparty/aska.rb
 - lib/poolparty/base_packages
 - lib/poolparty/base_packages/haproxy.rb
 - lib/poolparty/base_packages/heartbeat.rb
@@ -181,6 +181,7 @@ files:
 - lib/poolparty/modules/resourcing_dsl.rb
 - lib/poolparty/modules/s3_string.rb
 - lib/poolparty/modules/safe_instance.rb
+- lib/poolparty/modules/searchable_paths.rb
 - lib/poolparty/modules/thread_pool.rb
 - lib/poolparty/modules/user_helpers.rb
 - lib/poolparty/monitors
@@ -215,19 +216,19 @@ files:
 - lib/poolparty/net/remoter_bases/vmrun/vmrun.rb
 - lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb
 - lib/poolparty/plugins
-- lib/poolparty/plugins/apache2.rb
+- lib/poolparty/plugins/apache2
+- lib/poolparty/plugins/apache2/apache.rb
 - lib/poolparty/plugins/bind.rb
 - lib/poolparty/plugins/chef.rb
 - lib/poolparty/plugins/chef_deploy.rb
 - lib/poolparty/plugins/deploy_directory.rb
-- lib/poolparty/plugins/dynomite.rb
 - lib/poolparty/plugins/gem_package.rb
 - lib/poolparty/plugins/git.rb
 - lib/poolparty/plugins/line_in_file.rb
 - lib/poolparty/plugins/nanite.rb
+- lib/poolparty/plugins/rails_deploy.rb
 - lib/poolparty/plugins/runit.rb
 - lib/poolparty/plugins/svn.rb
-- lib/poolparty/plugins/tokyo_tyrant.rb
 - lib/poolparty/poolparty
 - lib/poolparty/poolparty/cloud.rb
 - lib/poolparty/poolparty/default.rb
@@ -265,6 +266,21 @@ files:
 - lib/poolparty/resources.rb
 - lib/poolparty/schema.rb
 - lib/poolparty/templates
+- lib/poolparty/templates/apache2
+- lib/poolparty/templates/apache2/apache2.conf
+- lib/poolparty/templates/apache2/base.conf.erb
+- lib/poolparty/templates/apache2/browser_fixes.conf.erb
+- lib/poolparty/templates/apache2/debian.conf.erb
+- lib/poolparty/templates/apache2/default-site.conf.erb
+- lib/poolparty/templates/apache2/directory_indexes.conf.erb
+- lib/poolparty/templates/apache2/logging-syslog.conf.erb
+- lib/poolparty/templates/apache2/mime-extras.conf.erb
+- lib/poolparty/templates/apache2/mime-minimal.conf.erb
+- lib/poolparty/templates/apache2/mpm-worker.conf.erb
+- lib/poolparty/templates/apache2/mpm-worker.erb
+- lib/poolparty/templates/apache2/passenger.conf.erb
+- lib/poolparty/templates/apache2/php.ini.erb
+- lib/poolparty/templates/apache2/server-status.erb
 - lib/poolparty/templates/authkeys
 - lib/poolparty/templates/chef
 - lib/poolparty/templates/cib.xml
@@ -299,6 +315,8 @@ files:
 - lib/poolparty/verification
 - lib/poolparty/verification/verifier_base.rb
 - lib/poolparty/verification/verifiers
+- lib/poolparty/verification/verifiers/http_match.rb
+- lib/poolparty/verification/verifiers/http_status.rb
 - lib/poolparty/verification/verifiers/ping.rb
 - lib/poolparty/verification/verify.rb
 - lib/poolparty.rb
@@ -348,6 +366,7 @@ files:
 - spec/poolparty/modules/definable_resource.rb
 - spec/poolparty/modules/file_writer_spec.rb
 - spec/poolparty/modules/s3_string_spec.rb
+- spec/poolparty/modules/searchable_paths_spec.rb
 - spec/poolparty/monitors
 - spec/poolparty/monitors/base_monitor_spec.rb
 - spec/poolparty/monitors/monitors
@@ -472,6 +491,7 @@ files:
 - bin/cloud-start
 - bin/cloud-terminate
 - bin/cloud-verify
+- bin/install-poolparty
 - bin/server-butterfly
 - bin/server-cloud-elections
 - bin/server-ensure-provisioning

data/lib/poolparty/plugins/apache2.rb

@@ -1,53 +0,0 @@
-module PoolParty
-  class Base
-    plugin :apache do
-      
-      # Called after the plugin is loaded entirely, all the options are set, etc.
-      def loaded(o={}, &block)
-        include_chef_recipe chef_apache2_recipe_root # We want to include the chef apache2 recipe to use it
-      end
-      
-      def present_apache_module(*names)
-        names.each do |name|
-          has_chef_recipe "apache2::mod_" + name
-        end
-      end
-
-      private
-      def chef_apache2_recipe_root
-        "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
-      end
-      
-    end
-
-
-    # Usage:°
-    #°
-    # enable_php5 do
-    #   extras :cli, :pspell, :mysql
-    # end
-    virtual_resource(:enable_php5) do
-      def loaded(opts={}, parent=self)
-        has_package("php5")
-        has_package("libapache2-mod-php5")
-        present_apache_module("php5")
-        has_file({:name => "/etc/php5/apache2/php.ini",
-                :template => File.dirname(__FILE__) + "/../templates/php.ini.erb",
-                :mode => 755,
-                :requires => get_package("libapache2-mod-php5")})
-                # :notify => get_exec("reload-apache2")})
-      end
-
-      def extras(*names)
-        names.each do |name|
-          # has_package(:name => "php5-#{name}", :requires => get_package("php5"))
-          has_package(:name => "php5-#{name}")
-        end
-      end
-
-    end
-
-
-  end
-
-end

data/lib/poolparty/plugins/dynomite.rb

@@ -1,14 +0,0 @@
-module PoolParty
-  class Base
-    plugin :dynomite do
-      
-      def enable
-        has_exec "install dynomite" do
-          command "git clone git://github.com/cliffmoon/dynomite.git && cd dynomite && git submodule init && git submodule update && rake"
-          not_if "which tcrtest"
-        end
-      end
-      
-    end
-  end
-end

data/lib/poolparty/plugins/tokyo_tyrant.rb

@@ -1,23 +0,0 @@
-module PoolParty
-  class Base
-    plugin :tokyo_tyrant do
-      
-      def enable
-        has_package "build-essential"
-        has_package "zlib1g-dev"
-        has_package "libbz2-dev"
-        has_gem_package "rufus-tokyo"
-        
-        has_exec "install tokyo-cabinet" do
-          command "cd ~ && git clone git://github.com/etrepum/tokyo-cabinet.git && cd tokyo-cabinet/ && ./configure && make && make install && cd ~"
-          not_if "which tcrtest"
-        end
-        has_exec "install tokyo-tyrant" do
-          command "cd ~ && git clone git://github.com/etrepum/tokyo-tyrant.git && cd tokyo-tyrant/ && ./configure && make && make install && cd ~"
-          not_if "which ttserver"
-        end
-      end
-      
-    end
-  end
-end