cirrocumulus 0.5.2 → 0.6.0

data/lib/cirrocumulus/message.rb

@@ -0,0 +1,67 @@
+module Cirrocumulus
+  # Message. Used by agents to communicate
+  class Message
+    attr_accessor :sender, :act, :content
+    attr_accessor :receiver, :reply_with, :in_reply_to, :conversation_id
+    attr_accessor :ontology
+
+    def initialize(sender, act, content)
+      @sender = sender
+      @act = act
+      @content = content
+    end
+
+    def failed?
+      act == 'failure' || act == 'refuse'
+    end
+
+    def context
+      Context.new(@sender, @reply_with)
+    end
+
+    def self.parse_params(content, subroutine = false)
+      return parse_params(content.size == 1 ? content[0] : content, true)  if !subroutine
+
+      return [] if content.nil?
+      return content if !content.is_a?(Array)
+      return [] if content.size == 0
+      return {content[0] => []} if content.size == 1
+      return {content[0] => parse_params(content[1], true)} if content.size == 2
+
+      res = {content[0] => []}
+
+      if content.all? {|item| !item.is_a?(Array)}
+        content.each_with_index do |item,i|
+          if i == 0
+            res[content[0]] = []
+          else
+            res[content[0]] << item
+          end
+        end
+      else
+        content.each_with_index do |item,i|
+          if i == 0
+            res[content[0]] = {}
+          else
+            res[content[0]].merge!(parse_params(item, true))
+          end
+        end
+      end
+
+      res
+    end
+  end
+
+  # Message context. Includes sender, reply-with and conversation-id
+  class Context
+    attr_reader :sender
+    attr_reader :reply_with
+    attr_reader :conversation_id
+
+    def initialize(sender, reply_with, conversation_id = nil)
+      @sender = sender
+      @reply_with = reply_with
+      @conversation_id = conversation_id
+    end
+  end
+end

data/lib/cirrocumulus/ontology.rb

@@ -17,11 +17,13 @@ module Ontology
     end
 
     def tick()
+      time = Time.now.to_i
+
       @sagas.each do |saga|
         next if saga.is_finished?
+
         begin
-          saga.timeout -= 1 if saga.timeout > 0
-          saga.handle(nil) if saga.timeout == 0
+          saga.handle(nil) if saga.timed_out?(time)
         rescue Exception => e
           Log4r::Logger['agent'].warn "Got exception while ticking saga: %s\n%s" % [e.to_s, e.backtrace.to_s]
         end
@@ -35,7 +37,7 @@ module Ontology
       @sagas.each do |saga|
         next if saga.is_finished?
 
-        if saga.id == message.in_reply_to
+        if [message.in_reply_to, message.conversation_id].include?(saga.id)
           was_processed = true
           saga.handle(message)
         end

data/lib/cirrocumulus/rules/engine.rb

@@ -1,6 +1,8 @@
 require 'thread'
 
 module RuleEngine
+  # Rule representation.
+  # After processing a ruleset, all rules are wrapped with this object.
   class RuleDescription
     attr_reader :name
     attr_reader :conditions
@@ -13,10 +15,12 @@ module RuleEngine
       @options = options
       @code = code
     end
-
   end
 
+  # Core class for Cirrocumulus Rule Engine.
+  # All the magic about asserting/retracting facts and pattern-matching is performed here.
   class Base
+    # DSL-method for defining rules.
     def self.rule(name, facts, options = {}, &block)
       current_ruleset << RuleDescription.new(name, facts, options, block)
     end
@@ -47,22 +51,32 @@ module RuleEngine
       log "Empty ruleset" if self.class.current_ruleset.empty?
     end
 
+    # Asserts new fact. If 'silent' is set to true, does not perform any associated rules
+    #
+    # * *Returns* :
+    #   - nothing
     def assert(fact, silent = false)
       @mutex.synchronize do
         assert_nonblocking(fact, silent)
       end
     end
 
+    # Retracts an existing fact. If 'silent' is set to true, does not perform any associated rules
+    #
+    # * *Returns* :
+    #   - nothing
     def retract(fact, silent = false)
       @mutex.synchronize do
         retract_nonblocking(fact, silent)
       end
     end
 
+    # Replaces fact value
+    #
+    # * *Returns* :
+    #   - nothing
     def replace(pattern, values)
       @mutex.synchronize do
-        log "replace #{pattern.inspect} for #{values.inspect}"
-
         data = match(pattern)
         data.each do |match_data|
           old_fact = pattern.clone
@@ -74,8 +88,18 @@ module RuleEngine
             end
           end
 
-          retract_nonblocking(old_fact, true)
-          assert_nonblocking(new_fact)
+          facts_are_same = true
+          old_fact.each_with_index do |item, idx|
+            new_item = new_fact[idx]
+            facts_are_same = false if new_item != item
+          end
+
+          unless facts_are_same
+            log "replace #{pattern.inspect} for #{values.inspect}"
+
+            retract_nonblocking(old_fact, true)
+            assert_nonblocking(new_fact)
+          end
         end
       end
     end
@@ -94,6 +118,7 @@ module RuleEngine
       res
     end
 
+    # Starts this rule engine instance.
     def start()
       @worker_thread = Thread.new do
         while true do
@@ -103,6 +128,7 @@ module RuleEngine
       end
     end
 
+    # Executes all associated with current KB rules. Normally, this shouldn't be called by the programmer.
     def execute()
       process()
     end

data/lib/cirrocumulus/saga.rb

@@ -2,7 +2,6 @@ class Saga
   attr_reader :id
   attr_reader :context
   attr_reader :finished
-  attr_accessor :timeout
 
   DEFAULT_TIMEOUT = 15
   LONG_TIMEOUT = 60
@@ -15,7 +14,7 @@ class Saga
     @id = id
     @ontology = ontology
     @finished = false
-    @timeout = -1
+    @timeout_at = -1
     @state = STATE_START
   end
 
@@ -23,15 +22,19 @@ class Saga
     @finished || @state == STATE_ERROR
   end
 
+  def timed_out?(time)
+    @timeout_at > 0 && @timeout_at <= time
+  end
+
   protected
 
   def clear_timeout()
-    @timeout = -1
+    @timeout_at = -1
   end
 
   def set_timeout(secs)
     Log4r::Logger['agent'].debug "[#{id}] waiting for #{secs} second(s)" if secs > 1
-    @timeout = secs*2
+    @timeout_at = Time.now.to_i + secs
   end
   
   def change_state(new_state)

data/lib/test.rb

@@ -0,0 +1,68 @@
+require 'bundler/setup'
+require_relative 'cirrocumulus'
+require_relative 'cirrocumulus/engine'
+
+puts Cirrocumulus::PLATFORM
+exit 0
+#require_relative 'cirrocumulus/rule_engine.rb'
+
+class Test < RuleEngine::Base
+  rule 'convert', [[:temperature, :X, 'F']] do |engine, params|
+    puts "qqq"
+    x = params[:X].to_i
+    engine.retract([:temperature, x, 'F'])
+    y = 5*(x - 32)/9
+    engine.assert([:temperature, y, 'C'])
+  end
+  
+  rule 'guest_powered_off', [[:guest, :X, :powered_off]], :for => 10.seconds do |engine, params|
+    puts "guest_powered_off"
+  end
+  
+  rule 'monitor_md', [[:virtual_disk, :X, :active], [:mdraid, :X, :failed]] do |engine, params|
+    # md devices is failed, but virtual disk should be up
+    p params
+    puts "virtual disk #{params[:X]} should be up, but corresponding md devices is failed!"
+  end
+end
+
+#RuleEngine::Server.run()
+
+e = Test.new
+e.assert [:guest, "233bed174ab0802fd908f981d64d185b", :powered_off]
+e.assert [:guest, "233bed174ab0802fd908f981d64d185b", :running]
+e.assert [:guest, "233bed174ab0802fd908f981d64d185b", :state, :powered_on]
+e.replace [:guest, "233bed174ab0802fd908f981d64d185b", :state, :STATE], :powered_off
+
+p e.match [:guest, "233bed174ab0802fd908f981d64d185b", :running]
+#while true do
+  e.tick()
+#  sleep 1
+#end
+
+gets
+e.dump_kb()
+exit(0)
+
+e.assert [:virtual_disk, 163, :active]
+#e.assert [:virtual_disk, 139, :active]
+#e.assert [:virtual_disk, 145, :active]
+#e.assert [:virtual_disk, 146, :active]
+#e.assert [:virtual_disk, 149, :active]
+e.assert [:virtual_disk, 153, :active]
+#e.assert [:virtual_disk, 154, :active]
+#e.assert [:virtual_disk, 156, :active]
+e.assert [:virtual_disk, 158, :active]
+#e.assert [:virtual_disk, 137, :active]
+#e.assert [:virtual_disk, 135, :active]
+#e.assert [:virtual_disk, 159, :active]
+#e.assert [:virtual_disk, 103, :active]
+#e.assert [:virtual_disk, 102, :active]
+#e.assert [:virtual_disk, 20, :active]
+#e.assert [:virtual_disk, 2, :active]
+#e.assert [:virtual_disk, 777, :active]
+#e.assert [:virtual_disk, 90, :active]
+e.assert [:mdraid, 153, :failed], true
+e.assert [:mdraid, 158, :failed], true
+e.execute()
+gets

data/lib/test2.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'sexpistol'
+
+def map_sub(arr)
+  return [] if arr.nil?
+  return arr if !arr.is_a?(Array)
+  return [] if arr.size == 0
+  return {arr[0] => []} if arr.size == 1
+  return {arr[0] => map_sub(arr[1])} if arr.size == 2
+
+  res = {arr[0] => []}
+  
+  arr.each_with_index do |item,i|
+    next if i == 0
+    res[arr[0]] << map_sub(item)
+  end
+
+  res
+end
+
+def map(arr)
+  return map_sub(arr[0]) if arr.size == 1
+  return map_sub(arr)
+end
+
+s = Sexpistol.new
+e = s.parse_string "(create (vds (ram 256) (eth \"1\" \"2\")))"
+
+p e
+p map(e)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirrocumulus
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77891350 !ruby/object:Gem::Requirement
+  requirement: &72357370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *77891350
+  version_requirements: *72357370
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &77890270 !ruby/object:Gem::Requirement
+  requirement: &72356070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *77890270
+  version_requirements: *72356070
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &77888870 !ruby/object:Gem::Requirement
+  requirement: &71921240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77888870
+  version_requirements: *71921240
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &77888390 !ruby/object:Gem::Requirement
+  requirement: &71920240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *77888390
+  version_requirements: *71920240
 - !ruby/object:Gem::Dependency
   name: xmpp4r-simple
-  requirement: &77887740 !ruby/object:Gem::Requirement
+  requirement: &71919220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77887740
+  version_requirements: *71919220
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &77886600 !ruby/object:Gem::Requirement
+  requirement: &71916250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77886600
+  version_requirements: *71916250
 - !ruby/object:Gem::Dependency
   name: deil_sexpistol
-  requirement: &77885090 !ruby/object:Gem::Requirement
+  requirement: &71914020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,40 +87,51 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77885090
+  version_requirements: *71914020
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &78301580 !ruby/object:Gem::Requirement
+  name: guid
+  requirement: &71931850 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *71931850
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &71930640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78301580
+  version_requirements: *71930640
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &78300700 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &71928880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78300700
+  version_requirements: *71928880
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &78299830 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &71927190 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *78299830
+  version_requirements: *71927190
 description: Engine for building your own agents, providing you base functionality
   for loading ontologies, communicating with other agents and parsing FIPA-ACL messages
 email: deil@mneko.net
@@ -131,24 +142,37 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .idea/.name
+- .idea/.rakeTasks
+- .idea/cirrocumulus.iml
+- .idea/encodings.xml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
+- .idea/workspace.xml
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - cirrocumulus.gemspec
+- lib/.gitignore
 - lib/cirrocumulus.rb
 - lib/cirrocumulus/agent.rb
 - lib/cirrocumulus/agent_wrapper.rb
-- lib/cirrocumulus/engine.rb
-- lib/cirrocumulus/kb.rb
+- lib/cirrocumulus/jabber_bus.rb
 - lib/cirrocumulus/logger.rb
+- lib/cirrocumulus/message.rb
 - lib/cirrocumulus/ontology.rb
 - lib/cirrocumulus/rule_engine.rb
 - lib/cirrocumulus/rule_server.rb
 - lib/cirrocumulus/rules/engine.rb
 - lib/cirrocumulus/rules/run_queue.rb
 - lib/cirrocumulus/saga.rb
+- lib/test.rb
+- lib/test2.rb
 - test/helper.rb
 - test/test_cirrocumulus.rb
 homepage: http://github.com/deil/cirrocumulus
@@ -163,10 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 821784403
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: