pangdudu-robots 0.2.3.2 → 0.2.3.3

data/config/start_dbus_session.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
+avahi-publish-service "Robots IPC cluster server" _robots._tcp 2687 &
 dbus-daemon --print-address --config-file=remote.session.dbus.conf

data/lib/robots.rb

@@ -1,7 +1,7 @@
 require 'socket' #to get hostname etc.
 require 'rubygems'
 require 'rofl' #gem install pangdudu-rofl --source=http://gems.github.com
-#local requires, actually don't need them, just to let you know whats going on
+#local requires
 require 'robots_agent'
 
 module Robots
@@ -21,6 +21,8 @@ module Robots
     @robots_running = true
   end
   
+  #OVERWRITE FOLLOWING METHODS:
+  
   #receives messages from the robots, should be overwritten in the implementing class
   def receive_msg msg
     ilog msg
@@ -35,6 +37,8 @@ module Robots
     end
   end
   
+  #OVERWRITE END
+  
   #check if robots are set up
   def check_robotsagent
     @haz_robots = @robotsagent.nil?

data/lib/robots_agent.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'dbus' #gem install pangdudu-ruby-dbus --source=http://gems.github.com
-require 'rofl' #gem install pangdudu-rofl --source=http://gems.github.com
-#local requires, actually don't need them, just to let you know whats going on
+require 'dbus'
+require 'rofl'
+#local requires
 require 'robots_infrastructure'
 
 class Robot
@@ -13,6 +13,9 @@ class Robot
     dlog "new Robot initialized."
     @coreservice, @dbussession = nil,nil
     @listeners,@emitters,@infrastructure = [],{},{}
+    @remote_robots_daemons = [] #we'll use avahi service discovery to fill this
+    @system_bus = DBus::SystemBus.instance #we'll need this all over
+    @active_busses = [] #we'll add them to the dbus loop later on
     @servicetypes = fill_servicetypes #refer to robots_infrastructure.rb
   end
   
@@ -22,9 +25,26 @@ class Robot
       elog "Agent not configured, exiting!"
       exit(0)
     end
-    setup_robots_service
-    register_callbacks
-    #test_messages; #main_loop;
+    #we can always register the system (avahi) services, because they don't depend on the robots infrastructure
+    register_system_callbacks
+    #if our session is connecting to a special (remote robots) daemon, we need a little more care
+    if @config[:sessiontype].eql? "robots"
+      #if a host and a port were specified, we can connect directly
+      unless @config[:daemonhost].eql?("avahi") and @config[:daemonport].eql?("avahi")
+        setup_robots_service
+        register_robots_callbacks
+      else
+        dlog "Using avahi auto daemon discovery!"
+        dlog "Remote daemons found: #{@remote_robots_daemons.inspect}"
+        exit(0)
+      end
+    end
+    #if the session uses the system or session bus, everythings easy
+    unless @config[:sessiontype].eql? "robots"
+      setup_robots_service
+      register_robots_callbacks      
+    end
+    #finally get into the dbus loop
   end
 
   #setup the robots service
@@ -91,23 +111,66 @@ class Robot
       return nil
     end
   end 
-  
-  #register callback methods
-  def register_callbacks
-    #setup callbacks for infrastructure emitters
-    @emitters.each { |name,emitter| register_emitter_callback name,emitter }
+   
+  #register callbacks for avahi service discovery and other useful services from the local system bus
+  def register_system_callbacks
     #old systems sometimes don't have avahi
-    if DBus::SystemBus.instance.proxy.ListNames[0].include? "org.freedesktop.Avahi"
+    if @system_bus.proxy.ListNames[0].include? "org.freedesktop.Avahi"
       #setup service browser
-      bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
-      proxy = bus.introspect("org.freedesktop.Avahi","/")
+      #bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
+      proxy = @system_bus.introspect("org.freedesktop.Avahi","/")
       @avahi = proxy["org.freedesktop.Avahi.Server"]  
       @servicetypes.each { |name,type| register_service_callback name,type }
     else
-      wlog "Sorry, no Avahi service running, no magic service discovery."
+      wlog "Sorry, no Avahi service running, no auto service discovery."
+      #check if we depend on avahi running
+      if @config[:daemonhost].eql?("avahi") and @config[:daemonport].eql?("avahi") and @config[:sessiontype].eql?("robots")
+        elog "Sorry mate, can't continue without avahi. Change your 'sessiontype' to 'system' or 'session', will now exit."
+        exit(0) #cruel, I know, but it makes no sense to continue, 
+      end
+    end
+  end
+
+  #builds a service type specific callback
+  def register_service_callback name,type
+    #bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
+    sb = @avahi.ServiceBrowserNew(-1,-1,"_#{type}._tcp","local",0)
+    #now we start the match rule definition
+    mr = DBus::MatchRule.new
+    mr.type = "signal"
+    mr.interface = "org.freedesktop.Avahi.ServiceBrowser"
+    mr.path = sb.first
+    @system_bus.add_match(mr) { |msg| service_callback name,msg } unless type.eql? "robots"
+    #our service is handled specialy
+    @system_bus.add_match(mr) { |msg| robots_daemon_callback name,msg } if type.eql? "robots" 
+  end
+ 
+  #gets called on a service change
+  def service_callback name,msg
+    if msg.member.eql? "ItemNew"
+      dlog "new #{name}: #{msg.params[2]}"
+    end
+    if msg.member.eql? "ItemRemoved"
+      dlog "removed #{name}: #{msg.params[2]}"
+    end
+  end
+
+  #gets called when a robots daemon has been found
+  def robots_daemon_callback name,msg
+    if msg.member.eql? "ItemNew"
+      dlog "new robots daemon #{name}: #{msg.params[2]}"
+    end
+    if msg.member.eql? "ItemRemoved"
+      dlog "robots daemon removed #{name}: #{msg.params[2]}"
     end
   end
   
+  #register robots callback methods
+  def register_robots_callbacks
+    #setup callbacks for infrastructure emitters
+    @emitters.each { |name,emitter| register_emitter_callback name,emitter }
+  end
+
   #register an emitter callback
   def register_emitter_callback name,emitter
     bus = get_bus
@@ -131,38 +194,14 @@ class Robot
      #local non proxy object, so we need to emit a signal and tell everyone 
      @infrastructure["emitter"].newMessage(msg) if  @infrastructure.has_key? "emitter"
   end
-  
-  #builds a service type specific callback
-  def register_service_callback name,type
-    bus = DBus::SystemBus.instance #needs to be the system bus for the avahi stuff
-    sb = @avahi.ServiceBrowserNew(-1,-1,"_#{type}._tcp","local",0)
-    #now we start the match rule definition
-    mr = DBus::MatchRule.new
-    mr.type = "signal"
-    mr.interface = "org.freedesktop.Avahi.ServiceBrowser"
-    mr.path = sb.first
-    bus.add_match(mr) { |msg| service_callback name,msg }
-  end
- 
-  #gets called on a service change
-  def service_callback name,msg
-    if msg.member.eql? "ItemNew"
-      dlog "new #{name}: #{msg.params[2]}"
-    end
-    if msg.member.eql? "ItemRemoved"
-      dlog "removed #{name}: #{msg.params[2]}"
-    end
-  end
-  
+    
   #check if a service is running
   def running? service_name
     bus = get_bus
     return bus.proxy.ListNames[0].include? service_name
   end
 
-#functions used by the module
-
-  #send
+  #send a message over the robots service
   def send_msg msg
     @emitters["robots"].send_message(msg) unless @emitters["robots"].nil?
     wlog "emitter is nil, can not send message." if @emitters["robots"].nil?
@@ -184,13 +223,15 @@ class Robot
   #get the bus session, cleaner then creating new sessions all over
   def get_bus
     if @dbussession.nil?
-      @dbussession = DBus::SystemBus.instance if @config[:sessiontype].eql? "system"
+      @dbussession = @system_bus if @config[:sessiontype].eql? "system"
       @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
        get_remote_cookie if @config[:sshcookie] #i need not say more,...
        @dbussession = DBus::SessionBus.instance
       end
+      #need to add them to the dbus_loop later on
+      @active_busses << @dbussession unless @active_busses.include? @dbussession
     end
     #no point if this is still true :)
     if @dbussession.nil?
@@ -220,27 +261,7 @@ class Robot
       dlog "Nothing to hack, boring."
     end
   end
-
-#functions used by the module end here 
-  
-  #dbus main loop
-  def main_loop
-    dlog "going into main loop..."
-    loop do 
-      sleep 1
-    end
-  end
-  
-  def test_messages
-     Thread.new do 
-      loop do
-        msg = "it worx from robots agent!"
-        send_msg msg
-        sleep 1
-      end
-    end 
-  end
-  
+ 
   #list names of a proxy object
   def list_names proxy=nil
     if proxy.nil?
@@ -250,4 +271,13 @@ class Robot
     dlog "listnames:"
     proxy.ListNames[0].each { |name| dlog name }
   end
+  
+  #loop we need to stay tuned,broken
+  def dbus_loop
+    Thread.new do
+      main = DBus::Main.new
+      @active_busses.each { |bus| main << bus }
+      main.run
+    end
+  end
 end

data/lib/robots_infrastructure.rb

@@ -32,21 +32,22 @@ class Emitter < DBus::Object
   end
 end
 
-
 #hardcoding i don't want in the agent file
 def fill_servicetypes
   types = {}
+  types["Robots IPC cluster server"] = "robots"
   types["Workstation"] = "workstation"
   types["SSH Remote Terminal"] = "ssh"
-  types["Website"] = "http"
-  types["Secure Website"] = "https"
-  types["iChat Presence"] = "presence"
-  types["PulseAudio Sound Server"] = "pulse-server"
-  types["Subversion Revision Control"] = "svn"
-  types["GIT"] = "git"
-  types["APT Package Repository"] = "apt"
-  types["WebDAV"] = "webdav"
-  types["Secure WebDAV"] = "webdavs"
-  types["Samba"] = "smb"
+  #if you like debug output, uncomment the following lines  
+  #types["Website"] = "http"
+  #types["Secure Website"] = "https"
+  #types["iChat Presence"] = "presence"
+  #types["PulseAudio Sound Server"] = "pulse-server"
+  #types["Subversion Revision Control"] = "svn"
+  #types["GIT"] = "git"
+  #types["APT Package Repository"] = "apt"
+  #types["WebDAV"] = "webdav"
+  #types["Secure WebDAV"] = "webdavs"
+  #types["Samba"] = "smb"
   return types
 end

data/lib/robots_prototype.rb

@@ -15,6 +15,7 @@ class RobotsProto
   attr_accessor :roboname,:config
   
   def initialize
+    #rofl_enable_trace
     @roboname = "Robots Prototype" #name used in alive messages
     configure #configure the robot
     ilog "#{@roboname} initialized"
@@ -25,9 +26,9 @@ class RobotsProto
     @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[:daemonhost] = "q"
     @config[:daemonport] = "2687"
-    @config[:sshcookie] = false #if you want to connect remotely, you need to get the daemon cookie over ssh
+    @config[:sshcookie] = true #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
@@ -52,6 +53,7 @@ rp.release_robots #start the robot agent module
 loop do 
   sleep 1
   #send an xml message over the system
+  puts "send msg"
   alive_msg = rp.create_xml_alive_msg
   rp.send_msg alive_msg
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangdudu-robots
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.2
+  version: 0.2.3.3
 platform: ruby
 authors: 
 - pangdudu