openplacos 0.0.2 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/lib/openplacos/libclient.rb

@@ -16,7 +16,7 @@
 
 module Openplacos
   class Client # client for openplacos server 
-    attr_accessor :config, :objects, :service, :sensors, :actuators, :rooms,  :reguls
+    attr_accessor :config, :objects, :service, :sensors, :actuators, :rooms,  :reguls, :initial_room
     
     def initialize
       if(ENV['DEBUG_OPOS'] ) ## Stand for debug
@@ -27,10 +27,11 @@ module Openplacos
       if @bus.service("org.openplacos.server").exists?
         @service = @bus.service("org.openplacos.server")
         @service.introspect
-        #@server_mutex = Mutex.new
         #discover all objects of server
-        @objects = get_objects(@service.root)
-        @rooms = get_rooms(@service.root)
+        @initial_room = Room.new(nil, "/")   
+        @objects = get_objects(@service.root, @initial_room)
+        @rooms = @initial_room.tree
+
         
         #get sensors and actuators
         @sensors = get_sensors
@@ -44,27 +45,16 @@ module Openplacos
     
     end  
     
-    def get_rooms(nod)
-      room = Array.new
-      nod.each_pair{ |key,value|
-       if not(key=="Debug" or key=="server" or key=="plugins") #ignore debug objects
-         if value.object.nil?
-          room.push(key)
-         end
-       end
-      }
-      room.uniq
-    end
-    
-    
-    def get_objects(nod) #get objects from a node, ignore Debug objects
+    def get_objects(nod, father_) #get objects from a node, ignore Debug objects
       obj = Hash.new
       nod.each_pair{ |key,value|
        if not(key=="Debug" or key=="server") #ignore debug objects
          if not value.object.nil?
-          obj[value.object.path] = value.object
+           obj[value.object.path] = value.object
+           father_.push_object(value.object)
          else
-          obj.merge!(get_objects(value))
+           children = father_.push_child(key)
+           obj.merge!(get_objects(value, children))
          end
        end
       }
@@ -91,6 +81,29 @@ module Openplacos
       sensors  
     end
     
+    def is_regul(sensor)
+      # get dbus object of sensor
+      key = get_sensors.index(sensor)
+      if (key == nil)
+        return false
+      end
+
+      # Test interface
+      if (@objects[key].has_iface?('org.openplacos.server.regul'))
+        return true
+      else
+        return false
+      end
+    end
+
+    def get_regul_iface(sensor)
+      if (is_regul(sensor)==nil)
+        return nil
+      end
+      key = get_sensors.index(sensor)
+      return @objects[key]['org.openplacos.server.regul']
+    end
+
     def get_actuators
       actuators = Hash.new
       @objects.each_pair{ |key, value|
@@ -112,4 +125,35 @@ module Openplacos
     end
     
   end
+
+  class Room
+    attr_accessor :father, :childs, :path, :objects
+
+    def initialize(father_, path_)
+      @father = father_
+      @path = path_
+      @childs = Array.new
+      @objects = Hash.new
+   end
+
+    def push_child (value_)
+      children = Room.new(self, self.path  + value_ + "/")
+      @childs << children
+      return children
+    end
+
+    def push_object(obj_)
+      @objects.store(obj_.path, obj_)
+    end
+    
+    def tree()
+      hash = Hash.new
+      hash.store(@path, self)
+      @childs.each { |child|
+        hash.merge!(child.tree)
+      }
+      return hash
+    end
+
+  end
 end

data/lib/openplacos/libplugin.rb

@@ -17,7 +17,7 @@
 module Openplacos
 
   class Plugin
-    attr_reader :name, :opos ,:main
+    attr_reader :name, :opos ,:main ,:config
     def initialize(name_)
       @server_ready_queue = Queue.new
       @name = name_
@@ -34,6 +34,8 @@ module Openplacos
       @opos.introspect
       @opos.default_iface = "org.openplacos.plugins"
       
+      @config = @opos.getConfig[0]
+      
       @opos.on_signal("quit") do
         self.quit
       end

data/lib/openplacos.rb

@@ -14,8 +14,7 @@
 #    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
 #
 ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
-require 'rubygems'
-require 'dbus'
+require 'dbus-openplacos'
 require 'openplacos/libplugin'
 require 'openplacos/libclient'
 require 'openplacos/libdriver'

data/openplacos.gemspec

@@ -4,18 +4,18 @@ require "rake"
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "openplacos"
-  # s.rubyforge_project = nil
   s.summary = "Openplacos libraries : Libclient, LibPlugin, LibDriver"
   s.description = <<-EOF
     Openplacos Gem is a set of libraries for openplacos software.
     These libraries allow an easier coding of openplacos clients, plugins or drivers in ruby.
   EOF
   s.version = File.read("VERSION").strip
+  s.license = 'GPL-3'
   s.author = "Openplacos Team"
   s.email = "openplacos-general@lists.sourceforge.net"
   s.homepage = "http://openplacos.sourceforge.net/"
   s.files = FileList["{lib}/**/*", "openplacos.gemspec", "VERSION"].to_a.sort
   s.require_path = "lib"
   s.has_rdoc = false
-  s.add_dependency('ruby-dbus', '>= 0.6.0')
+  s.add_dependency('ruby-dbus-openplacos', '>= 0.6.0')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openplacos
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 23
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Openplacos Team
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +01:00
+date: 2011-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-dbus
+  name: ruby-dbus-openplacos
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -51,8 +51,8 @@ files:
 - openplacos.gemspec
 has_rdoc: true
 homepage: http://openplacos.sourceforge.net/
-licenses: []
-
+licenses: 
+- GPL-3
 post_install_message: 
 rdoc_options: []
 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Openplacos libraries : Libclient, LibPlugin, LibDriver"