poolparty 0.2.69 → 0.2.84

data/lib/poolparty/spec/matchers/have_variable.rb

@@ -0,0 +1,32 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveVariable < SpecExtensionsBase
+        def initialize(varname, expected,extra="")
+          @varname = varname
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def is_present?
+          @target.match(/\$#{@varname}(\W+)=(\W+)#{@expected}/)[0]
+        end
+        def failure_message
+          "expected #{@target.inspect} to have variable #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have variable #{@expected}"
+        end
+        def type
+          "variable"
+        end
+      end
+    end
+    def have_variable(name, extra="")
+      SpecExtensions::HaveVariable.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/spec/dynamic_matchers.rb

@@ -0,0 +1,63 @@
+require "rubygems"
+require "spec"
+require "#{::File.dirname(__FILE__)}/../matchers/a_spec_extensions_base.rb"
+class Object
+  # For all of the available_resources, write the matcher template
+  # based on the have_base base and write the method have_
+  # for each of the resources available
+  def write_dynamic_matchers
+    PoolParty::Resources::Resource.available_resources.each do |ty|
+      ty.downcase!
+      filename = "#{::File.dirname(__FILE__)}/../matchers/have_#{ty}.rb"
+      unless ::File.file?(filename)
+        str = make_dynamic_matcher_string_for(ty)
+        ::File.open(filename, "w+") {|f| f << str}
+      end
+    end
+  end
+  # Create a dynamic matcher
+  # Create a matcher for spec based in the context called from
+  # Usage example:
+  #   dynamic_matcher_for(:virtualhost) do
+  #     set_description "should have virtualhost"
+  #     it "should have the directory /var/www" do        
+  #       have_directory("/var/www")
+  #     end
+  #   end
+  # This creates a method by the name of the dynamic matcher
+  # so in the above example for virtualhost, the 
+  # method have_virtualhost(name) &block is created in the spec 
+  # context and can be called from within the describe/context
+  # in a spec
+  def dynamic_matcher_for(ty, &block)
+    name = "#{ty}".camelcase
+    
+    begin
+      const = Object.const_set(name, Spec::Example::SharedExampleGroup.register(name.to_sym, &block))
+    rescue NameError => e
+      raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n")
+    end
+    
+    described_type = "#{ty.to_s.underscore.downcase}"    
+    
+    ::Spec::Example::ExampleGroupMethods.module_eval <<-EOM
+      def have_#{ty.to_s.underscore.downcase}(*args)        
+        include #{const}
+        self.module_eval "@@described_type = args;def #{described_type}; @@described_type; end"
+      end
+    EOM
+  end
+  # Load the have_base file and fill in the variables for the
+  # have_base base template
+  def make_dynamic_matcher_string_for(ty, matcher="is_present?")
+    @basestr ||= open("#{::File.dirname(__FILE__)}/../templates/have_base.rb").read
+    typestring = ty.to_s
+    begin
+      @basestr ^ {:classname => "Have#{typestring.capitalize}",
+                  :type => typestring,
+                  :matches => matcher,
+                  :includer => "SpecExtensions::Have#{typestring.capitalize}.new(name, extra)"}
+    rescue Exception => e
+    end
+  end
+end

data/lib/poolparty/spec/spec/ensure_matchers_exist.rb

@@ -0,0 +1,7 @@
+require "rubygems"
+require "poolparty"
+Dir["#{::File.dirname(__FILE__)}/../core/*.rb"].each {|f| require f}
+
+write_dynamic_matchers if @ensure_matchers_exist
+
+Dir["#{::File.dirname(__FILE__)}/../matchers/*.rb"].each {|f| require f}

data/lib/poolparty/spec/templates/have_base.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class :classname < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          :matches
+        end
+        def failure_message
+          "expected #{@target.inspect} to have :type #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have :type #{@expected}"
+        end
+        def type
+          ":type"
+        end
+      end
+    end
+    def have_:type(name, extra="")
+      :includer
+    end
+  end
+end

data/lib/poolparty/templates/authkeys

@@ -1,2 +1,2 @@
 auth 1
-1 md5 PasswordForpoolpartyClusterApplicationButItIsOnlyADefault
+1 sha1 PasswordForpoolpartyClusterApplicationButItIsOnlyADefault

data/lib/poolparty/templates/gem

@@ -1,20 +1,18 @@
-#! /usr/bin/ruby1.8
+#!/usr/bin/env ruby
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
 # See LICENSE.txt for permissions.
-# /usr/bin/gem is broken, so... have to use this until it is fixed
 #++
 
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
 
-require "rubygems"
-require "rubygems/gem_runner"
-Gem.manage_gems
+required_version = Gem::Requirement.new "> 1.8.3"
 
-required_version = Gem::Version::Requirement.new(">= 1.8.0")
-unless  required_version.satisfied_by?(Gem::Version.new(RUBY_VERSION))
-  puts "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
-  exit(1)
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
 end
 
 # We need to preserve the original ARGV to use for passing gem options
@@ -22,4 +20,8 @@ end
 # it...its for the source building process.
 args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
 
-Gem::GemRunner.new.run(args)
+begin
+  Gem::GemRunner.new.run args
+rescue Gem::SystemExitException => e
+  exit e.exit_code
+end

data/lib/poolparty/templates/ha.cf

@@ -1,19 +1,17 @@
 # Heartbeat
-keepalive 2 # Time inbetween heartbeats
-deadtime 32 # wait 32 seconds before declaring dead
+keepalive 5 # Time inbetween heartbeats
+deadtime 32 # wait 10 seconds before declaring dead
 warntime 16 # issue a warning halfway through
 initdead 60 # Don't boot instances between 60 seconds of each other
 logfacility daemon         # Log to syslog as facility "daemon"
-auto_failback off
+auto_failback on
 use_logd yes
-bcast eth0
-crm on
-logfile /var/log/ha.log
+crm yes
 
 <% ha_node_ips.chomp.split(/\t/).each_with_index do |ip,index| -%>
-  <% if $hostname != ha_nodenames.chomp.split(/\t/)[index] -%>
-  ucast eth0 <%= ip %>
-  <% end %>
-<% end %>
+  <% if hostname != ha_nodenames.chomp.split(/\t/)[index] -%>
+ucast eth0 <%= ip %>
+  <% end -%>
+<% end -%>
 
-node <%= ha_nodenames %>
+node <%= ha_nodenames.chomp.split(/\t/).join(" ") %>

data/lib/poolparty/templates/haresources

@@ -1,3 +1,3 @@
-<% ha_nodenames.each_with_index do |name, index| -%>
+<% ha_nodenames.split(/\t/).each_with_index do |name, index| -%>
 <%= name -%>       <%= ha_node_ips[index] -%>/eth0:0
 <% end %>

data/lib/poolparty/templates/logd.cf

@@ -0,0 +1,42 @@
+#	File to write debug messages to
+#	Default: /var/log/ha-debug
+#debugfile /var/log/ha-debug
+
+#
+#
+# 	File to write other messages to
+#	Default: /var/log/ha-log
+#logfile	/var/log/ha-log
+
+#
+#
+#	Facility to use for syslog()/logger 
+#	Default: daemon
+logfacility	daemon
+
+
+#	Entity to be shown at beginning of a message
+# 	for logging daemon
+# 	Default: "logd"
+#entity logd
+
+
+#	Do we register to apphbd
+#	Default: no
+#useapphbd no
+
+#	There are two processes running for logging daemon
+#  		1. parent process which reads messages from all client channels 
+#  		and writes them to the child process 
+#  
+#  		2. the child process which reads messages from the parent process through IPC
+#  		and writes them to syslog/disk
+
+
+#	set the send queue length from the parent process to the child process
+#
+#sendqlen 256 
+
+#	set the recv queue length in child process
+#
+#recvqlen 256

data/lib/poolparty/templates/puppet.conf

@@ -1,16 +1,26 @@
 [main]
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
-  pluginsync=false
-  factsync=false
+  ssldir = /etc/poolparty/ssl
+  pluginsync = false
+  factsync = false
+
+[puppetca]
+  config = $config/puppetca.conf
  
+[certificates]
+  publickeydir = /etc/poolparty/public_keys
+  certdir = /etc/poolparty/certs
+  privatekeydir = /etc/poolparty/private_keys
+
+[ca]
+  signeddir = /etc/poolparty/signed
+
 [puppetd]
   localconfig = $vardir/localconfig      
-  report=true
-  server=master
-
-[puppetrun]
-  certname = master
+  report = true
+  server = master
   
 [puppetmasterd]
-  certname = master
+  certname = master
+  server = master

data/lib/poolparty/templates/puppetcleaner

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
-# /var/lib/puppet/state/puppetdlock
+ARGS=1        # Number of arguments expected.
+E_BADARGS=85  # Exit value if incorrect number of args passed.
+
+test $# -ne $ARGS && echo "Usage: `basename $0` requires $ARGS argument(s)" && exit $E_BADARGS
+
 . /etc/profile
-ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
-/etc/init.d/puppetmaster stop;rm -rf /etc/puppet/ssl;/etc/init.d/puppetmaster start;puppetmasterd --verbose
+HN=$1
+
+echo "Cleaning $1 signed certs"
+rm /etc/poolparty/ssl/ca/signed/$HN.*

data/lib/poolparty/templates/puppetrerun

@@ -2,8 +2,21 @@
 
 . /etc/profile
 if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master)]; then
-  echo "Run successfully"
+  echo "Run successfully" && exit 0
   else
-  ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
-  /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+  echo "Clearing old certs"
+  HN=`hostname`
+  if [[ $HN == "master" ]]; then
+      rm /etc/poolparty/ssl/ca/signed/$HN*
+      if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ]; then
+        echo "Run successfully" && exit 0
+        else
+        # /etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
+        rm /etc/poolparty/ssl/$HN*
+        /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      fi
+    else
+      rm /etc/poolparty/ssl/ca/signed/$HN*
+      /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+  fi
 fi

data/lib/poolparty/templates/puppetrunner

@@ -4,5 +4,5 @@
 if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master)]; then
   echo "Run successfully"
   else
-  /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+  /usr/bin/puppetrerun;/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
 fi

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 69
+    TINY  = 84
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/poolparty.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 # Load required gems
 @required_software = Array.new
-%w(activesupport ftools logging resolv ruby2ruby).each do |lib|
+%w(activesupport ftools logging resolv ruby2ruby digest/sha2 open3 capistrano).each do |lib|
   begin
     require lib
   rescue Exception => e
@@ -36,21 +36,23 @@ end
 ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
 
 ## Load PoolParty
-require "#{File.dirname(__FILE__)}/poolparty/version"
+%w(version).each do |f|
+  require "#{File.dirname(__FILE__)}/poolparty/#{f}"
+end
 
-%w(core modules exceptions dependency_resolutions aska monitors net).each do |dir|
+%w(core modules exceptions dependency_resolutions aska monitors provisioners extra net).each do |dir|
   Dir[File.dirname(__FILE__) + "/poolparty/#{dir}/**.rb"].each do |file|
     require file
   end
 end
 
-Kernel.load_p File.dirname(__FILE__) + "/poolparty/pool"
+Kernel.load_p File.dirname(__FILE__) + "/poolparty/poolparty"
 Logging.init :debug, :info, :warn, :error, :fatal
 
 module PoolParty
   include FileWriter
   
-  def logger
+  def log
     @logger ||= make_new_logger
   end
   
@@ -81,8 +83,10 @@ class Class
 end
 
 ## Load PoolParty Plugins and package
-%w(plugins base_packages).each do |dir|
-  Dir[File.dirname(__FILE__) + "/poolparty/#{dir}/**.rb"].each do |file|
-    require file
+module PoolParty
+  %w(plugins base_packages).each do |dir|
+    Dir[::File.dirname(__FILE__) + "/poolparty/#{dir}/*.rb"].each do |file|
+      require file
+    end
   end
 end

data/lib/poolpartyspec.rb

@@ -0,0 +1,34 @@
+["core", "spec"].each do |dir|
+  Dir[File.join(File.dirname(__FILE__), "poolparty", "spec", dir, "*.rb")].each {|f| require f}
+end
+
+class TestCloudClass < PoolParty::Cloud::Cloud  
+  def build_test_manifest
+    reset_resources!
+    realize_plugins!
+    
+    returning Array.new do |arr|
+      
+      services.each do |service|
+        service.options.merge!(:name => service.name)
+        classpackage_with_self(service)
+      end
+      
+      global_classpackages.each do |cls|
+        arr << cls.to_string
+      end
+      
+    end.join("\n")
+  end
+end
+
+def new_test_cloud(&block)  
+  TestCloudClass.new(:test_cloud, &block)
+end
+
+def load_test_cloud(name, poolfile=nil)  
+  PoolParty::Script.inflate_file poolfile
+  blk = cloud(name).stored_block.dup
+  PoolParty::Pool.reset!
+  new_test_cloud &blk
+end