cirrocumulus 0.5.2 → 0.6.0

data/Gemfile

@@ -7,9 +7,12 @@ gem "xmpp4r", "~> 0.5"
 gem "xmpp4r-simple", :git => 'git://github.com/blaine/xmpp4r-simple.git'
 gem "eventmachine"
 gem "deil_sexpistol", :require => "sexpistol"
+gem 'guid'
 
 group :development do
+  #gem "shoulda", ">= 0"
+  gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "jeweler", "~> 1.8.3"
+  #gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -0,0 +1,43 @@
+GIT
+  remote: git://github.com/blaine/xmpp4r-simple.git
+  revision: 92e2cd0002ec3a9a38506527e1a3a2d622408626
+  specs:
+    xmpp4r-simple (0.8.8)
+      xmpp4r (>= 0.3.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (2.3.14)
+    deil_sexpistol (0.0.8)
+    eventmachine (0.12.10)
+    git (1.2.5)
+    guid (0.1.1)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.5)
+    log4r (1.1.10)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    systemu (2.4.2)
+    xmpp4r (0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 2.3.11)
+  bundler (~> 1.0.0)
+  deil_sexpistol
+  eventmachine
+  guid
+  jeweler (~> 1.8.3)
+  log4r (~> 1.1.9)
+  rdoc (~> 3.12)
+  systemu
+  xmpp4r (~> 0.5)
+  xmpp4r-simple!

data/Rakefile

@@ -21,28 +21,12 @@ Jeweler::Tasks.new do |gem|
   gem.description = "Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages"
   gem.email = "deil@mneko.net"
   gem.authors = ["Anton Kosyakin"]
+  gem.required_ruby_version = '>= 1.9.2'
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/cirrocumulus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cirrocumulus"
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Kosyakin"]
-  s.date = "2011-12-01"
+  s.date = "2012-04-10"
   s.description = "Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages"
   s.email = "deil@mneko.net"
   s.extra_rdoc_files = [
@@ -18,30 +18,44 @@ Gem::Specification.new do |s|
   ]
   s.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"
   ]
   s.homepage = "http://github.com/deil/cirrocumulus"
   s.licenses = ["GPL-2"]
   s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.rubygems_version = "1.8.10"
   s.summary = "Agent-based infrastructure management system"
 
@@ -56,9 +70,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<xmpp4r-simple>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<deil_sexpistol>, [">= 0"])
+      s.add_runtime_dependency(%q<guid>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<activesupport>, ["~> 2.3.11"])
       s.add_dependency(%q<log4r>, ["~> 1.1.9"])
@@ -67,9 +82,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<xmpp4r-simple>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<deil_sexpistol>, [">= 0"])
+      s.add_dependency(%q<guid>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
     s.add_dependency(%q<activesupport>, ["~> 2.3.11"])
@@ -79,9 +95,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<xmpp4r-simple>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<deil_sexpistol>, [">= 0"])
+    s.add_dependency(%q<guid>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end
 end
 

data/lib/.gitignore

@@ -0,0 +1,5 @@
+config/*
+ontologies/*
+standalone/*
+agent.rb
+*.log

data/lib/cirrocumulus.rb

@@ -1,4 +1,2 @@
-require 'sexpistol'
-require 'xmpp4r'
-require 'xmpp4r-simple'
 require 'active_support'
+require 'cirrocumulus/logger'

data/lib/cirrocumulus/agent.rb

@@ -1,4 +1,6 @@
 require 'thread'
+require 'systemu'
+require_relative 'jabber_bus'
 
 module Agent
   class AgentInfo
@@ -138,18 +140,32 @@ module Agent
   end
 
   class Base
-    attr_reader :identifier
+    attr_reader :identifier # identifier of running agent
     attr_reader :network_map
 
-    def initialize(cm)
-      Log4r::Logger['agent'].info('Initializing new agent')
+    def initialize(suffix = 'master')
+      Log4r::Logger['agent'].info('Hello world!')
 
-      @cm = cm
-      @identifier = cm.jid
       @ontologies = []
       @message_queues = {}
       @worker_threads = {}
       #@network_map = NetworkMap.new(self)
+
+      @suffix = suffix
+      @identifier = nil
+      @bus = nil
+      @incoming_queue = Queue.new
+    end
+
+    # Gets current platform (linux, freebsd, etc)
+    def platform
+      if RUBY_PLATFORM =~ /freebsd/
+        return 'freebsd'
+      elsif RUBY_PLATFORM =~ /linux/
+        return 'linux'
+      end
+
+      return 'unknown'
     end
 
     # Loads ontologies into agent
@@ -190,52 +206,86 @@ module Agent
       Log4r::Logger['agent'].info 'State restored successfully!'
     end
 
-    # Starts message processing threads
-    def start()
-      start_workers()
+    # Just sends an ACL message to bus
+    def send_message(message)
+      @bus.send_message(message)
     end
 
-    def send_message(message)
-      @cm.send_message(message)
+    # Replies to specified message.
+    # Sends a reply to bus in reply to original message using sender, reply_with and conversation_in
+    def reply_to_message(reply, message)
+      reply.receiver = message.sender
+      reply.in_reply_to = message.reply_with
+      reply.conversation_id = message.conversation_id
+      @bus.send_message(reply)
     end
 
-    def handle_message(message)
-      #@network_map.handle_message(message, @cm)
+    # Start the agent!
+    def start()
+      suffix = default_ontology ? default_ontology.gsub('cirrocumulus-', '') : @suffix
+      _, hostname = systemu('hostname')
+      hostname.strip!
+      @identifier = '%s-%s' % [hostname, suffix]
+
+      @bus = JabberBus.new(@identifier)
+      @bus.start(self)
 
-      self.ontologies.each {|ontology|
-        if message.ontology == ontology.name || ontology.sagas.any? {|saga| saga.id == message.in_reply_to}
-          @message_queues[ontology] << message
-          break
-        end
-      }
+      start_workers
+      restore_state
+      main_loop
+    end
+
+    def process_incoming_message(message)
+      @incoming_queue << message
     end
 
     protected
 
-    attr_reader :cm
     attr_reader :ontologies
 
     def start_workers()
       self.ontologies.each do |ontology|
         @worker_threads[ontology] = Thread.new do
-          Log4r::Logger['agent'].info "Starting worker for ontology %s" % [ontology.name]
-          process_ontology(ontology, @message_queues[ontology])
+          Log4r::Logger['agent'].info 'Starting worker for ontology %s' % [ontology.name]
+          ontology_loop(ontology, @message_queues[ontology])
         end
       end
     end
 
-    def process_ontology(ontology, queue)
+    def ontology_loop(ontology, queue)
       while true do
         message = queue.pop(true) rescue nil
-        begin
-          ontology.handle_incoming_message(message, nil) if message
-        rescue Exception => e
-          Log4r::Logger['agent'].warn "failed to handle incoming message for ontology %s: %s" % [ontology.name, e.to_s]
-          Log4r::Logger['agent'].warn e.backtrace.to_s
+
+        if message
+          begin
+            ontology.handle_incoming_message(message, nil)
+          rescue Exception => e
+            Log4r::Logger['agent'].warn "failed to handle incoming message for ontology %s: %s" % [ontology.name, e.to_s]
+            Log4r::Logger['agent'].warn e.backtrace.to_s
+          end
+        else
+          ontology.tick()
+          sleep 0.2
         end
+      end
+    end
+
+    def main_loop
+      while true
+        message = @incoming_queue.pop(true) rescue nil
+
+        if message
+          next if (message.sender == self.identifier) && !(message.receiver == self.identifier)
 
-        ontology.tick()
-        sleep 0.5
+          ontologies.each do |ontology|
+            if message.ontology == ontology.name || ontology.sagas.any? {|saga| [message.in_reply_to, message.conversation_id].include?(saga.id) }
+              @message_queues[ontology] << message
+              break
+            end
+          end
+        else # sleep if no messages available
+          sleep 0.2
+        end
       end
     end
   end

data/lib/cirrocumulus/agent_wrapper.rb

@@ -9,8 +9,6 @@ end
 require 'yaml'
 require 'cirrocumulus'
 require 'cirrocumulus/logger'
-require 'cirrocumulus/engine'
-require 'cirrocumulus/kb'
 require 'cirrocumulus/ontology'
 require 'cirrocumulus/agent'
 
@@ -45,6 +43,7 @@ ontologies.each do |ontology_name|
   require File.join(AGENT_ROOT, 'ontologies', ontology_name.underscore)
 end
 
+=begin
 kb_name = agent_config['kb']
 kb = if kb_name
   puts "Will load knowledge base %s" % kb_name
@@ -53,12 +52,12 @@ kb = if kb_name
 else
   Kb.new
 end
+=end
 
-cm = Cirrocumulus.new('master')
-a = Agent::Base.new(cm)
-a.load_ontologies(agent_config['ontologies'])
 begin
-  cm.run(a, kb)
+  a = Agent::Base.new
+  a.load_ontologies(agent_config['ontologies'])
+  a.start
 rescue Exception => e
   puts 'Got an error:'
   puts e

data/lib/cirrocumulus/jabber_bus.rb

@@ -0,0 +1,140 @@
+require 'xmpp4r'
+require 'xmpp4r-simple'
+require 'guid'
+require 'sexpistol'
+require_relative 'message'
+
+class JabberBus
+  attr_reader :jid
+
+  def initialize(jid)
+    @jid = jid
+    @send_queue = Queue.new
+
+    Log4r::Logger['bus'].info 'will use Jabber for agent communications'
+  end
+
+  def connected?
+    @jabber && @jabber.connected?
+  end
+
+  def connect
+    Log4r::Logger['bus'].info "logging to #{JABBER_SERVER} as #{jid}"
+
+    begin
+      full_jid = jid + "@" + JABBER_SERVER
+      @jabber = Jabber::Simple.new(full_jid, JABBER_DEFAULT_PASSWORD)
+    rescue Errno::ECONNREFUSED => ex
+      Log4r::Logger['bus'].warn 'connection refused' and return false
+    rescue Jabber::ClientAuthenticationFailure => ex
+      Log4r::Logger['bus'].warn 'got Jabber::ClientAuthenticationFailure'
+      Log4r::Logger['bus'].info 'using default password to register new account'
+
+      client = Jabber::Client.new(full_jid)
+      client.connect()
+      client.register(JABBER_DEFAULT_PASSWORD) #, {'username' => full_jid, 'password' => JABBER_DEFAULT_PASSWORD})
+      client.close()
+      @jabber = Jabber::Simple.new(full_jid, JABBER_DEFAULT_PASSWORD)
+    end
+
+    if connected?
+      Log4r::Logger['bus'].info 'joining ' + JABBER_CONFERENCE
+      @jabber.send!("<presence to='#{JABBER_CONFERENCE}/#{@jid}' />")
+      true
+    else
+      false
+    end
+  rescue
+    false
+  end
+
+  def start(agent)
+    thrd = Thread.new do
+      s = Sexpistol.new
+      while true do
+        begin
+          if connected?
+            @jabber.received_messages do |message|
+              # <fipa-message ontology="cirrocumulus-cloud" act="inform" receiver="sapco-cloud"><content>q</content></fipa-message>
+              next unless message.x('jabber:x:delay').nil?
+
+              begin
+                xml = Hash.from_xml(message.body)['fipa_message']
+                content_raw = xml['content']
+                content = s.parse_string(content_raw)
+                acl = Cirrocumulus::Message.new(message.from.resource, xml['act'], content)
+                acl.receiver = xml['receiver']
+                acl.ontology = xml['ontology']
+                acl.reply_with = xml['reply_with']
+                acl.in_reply_to = xml['in_reply_to']
+                acl.conversation_id = xml['conversation_id']
+                flatten_message_content(acl)
+
+                #Log4r::Logger['bus'].debug(acl.inspect)
+                agent.process_incoming_message(acl)
+              rescue Exception => ex
+                p ex
+                p ex.backtrace
+              end
+            end
+
+            while true do
+              message = @send_queue.pop(true) rescue nil
+              break if message.nil?
+
+              send_message_actual(message)
+            end
+          else
+            sleep 5 unless connect
+          end
+
+          sleep 0.5
+        rescue Exception => ex
+          puts ex.to_s
+          puts ex.backtrace.to_s
+        end
+      end
+    end
+  end
+
+  def send_message(message)
+    @send_queue << message
+  end
+
+  private
+
+  def flatten_message_content(message)
+    if !message.content.is_a?(Array)
+      message.content = [message.content]
+    else
+      while message.content.is_a?(Array) && message.content.size == 1 && message.content.first.is_a?(Array)
+        message.content = message.content.first
+      end
+    end
+  end
+
+  def send_message_actual(message)
+    message_content = message.content if message.content.is_a?(String)
+    message_content = Sexpistol.new.to_sexp(message.content) if message.content.is_a?(Array)
+
+    text = '<fipa-message ontology="%s"' % message.ontology
+    text += ' receiver="%s"' % message.receiver if message.receiver
+    text += ' act="%s"' % message.act
+    text += ' reply-with="%s"' % message.reply_with if message.reply_with
+    text += ' in-reply-to="%s"' % message.in_reply_to if message.in_reply_to
+    text += ' conversation-id="%s"' % message.conversation_id if message.conversation_id
+    text += '><content>%s</content></fipa-message>' % message_content
+    @jabber.send!('<message type="groupchat" to="%s" id="%s"><body>%s</body></message>' % [
+        JABBER_CONFERENCE,
+        Guid.new.to_s.gsub('-', ''),
+        text.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('"', '&quot;')
+    ])
+
+    true
+  rescue Exception => ex
+    puts ex.to_s
+    puts ex.backtrace.to_s
+    false
+  end
+
+end