cirrocumulus 0.4.6 → 0.5.2

data/lib/cirrocumulus/rules/run_queue.rb

@@ -0,0 +1,108 @@
+require 'thread'
+
+module RuleEngine
+  class QueueEntry
+    attr_reader :rule
+    attr_reader :params
+    attr_reader :run_at
+    attr_accessor :state
+
+    def initialize(rule, params, run_at = nil)
+      @rule = rule
+      @params = params
+      @run_at = run_at
+      @state = :queued
+    end
+  end
+
+  class RunQueue
+    def initialize(engine)
+      @engine = engine
+      @queue = []
+      @running_rules = []
+      @mutex = Mutex.new
+    end
+
+    def enqueue(rule, params)
+      @mutex.synchronize do
+        if !already_queued?(rule, params)
+          debug "Enqueueing rule #{rule.name}#{params.inspect}"
+
+          if !rule.options.blank? && rule.options.include?(:for)
+            delay = rule.options[:for]
+            run_at = Time.now + delay
+            debug "Will run this rule after #{delay.to_s} sec (at #{run_at.strftime("%H:%M:%S %d.%m.%Y")})"
+            @queue << QueueEntry.new(rule, params, run_at)
+          else
+            @queue << QueueEntry.new(rule, params)
+          end
+        end
+      end
+    end
+
+    def run_queued_rules()
+      rules_for_running = Queue.new
+      @mutex.synchronize do
+        count = @queue.count {|entry| entry.state == :queued}
+
+        if count > 0
+          debug "There are #{count} rules waiting, running.." if count > 1
+
+          idx = 0
+          while count > 0
+            entry = @queue[idx]
+
+            if entry.state != :queued
+              idx += 1
+              next
+            end
+
+            if entry.run_at.blank? || (entry.run_at <= Time.now)
+              rules_for_running << entry
+              entry.state = :running
+            end
+
+            count -= 1
+          end
+        end
+      end
+
+      while !rules_for_running.empty? do
+        entry = rules_for_running.pop
+        begin
+          debug "Executing #{entry.rule.name}#{entry.params.inspect}"
+          entry.rule.code.call(@engine, entry.params)
+          entry.state = :finished # TODO: cleanup @queue from this entries
+        rescue Exception => e
+          Log4r::Logger['kb'].warn "Exception while executing rule: %s\n%s" % [e.to_s, e.backtrace.to_s]
+        end
+      end
+    end
+
+    private
+
+    def already_queued?(rule, params)
+      return false if @queue.empty?
+
+      @queue.each do |queued_rule|
+        next if queued_rule.rule.name != rule.name
+        return true if params === queued_rule.params && queued_rule.state != :finished
+      end
+
+      false
+    end
+
+    def log(msg)
+      Log4r::Logger['kb'].info(msg)
+    rescue
+      puts "[INFO] %s" % msg
+    end
+
+    def debug(msg)
+      Log4r::Logger['kb'].debug(msg)
+    rescue
+      puts "[DEBUG] %s" % msg
+    end
+
+  end
+end

metadata

@@ -1,187 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cirrocumulus
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 6
-  version: 0.4.6
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Anton Kosyakin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-27 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &77891350 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 3
-        - 11
+      - !ruby/object:Gem::Version
         version: 2.3.11
-  requirement: *id001
   type: :runtime
-  name: activesupport
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *77891350
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &77890270 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.1.9
-  requirement: *id002
   type: :runtime
-  name: log4r
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *77890270
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: &77888870 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: systemu
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *77888870
+- !ruby/object:Gem::Dependency
+  name: xmpp4r
+  requirement: &77888390 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  name: xmpp4r
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *77888390
+- !ruby/object:Gem::Dependency
+  name: xmpp4r-simple
+  requirement: &77887740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 8
-        - 8
-        version: 0.8.8
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: xmpp4r-simple
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *77887740
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &77886600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: eventmachine
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *77886600
+- !ruby/object:Gem::Dependency
+  name: deil_sexpistol
+  requirement: &77885090 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: deil_sexpistol
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *77885090
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &78301580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id008
   type: :development
-  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *78301580
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &78300700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id009
   type: :development
-  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *78300700
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &78299830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
   prerelease: false
-description: Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages
+  version_requirements: *78299830
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -189,50 +139,44 @@ files:
 - cirrocumulus.gemspec
 - lib/cirrocumulus.rb
 - lib/cirrocumulus/agent.rb
+- lib/cirrocumulus/agent_wrapper.rb
 - lib/cirrocumulus/engine.rb
 - lib/cirrocumulus/kb.rb
 - lib/cirrocumulus/logger.rb
-- lib/cirrocumulus/master_agent.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
 - test/helper.rb
 - test/test_cirrocumulus.rb
-has_rdoc: true
 homepage: http://github.com/deil/cirrocumulus
-licenses: 
+licenses:
 - GPL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 821784403
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Agent-based infrastructure management system
 test_files: []
-

data/Gemfile.lock

@@ -1,33 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (2.3.14)
-    deil_sexpistol (0.0.8)
-    eventmachine (0.12.10)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    log4r (1.1.9)
-    rake (0.9.2)
-    rcov (0.9.10)
-    systemu (2.3.0)
-    xmpp4r (0.5)
-    xmpp4r-simple (0.8.8)
-      xmpp4r (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 2.3.11)
-  bundler (~> 1.0.0)
-  deil_sexpistol
-  eventmachine
-  jeweler (~> 1.6.4)
-  log4r (~> 1.1.9)
-  rcov
-  systemu
-  xmpp4r (~> 0.5)
-  xmpp4r-simple (~> 0.8.8)