fairchild-poolparty 1.1.3 → 1.1.4

data/README.txt

@@ -9,9 +9,7 @@ with language such as:
 
 pool :cloud do
  cloud :app do
-  apache do
-   has_virtualhost(:name => "/var/www/sites/poolpartyrb.com")
-  end
+   instances 2..10
  end
 end
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 1
 :minor: 1

data/bin/cloud-configure

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-# require "poolpartycl"
-
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }

data/bin/cloud-show

@@ -7,11 +7,11 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
 end
 
 o.loaded_clouds.each do |cld|
-    
+  puts "\nFrom #{$pool_specfile}\n"
   print_with_nice_printer "Cloud: #{cld.name}", [
     "instances #{cld.minimum_instances}..#{cld.maximum_instances}",
     "keypair #{cld.keypair}"
-  ] do |printer|    
+  ] do |printer|
     if cld.list_of_running_instances.size > 0
       printer.empty
       printer.center("Active instances")

data/lib/poolparty/base_packages/haproxy.rb

@@ -4,13 +4,17 @@ module PoolParty
       
       def enable
         # We need the haproxy package
-        has_package "apache2"
+        ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2", "chef/recipes")
+
+        has_chef_recipe 'apache2'
         has_service "apache2"
-        has_package({:name => "haproxy"})
+        
+        has_package({:name => "haproxy"}) do
+          stops get_service("apache2")
+        end
     
         # Restart sysklogd after we update the haproxy.log
-        has_service(:name => "sysklogd")
-    
+        has_service(:name => "sysklogd")    
         # Template variables
         has_variable("haproxy_name", :value => "#{cloud.name}")
         has_variable("listen_ports", :value => [ "8080" ], :namespace => "apache")
@@ -40,6 +44,7 @@ module PoolParty
           template "#{::File.dirname(__FILE__)}/../templates/haproxy.conf"
           calls get_exec("reloadhaproxy")
         end
+        
       end
     end
   end

data/lib/poolparty/base_packages/poolparty.rb

@@ -3,6 +3,8 @@ module PoolParty
     plugin :poolparty_base_packages do
       
       def enable
+        has_package "git"
+        
         has_cron "/usr/bin/server-manage-election" do
           minute "0,5,10,15,20,25,30,35,40,45,50,55"
           command "/usr/bin/server-manage-election"

data/lib/poolparty/base_packages/tokyo_tyrant.rb

@@ -0,0 +1,23 @@
+module PoolParty
+  class Base
+    plugin :poolparty_base_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

data/lib/poolparty/core/string.rb

@@ -67,6 +67,20 @@ class String
     klass
   end
   
+  def new_resource_class(superclass=nil, opts={}, &block)
+    symc = "::PoolParty::Resources::#{self.camelcase}"
+    kla=<<-EOE
+      class #{symc} < ::PoolParty::Resources::Resource
+      end
+    EOE
+    
+    Kernel.module_eval kla
+    klass = symc.constantize
+    klass.module_eval &block if block
+
+    klass
+  end
+  
   def camelcase
     gsub(/(^|_|-)(.)/) { $2.upcase }
   end

data/lib/poolparty/dependency_resolver/chef_resolver.rb

@@ -33,12 +33,7 @@ module PoolParty
     end
     
     def options_to_string(opts,tabs=0)
-      # opts.map do |k,v| 
-      #   res = to_option_string(v)
-      #   next unless res && !res.empty?
-      #   # "#{tf(tabs)}$#{k} = #{res}"
       handle_print_variables(opts) if opts
-      # end.join("\n") if opts
     end
     
     def resources_to_string(opts,tabs=0)
@@ -50,6 +45,12 @@ module PoolParty
           handle_print_variables(vars)
         end
         
+        if opts[:chef_recipe]
+          opts.delete(:chef_recipe).each do |rcp|
+            out << "include_recipe #{to_option_string(rcp.name)}"
+          end          
+        end
+        
         if opts.has_key?(:line_in_file)
           lines = opts.delete(:line_in_file).inject([]) do |sum, l|
             sum << PoolParty::Resources::Exec.new(:name => l[:name], :command => PoolParty::Resources::LineInFile.command(l[:line], l[:file]) ).to_properties_hash
@@ -115,6 +116,8 @@ module PoolParty
       end
     end
     
+    # TODO: This is brittle, need to find a way to make them reactive, rather than 
+    # separate (the key/value pairs)
     def hash_flush_out(hash, pre="", post="")      
       hash.map do |k,v|
         key = to_chef_key(k)
@@ -184,6 +187,10 @@ module PoolParty
         "notifies :start,"
       when :enable
         nil
+      when :if_not
+        "not_if"
+      when :notif
+        "not_if"
       when :onlyif
         "only_if"
       else

data/lib/poolparty/helpers/binary.rb

@@ -15,6 +15,7 @@ module PoolParty
     end
   end
   
+  # Helper to print with the nice printer
   def print_with_nice_printer(header=nil, strs=[], &block)
     printer = NicePrinter.new
     printer.header
@@ -25,6 +26,7 @@ module PoolParty
     printer.print
   end
   
+  # Keep the pool_specfile 
   def pool_specfile
     $pool_specfile
   end
@@ -45,8 +47,9 @@ module PoolParty
       # These are the locations the spec file can be before the cloud
       # aborts because it cannot load the cloud
       def get_existing_spec_location
-        [          
-          Dir["#{Dir.pwd}/*/clouds.rb"],
+        [ 
+          "#{Dir.pwd}/#{Default.default_specfile_name}",
+          Dir["#{Dir.pwd}/*/#{Default.default_specfile_name}"],
           "#{Default.remote_storage_path}/#{Default.default_specfile_name}", 
           "#{Default.default_specfile_name}",            
           "#{Default.base_config_directory}/#{Default.default_specfile_name}",

data/lib/poolparty/modules/cloud_dsl.rb

@@ -16,5 +16,15 @@ module PoolParty
       dsl_options[:dependency_resolver] = klass unless dsl_options[:dependency_resolver]
     end
     
+    # Enable a service package
+    def enable(service);dsl_options[service] = :enabled;end
+    # Disable a service package
+    def disable(service);dsl_options[service] = :disabled;end
+    
+    # Check to see if the package has been enabled
+    def enabled?(srv)
+      dsl_options.has_key?(srv) && dsl_options[srv] == :enabled
+    end
+    
   end
 end

data/lib/poolparty/modules/definable_resource.rb

@@ -16,10 +16,7 @@ module PoolParty
     # 
     # For example usage, see lib/poolparty/plugins/line.rb
     def define_resource(name, &block)
-      symc = "#{name}".camelcase
-      klass = symc.class_constant(PoolParty::Resources::CustomResource, {:preserve => true}, &block)
-      PoolParty::Resources.module_eval &block
-      klass
+      name.to_s.new_resource_class(PoolParty::Resources::Resource, &block)
     end
     
     # Allow us to create virtual resources

data/lib/poolparty/monitors/neighborhood_monitor.rb

@@ -1,6 +1,7 @@
 require ::File.dirname(__FILE__)+"/monitor_rack.rb"
 require ::File.dirname(__FILE__)+"/../lite.rb"
 require ::File.dirname(__FILE__)+"/../core/hash.rb"
+require "#{::File.dirname(__FILE__)}/../poolparty/neighborhoods"
 
 module Monitors
     
@@ -12,13 +13,11 @@ module Monitors
       @env = env
       @request = Rack::Request.new env
       @response = Rack::Response.new
-      @cloud = JSON.parse( open( "/etc/poolparty/clouds.json" ).read )
-      @opts = @cloud["options"]
-      @remoter_base = PoolParty::Remote.const_get(@opts.remote_base.split("::")[-1].camelcase)
+      @neighboorhoods = ::PoolParty::Neighborhoods.load_default
     end
     
     def default
-      @remoter_base.send :describe_instances, @opts
+      @neighboorhoods.to_json
     end
     
   end

data/lib/poolparty/net/remoter/interactive.rb

@@ -42,6 +42,7 @@ module PoolParty
     # A callback before the configuration task takes place
     def before_configuration_tasks        
     end
+    
     def remote_instances_list        
       @containing_cloud = self
       n = Neighborhoods.load_default

data/lib/poolparty/plugins/chef.rb

@@ -4,6 +4,11 @@ module PoolParty
     include Dslify
   end
   class Chef
+    define_resource :chef_recipe do
+      def loaded o={}, &block
+        puts "Added chef_recipe virtual_resource"
+      end
+    end
     
     plugin :chef do
       def before_load(o, &block)        

data/lib/poolparty/plugins/deploydirectory.rb

@@ -1,9 +1,13 @@
 =begin rdoc
   DeployDirectory
+
+  Deploy directory will rsync a local directory to 
+  each instance of your cloud. 
   
-  Deploy directory will tar.gz a local directory and sync it up to 
-  the master instance of the cloud. This enables you to send a directory
-  up to the cloud and let the master host it for the remote slaves
+  example:
+    has_directory 'name', :from => '/local/path', :to => '/path/on/server/'
+    
+  The above example will place the contents of '/local/path' at '/path/on/server/name'
 =end
 module PoolParty
   class Deploydirectory
@@ -11,35 +15,22 @@ module PoolParty
     virtual_resource(:deploy_directory) do
       
       def loaded(opts={}, &block)        
-        # raise(Exception.new("You must include a directory for the git repos set by :at")) if at?.nil?
-        # opts.has_key?(:at) ? at(opts.delete(:at)) : raise(Exception.new("You must include a directory for the git repos set by :at"))
-
         package_deploy_directory
         add_unpack_directory
       end
       
       def package_deploy_directory
-        ::Suitcase::Zipper.add(sync_dir, "user_directory/")
+        ::Suitcase::Zipper.add("#{from}", "user_directory/")
       end
       
       def add_unpack_directory
-        has_directory("#{::File.dirname(basedir)}")
-        
-        has_exec("unpack-#{::File.basename(basedir)}-deploy-directory") do
-          requires get_directory("#{::File.dirname(basedir)}")
-          cwd basedir
-          onlyif "test -f #{basedir}/#{sync_dir}"
-          command "cd #{cwd}; cp -R /var/poolparty/dr_configure/user_directory/#{sync_dir}; rm -rf /var/poolparty/dr_configure/#{name}"
+        has_directory("#{::File.dirname(to)}")
+        has_exec("unpack-#{::File.basename(to)}-deploy-directory") do
+          requires get_directory("#{::File.dirname(to)}")
+          not_if "test -f #{to}"
+          command "cp -R /var/poolparty/dr_configure/user_directory/#{name}/* #{to}"
         end
       end
-            
-      def from(dir)
-        sync_dir dir
-      end
-      
-      def to(dir)
-        basedir dir
-      end
       
     end
     

data/lib/poolparty/plugins/git.rb

@@ -31,11 +31,19 @@ module PoolParty
         has_exec(:name => "update-#{name}", :cwd => ::File.dirname( creates_dir )) do          
           command "git pull"
         end
+        
         if owner?
           has_exec(:name => "chown-#{name}", :cwd => ::File.dirname( creates_dir )) do
             command "chown #{owner} * -R"
           end
         end
+        
+        if deploy_key?
+          raise Exception.new("Cannot find the git deploy key: #{deploy_key}") unless ::File.file?(::File.expand_path(deploy_key))
+          ::Suitcase::Zipper.add(::File.expand_path(deploy_key), "keys")
+          PoolParty::Provision::DrConfigure.class_commands << "cp -f /var/poolparty/dr_configure/keys/* ~/.ssh"
+        end
+        
       end
       
       def git_repos(src)
@@ -54,12 +62,6 @@ module PoolParty
         "#{::File.join( working_dir, ::File.basename(source, ::File.extname(source)) )}/.git"
       end
       
-      # Since git is not a native type, we have to say which core resource
-      # it is using to be able to require it
-      def class_type_name
-        "exec"
-      end
-      
     end
     
   end

data/lib/poolparty/plugins/svn.rb

@@ -1,47 +1,64 @@
 module PoolParty    
-  class Svn
+  class SvnResource
         
-    define_resource(:svn) do
+    virtual_resource :svn do
+      def loaded(*args)
+        has_package :name => "subversion"
+      end
+    end
+    
+    virtual_resource :svn_repos do
+      
+      def loaded(opts={}, &block)
+        has_package("subversion")
+        has_svn_repository
+      end
+
+      def has_svn_repository
+        puts "wd #{working_dir}"
+        puts "cd #{creates_dir}"
+        has_directory(::File.dirname(working_dir))
+        has_directory(:name => "#{working_dir}", :requires => get_directory("#{::File.dirname(working_dir)}"))
+        
+        has_exec(:name => "svn-#{name}", :requires => [get_directory("#{working_dir}"), get_package("subversion")] ) do
+          cwd working_dir
+          svn_cmd = if parent.requires_user?
+            "svn co #{source} --username #{requires_user} --password #{requires_password}" 
+          else
+            "svn co #{source}"
+          end
+          command svn_cmd
+          creates creates_dir
+        end
+        has_exec(:name => "update-#{name}", :cwd => ::File.dirname( creates_dir )) do
+          command "svn up"
+          # If the parent has after_update_svn set on it, then run it
+          runs parent.after_update_svn if parent.after_update_svn?
+        end
+      end
+      
+      def svn_repos(src)
+        source src
+      end
+      
+      def at(dir)
+        working_dir dir
+      end
+      
+      def to(dir)
+        at(dir)
+      end
+      
+      def creates_dir
+       "#{::File.join( working_dir, ::File.basename(source, ::File.extname(source)) )}/.svn"
+      end
       
-      def has_svnpath(opts={})
-        call_custom_function <<-EOE
-        svnserve { #{opts[:name]}:
-          source => "#{opts[:source]}",
-          path => "#{opts[:path]}",
-          user => "#{opts[:user] || false}",
-          password => "#{opts[:password] || ""}"
-        }
-        EOE
+      # Since svn is not a native type, we have to say which core resource
+      # it is using to be able to require it
+      def class_type_name
+        "exec"
       end
       
-      custom_function <<-EOF
-      # Serve subversion-based code from a local location.  The job of this
-      # module is to check the data out from subversion and keep it up to
-      # date, especially useful for providing data to your Puppet server.
-      define svnserve($source, $path, $user = false, $password = false) {
-          file { $path:
-              ensure => directory,
-              owner => root,
-              group => root
-          }
-          $svncmd = $user ? {
-              false => "/usr/bin/svn co --non-interactive $source/$name .",
-              default => "/usr/bin/svn co --non-interactive --username $user --password '$password' $source/$name ."
-          }   
-          exec { "svnco-$name":
-              command => $svncmd,
-              cwd => $path,
-              require => File[$path],
-              creates => "$path/.svn"
-          }
-          exec { "svnupdate-$name":
-              command => "/usr/bin/svn update",
-              require => Exec["svnco-$name"],
-              onlyif => '/usr/bin/svn status -u --non-interactive | /bin/grep "\*"',
-              cwd => $path
-          }
-      }
-      EOF
     end
     
   end

data/lib/poolparty/poolparty/cloud.rb

@@ -3,14 +3,17 @@ require File.dirname(__FILE__) + "/resource"
 
 module PoolParty    
   module Cloud
+    # Instantiate a new cloud
     def cloud(name=:app, &block)
       clouds[name] ||= Cloud.new(name, &block)
     end
 
+    # Global hash of clouds
     def clouds
       $clouds ||= {}
     end
     
+    # TODO: Deprecate
     def with_cloud(cl, opts={}, &block)
       raise CloudNotFoundException.new("Cloud not found") unless cl
       cl.options.merge!(opts) if opts
@@ -39,6 +42,7 @@ module PoolParty
         [:name]
       end
       
+      # Redefining methods are not allowed
       def self.method_added sym        
         raise "Exception: #{sym.to_s.capitalize} method has been redefined" if immutable_methods.include?(sym) && !respond_to?(sym)
       end      
@@ -51,7 +55,10 @@ module PoolParty
         remote_base.respond_to?(m) ? remote_base.send(m, *args, &block) : super
       end
       
+      # Default set of options. Most take the Default options from the default class
       default_options(
+        :expand_when => Default.expand_when,
+        :contract_when => Default.contract_when,
         :minimum_instances => 2,
         :maximum_instances => 5,
         :access_key => Default.access_key,
@@ -66,8 +73,9 @@ module PoolParty
       def initialize(name, &block)
         @cloud_name = name
         @cloud_name.freeze
-        plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins"
-        super        
+        
+        plugin_directory "#{pool_specfile ? ::File.dirname(pool_specfile) : Dir.pwd}/plugins"        
+        super
         
         after_create
       end
@@ -100,6 +108,7 @@ module PoolParty
         options[:keypair] ||= keypair.basename rescue nil
         options[:rules] = {:expand => expand_when, :contract => contract_when}
         dependency_resolver 'chef'
+        enable :haproxy unless dsl_options[:haproxy] == :disabled
       end
       
       # provide list of public ips to get into the cloud
@@ -156,12 +165,13 @@ module PoolParty
         @build_manifest
       end
       
+      # Force rebuilding of the manifest
       def rebuild_manifest
         @build_manifest = nil
         build_manifest
       end
       
-      # If the 
+      # If the pp already exists, then let's not recreate it
       def build_from_existing_file
         ::FileTest.file?("#{Default.base_config_directory}/poolparty.pp") ? open("#{Default.base_config_directory}/poolparty.pp").read : nil
       end
@@ -193,12 +203,20 @@ module PoolParty
       # all that is necessary in a method called enable
       # which is called when there is no block
       def add_poolparty_base_requirements
-        poolparty_base_haproxy
         poolparty_base_heartbeat
         poolparty_base_ruby
         poolparty_base_packages
+        
+        add_optional_base_packages
+      end
+      
+      # Add optional base packages included with PP
+      def add_optional_base_packages
+        poolparty_base_haproxy      if enabled? :haproxy
+        poolparty_base_tokyo_tyrant if enabled? :tokyo_tyrant
       end
       
+      # TODO: Deprecate
       def other_clouds
         arr = []
         clouds.each do |name, cl|
@@ -207,6 +225,7 @@ module PoolParty
         arr
       end
       
+      # Reset the entire cloud
       def reset!
         reset_remoter_base!
         @build_manifest = @describe_instances = @remote_instances_list = nil

data/lib/poolparty/poolparty/plugin_model.rb

@@ -29,7 +29,7 @@ module PoolParty
             if i
               i
             else
-              inst = #{lowercase_class_name.camelcase}Class.new(opts, parent, &block)            
+              inst = #{lowercase_class_name.camelcase}Class.new(opts, parent, &block)
               this_context.plugin_store << inst if this_context
               inst
             end

data/lib/poolparty/poolparty/pool.rb

@@ -25,7 +25,7 @@ module PoolParty
 
     class Pool < PoolParty::PoolPartyBaseClass
       include PrettyPrinter
-      include CloudResourcer
+      include CloudResourcer # WHY?!?! TODO: investigate
       include Remote
       
       default_options Default.default_options

data/lib/poolparty/poolparty/poolparty_base_class.rb

@@ -37,6 +37,7 @@ module PoolParty
       end
     end
     
+    # Add the parent's options to my own and add myself as a service if I am not a resource
     def add_to_parent_if_parent_exists_and_is_a_service      
       if parent && !parent.is_a?(PoolParty::Resources::Resource)
         dsl_options(parent.dsl_options) if parent.is_a?(PoolParty::Pool::Pool)
@@ -44,6 +45,7 @@ module PoolParty
       end
     end
     
+    # Try to extract the name from the options
     def get_name_from_options_and_extra_options(opts={}, extra_opts={})
       opts.is_a?(Hash) ? (opts.has_key?(:name) ? opts.delete(:name) : nil) : dsl_options[:name] = opts
     end

data/lib/poolparty/provision/dr_configure.rb

@@ -35,13 +35,13 @@ module PoolParty
       ::File.open "#{Default.tmp_path}/dr_configure/clouds.json", "w" do |f|
         f << cloud.to_properties_hash.to_json
       end
-      
-      pack_up_and_ship_off_suitcase
+            
       setup_configurator
       write_erlang_cookie
       @configurator.files_to_upload.each {|f| ::FileUtils.cp f, "#{Default.tmp_path}/dr_configure/#{::File.basename(f)}" if ::File.file?(f) }
-            
-      rsync "#{Default.tmp_path}/dr_configure/", "/var/poolparty/dr_configure/" 
+      
+      pack_up_and_ship_off_suitcase
+                  
       commands << [
         'chmod 600 /var/poolparty/dr_configure/clouds.json',
         'chmod 600 /var/poolparty/dr_configure/clouds.rb',
@@ -49,6 +49,7 @@ module PoolParty
         'cp /var/poolparty/dr_configure/clouds.rb /etc/poolparty',
         'cp /var/poolparty/dr_configure/erlang.cookie /root/.erlang.cookie',        
         'ruby /var/poolparty/dr_configure/erlang_cookie_maker',
+        "touch /var/poolparty/POOLPARTY.PROGRESS",
         'echo "configure" >> /var/poolparty/POOLPARTY.PROGRESS'
         ]
       commands << self.class.class_commands unless self.class.class_commands.empty?
@@ -58,7 +59,7 @@ module PoolParty
      def pack_up_and_ship_off_suitcase
        ::Suitcase::Zipper.build_dir!("#{Default.tmp_path}/dr_configure")
        
-       rsync "#{Default.tmp_path}/dr_configure", '/var/poolparty'
+       rsync "#{Default.tmp_path}/dr_configure/", "/var/poolparty/dr_configure/"
      end
      
      def setup_configurator