pangdudu-robots 0.2.3 → 0.2.3.1

data/README.rdoc

@@ -2,8 +2,6 @@
 
 Local messaging with dbus working, need to make service avahi discoverable. 
 
-Well, fork, dbus is not really remote capable right now. Ohh, I so much don't want to write that myself,... ;(...  
-
 Let's try to built a nice easy to use multiagent framework
 based on all the cool stuff we can get for ruby.
 
@@ -11,18 +9,17 @@ rObOts!
 
 == Installation
 
-  #on ubuntu you need stuff like this to build dbus
-  sudo apt-get install avahi-daemon avahi-utils libavahi-client-dev libavahi-common-dev libavahi-compat-libdnssd-dev libnss-mdns libdbus-1-dev libdbus-glib-1-dev
-  #essential gems
-  sudo gem install pangdudu-ruby-dbus --source=http://gems.github.com
-  sudo gem install pangdudu-ruby-dbus-daemon --source=http://gems.github.com
-  sudo gem install pangdudu-rofl --source=http://gems.github.com
   sudo gem install pangdudu-robots --source=http://gems.github.com
-  #for xml parsing and building
-  sudo gem install hpricot builder
 	 	 
 == Usage
 
+sorry, this section was actualy missing before.
+
+oki, if you choose sessiontype 'robots', start the daemon with the 'start_dbus_session.sh'
+script in 'config/'. 
+
+then start one of the robots from examples or the robots_prototype.
+
 == Rule the universe! 
 
 Robots are coming!

data/config/start_dbus_session.sh

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

data/lib/robots.rb

@@ -28,7 +28,7 @@ module Robots
     @haz_robots = @robotsagent.nil?
     if @haz_robots
       @robotsagent = Robot.new
-      @hostname = @robotsagent.hostname
+      @hostname = @robotsagent.config[:hostname]
       @robotsagent.run
       @robotsagent.add_listener self
     end 

data/lib/robots_agent.rb

@@ -1,35 +1,38 @@
 require 'rubygems'
 require 'dbus' #gem install pangdudu-ruby-dbus --source=http://gems.github.com
-require 'dbus-daemon' #gem install pangdudu-ruby-dbus-daemon --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 'robots_infrastructure'
 
 class Robot
-  attr_accessor :dbusdaemon #in case we use a custom dbus-daemon
   attr_accessor :avahi #for mdns service discovery
   attr_accessor :emitters,:infrastructure,:listeners #stuff a robot needs
-  attr_accessor :hostname #infos
+  attr_accessor :config #hash with lots of config magic inside
   
   def initialize
     dlog "new Robot initialized."
-    @localhost = Socket.gethostname
-    @daemonhost = "127.0.0.1"
-    @remote = false #if you want to connect remotely, change this value
-    @sessiontype = "robots" #could be session,system or robots (use robots, if you want it to work over multiple hosts)
-    @daemonconfig = "~/.robots/config/remote.session.dbus.conf" #listens on tcp
-    @robots_socket_name = "tcp:host=#{@daemonhost},port=2687,family=ipv4" #look at: ~/.robots/config/remote.session.dbus.conf
-    @robotsservice = "org.robots.Service"
-    @emitterpath = "/org/robots/Service/Emitter"
-    @emitterinterface = "org.robots.Service.EmitterInterface"
-    @coreservice, @dbussession, @dbusdaemon = nil,nil,nil
+    @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
-    check_for_dbus_daemon if @sessiontype.eql? "robots" #will start a dbus-daemon if necessary
     setup_robots_service
     register_callbacks
     #test_messages; #main_loop;
@@ -37,11 +40,11 @@ class Robot
 
   #setup the robots service
   def setup_robots_service
-    robots_running = running? @robotsservice
+    robots_running = running? @config[:robotsservice]
     dlog "robots service has already been started." if robots_running
     unless robots_running
       ilog "will now setup robots service infrastructure."
-      start_core_service @robotsservice
+      start_core_service @config[:robotsservice]
       init_robots_infrastructure
     end
     get_robots_infrastructure
@@ -53,45 +56,21 @@ class Robot
   the following methods are only called, if the robots service is not already running 
 =end 
  
-  #check if a dbus-daemon suitable for robots is running, otherwise start one
-  def check_for_dbus_daemon
-    unless @remote
-      @daemonconfig = File.expand_path(@daemonconfig) #dbus-daemon won't accept otherwise
-      #ok, no config file, not good!
-      unless File.exist? @daemonconfig
-        wlog "no daemon config: #{@daemonconfig}!"
-        wlog "will sleep for 5 seconds,..."
-        sleep 5 #give the user time to realize
-      end
-      #if the config file is there
-      if File.exist? @daemonconfig  
-        @dbusdaemon = DbusDaemon.new @daemonconfig
-        got_twins = @dbusdaemon.got_twin_daemon? #check if a daemon like this is already running
-        ilog "custom dbus-daemon is already running." if got_twins #inform user
-        unless got_twins #no suitable dbus-daemon running, start one
-          @dbusdaemon.start_daemon
-          ilog "custom dbus-daemon started and running, check \"ps x | grep \"dbus-daemon\", if plan a CTRL-C."
-          #@dbusdaemon.stop_daemon #must get called sometimes, super nasty, use " ps x | grep "dbus-daemon" "
-        end
-      end
-    end
-  end
- 
   #setup the infrastructure objects for communication
   def init_robots_infrastructure
-    emitter = Emitter.new(@emitterpath,self)
+    emitter = Emitter.new(config[:emitterpath],self)
     @coreservice.export(emitter)
     @infrastructure["emitter"] = emitter
   end
 
   #get instances of our infrastructure objects
   def get_robots_infrastructure
-    emitter = get_object_from_service @robotsservice,@emitterpath,@emitterinterface
+    emitter = get_object_from_service @config[:robotsservice],@config[:emitterpath],@config[:emitterinterface]
     @emitters["robots"] = emitter
   end
   
   #start a service
-  def start_core_service service_name=@robotsservice
+  def start_core_service service_name=@config[:robotsservice]
     bus = get_bus
     #first of all check if the service we want to launch is already started
     dlog "skipping service: #{service_name} has already been started." if running? service_name 
@@ -147,7 +126,7 @@ class Robot
     dlog "registering callback for #{name} on path #{emitter.path}"
     mr = DBus::MatchRule.new
     mr.type = "signal"
-    mr.interface = "org.ruby.Service.EmitterInterface"
+    mr.interface = @config[:emitterinterface]
     mr.path = emitter.path
     bus.add_match(mr) { |msg| emitter_proxy_callback msg }
   end
@@ -197,6 +176,7 @@ class Robot
   #send
   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?
   end
   
   #add a listener
@@ -215,11 +195,11 @@ class Robot
   #get the bus session, cleaner then creating new sessions all over
   def get_bus
     if @dbussession.nil?
-      @dbussession = DBus::SystemBus.instance if @sessiontype.eql? "system"
-      @dbussession = DBus::SessionBus.instance if @sessiontype.eql? "session"
-      if @sessiontype.eql? "robots"
-       DBus.const_set("SessionSocketName", @robots_socket_name) #overwrite the modules constant
-       evil_hack_remote_cookie if @remote #i need not say more,...
+      @dbussession = DBus::SystemBus.instance 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
+       evil_hack_remote_cookie if @config[:remote] #i need not say more,...
        @dbussession = DBus::SessionBus.instance
       end
     end
@@ -233,8 +213,8 @@ class Robot
 
   #because dbus remote auth still betrays us, we need to hack it
   def evil_hack_remote_cookie
-    if @robots_socket_name.include? "tcp:"
-      af, port, daemon_name, daemon_addr = (Socket::getaddrinfo(@daemonhost, 2687)).first
+    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}."
       begin
         cookiepath = "#{ENV['HOME']}/.dbus-keyrings/org_freedesktop_general"

data/lib/robots_daemon.rb

@@ -0,0 +1,23 @@
+#check if a dbus-daemon suitable for robots is running, otherwise start one
+def check_for_dbus_daemon
+  unless @remote
+    @daemonconfig = File.expand_path(@daemonconfig) #dbus-daemon won't accept otherwise
+    #ok, no config file, not good!
+    unless File.exist? @daemonconfig
+      wlog "no daemon config: #{@daemonconfig}!"
+      wlog "will sleep for 5 seconds,..."
+      sleep 5 #give the user time to realize
+    end
+    #if the config file is there
+    if File.exist? @daemonconfig  
+      @dbusdaemon = DbusDaemon.new @daemonconfig
+      got_twins = @dbusdaemon.got_twin_daemon? #check if a daemon like this is already running
+      ilog "custom dbus-daemon is already running." if got_twins #inform user
+      unless got_twins #no suitable dbus-daemon running, start one
+        @dbusdaemon.start_daemon
+        ilog "custom dbus-daemon started and running, check \"ps x | grep \"dbus-daemon\", if plan a CTRL-C."
+        #@dbusdaemon.stop_daemon #must get called sometimes, super nasty, use " ps x | grep "dbus-daemon" "
+      end
+    end
+  end
+end

data/lib/robots_infrastructure.rb

@@ -17,7 +17,7 @@ class Emitter < DBus::Object
   end
   
   #create an dbus interface
-  dbus_interface "org.ruby.Service.EmitterInterface" do
+  dbus_interface "org.robots.Service.EmitterInterface" do
     #creates a signal in the interface:
     dbus_signal :newMessage, "msgbody:s"
     #creates an emit method in the interface:

data/lib/robots_prototype.rb

@@ -44,5 +44,6 @@ rp.release_robots #start the robot agent module
 loop do 
   sleep 1
   #send an xml message over the system
-  rp.send_msg rp.create_xml_alive_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
+  version: 0.2.3.1
 platform: ruby
 authors: 
 - pangdudu
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: robots!
 email: pangdudu@github
 executables: 
@@ -58,6 +78,7 @@ files:
 - lib/robots_infrastructure.rb
 - lib/robots_xml.rb
 - lib/robots_prototype.rb
+- lib/robots_daemon.rb
 - config/org.robots.service.conf
 - config/remote.session.dbus.conf
 - config/start_dbus_session.sh