auser-poolparty 1.3.11 → 1.3.12

data/VERSION.yml

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

data/bin/cloud-thrift

@@ -72,7 +72,11 @@ EOS
         server = Thrift::SimpleServer.new(processor, transport, transportFactory)
 
         puts "Starting the cloud server..."
-        server.serve()
+        begin
+          server.serve()
+        rescue
+          exit 10
+        end
         puts "done."
       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"

data/lib/poolparty/cloud.rb

@@ -239,7 +239,7 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
     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
@@ -250,6 +250,16 @@ Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}
       @monitors ||= {}
     end
     
+    def monitor_format(mon_name, meth, &block)
+      delayed_action do
+        if monitors.has_key?(mon_name)
+          monitors[mon_name].format(meth, &block)
+        else
+          raise PoolPartyError.create("MonitorsFormattingError", "You created a monitor format for an unknown monitor. Please check and try again!")
+        end
+      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
@@ -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/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/test/lib/poolparty/cloud_test.rb

@@ -158,13 +158,18 @@ 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.8
+        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

data/test/lib/poolparty/monitor_test.rb

@@ -27,4 +27,32 @@ 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 do |d|
+      return *d.split(",")
+    end
+    assert_equal({:hello => []}, mon.run("hello, world"))
+    assert_equal({:short => []}, mon.run("good day"))
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.11
+  version: 1.3.12
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -1114,6 +1114,7 @@ files:
 - vendor/gems/trollop/www/index.html
 has_rdoc: false
 homepage: http://poolpartyrb.com
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --quiet
@@ -1139,10 +1140,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 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