cirrocumulus 0.4.3 → 0.4.4

data/Gemfile

@@ -5,6 +5,7 @@ gem "log4r", "~> 1.1.9"
 gem "systemu"
 gem "xmpp4r", "~> 0.5"
 gem "xmpp4r-simple", "~> 0.8.8"
+gem "eventmachine"
 gem "deil_sexpistol", :require => "sexpistol"
 
 group :development do

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   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)
@@ -23,6 +24,7 @@ DEPENDENCIES
   activesupport (~> 2.3.11)
   bundler (~> 1.0.0)
   deil_sexpistol
+  eventmachine
   jeweler (~> 1.6.4)
   log4r (~> 1.1.9)
   rcov

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/cirrocumulus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cirrocumulus}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Kosyakin"]
-  s.date = %q{2011-10-20}
+  s.date = %q{2011-10-24}
   s.description = %q{Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages}
   s.email = %q{deil@mneko.net}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/cirrocumulus/master_agent.rb",
     "lib/cirrocumulus/ontology.rb",
     "lib/cirrocumulus/rule_engine.rb",
+    "lib/cirrocumulus/rule_server.rb",
     "lib/cirrocumulus/saga.rb",
     "lib/test.rb",
     "test/helper.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<systemu>, [">= 0"])
       s.add_runtime_dependency(%q<xmpp4r>, ["~> 0.5"])
       s.add_runtime_dependency(%q<xmpp4r-simple>, ["~> 0.8.8"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<deil_sexpistol>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -64,6 +66,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<systemu>, [">= 0"])
       s.add_dependency(%q<xmpp4r>, ["~> 0.5"])
       s.add_dependency(%q<xmpp4r-simple>, ["~> 0.8.8"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<deil_sexpistol>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -75,6 +78,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<systemu>, [">= 0"])
     s.add_dependency(%q<xmpp4r>, ["~> 0.5"])
     s.add_dependency(%q<xmpp4r-simple>, ["~> 0.8.8"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<deil_sexpistol>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/cirrocumulus/master_agent.rb

@@ -186,7 +186,11 @@ module Agent
 
     def handle_message(message, kb)
       @network_map.handle_message(message, @cm)
-      self.ontologies.each {|ontology| ontology.handle_incoming_message(message, kb) or return if message.ontology == ontology.name} # return from loop if message was handled; 'or' is correct
+      self.ontologies.each {|ontology|
+        if message.ontology == ontology.name || ontology.sagas.any? {|saga| saga.id == message.in_reply_to}
+          ontology.handle_incoming_message(message, kb)
+        end
+      }
     rescue Exception => e
       Log4r::Logger['agent'].warn "failed to handle incoming message: %s" % e.to_s
       puts e.backtrace.to_s

data/lib/cirrocumulus/ontology.rb

@@ -2,6 +2,7 @@ module Ontology
   class Base
     attr_reader :name
     attr_reader :agent
+    attr_reader :sagas
 
     def initialize(name, agent)
       @name = name

data/lib/cirrocumulus/rule_server.rb

@@ -0,0 +1,49 @@
+require 'eventmachine'
+require 'sexpistol'
+require 'log4r'
+
+module RuleEngine
+  class Server < EventMachine::Connection
+    def self.run
+      l = Log4r::Logger.new('kb')
+      o = Log4r::StdoutOutputter.new('console')
+      l.outputters << o
+      
+      EventMachine.run do
+        Signal.trap("INT") { EventMachine.stop }
+        Signal.trap("TERM") { EventMachine.stop }
+        
+        EventMachine.start_server('127.0.0.1', 2812, self)
+      end
+    end
+    
+    attr_reader :engine
+    
+    def initialize()
+      @engine = Test.new
+    end
+
+    def receive_data(data)
+      s = Sexpistol.new
+      sexp = s.parse_string(data)
+      if sexp.first == :assert
+        engine.assert get_fact(sexp)
+      elsif sexp.first == :retract
+        engine.retract get_fact(sexp)
+      elsif sexp.first == :query
+        send_data engine.query(get_fact(sexp))
+      else
+        puts sexp.inspect
+      end
+    rescue Exception => ex
+      puts ex.to_s
+    end
+    
+    protected
+    
+    def get_fact(sexp)
+      sexp[1]
+    end
+    
+  end
+end

data/lib/test.rb

@@ -1,7 +1,9 @@
 require 'cirrocumulus/rule_engine.rb'
+require 'cirrocumulus/rule_server.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
@@ -15,6 +17,8 @@ class Test < RuleEngine::Base
   end
 end
 
+RuleEngine::Server.run()
+
 e = Test.new
 e.assert [:virtual_disk, 163, :active]
 #e.assert [:virtual_disk, 139, :active]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cirrocumulus
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Anton Kosyakin
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 +04:00
+date: 2011-10-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  name: activesupport
   requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +46,11 @@ dependencies:
         - 1
         - 9
         version: 1.1.9
-  name: log4r
   requirement: *id002
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: log4r
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: systemu
   requirement: *id003
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: systemu
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +75,11 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  name: xmpp4r
   requirement: *id004
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: xmpp4r
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +91,11 @@ dependencies:
         - 8
         - 8
         version: 0.8.8
-  name: xmpp4r-simple
   requirement: *id005
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: xmpp4r-simple
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,12 +105,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: deil_sexpistol
   requirement: *id006
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  name: eventmachine
   prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  type: :runtime
+  name: deil_sexpistol
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,12 +135,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  requirement: *id007
+  requirement: *id008
   type: :development
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,12 +151,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  requirement: *id008
+  requirement: *id009
   type: :development
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,9 +165,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  requirement: *id009
+  requirement: *id010
   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
 email: deil@mneko.net
 executables: []
@@ -181,6 +195,7 @@ files:
 - lib/cirrocumulus/master_agent.rb
 - lib/cirrocumulus/ontology.rb
 - lib/cirrocumulus/rule_engine.rb
+- lib/cirrocumulus/rule_server.rb
 - lib/cirrocumulus/saga.rb
 - lib/test.rb
 - test/helper.rb