pangdudu-robots 0.2.3.1 → 0.2.3.2

data/config/start_dbus_session.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dbus-daemon --print-address --config-file=$HOME/.robots/config/remote.session.dbus.conf
+dbus-daemon --print-address --config-file=remote.session.dbus.conf

data/funky-examples/memory-agent/memory_agent.rb

@@ -71,9 +71,20 @@ class MemoryAgent
   
   def initialize
     @roboname = "Active Memory" #name used in alive messages
+    configure #configure the robot
     ilog "#{@roboname} initialized"
   end
   
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
+  end
+  
   #process an incoming memory message
   def process_memory_msg xml_msg
     memories = get_memories xml_msg

data/funky-examples/memory-agent/memory_generator_agent.rb

@@ -16,9 +16,20 @@ class MemoryGeneratorAgent
   
   def initialize
     @roboname = "Memory Generator" #name used in alive messages
+    configure #configure the robot
     ilog "#{@roboname} initialized"
   end
   
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
+  end
+  
   #ROBOTS message parsing stuff
   
   #method that gets called when a new message arrives

data/funky-examples/talking-swift-agent/talking_swift_agent.rb

@@ -18,9 +18,20 @@ class SwiftAgent
   
   def initialize
     @roboname = "Swift Talker" #name used in alive messages
+    configure #configure the robot
     ilog "#{@roboname} initialized"
   end
   
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
+  end
+  
   #method that gets called when a new message arrives
   def receive_msg msg
     check_for_interests msg

data/funky-examples/talking-swift-agent/text_generator.rb

@@ -16,7 +16,18 @@ class TextGenerator
   
   def initialize
     @roboname = "Text Generator" #name used in alive messages
-    ilog "#{@roboname} initialized"  
+    configure #configure the robot
+    ilog "#{@roboname} initialized"
+  end
+  
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
   end
   
   #method that gets called when a new message arrives

data/funky-examples/visualizer-agent/visualizer_agent.rb

@@ -14,10 +14,21 @@ class VisualizerAgent
   
   def initialize argv
     @roboname = "Visualizer" #name used in alive messages
-    ilog "#{@roboname} initialized"
     @width, @height = 800,600
     @app = Qt::Application.new(argv)
     @agents = {} #thats where we register the agents in
+    configure #configure the robot
+    ilog "#{@roboname} initialized"
+  end
+  
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
   end
   
   #process an info message

data/lib/robots.rb

@@ -6,11 +6,19 @@ require 'robots_agent'
 
 module Robots
   
-  attr_accessor :robotsagent,:haz_robots,:hostname
+  attr_accessor :robotsagent,:hostname,:config
   
   #release the robots
   def release_robots
     check_robotsagent
+    @hostname = @config[:localhost]
+    socket_name = "tcp:host=#{@config[:daemonhost]},port=#{@config[:daemonport]},family=ipv4"
+    @config[:robots_socket_name] = socket_name #look at: config/remote.session.dbus.conf
+    #the final steps, to make the robot ready
+    @robotsagent.config = @config
+    @robotsagent.run
+    @robotsagent.add_listener self
+    @robots_running = true
   end
   
   #receives messages from the robots, should be overwritten in the implementing class
@@ -20,7 +28,11 @@ module Robots
 
   #sends messages to the robots, should be overwritten in the implementing class
   def send_msg msg
-    @robotsagent.send_msg msg if @haz_robots
+    if @robots_running
+      @robotsagent.send_msg msg
+    else
+      wlog "Robot not yet running, can't send message."
+    end
   end
   
   #check if robots are set up
@@ -28,11 +40,25 @@ module Robots
     @haz_robots = @robotsagent.nil?
     if @haz_robots
       @robotsagent = Robot.new
-      @hostname = @robotsagent.config[:hostname]
-      @robotsagent.run
-      @robotsagent.add_listener self
+    end
+    if @config.nil?
+      wlog "No config supplied! Will use default config."
+      @config = get_default_config
     end 
     return @haz_robots
   end
   
+  #this is the default config, you can modify the values, than pass it to the agent  
+  def get_default_config
+    config = {}
+    config[:localhost] = Socket.gethostname
+    config[:daemonhost] = "localhost"
+    config[:daemonport] = "2687"
+    config[:sshcookie] = false #if you want to connect remotely, change this value
+    config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    config[:robotsservice] = "org.robots.Service"
+    config[:emitterpath] = "/org/robots/Service/Emitter"
+    config[:emitterinterface] = "org.robots.Service.EmitterInterface"
+    return config
+  end
 end

data/lib/robots_agent.rb

@@ -11,28 +11,17 @@ class Robot
   
   def initialize
     dlog "new Robot initialized."
-    @config = get_default_config
     @coreservice, @dbussession = nil,nil
     @listeners,@emitters,@infrastructure = [],{},{}
     @servicetypes = fill_servicetypes #refer to robots_infrastructure.rb
   end
   
-  def get_default_config
-    config = {}
-    config[:localhost] = Socket.gethostname
-    config[:daemonhost] = "127.0.0.1"
-    config[:daemonport] = "2687"
-    config[:remote] = false #if you want to connect remotely, change this value
-    config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
-    config[:robots_socket_name] = "tcp:host=#{config[:daemonhost]},port=#{config[:daemonport]},family=ipv4" #look at: ~/.robots/config/remote.session.dbus.conf
-    config[:robotsservice] = "org.robots.Service"
-    config[:emitterpath] = "/org/robots/Service/Emitter"
-    config[:emitterinterface] = "org.robots.Service.EmitterInterface"
-    return config
-  end
-  
   #start the mojo
   def run
+    if @config.nil?
+      elog "Agent not configured, exiting!"
+      exit(0)
+    end
     setup_robots_service
     register_callbacks
     #test_messages; #main_loop;
@@ -199,7 +188,7 @@ class Robot
       @dbussession = DBus::SessionBus.instance if @config[:sessiontype].eql? "session"
       if @config[:sessiontype].eql? "robots"
        DBus.const_set("SessionSocketName", @config[:robots_socket_name]) #overwrite the modules constant
-       evil_hack_remote_cookie if @config[:remote] #i need not say more,...
+       get_remote_cookie if @config[:sshcookie] #i need not say more,...
        @dbussession = DBus::SessionBus.instance
       end
     end
@@ -212,7 +201,7 @@ class Robot
   end
 
   #because dbus remote auth still betrays us, we need to hack it
-  def evil_hack_remote_cookie
+  def get_remote_cookie
     if @config[:robots_socket_name].include? "tcp:"
       af, port, daemon_name, daemon_addr = (Socket::getaddrinfo(@config[:daemonhost],@config[:daemonhost].to_i)).first
       ilog "Trying to get/hack remote cookie from: #{daemon_name}."

data/lib/robots_prototype.rb

@@ -12,11 +12,22 @@ class RobotsProto
   include Robots
   include RobotsXml
   
-  attr_accessor :roboname
+  attr_accessor :roboname,:config
   
   def initialize
     @roboname = "Robots Prototype" #name used in alive messages
-    ilog "RobotsProto initialized"
+    configure #configure the robot
+    ilog "#{@roboname} initialized"
+  end
+  
+  #configure the robot using a default config
+  def configure
+    @config = get_default_config #get the default config from the module
+    #config values
+    @config[:sessiontype] = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
+    @config[:daemonhost] = "localhost"
+    @config[:daemonport] = "2687"
+    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
   end
   
   #method that gets called when a new message arrives
@@ -29,9 +40,6 @@ class RobotsProto
     #message filter callback looks like this now
     info = parse_xml_msg xml_msg,"//info"
     dlog info unless info.empty?
-    #and one that doesn't work, unless you add this tag to the xml
-    notfound = parse_xml_msg xml_msg,"//thereisnosuchtag"
-    dlog notfound unless notfound.empty?
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangdudu-robots
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.1
+  version: 0.2.3.2
 platform: ruby
 authors: 
 - pangdudu
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: robots
 dependencies: 
 - !ruby/object:Gem::Dependency