cirrocumulus 0.1.4 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.3

data/cirrocumulus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cirrocumulus}
-  s.version = "0.1.4"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Kosyakin"]
-  s.date = %q{2011-09-14}
+  s.date = %q{2011-09-16}
   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 = [

data/lib/cirrocumulus/engine.rb

@@ -45,13 +45,10 @@ class Cirrocumulus
 
   def initialize(suffix, generate_jid = true)
     Log4r::Logger['cirrocumulus'].info 'platform: ' + Cirrocumulus::platform
-    _, hostname = systemu 'hostname'
-    hostname.strip!
-    @jid = generate_jid ? "#{hostname}-#{suffix}" : suffix
-    Log4r::Logger['cirrocumulus'].info "logging as " + @jid
-    connect()
+    @suffix = suffix
+    @generate_jid = generate_jid
   end
-  
+
   def send(message)
     msg = "<fipa-message ontology=\"#{message.ontology}\""
     msg += " receiver=\"#{message.receiver}\"" if message.receiver
@@ -85,6 +82,17 @@ class Cirrocumulus
   end
 
   def run(agent, kb, sniff = false)
+    suffix = agent.default_ontology ? agent.default_ontology.gsub('cirrocumulus-', '') : @suffix
+    @jid = if @generate_jid
+      _, hostname = systemu 'hostname'
+      hostname.strip!
+      "%s-%s" % [hostname, suffix]
+    else
+      suffix
+    end
+    Log4r::Logger['cirrocumulus'].info "logging as " + @jid
+    connect()
+
     Log4r::Logger['cirrocumulus'].info("entering main loop")
     agent.restore_state()
     

data/lib/cirrocumulus/master_agent.rb

@@ -155,6 +155,10 @@ module Agent
       end
     end
 
+    def default_ontology
+      self.ontologies.size == 1 ? self.ontologies.first.name : nil
+    end
+
     def handles_ontology?(ontology_name)
       self.ontologies.any? {|ontology| ontology.name == ontology_name}
     end
@@ -182,7 +186,7 @@ module Agent
 
     def handle_message(message, kb)
       @network_map.handle_message(message, @cm)
-      self.ontologies.each {|ontology| ontology.handle_message(message, kb) if message.ontology == ontology.name}
+      self.ontologies.each {|ontology| ontology.handle_incoming_message(message, kb) if message.ontology == ontology.name}
     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

@@ -6,6 +6,8 @@ module Ontology
     def initialize(name, agent)
       @name = name
       @agent = agent
+      @sagas = []
+      @saga_idx = 0
     end
 
     def restore_state()
@@ -13,14 +15,38 @@ module Ontology
     end
 
     def tick()
+      @sagas.each do |saga|
+        next if saga.is_finished?
+        saga.timeout -= 1 if saga.timeout > 0
+        saga.handle(nil) if saga.timeout == 0
+      end
+
+      handle_tick()
     end
 
-    def handle_message(message, kb)
-      puts "call to dummy Ontology::Base.handle_message()"
+    def handle_incoming_message(message, kb)
+      was_processed = false
+      @sagas.each do |saga|
+        next if saga.is_finished?
+
+        if saga.id == message.in_reply_to
+          was_processed = true
+          saga.handle(message)
+        end
+      end
+
+      handle_message(message, kb) if !was_processed
     end
 
     protected
 
+    def handle_tick()
+    end
+
+    def handle_message(message, kb)
+      puts "call to dummy Ontology::Base.handle_message()"
+    end
+
     def logger
       Log4r::Logger['agent']
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cirrocumulus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Anton Kosyakin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 +04:00
+date: 2011-09-16 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency