poolparty 1.3.4 → 1.3.6

data/lib/poolparty/plugins/hermes.rb

@@ -0,0 +1,89 @@
+=begin rdoc
+=end
+
+module PoolParty
+  module Resources
+    
+    class Hermes < Resource
+      
+      default_options(
+        :name => nil
+      )
+
+      def after_loaded
+        add_unpack
+        run_if_needed
+      end
+
+      def after_compile
+        run_dependencies
+        build_rsync_directory
+      end
+
+      def run_dependencies
+        case cloud.platform
+        when false
+        else
+          has_package "erlang-nox"
+          has_package "erlang-dev"
+          has_package "rrdtool"
+        end
+      end
+
+      def build_rsync_directory
+        hermes_dir = cloud.tmp_path + "/tmp/hermes"
+        FileUtils.mkdir_p(hermes_dir)
+        FileUtils.cp(hermes_release_tar_gz, hermes_dir)
+        FileUtils.cp(target_system_file, hermes_dir)
+        build_nodes_config
+      end
+
+      # write out a conf file listing all of the seed nodes based on the nodes in the cluster
+      def build_nodes_config
+        etc_poolparty = cloud.tmp_path + "/etc/poolparty"
+        FileUtils.mkdir_p(etc_poolparty)
+        node_names = cloud.nodes.collect{|n| n.internal_ip || n.dns_name}.compact.collect{|n| "hermes@#{n}"}
+        contents = node_names.collect{|n| %Q{"#{n}".}}.join("\n")
+        File.open(etc_poolparty + "/seeds.conf", "w") {|f| f.puts contents}
+      end
+
+      def add_unpack
+        has_exec "cd /tmp/hermes && escript target_system install hermes-#{hermes_release_version} #{remote_hermes_deployed_dir}", 
+          :creates => "#{remote_hermes_deployed_dir}/releases/#{hermes_release_version}"
+      end
+
+      def run_if_needed
+        has_exec "env GEN_CLUSTER_SEED_CONFIG=/etc/poolparty/seeds.conf #{remote_hermes_deployed_dir}/bin/erl -boot #{remote_hermes_deployed_dir}/releases/#{hermes_release_version}/start -noshell -detached", 
+          :not_if => "ps aux | grep -v grep | grep hermes | grep beam"
+      end
+
+      private
+
+      def hermes_release_tar_gz
+        `#{hermes_dir}/scripts/most_recent_release tar.gz`.strip
+      end
+
+      def target_system_file
+        "#{hermes_dir}/scripts/target_system"
+      end
+
+      def hermes_dir 
+        PoolParty.lib_dir + "/vendor/erlang/hermes"
+      end
+
+      def remote_hermes_deployed_dir
+        "/var/poolparty/hermes"
+      end
+
+      def hermes_release_version
+        File.basename(hermes_release_tar_gz).gsub(/hermes-(.*?)\.tar\.gz/, '\1')
+      end
+      
+    end
+  end
+end
+
+# == install
+# upload tar.gz & target_system
+# run target_system unless VERSION exists
+# run erlang: /usr/local/erl-target/bin/erl -boot /usr/local/erl-target/releases/FIRST/start _unless_ already running

data/lib/poolparty/pool.rb

@@ -2,6 +2,11 @@ module PoolParty
     
   class Pool < DslBase
     
+    default_options(
+      :minimum_instances        => nil,     # minimum_instances default
+      :maximum_instances        => nil     # maximum_instances default
+    )
+    
     # Freeze the pool_name so we can't modify it at all
     # call and run instance_eval on the block and then call the after_create callback
     def initialize(n, &block)
@@ -26,12 +31,25 @@ module PoolParty
     # Define a cloud by a name and a block
     def cloud(name, o={}, &block)
       if block
-        clouds[name.to_s] ||= PoolParty::Cloud.new(name, o, &block)
+        clouds[name.to_s] ||= PoolParty::Cloud.new(name, soakable_options.merge(o), &block)
       else
         raise PoolPartyError.new("CloudError", "You must pass a block when defining a cloud")
       end
     end
     
+    # Soaked options
+    # These are options that can be set on the pool that will be grabbed from the pool
+    # that can be set to the cloud. 
+    # Soakable options:
+    #   minimum_instances
+    #   maximum_instances
+    def soakable_options
+      soaked_options = {}
+      soaked_options.merge!(:minimum_instances => minimum_instances) if minimum_instances
+      soaked_options.merge!(:maximum_instances => maximum_instances) if maximum_instances
+      soaked_options
+    end
+    
     # Run twice to catch the errors on the first run
     # TODO: CHANGE ME!
     def form_clouds
@@ -78,7 +96,7 @@ module PoolParty
       end
     end
     
-    def self.clouds_dot_rb_dir
+    def self.clouds_dot_rb_dir(n=nil)
       File.dirname(self.clouds_dot_rb_file) if self.clouds_dot_rb_file
     end
     
@@ -98,6 +116,7 @@ module PoolParty
         else
           find_default_clouds_dot_rb(filename)
         end
+      ENV["CLOUDS_DOT_RB"] = f
       load_from_file(f)
     end
     
@@ -133,7 +152,18 @@ module PoolParty
     #   + sets up the log
     def self.before_file_load(filepath)
       $:.unshift(::File.dirname(filepath))
-      Dir["#{::File.dirname(filepath)}/plugins/*"].each { |plugin_path| $:.unshift(plugin_path) }
+      Dir["#{ ::File.dirname(filepath)}/{plugins,lib}/**/*"].each do |plugin_path| 
+        if File.directory?(plugin_path)
+          $:.unshift(plugin_path)
+
+          ["#{plugin_path}/#{File.basename(plugin_path)}", "#{plugin_path}/lib/#{File.basename(plugin_path)}"].each do |potential|
+            require potential if File.exists?(potential)
+          end
+
+        elsif File.file?(plugin_path) && plugin_path.match(/.rb$/)
+          require plugin_path
+        end
+      end
     end
     
     # Call init to the resource methods and init the log

data/lib/poolparty/resource.rb

@@ -1,8 +1,8 @@
 module PoolParty
   class Resource < Base
     
-    attr_reader :exists
-    attr_reader :meta_notifies, :meta_not_if, :meta_only_if, :meta_subscribes
+    attr_accessor :exists
+    attr_accessor :meta_notifies, :meta_not_if, :meta_only_if, :meta_subscribes
     attr_accessor :graph_index
     
     default_options(
@@ -12,9 +12,9 @@ module PoolParty
       :provider       => nil
     )
     
-    def initialize(opts={}, extra_opts={}, &block)
-      @exists = true
-      super
+    def initialize(opts={}, extra_opts={}, exists=true, &block)
+      @exists ||= exists
+      super(opts, extra_opts, &block)
       valid?
     end
     
@@ -44,7 +44,9 @@ module PoolParty
       other_resources_hash.each do |k,v|
         notifies_array = (@meta_notifies[k] ||= [])
         notifies_array << [v, action_to_take] unless notifies_array.include?([v, action_to_take])
-      end      
+        # Implicitly add a require
+        # requires(k => v)
+      end
     end
     
     def subscribes(other_resources_hash, action_to_take=:reload, at_time=:delayed)
@@ -56,12 +58,19 @@ module PoolParty
     end
     
     # Requires
-    def requires(other_resources_hsh)
-      other_resources_hsh.each do |k,v|
-        current_deps = (dependencies[k] ||= [])
-        current_deps << v unless current_deps.include?(v)
+    def requires(other_resources_obj)
+      case other_resources_obj
+      when Hash
+        other_resources_obj.each do |k,v|
+          dependencies[k] ||= []
+          dependencies[k] << v unless dependencies[k].include?(v)
+        end
+      when Array
+        other_resources_obj.each do |obj|
+          requires(obj)
+        end
       end
-    end    
+    end
     
     # Not if
     # If a block is given with the not_if, we assume it is
@@ -79,7 +88,10 @@ module PoolParty
     # Should this resource exist on the remote systems
     # which is a lookup of the instance variable 
     # on the instance of the resource
-    # The default is that the resource DOES exist    
+    # The default is that the resource DOES exist
+    def exists(n=nil)
+      @exists
+    end
     alias :exists? :exists
     
     # The resource exists in the output and should be created
@@ -102,6 +114,10 @@ module PoolParty
     def after_compile
     end
     
+    def after_loaded
+      requires parent if parent && !parent.is_a?(PoolParty::Cloud) && !parent.is_a?(PoolParty::Pool)
+    end
+    
     # Singleton methods
     # has_name
     # The has_ and does_not_have methods names
@@ -159,15 +175,13 @@ module PoolParty
     # PoolParty classes that use Base
     def self.define_resource(res)
       Base.class_eval <<-EOE
-        def has_#{res.has_method_name}(a={},b={},&block)
-          obj = #{res}.new(a,b,&block)
-          obj.exists!
+        def has_#{res.has_method_name}(a={},b={},e=true, &block)
+          obj = #{res}.new(a,b,e,&block)
           resources << obj
           obj
         end
-        def does_not_have_#{res.has_method_name}(a={},b={},&block)
-          obj = has_#{res.has_method_name}(a,b,&block)
-          obj.does_not_exist!
+        def does_not_have_#{res.has_method_name}(a={},b={},e=false,&block)
+          obj = has_#{res.has_method_name}(a,b,e,&block)
           obj
         end
         def #{res.has_method_name}s

data/lib/poolparty/resources/directory.rb

@@ -31,6 +31,10 @@ module PoolParty
         :group      => "root",
         :recursive  => true
       )
+
+      def after_loaded
+        requires get_user(owner) if owner && owner != "root"
+      end
       
       def print_to_chef
         <<-EOE
@@ -47,4 +51,4 @@ end
     end
     
   end
-end
+end

data/lib/poolparty/resources/exec.rb

@@ -43,7 +43,7 @@ module PoolParty
 str = 'execute "<%= name %>" do
   command <%= print_variable(command || name) %>
   path <%= print_variable(path) %>
-  action :<%= action ? action : (exists ? :run : :nothing) %>
+  action <%= print_variable(action ? action : (exists ? :run : :nothing)) %>
 '
       str << "  creates <%= print_variable(creates) %>\n" if creates
       str << "  cwd <%= print_variable(cwd) %>\n" if cwd
@@ -58,4 +58,4 @@ str = 'execute "<%= name %>" do
     end
     
   end
-end
+end

data/lib/poolparty/resources/file.rb

@@ -38,7 +38,11 @@ module PoolParty
         :backup   => 5,
         :owner    => "root"
       )
-      
+
+      def after_loaded
+        requires get_user(owner) if owner && owner != "root"
+      end
+            
       def self.has_method_name
         "file"
       end
@@ -62,6 +66,8 @@ end
           file = arg.first
           @template = if File.file?(b = File.expand_path(file))
             b
+          elsif File.file?(c = File.expand_path(File.join(clouds_dot_rb_dir, file)))
+            c
           elsif f = search_in_known_locations(file)
             f
           else
@@ -78,4 +84,4 @@ end
     end
     
   end
-end
+end

data/lib/poolparty/resources/gem_package.rb

@@ -40,7 +40,7 @@ module PoolParty
       def print_to_chef
         str = <<-EOE
 gem_package "<%= name %>" do
-  action :<%= (action ? action : (exists ? :install : :remove)) %>
+  action <%= print_variable(action ? action : (exists ? :install : :remove)) %>
 EOE
         str << "  options <%= print_variable(options) %>\n" if options
         str << "  version <%= print_variable(version) %>\n" if version
@@ -52,4 +52,4 @@ EOE
     end
     
   end
-end
+end

data/lib/poolparty/resources/line.rb

@@ -32,16 +32,33 @@ module PoolParty
       end
       
       def after_loaded
-        has_exec "line_in_#{filepath}" do
-          command "grep -q \'#{line.safe_quote}\' #{filepath} || echo \'#{line.safe_quote}\' >> #{filepath}"
-          not_if "grep -q \'#{line.safe_quote}\' #{filepath}"
+        opts = if exists?
+          {:command => "grep -q \'#{line.safe_quote}\' #{filepath} || echo \'#{line.safe_quote}\' >> #{filepath}",
+          :not_if => "grep -q \'#{line.safe_quote}\' #{filepath}"}
+        else
+          {:command => "cat #{filepath} | grep -v \'#{line.safe_quote}\' > tempfile && mv tempfile #{filepath}",
+          :only_if => "grep -q \'#{line.safe_quote}\' #{filepath}"}
+        end
+        
+        opts.merge!(:name => exists? ? "line in #{filepath}" : "no line in #{filepath}")
+        
+        e = has_exec opts
+        
+        # Not incredibly pretty. 
+        # {:file => [["pool_name", :reload]]}
+        # TODO: Find an alternative
+        e.meta_notifies = meta_notifies if meta_notifies
+        e.meta_subscribes = meta_subscribes if meta_subscribes
+        
+        # TODO: Figure out better solution
+        deps = @dependencies
+        e.instance_eval do
+          @dependencies = deps
         end
       end
       
       def print_to_chef
-        <<-EOE
-# line in file: <%= filepath %>
-        EOE
+        :no_print
       end
       
     end

data/lib/poolparty/resources/mount.rb

@@ -40,7 +40,7 @@ module PoolParty
       def print_to_chef
         str = <<-EOE
 mount "<%= name %>" do
-  action :<%= (action ? action : (exists ? :mount : :unmount)) %>
+  action <%= print_variable(action ? action : (exists ? :mount : :unmount)) %>
   device_type <%= print_variable(device_type) %>
 EOE
         str << "  device <%= print_variable(device) %>\n" if device
@@ -54,4 +54,4 @@ EOE
     end
     
   end
-end
+end

data/lib/poolparty/resources/package.rb

@@ -40,7 +40,7 @@ module PoolParty
       def print_to_chef
         str = <<-EOE
 package "<%= name %>" do
-  action :<%= (action ? action : (exists ? :install : :remove)) %>
+  action <%= print_variable(action ? action : (exists ? :install : :remove)) %>
 EOE
         str << "  options <%= print_variable(options) %>\n" if options
         str << "  version <%= print_variable(version) %>\n" if version
@@ -52,4 +52,4 @@ EOE
     end
     
   end
-end
+end

data/lib/poolparty/resources/service.rb

@@ -39,7 +39,7 @@ module PoolParty
       def print_to_chef
 str = 'service "<%= name %>" do
   pattern <%= print_variable(pattern || name) %>
-  action :<%= action ? print_variable(action) : (exists ? :enable : :disable) %>
+  action <%= print_variable(action ? action : (exists ? :enable : :disable)) %>
 '
         str << "  running <%= print_variable(running) %>\n" if running
         str << "  start_command <%= print_variable(start_command) %>\n" if start_command
@@ -55,4 +55,4 @@ str = 'service "<%= name %>" do
     end
     
   end
-end
+end

data/lib/poolparty/resources/user.rb

@@ -44,7 +44,7 @@ module PoolParty
       
       def print_to_chef
 str = 'user "<%= name %>" do
-  action :<%= action ? print_variable(action) : (exists ? :create : :remove) %>
+  action <%= print_variable(action ? action : (exists ? :create : :remove)) %>
 '
         str << "  comment <%= print_variable(comment) %>\n" if comment
         str << "  uid <%= print_variable(uid) %>\n" if uid
@@ -60,4 +60,4 @@ str = 'user "<%= name %>" do
     end
     
   end
-end
+end

data/lib/poolparty/resources/variable.rb

@@ -33,7 +33,7 @@ module PoolParty
         :value => nil
       )
       
-      def initialize(k, v=nil)
+      def initialize(k, v=nil, exists=true)
         case k
         when Hash
           super
@@ -41,7 +41,7 @@ module PoolParty
           if value.is_a?(Hash)
             super(v.merge(:name => k))
           else
-            super(:name => k, :value => v)
+            super({:name => k, :value => v})
           end
         end
       end
@@ -51,7 +51,8 @@ module PoolParty
       def print_to_chef
         # Variable
         # TODO: Variable => <%= name %>
-        "poolparty[:#{name}] = #{value}"
+        # "poolparty[:#{name}] = #{value}"
+        :no_print
       end
       
     end

data/lib/poolparty.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 t=Time.now
 
 # Load system gems
-%w(rubygems logger erb net/ssh open-uri).each do |lib|
+%w(rubygems logger erb open-uri).each do |lib|
   require lib
 end
 
@@ -11,7 +11,7 @@ end
 Dir[File.dirname(__FILE__)+"/../vendor/gems/*"].each {|lib| $LOAD_PATH.unshift(File.expand_path("#{lib}/lib")) }
 
 # Load local gems
-%w(dslify parenting json daemons).each do |dep|
+%w(dslify parenting json daemons net/ssh).each do |dep|
   require dep
 end
 
@@ -43,7 +43,9 @@ require "poolparty/pool_party_error"
     hash
     symbol
     proc
-    time).each do |lib|
+    time
+    file
+  ).each do |lib|
   require "core/#{lib}"
 end
 

data/lib/proto/command_interface_handler.rb

@@ -6,7 +6,23 @@ class CommandInterfaceHandler
     cr.command = command
     resp = begin
       the_cloud = clouds[cld.name]
-      the_cloud ? the_cloud.send(command.to_sym, *args) : "Cloud not found: #{cld.name}"
+      if the_cloud
+        if command.include?(".")
+          command.split(".").inject([]) do |sum, cmd|
+            if cmd.match(/\((.*)\)/)
+              args = $1
+              new_cmd = cmd.gsub(args, '').gsub(/\(\)/, '')
+              sum = arr.send(new_cmd.to_sym, *args)
+            else
+              sum = arr.send(cmd)
+            end
+          end
+        else
+          the_cloud.send(command.to_sym, *args)
+        end
+      else
+        "Cloud not found: #{cld.name}"
+      end
     rescue Exception => e
       cr.response = "Error: #{e.inspect}"
     end