poolparty 1.3.8 → 1.3.13

data/VERSION.yml

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

data/bin/cloud-thrift

@@ -22,9 +22,11 @@ Usage: #{$0} #{all_options_string}
 EOS
 
   short_desc "Start the cloud thrift interface"
-  opt :port, "Start a port", :type => :integer, :default => 11223
+  opt :port, "Start on port", :type => :integer, :default => 11223
   opt :dir, "Pid directory", :type => :string, :default => "/tmp"
   opt :daemon, "Daemonize", :type => :bool, :default => true
+  # Query params
+  opt :host, "Query on host", :type => :string, :default => "localhost"
 
   run do |command|
     
@@ -33,12 +35,12 @@ EOS
     cmd = ARGV.shift
     cmd = ARGV.shift if cmd == "thrift"
     
-    if %w(run start restart stop).include?(cmd)
+    if %w(run start restart stop query).include?(cmd)
       args = [cmd]
       args << ["--", command.argv] unless command.argv.empty?
       args.flatten!
     else
-      puts "You must pass one of the following: #{%w(run start restart stop).join(", ")}"
+      puts "You must pass one of the following: #{%w(run start restart stop query).join(", ")}"
       args = ["--help"]
     end
     
@@ -55,22 +57,34 @@ EOS
       :monitor    => true
     }.merge(command.opts)
     
-    block = Proc.new do
-      handler = CommandInterfaceHandler.new
-      processor = CloudThrift::CommandInterface::Processor.new(handler)
-      transport = Thrift::ServerSocket.new( options[:port] )
-      transportFactory = Thrift::BufferedTransportFactory.new()
-      server = Thrift::SimpleServer.new(processor, transport, transportFactory)
+    if cmd == "query"
+      require "command_query_handler"
       
-      puts "Starting the cloud server..."
-      server.serve()
-      puts "done."
-    end
-    
-    if command[:daemon]
-      Daemons.run_proc("cloud-thrift", options, &block)
-    else
-      block.call
+      @loaded_clouds.each do |cld|
+        puts CommandQueryHandler.run_query(cld, ARGV.shift, ARGV, options)
+      end
+    else      
+      block = Proc.new do
+        handler = CommandInterfaceHandler.new
+        processor = CloudThrift::CommandInterface::Processor.new(handler)
+        transport = Thrift::ServerSocket.new( options[:port] )
+        transportFactory = Thrift::BufferedTransportFactory.new()
+        server = Thrift::SimpleServer.new(processor, transport, transportFactory)
+
+        puts "Starting the cloud server..."
+        begin
+          server.serve()
+        rescue
+          exit 10
+        end
+        puts "done."
+      end
+
+      if command[:daemon]
+        Daemons.run_proc("cloud-thrift", options, &block)
+      else
+        block.call
+      end
     end
     
   end

data/config/jeweler.rb

@@ -15,7 +15,7 @@ end
     s.description = "PoolParty: The easy, open-source, cross-cloud management solution"
     s.summary = <<-EOM      
       Self-healing, auto-scaling system administration, provisioning
-      and maintaining tool that makes cloud computing easy and fun
+      and maintaining tool that makes cloud computing easier.
     EOM
     
     s.homepage = "http://poolpartyrb.com"
@@ -25,8 +25,9 @@ end
     s.test_files = Dir["test/**/test_*.rb"]
 
     s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"])
+    s.files += ["vendor/erlang/hermes/ebin/*.tar.gz"]
     
-    s.files.exclude 'vendor/erlang/*'
+    s.files.exclude 'vendor/erlang/hermes'
     s.files.exclude 'examples/thrift/**/*.beam'
     # s.files.exclude "**/*/erl_crash.dump"
     

data/examples/thrift/thrift_example.rb

@@ -15,6 +15,7 @@ require "poolparty_types"
 port = ARGV.pop || 11223
 
 transport = Thrift::BufferedTransport.new(Thrift::Socket.new('localhost', port))
+# transport = Thrift::BufferedTransport.new(Thrift::Socket.new('192.168.2.31', port))
 # transport = Thrift::BufferedTransport.new(Thrift::Socket.new('vm', port))
 protocol = Thrift::BinaryProtocol.new(transport)
 
@@ -22,7 +23,8 @@ client = CloudThrift::CommandInterface::Client.new(protocol)
 transport.open()
 
 cld = CloudThrift::CloudQuery.new
-cld.name = 'monitored_app'
+cld.name = 'pp2'
+# cld.name = 'monitored_app'
 # cld.name = 'vmware'
 
 resp = client.run_command(cld, "name", [])

data/lib/cloud_providers/cloud_provider.rb

@@ -81,5 +81,14 @@ module CloudProviders
       results.select_with_hash(hsh)
     end
     
+    def before_compile(cld)
+    end
+    
+    def after_compile(cld)
+    end
+    
+    
+    
+    
   end
 end

data/lib/cloud_providers/cloud_provider_instance.rb

@@ -68,10 +68,15 @@ module CloudProviders
         raise StandardError.new("You must pass in a cloud to configure an instance") unless cloud
         cloud.compile(self)        
         
-        scp(:source       => keypair.full_filepath, 
-            :destination  => "/etc/poolparty/keys/#{keypair.basename}")
+        # scp(:source       => keypair.full_filepath, 
+        #     :destination  => "/etc/poolparty/keys/#{keypair.basename}")
         
         FileUtils.mkdir_p cloud.tmp_path/"etc"/"poolparty" unless File.directory?(cloud.tmp_path/"etc"/"poolparty")
+        FileUtils.mkdir_p cloud.tmp_path/"etc"/"poolparty"/"keys" unless File.directory?(cloud.tmp_path/"etc"/"poolparty"/"keys")
+        
+        FileUtils.cp keypair.full_filepath, cloud.tmp_path/"etc"/"poolparty"/"keys"/keypair.basename
+        File.open(cloud.tmp_path/"etc"/"poolparty"/"cloud_name", "w") {|f| f << cloud.name }
+        
         pack_clouds_dot_rb_and_expected_directories
         
         dputs("Rsyncing #{cloud.tmp_path/"*"}")

data/lib/cloud_providers/ec2/ec2.rb

@@ -19,12 +19,15 @@ using :provider_name
 EOM
 end
 
+require "#{File.dirname(__FILE__)}/ec2_helpers"
 require "#{File.dirname(__FILE__)}/ec2_response"
 require "#{File.dirname(__FILE__)}/ec2_instance"
 
 module CloudProviders
   class Ec2 < CloudProvider
     
+    include CloudProviders::Ec2Helpers
+    
     # Set the aws keys from the environment, or load from /etc/poolparty/env.yml if the environment variable is not set
     def self.default_access_key
       ENV['EC2_ACCESS_KEY'] || load_keys_from_file[:access_key]
@@ -63,7 +66,7 @@ module CloudProviders
       return @aws_yml if @aws_yml && caching==true
       return {} unless File.exists?(filename)
       ddputs("Reading keys from file: #{filename}")
-      @aws_yml = YAML::load( open(filename).read )
+      @aws_yml = YAML::load( open(filename).read ) || {}
     end
     
     default_options({
@@ -88,13 +91,13 @@ module CloudProviders
         :ramdisk_id             => nil,
         :availability_zone      => nil,
         :block_device_mappings  => nil,
-        :elastic_ips            => nil, # An array of the elastic ips
-        :ebs_volume_id          => nil  # The volume id of an ebs volume # TODO: ensure this is consistent with :block_device_mappings
+        :elastic_ips            => [],  # An array of the elastic ips
+        :ebs_volumes            => []   # The volume id of an ebs volume # TODO: ensure this is consistent with :block_device_mappings
       })
       
       
     def ec2(o={})
-      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :default_host => ec2_url))
+      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :endpoint_url => ec2_url))
     end
     
     # Start a new instance with the given options
@@ -114,9 +117,12 @@ module CloudProviders
                                       availability_zone,
                                       block_device_mappings
                                       )
-      instances = response_array .collect do |aws_response_hash|
+      instances = response_array.collect do |aws_response_hash|
         Ec2Instance.new( Ec2Response.pp_format(aws_response_hash).merge(o) )
       end
+      
+      after_run_instance(instances)
+      
       #FIXME: This needs to deal with the case when an array is returned if max_instances > 1
       instances.first
     end
@@ -159,7 +165,15 @@ module CloudProviders
     end
     
     def after_compile(cld)
-      save_aws_env_to_yml(cld.tmp_path/"etc"/"poolparty"/"env.yml")
+      save_aws_env_to_yml(cld.tmp_path/"etc"/"poolparty"/"env.yml") rescue nil
+    end
+    
+    # Run after all the instances are run
+    def after_run_instance(instances_list)
+      instances_list.each do |inst|
+        associate_address(inst.instance_id) if next_unused_elastic_ip
+        attach_volume(inst.instance_id) if next_unused_volume
+      end
     end
     
     # Read  yaml file and use it to set environment variables and local variables.
@@ -171,7 +185,8 @@ module CloudProviders
     
     # Save aws keys and env variables to a yaml file
     def save_aws_env_to_yml(filename='/etc/poolparty/env.yml')
-      File.open(filename, 'w') {|f| f<<YAML::dump(aws_hash(dsl_options, "/etc/poolparty/ec2")) } rescue nil
+      hsh = aws_hash(default_options, "/etc/poolparty/ec2")
+      File.open(filename, 'w') {|f| f<<YAML::dump(hsh) }
     end
     
     # Return a hash of the aws keys and environment variables

data/lib/cloud_providers/ec2/ec2_helpers.rb

@@ -1,12 +1,57 @@
 module CloudProviders
   module Ec2Helpers
     
+    # VOLUMES    
+    def attach_volume(instance_id, volume_id=next_unused_volume, device="/dev/sdh")
+      ec2.attach_volume(volume_id, instance_id, device)
+    end
+    
+    def next_unused_volume
+      if all_volumes.empty?
+        nil
+      else
+        available_volumes.first
+      end
+    end    
+        
+    private
+    
+    def all_volumes
+      ebs_volumes.empty? ? [] : ec2.describe_volumes.select {|v| ebs_volumes.include?(v[:aws_id]) }
+    end
+    
+    def available_volumes
+      all_volumes.select {|v| v[:aws_status] == 'available' }
+    end
+    
+    def unavailable_volumes
+      all_volumes.reject {|v| available_volumes.include?(v) }
+    end
+    
+    public
+    
+    # SECURITY GROUPS
+    def security_groups(list=[])
+      ec2.describe_security_groups(list)
+    end
+    
+    public
+    
+    # ELASTIC IPS
+    
     # Associate an address with the instance using ec2
     # Get the next_unused_elastic_ip
     # and if there is one, associate the instance to the 
     # public ip
-    def associate_address()
-      raise StandardError.new('Not Implemented Yet')
+    def associate_address(instance_id)
+      new_ip = next_unused_elastic_ip
+      ec2.associate_address(instance_id, new_ip)
+      loop do
+        if describe_instance(:instance_id => instance_id).public_ip == new_ip
+          return new_ip
+        end
+        sleep 1
+      end
     end
     
     # Get the next usable elastic ip
@@ -17,13 +62,23 @@ module CloudProviders
     # intersection of the unused ips and those, find the first one available
     # and return that.
     def next_unused_elastic_ip
-      raise StandardError.new('Not Implemented Yet')
-      if elastic_ips.empty?
+      if unusued_elastic_ips.empty?
         nil
       else
+        unusued_elastic_ips.first
       end
     end
-
+    
+    private
+    
+    def all_elastic_ips
+      elastic_ips.empty? ? [] : ec2.describe_addresses & elastic_ips
+    end
+    
+    def unusued_elastic_ips
+      all_elastic_ips.select {|i| i[:instance_id] == nil }
+    end
+    
     # Help create a keypair for the cloud
     # This is a helper to create the keypair and add them to the cloud for you
     # def create_keypair

data/lib/dependency_resolvers/base.rb

@@ -89,14 +89,7 @@ module DependencyResolvers
           "#{obj.to_i}"
         end
       when String
-        case obj
-        when /^\d{4}$/
-          "#{obj}"
-        when /^\d{3}$/
-          "0#{obj}"
-        else
-          "\"#{obj}\""
-        end
+        "\"#{obj}\""
       when Proc
         obj.call # eh
       when Array
@@ -119,4 +112,4 @@ module DependencyResolvers
     
   end
   
-end
+end

data/lib/poolparty/base.rb

@@ -157,12 +157,12 @@ module PoolParty
           deps_array.each do |dep_name|
             dep = get_resource(dep_type, dep_name)
             raise PoolPartyError.create("ResourceNotFound", "A resource required for #{resource.has_method_name}(#{resource.name}) was not found: #{dep_type}(#{dep_name}). Please make sure you've specified this in your configuration.") unless dep
-            result.add_edge!(dep, resource, dep.name) unless result.edge?(dep, resource)
+            result.add_edge!(dep, resource, dep.name) unless result.edge?(dep, resource) or result.edge?(resource, dep)
           end
         end
         
         if on
-          result.add_edge!(resource, on, resource.name) unless result.edge?(resource, on)
+          result.add_edge!(resource, on, resource.name) unless result.edge?(resource, on) or result.edge?(on, resource)
         else
           result.add_vertex!(resource)
         end

data/lib/poolparty/cloud.rb

@@ -196,12 +196,14 @@ module PoolParty
     # the defined (or the default dependency_resolver, chef)
     def compile(caller=nil)
       callback :before_compile
+      cloud_provider.before_compile(self)
       FileUtils.mkdir_p tmp_path unless File.directory?(tmp_path)
       ddputs <<-EOE
 Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"} 
   number of resources: #{ordered_resources.size}
       EOE
       out = dependency_resolver.compile_to(ordered_resources, tmp_path/"etc"/"#{dependency_resolver_name}", caller)
+      cloud_provider.after_compile(self)
       callback :after_compile
       out
     end
@@ -230,14 +232,14 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
     #     vote_for(:expand) if v > 0.8
     #   end
     def monitor(monitor_symbol, &block)
-      monitors[monitor_symbol] ||= PoolParty::Monitor.new(monitor_symbol, &block)
+      monitors[monitor_symbol.to_sym] ||= PoolParty::Monitor.new(monitor_symbol, &block)
     end
     
     # Run the monitor logic
     def run_monitor(monitor_name, value)
       mon = monitors[monitor_name.to_sym]
       if mon
-        mon.run(value.to_f)
+        mon.run(value)
       else
         "unhandled monitor"
       end
@@ -248,6 +250,14 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
       @monitors ||= {}
     end
     
+    def monitor_format(mon_name, meth=nil, &block)
+      if monitors.has_key?(mon_name.to_sym)
+        monitors[mon_name.to_sym].format(meth, &block)
+      else
+        raise PoolPartyError.create("MonitorsFormattingError", "You created a monitor format for an unknown monitor. Please check and try again!")
+      end
+    end
+    
     ##### Internal methods #####
     # Methods that only the cloud itself will use
     # and thus are private

data/lib/poolparty/monitor.rb

@@ -15,7 +15,7 @@
 module PoolParty
   class Monitor
     
-    attr_reader :name, :monitor_block
+    attr_reader :name, :monitor_block, :value_format
     
     def initialize(monitor_name, &block)
       msg =<<-EOE
@@ -27,7 +27,7 @@ You must pass a block with your monitor
     end
       EOE
       raise PoolPartyError.create("MonitorDefinitionError", msg) unless block
-      @name = monitor_name
+      @name = monitor_name.to_sym
       @monitor_block = block
     end
     
@@ -37,11 +37,33 @@ You must pass a block with your monitor
     # retrieved and return the methods available.
     def run(val)
       @methods = nil
-      instance_exec val, &monitor_block
+      instance_exec format_value(val), &monitor_block
       methods
     end
     
+    # Format the monitor values
+    # Set the monitor format here.
+    # The default will be to turn the value into a float
+    # but to allow other formats, call the value here, for instance:
+    #   mon.format :to_s
+    # Blocks are also permitted
+    def format(meth=nil, &block)
+      @value_format ||= (meth ? meth : block)
+    end
+    
     private
+    
+    # Format the value of the monitor
+    def format_value(value)
+      case value_format
+      when Proc
+        value_format.call(value)
+      when nil
+        value.to_f
+      else
+        value.send value_format
+      end
+    end
 
     # We don't want the methods actually executing since we are executing the methods 
     # in a cloud, we just want to store the output values of the

data/lib/poolparty/plugins/hermes.rb

@@ -11,22 +11,28 @@ module PoolParty
       )
 
       def after_loaded
+        run_dependencies
+        build_rsync_directory
         add_unpack
+        run_dependencies
         run_if_needed
       end
 
       def after_compile
-        run_dependencies
-        build_rsync_directory
       end
 
       def run_dependencies
-        case cloud.platform
+        install_packages = case cloud.platform
         when false
         else
-          has_package "erlang-nox"
-          has_package "erlang-dev"
-          has_package "rrdtool"
+          ["erlang-nox", "erlang-dev"]
+        end
+        has_package "rrdtool"
+        has_exec "install_erlang" do
+          command "echo ''"
+          install_packages.each do |pkg|
+            has_package pkg
+          end
         end
       end
 
@@ -43,18 +49,25 @@ module PoolParty
         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")
+        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}"
+        has_exec "install_hermes",
+          :command => "cd /tmp/hermes && escript target_system install hermes-#{hermes_release_version} #{remote_hermes_deployed_dir}", 
+          :creates => "#{remote_hermes_deployed_dir}/releases/#{hermes_release_version}",
+          :requires => get_package("erlang-dev")
+          
+        has_link  :name => "collectd_dir", 
+                  :to => "/var/lib/collectd/rrd/\#{`hostname -f`.chomp}", :source => "/var/lib/collectd/localhost",
+                  :requires => [get_package("collectd")]
       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"
+        has_exec "env GEN_CLUSTER_SEED_CONFIG=/etc/poolparty/seeds.conf HERMES_RRD_DIRECTORY=/var/lib/collectd/localhost #{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",
+          :requires => [get_exec("install_hermes"), get_link("collectd_dir")]
       end
 
       private

data/lib/poolparty/pool.rb

@@ -97,7 +97,7 @@ module PoolParty
     end
     
     def self.clouds_dot_rb_dir(n=nil)
-      File.dirname(self.clouds_dot_rb_file) if self.clouds_dot_rb_file
+      self.clouds_dot_rb_file ? File.dirname(self.clouds_dot_rb_file) : "./"
     end
     
     # Load the default clouds.rb file
@@ -151,17 +151,16 @@ module PoolParty
     #   + calls the resource define_resource_methods to define the resource methods
     #   + sets up the log
     def self.before_file_load(filepath)
-      $:.unshift(::File.dirname(filepath))
-      Dir["#{ ::File.dirname(filepath)}/{plugins,lib}/**/*"].each do |plugin_path| 
+      $:.unshift(File.dirname(filepath))
+      $:.unshift("#{File.dirname(filepath)}/lib")
+      $:.unshift("#{File.dirname(filepath)}/plugins")
+      
+      Dir["#{File.dirname(filepath)}/lib/*"].each {|lib_path| require lib_path }
+      Dir["#{File.dirname(filepath)}/plugins/*"].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
+        else
+          require plugin_path if File.file?(plugin_path) && plugin_path.match(/.rb$/)
         end
       end
     end

data/lib/poolparty/resource.rb

@@ -15,6 +15,7 @@ module PoolParty
     def initialize(opts={}, extra_opts={}, exists=true, &block)
       @exists ||= exists
       super(opts, extra_opts, &block)
+      after_loaded_requires_parent
       valid?
     end
     
@@ -69,6 +70,11 @@ module PoolParty
         other_resources_obj.each do |obj|
           requires(obj)
         end
+      else
+        # When is an object
+        # k = other_resources_obj.has_method_name
+        # dependencies[k] ||= []
+        # dependencies[k] << other_resources_obj.name
       end
     end
     
@@ -114,7 +120,7 @@ module PoolParty
     def after_compile
     end
     
-    def after_loaded
+    def after_loaded_requires_parent
       requires parent if parent && !parent.is_a?(PoolParty::Cloud) && !parent.is_a?(PoolParty::Pool)
     end
     
@@ -162,8 +168,8 @@ module PoolParty
     def self.define_resource_methods
       defined_resources.each do |res|
         next if res.method_defined?
-        ddputs "Defining resource: #{res} as #{res.has_method_name}"
-        define_resource(res)
+        ddputs "Defining resource: #{res} as #{res.has_method_name} on #{self}"
+        define_resource(res, is_base_resource_class? ? Base : self)
         res.method_defined!
         unless res.defined_resources.empty?
           res.define_resource_methods
@@ -171,10 +177,14 @@ module PoolParty
       end
     end
     
+    def self.is_base_resource_class?
+      self.to_s == PoolParty::Resource.to_s
+    end
+    
     # Define the resource on the base class so it's available across all
     # PoolParty classes that use Base
-    def self.define_resource(res)
-      Base.class_eval <<-EOE
+    def self.define_resource(res, base_klass=Base)
+      base_klass.class_eval <<-EOE
         def has_#{res.has_method_name}(a={},b={},e=true, &block)
           obj = #{res}.new(a,b,e,&block)
           resources << obj
@@ -252,14 +262,7 @@ module PoolParty
           "#{obj.to_i}"
         end        
       when String
-        case obj
-        when /^\d{4}$/
-          "#{obj}"
-        when /^\d{3}$/
-          "0#{obj}"
-        else
-          "\"#{obj}\""
-        end
+        "\"#{obj}\""
       when Proc
         obj.call # eh
       when Array

data/lib/poolparty/resources/file.rb

@@ -66,8 +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 File.file?(d = File.expand_path(File.join(clouds_dot_rb_dir, file)))
+            d
           elsif f = search_in_known_locations(file)
             f
           else

data/lib/poolparty/resources/link.rb

@@ -30,12 +30,13 @@ module PoolParty
       
       default_options(
         :link_type  => :symbolic,
+        :source     => nil,
         :to         => nil
       )
       
       def print_to_chef
         <<-EOE
-link "<%= name %>" do
+link "<%= source || name %>" do
   link_type <%= print_variable(link_type) %>
   action :<%= exists? ? :create : :delete %>
   to <%= print_variable(to) %>

data/lib/proto/command_interface_handler.rb

@@ -4,7 +4,31 @@ class CommandInterfaceHandler
     cr = CloudThrift::CloudResponse.new
     cr.name = cld.name
     cr.command = command
-    resp = begin
+    
+    cr.response = format_response(get_response(cld, command, args))
+
+    return cr
+  end
+  
+  def cast_command(cld, command, args)
+        
+    cr = CloudThrift::CloudResponse.new
+    cr.name = cld.name
+    cr.command = command
+    cr.response = format_response("Running command: #{command}(#{args})")
+    
+    fork do
+      get_response(cld, command, args)
+    end
+
+    return cr
+  end
+  
+  
+  private
+  
+  def get_response(cld, command, args)
+    begin
       the_cloud = clouds[cld.name]
       if the_cloud
         if command.include?(".")
@@ -25,15 +49,9 @@ class CommandInterfaceHandler
       end
     rescue Exception => e
       cr.response = "Error: #{e.inspect}"
-    end
-    
-    cr.response = format_response(resp)
-
-    return cr
+    end    
   end
   
-  private
-  
   def format_response(resp)
     case resp
     when Array
@@ -44,4 +62,5 @@ class CommandInterfaceHandler
       [resp]
     end.map {|ele| ele.to_s }
   end
+  
 end

data/lib/proto/command_query_handler.rb

@@ -0,0 +1,19 @@
+class CommandQueryHandler
+  def self.run_query(on_cloud, command, args, opts={})
+    port = opts[:port] || 11223
+    host = opts[:host] || "localhost"
+
+    transport = Thrift::BufferedTransport.new(Thrift::Socket.new(host, port))
+    protocol = Thrift::BinaryProtocol.new(transport)
+
+    client = CloudThrift::CommandInterface::Client.new(protocol)
+    transport.open()
+
+    cld = CloudThrift::CloudQuery.new
+    cld.name = on_cloud.name
+    
+    ddputs("Running command: #{command} on #{cld.name} at #{host}:#{port}")
+    resp = client.run_command(cld, command, args)
+    resp.response
+  end
+end

data/lib/proto/poolparty.thrift

@@ -14,4 +14,5 @@ struct CloudResponse {
 
 service CommandInterface {
   CloudResponse run_command(1:CloudQuery cld, 2:string command, 3:list<string> arglist)
+  CloudResponse cast_command(1:CloudQuery cld, 2:string command, 3:list<string> arglist)
 }

data/lib/provision/bootstrap_scripts/build_centos.sh

@@ -4,6 +4,8 @@
 # Make the /etc/poolparty directory to hold poolparty configuration
 mkdir -p /etc/poolparty
 mkdir -p /var/log/poolparty
+mkdir -p /etc/poolparty/keys
+
 
 # Build the user groups
 if [ ! "$(egrep "poolparty" /etc/group)" ]; then

data/lib/provision/bootstrap_scripts/build_ubuntu.sh

@@ -3,6 +3,7 @@
 # Build the directories
 # Make the /etc/poolparty directory to hold poolparty configuration
 mkdir -p /etc/poolparty
+mkdir -p /etc/poolparty/keys
 mkdir -p /var/log/poolparty
 
 # Build the user groups

data/tasks/poolparty.rake

@@ -22,6 +22,30 @@ task :thrift do
   end
 end
 
+namespace(:hermes) do
+  
+  desc "Pack for distribution"
+  task :target_system do
+    erl_dir = File.dirname(__FILE__) + "/../vendor/erlang"
+    hermes_dir = File.join(erl_dir, "hermes")
+    
+    puts `cd #{hermes_dir} && make target_system`
+  end
+  desc "Update hermes code"
+  task :update do
+    erl_dir = File.dirname(__FILE__) + "/../vendor/erlang"
+    hermes_dir = File.join(erl_dir, "hermes")
+    
+    if File.directory?(hermes_dir)
+      `cd #{hermes_dir} && git pull origin master`
+    else
+      FileUtils.mkdir_p erl_dir
+      r = "git clone git://github.com/auser/hermes.git #{hermes_dir}"
+      Kernel.system r
+    end
+  end
+end
+
 namespace(:pp) do
   task :build_gem => ["poolparty:vendor:setup", "poolparty:vendor:update", :gemspec, :build]
   

data/test/lib/dependency_resolvers/base_test.rb

@@ -30,7 +30,7 @@ template "/etc/motd" do
   source "/etc/motd.erb"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
 end
       EOE

data/test/lib/dependency_resolvers/chef/resources/remote_directory_test.rb

@@ -26,10 +26,10 @@ class RemoteDirectoryResourceTest < Test::Unit::TestCase
 remote_directory "/tmp/remote_something" do
   source "something"
   files_backup 10
-  files_mode 0644
+  files_mode "0644"
   action :create
   recursive false
-  mode 0755
+  mode "0755"
   owner "nobody"
   group "nobody"
   files_owner "root"

data/test/lib/dependency_resolvers/chef/resources/remote_file_test.rb

@@ -22,7 +22,7 @@ remote_file "/tmp/testfile" do
   source "http://www.example.com/tempfiles/testfile"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
   checksum "08da002l"
 end

data/test/lib/dependency_resolvers/chef_test.rb

@@ -54,7 +54,7 @@ class ChefTest < Test::Unit::TestCase
     
   def test_compile_to_the_recipes
     @base.compile_to(@resources[:files], test_dir)
-    assert_equal "template \"/etc/motd\" do\n  source \"/etc/motd.erb\"\n  action :create\n  backup 5\n  mode 0644\n  owner \"root\"\nend\n", open(@cookboox_directory/"recipes"/"default.rb").read
+    assert_equal "template \"/etc/motd\" do\n  source \"/etc/motd.erb\"\n  action :create\n  backup 5\n  mode \"0644\"\n  owner \"root\"\nend\n", open(@cookboox_directory/"recipes"/"default.rb").read
   end
     
   def test_compile_the_recipes
@@ -78,14 +78,14 @@ template "/etc/motd" do
   source "/etc/motd.erb"
   action :create
   backup 5
-  mode 0644
+  mode "0644"
   owner "root"
 end
 
 directory "/etc/poolparty" do
   action :create
   recursive true
-  mode 0644
+  mode "0644"
   owner "root"
   group "root"
 end

data/test/lib/poolparty/cloud_test.rb

@@ -134,7 +134,6 @@ class CloudTest < Test::Unit::TestCase
     assert_equal 22, clouds["noneity"].ssh_port
   end
   
-  
   def test_children_getting_parent_options
     clear!
     pool "outside" do
@@ -159,13 +158,24 @@ class CloudTest < Test::Unit::TestCase
           configure if v < 0.2
           vote_for(:expand) if v > 1.1
         end
+        
+        monitor :load do |a|
+          # [0.42 0.43 0.37]
+          vote_for(:expand) if a[0] > 0.8
+        end
+        
+        monitor_format :load do |d|
+          d.split(",").map {|ele| ele.to_f }
+        end
+        
       end
     end
     
-    assert_equal 1, clouds["monitor_app"].monitors.size
-    assert_equal [:cpu], clouds["monitor_app"].monitors.map {|m,v| v.name }
+    assert_equal 2, clouds["monitor_app"].monitors.size
+    assert_equal [:cpu, :load], clouds["monitor_app"].monitors.map {|m,v| v.name }
     assert_equal({:configure => []}, clouds["monitor_app"].run_monitor("cpu", "0.1"))
     assert_equal({:vote_for => [:expand]}, clouds["monitor_app"].run_monitor("cpu", "1.4"))
+    assert_equal({:vote_for => [:expand]}, clouds["monitor_app"].run_monitor("load", "0.98, 0.23, 0.1"))
   end
   
   def test_add_monitoring_stack_if_needed
@@ -183,5 +193,11 @@ class CloudTest < Test::Unit::TestCase
     assert_equal 1, clouds["app_cloud"].monitors.size
     
     clouds["app_cloud"].compile
+    
+    compile_dir = clouds["app_cloud"].tmp_path/"etc"/"chef"/"cookbooks"/"poolparty"
+    recipe_file = compile_dir/"recipes"/"default.rb"
+    recipe_contents = open(recipe_file).read
+    
+    assert_match /install hermes/, recipe_contents
   end
 end

data/test/lib/poolparty/monitor_test.rb

@@ -3,7 +3,7 @@ require "#{File.dirname(__FILE__)}/../../test_helper"
 class MonitorTest < Test::Unit::TestCase
   
   def setup
-    @mon = PoolParty::Monitor.new(:'cpu-idle') do |c|
+    @mon = PoolParty::Monitor.new("cpu-idle") do |c|
       vote_for(:expand) if c > 0.8
       configure if c < 0.1
     end
@@ -27,4 +27,31 @@ class MonitorTest < Test::Unit::TestCase
     end
   end
   
+  def test_formatting_input
+    mon = PoolParty::Monitor.new("memory-used") {|c| long if c.length > 2}
+    mon.format(:to_s)
+    assert_equal({:long => []}, mon.run("hellllllllooooo world"))
+    
+    mon = PoolParty::Monitor.new("memory-used") do |c| 
+      long if c.length > 2
+      short if c.length < 2
+    end
+    mon.format(:to_a)
+    assert_equal({:long => []}, mon.run(%w(1 2 3 4)))
+    assert_equal({:short => []}, mon.run(%w(1)))
+    
+    mon = PoolParty::Monitor.new("memory-used") do |saying, to| 
+      if saying == "hello"
+        hello
+      else
+        goodbye
+      end
+    end
+    
+    mon.format {|d|return *d.split(",")}
+
+    assert_equal({:hello => []}, mon.run("hello, world"))
+    assert_equal({:short => []}, mon.run("good day"))
+  end
+  
 end

data/test/lib/poolparty/resource_test.rb

@@ -73,8 +73,6 @@ class ResourceTest < Test::Unit::TestCase
       assert_equal @inst.print_variable(:a), ":a"
       assert_equal @inst.print_variable({:a => "a"}), ":a => \"a\""
       assert_equal @inst.print_variable(644), "644"
-      assert_equal @inst.print_variable("0755"), "0755"
-      assert_equal @inst.print_variable("755"), "0755"
       assert_equal @inst.print_variable(@inst), @inst.to_s
       assert_equal @inst.print_variable(nil), nil
     end
@@ -147,4 +145,18 @@ class ResourceTest < Test::Unit::TestCase
     end
   end
   
+  def test_a_subclassed_resource_has_the_method_of_the_subclassed_resource
+    pool "oblong" do
+      cloud "piece" do
+        fake_plugin do
+          has_subclassed "box"
+        end
+      end
+    end
+    
+    assert_equal PoolParty::Resources::FakePlugin, clouds["piece"].resources.first.class
+    assert_equal PoolParty::Resources::FakeSubclassedPlugin, clouds["piece"].resources.first.resources[0].class
+    assert_equal 1, clouds["piece"].resources.first.resources[0].resources.size
+  end
+  
 end

data/test/lib/poolparty/resources/conditional_test.rb

@@ -27,6 +27,7 @@ end'
     pool "conditional_cloud" do
       cloud "test" do
         
+        keypair "test_key"
         has_case "os" do
           when_is :ubuntu, "git-core"
           else_is "git"

data/test/lib/poolparty/resources/directory_test.rb

@@ -12,7 +12,7 @@ class DirectoryResourceTest < Test::Unit::TestCase
     end
     
     should "have the directory method denoted by has_method_name" do
-      str = "directory \"/etc/poolparty\" do\n  action :create\n  recursive true\n  mode 0644\n  owner \"root\"\n  group \"root\"\nend\n"
+      str = "directory \"/etc/poolparty\" do\n  action :create\n  recursive true\n  mode \"0644\"\n  owner \"root\"\n  group \"root\"\nend\n"
       assert_equal str, @base.compile(@res)
     end
     

data/test/lib/poolparty/resources/file_test.rb

@@ -13,7 +13,7 @@ class DirectoryResourceTest < Test::Unit::TestCase
     end
     
     should "have the template method denoted by has_method_name" do
-      str = "template \"/etc/poolparty/lyrics\" do\n  source \"/etc/poolparty/lyrics.erb\"\n  action :create\n  backup 5\n  mode 0644\n  owner \"root\"\nend\n"
+      str = "template \"/etc/poolparty/lyrics\" do\n  source \"/etc/poolparty/lyrics.erb\"\n  action :create\n  backup 5\n  mode \"0644\"\n  owner \"root\"\nend\n"
       
       assert_equal str, @base.compile(@res)
       assert_equal "I'm just a file, a lonely little file in the world", open(@cookboox_directory/"templates"/"default"/"etc"/"poolparty"/"lyrics.erb").read

data/test/lib/poolparty/resources/user_test.rb

@@ -16,7 +16,7 @@ str = <<-EOS
 user "random" do
   action :create
   comment "Random User"
-  uid 1000
+  uid \"1000\"
   gid "users"
   home "/home/random"
   shell "/bin/zsh"

data/test/lib/proto/command_query_handler_test.rb

@@ -0,0 +1,11 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+$:.unshift("#{File.dirname(__FILE__)}/../../../lib/proto")
+require "command_query_handler"
+
+class CommandQueryHandlerTest < Test::Unit::TestCase
+
+  def test_has_run_query_command
+    assert CommandQueryHandler.respond_to?(:run_query)
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.3.13
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -208,6 +208,7 @@ files:
 - lib/poolparty/resources/user.rb
 - lib/poolparty/resources/variable.rb
 - lib/proto/command_interface_handler.rb
+- lib/proto/command_query_handler.rb
 - lib/proto/gen-erl/commandInterface_thrift.erl
 - lib/proto/gen-erl/commandInterface_thrift.hrl
 - lib/proto/gen-erl/poolparty_constants.hrl
@@ -335,6 +336,7 @@ files:
 - test/lib/poolparty/resources/service_test.rb
 - test/lib/poolparty/resources/user_test.rb
 - test/lib/poolparty/resources/variable_test.rb
+- test/lib/proto/command_query_handler_test.rb
 - test/lib/provision/base_test.rb
 - test/lib/provision/bootstrapper_test.rb
 - test/test_helper.rb
@@ -1142,7 +1144,7 @@ rubyforge_project:
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing easy and fun
+summary: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing easier.
 test_files: 
 - test/test_helper.rb
 - test/test_methods.rb