openplacos 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/openplacos/libclient.rb

@@ -14,6 +14,9 @@
 #    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
 
 
+ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
+require 'dbus-openplacos'
+
 module Openplacos
   class Client # client for openplacos server 
     attr_accessor :config, :objects, :service, :sensors, :actuators, :rooms,  :reguls, :initial_room

data/lib/openplacos/libdriver.rb

@@ -13,6 +13,11 @@
 #    You should have received a copy of the GNU General Public License
 #    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
+require 'dbus-openplacos'
+
+
 module Openplacos
   module Driver
   

data/lib/openplacos/libplugin.rb

@@ -14,13 +14,16 @@
 #    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
 
 
+ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
+require 'dbus-openplacos'
+
 module Openplacos
 
   class Plugin
-    attr_reader :name, :opos ,:main ,:config
-    def initialize(name_)
+    attr_reader :path, :opos ,:main ,:config
+    def initialize(path_)
       @server_ready_queue = Queue.new
-      @name = name_
+      @path = File.expand_path(path_)
       #DBus
       if(ENV['DEBUG_OPOS'] ) ## Stand for debug
         @clientbus =  DBus::SessionBus.instance
@@ -33,39 +36,45 @@ module Openplacos
       @opos = server.object("/plugins")
       @opos.introspect
       @opos.default_iface = "org.openplacos.plugins"
-      
-      @config = @opos.getConfig[0]
-      
+
+      @id =  @opos.register_plug(@path)[0]
+      puts "My plug ID: "+ @id.to_s
+      @config = @opos.getConfig(@id)[0]
+      @name = @config["name"]
+
       @opos.on_signal("quit") do
         self.quit
       end
-      
+  
       @opos.on_signal("ready") do
         @server_ready_queue.push "Go"
       end
-      
+
     end
     
     def run
       @main = DBus::Main.new
       @main << @clientbus
-      @opos.plugin_is_ready(@name)
+      @opos.plugin_is_ready(@name, @id)
       @main.run
     end
     
     def quit
       @main.quit
-      Process.exit(0)
+      puts "Quitting"
+      Process.exit!
     end
-
+    
     def nonblock_run
       @mainthread = Thread.new{
         @main = DBus::Main.new
         @main << @clientbus
-        @opos.plugin_is_ready(@name)
+        @opos.plugin_is_ready(@name, @id)
         @main.run
       }
-      @server_ready_queue.pop
+      if not @opos.is_server_ready[0]
+        @server_ready_queue.pop
+      end
     end
 
   end

data/lib/openplacos.rb

@@ -13,8 +13,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
 #
-ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
-require 'dbus-openplacos'
+
+# Please keep as it, each file should be included separetly
 require 'openplacos/libplugin'
 require 'openplacos/libclient'
 require 'openplacos/libdriver'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openplacos
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Openplacos Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: "Openplacos libraries : Libclient, LibPlugin, LibDriver"