ruby-dbus-openplacos 0.6.0 → 0.6.1

data/README

@@ -5,7 +5,7 @@ D-Bus system can be used in the Ruby programming language.
 
 == Requirements
 
- * Ruby 1.8 (>= 1.8.6?) or 1.9
+ * Ruby 1.8.7 or 1.9
 
 == Installation
 

data/Rakefile

@@ -11,7 +11,7 @@ task :default => "env:test"
 
 def common_test_task(t)
     t.libs << "lib"
-    t.test_files = FileList['test/*_test.rb', 'test/t*.rb']
+    t.test_files = FileList['test/*_test.rb', 'test/t[0-9]*.rb']
     t.verbose = true
 end
 Rake::TestTask.new {|t| common_test_task t }

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/dbus/auth.rb

@@ -62,7 +62,7 @@ module DBus
       # name of cookie file, id of cookie in file, servers random challenge  
       context, id, s_challenge = data.split(' ')
       # Random client challenge        
-      c_challenge = Array.new(s_challenge.length/2).map{|obj|obj=rand(255).to_s}.join
+      c_challenge = Array.new(s_challenge.bytesize/2).map{|obj|obj=rand(255).to_s}.join
       # Search cookie file for id
       path = File.join(ENV['HOME'], '.dbus-keyrings', context)
       puts "DEBUG: path: #{path.inspect}" if $debug
@@ -161,7 +161,7 @@ module DBus
       while left > 0
         buf = @socket.read( left > 1 ? 1 : left )
         break if buf.nil?
-        left -= buf.size
+        left -= buf.bytesize
         data += buf
         break if data.include? crlf #crlf means line finished, the TCP socket keeps on listening, so we break 
       end

data/lib/dbus/bus.rb

@@ -141,6 +141,7 @@ module DBus
     end
 
     # Return an XML string representation of the node.
+    # It is shallow, not recursing into subnodes
     def to_xml
       xml = '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
@@ -188,7 +189,7 @@ module DBus
     attr_reader :unique_name
     # The socket that is used to connect with the bus.
     attr_reader :socket
-    attr_accessor :main_message_queue, :main_thread, :queue_used_by_thread, :thread_waiting_for_message, :rescuemethod
+    attr_accessor :main_message_queue, :main_thread, :queue_used_by_thread, :thread_waiting_for_message, :rescuemethod, :read_thread
 
     # Create a new connection to the bus for a given connect _path_. _path_
     # format is described in the D-Bus specification:
@@ -215,7 +216,7 @@ module DBus
     end
 
     def start_read_thread
-      @thread = Thread.new{
+      @read_thread = Thread.new{
         puts "start the reading thread on socket #{@socket}" if $DEBUG
         loop do #loop to read
           
@@ -430,33 +431,52 @@ module DBus
 '
     # This apostroph is for syntax highlighting editors confused by above xml: "
 
-    def introspect_data(dest, path)
-      m = DBus::Message.new(DBus::Message::METHOD_CALL)
-      m.path = path
-      m.interface = "org.freedesktop.DBus.Introspectable"
-      m.destination = dest
-      m.member = "Introspect"
-      m.sender = unique_name
-      if not block_given?
-        # introspect in synchronous !
-        send_sync(m) do |rmsg|
+    # Send a _message_.
+    # If _reply_handler_ is not given, wait for the reply
+    # and return the reply, or raise the error.
+    # If _reply_handler_ is given, it will be called when the reply
+    # eventually arrives, with the reply message as the 1st param
+    # and its params following
+    def send_sync_or_async(message, &reply_handler)
+      ret = nil
+      if reply_handler.nil?
+        send_sync(message) do |rmsg|
           if rmsg.is_a?(Error)
             raise rmsg
           else
-            return rmsg.params[0] # return value of introspect_data
+            ret = rmsg.params
           end
         end
       else
-        send(m.marshall)
-        on_return(m) do |rmsg|
+        on_return(message) do |rmsg|
           if rmsg.is_a?(Error)
-            yield rmsg
+            reply_handler.call(rmsg)
           else
-            yield rmsg.params[0]
+            reply_handler.call(rmsg, * rmsg.params)
           end
         end
+        send(message.marshall)
+      end
+      ret
+    end
+
+    def introspect_data(dest, path, &reply_handler)
+      m = DBus::Message.new(DBus::Message::METHOD_CALL)
+      m.path = path
+      m.interface = "org.freedesktop.DBus.Introspectable"
+      m.destination = dest
+      m.member = "Introspect"
+      m.sender = unique_name
+      if reply_handler.nil?
+        send_sync_or_async(m).first
+      else
+        send_sync_or_async(m) do |*args|
+          # TODO test async introspection, is it used at all?
+          args.shift            # forget the message, pass only the text
+          reply_handler.call(*args)
+          nil
+        end
       end
-      nil
     end
 
     # Issues a call to the org.freedesktop.DBus.Introspectable.Introspect method
@@ -847,6 +867,7 @@ module DBus
     # Create a new main event loop.
     def initialize
       @buses = Hash.new
+      @buses_thread = Array.new
       @quit_queue = Queue.new
       @quitting = false
       $mainclass = self
@@ -855,14 +876,14 @@ module DBus
     # the standar quit method didn't quit imediately and wait for a last
     # message. This methodes allow to quit imediately 
     def quit_imediately 
+      @buses.each_value do |b|
+        #b.read_thread.exit
+      end
       @buses_thread.each do |th|
         @buses_thread_id.delete(th.object_id)
-        th.exit
+        #th.exit
       end
       @quit_queue << "quit"      
-      @buses.each_value do |b|
-        b.thread.exit
-      end
 
     end
     
@@ -912,10 +933,10 @@ module DBus
         
         @quit_queue.pop
         
-        while not @buses_thread_id.empty?
-          id = @thread_as_quit.pop
-          @buses_thread_id.delete(id)
-        end
+        #~ while not @buses_thread_id.empty?
+          #~ id = @thread_as_quit.pop
+          #~ @buses_thread_id.delete(id)
+        #~ end
 
       else
         @buses.each_value do |b|

data/lib/dbus/export.rb

@@ -15,19 +15,20 @@ module DBus
   # = Exportable D-Bus object class
   #
   # Objects that are going to be exported by a D-Bus service
-  # should inherit from this class.
+  # should inherit from this class. At the client side, use ProxyObject.
   class Object
     # The path of the object.
     attr_reader :path
-    # The interfaces that the object supports.
+    # The interfaces that the object supports. Hash: String => Interface
     class_attribute :intfs
     # The service that the object is exported by.
     attr_writer :service
 
-    @@cur_intf = nil
+    @@cur_intf = nil            # Interface
     @@intfs_mutex = Mutex.new
 
     # Create a new object with a given _path_.
+    # Use Service#export to export it.
     def initialize(path)
       @path = path
       @service = nil
@@ -39,7 +40,7 @@ module DBus
       self.intfs = (self.intfs || {}).merge({intf.name => intf})
     end
 
-    # Dispatch a message _msg_.
+    # Dispatch a message _msg_ to call exported methods
     def dispatch(msg)
       case msg.message_type
       when Message::METHOD_CALL
@@ -73,8 +74,10 @@ module DBus
     # belong to.
     def self.dbus_interface(s)
       @@intfs_mutex.synchronize do
-        @@cur_intf = Interface.new(s)
-        self.intfs = (self.intfs || {}).merge({s => @@cur_intf})
+        unless @@cur_intf = (self.intfs && self.intfs[s])
+          @@cur_intf = Interface.new(s)
+          self.intfs = (self.intfs || {}).merge({s => @@cur_intf})
+        end
         yield
         @@cur_intf = nil
       end

data/lib/dbus/introspect.rb

@@ -8,6 +8,7 @@
 # License, version 2.1 as published by the Free Software Foundation.
 # See the file "COPYING" for the exact licensing terms.
 
+# TODO check if it is slow, make replaceable
 require 'rexml/document'
 
 module DBus
@@ -27,15 +28,16 @@ module DBus
   # = D-Bus interface class
   #
   # This class is the interface descriptor.  In most cases, the Introspect()
-  # method call instanciates and configures this class for us.
+  # method call instantiates and configures this class for us.
   #
   # It also is the local definition of interface exported by the program.
+  # At the client side, see ProxyObjectInterface
   class Interface
-    # The name of the interface.
+    # The name of the interface. String
     attr_reader :name
-    # The methods that are part of the interface.
+    # The methods that are part of the interface. Hash: Symbol => DBus::Method
     attr_reader :methods
-    # The signals that are part of the interface.
+    # The signals that are part of the interface. Hash: Symbol => Signal
     attr_reader :signals
 
     # Creates a new interface with a given _name_.
@@ -47,7 +49,7 @@ module DBus
 
     # Validates a service _name_.
     def validate_name(name)
-      raise InvalidIntrospectionData if name.size > 255
+      raise InvalidIntrospectionData if name.bytesize > 255
       raise InvalidIntrospectionData if name =~ /^\./ or name =~ /\.$/
       raise InvalidIntrospectionData if name =~ /\.\./
       raise InvalidIntrospectionData if not name =~ /\./
@@ -100,14 +102,14 @@ module DBus
   # This is a generic class for entities that are part of the interface
   # such as methods and signals.
   class InterfaceElement
-    # The name of the interface element.
+    # The name of the interface element. Symbol
     attr_reader :name
-    # The parameters of the interface element
+    # The parameters of the interface element. Array: FormalParameter
     attr_reader :params
 
     # Validates element _name_.
     def validate_name(name)
-      if (not name =~ MethodSignalRE) or (name.size > 255)
+      if (not name =~ MethodSignalRE) or (name.bytesize > 255)
         raise InvalidMethodName, name
       end
     end
@@ -135,7 +137,7 @@ module DBus
   #
   # This is a class representing methods that are part of an interface.
   class Method < InterfaceElement
-    # The list of return values for the method.
+    # The list of return values for the method. Array: FormalParameter
     attr_reader :rets
 
     # Creates a new method interface element with the given _name_.
@@ -227,10 +229,9 @@ module DBus
       @xml = xml
     end
 
-    # Recursively parses the subnodes, constructing the tree.
+    # return the names of direct subnodes
     def parse_subnodes
       subnodes = Array.new
-      t = Time.now
       d = REXML::Document.new(@xml)
       d.elements.each("node/node") do |e|
         subnodes << e.attributes["name"]
@@ -238,9 +239,9 @@ module DBus
       subnodes
     end
 
-    # Parses the XML, constructing the tree.
+    # return a pair: [list of Interfaces, list of direct subnode names]
     def parse
-      ret = Array.new
+      interfaces = Array.new
       subnodes = Array.new
       t = Time.now
       d = REXML::Document.new(@xml)
@@ -259,13 +260,13 @@ module DBus
           parse_methsig(se, s)
           i << s
         end
-        ret << i
+        interfaces << i
       end
       d = Time.now - t
       if d > 2
         puts "Some XML took more that two secs to parse. Optimize me!" if $DEBUG
       end
-      [ret, subnodes]
+      [interfaces, subnodes]
     end
 
     ######################################################################
@@ -342,7 +343,7 @@ module DBus
       methdef = "def #{m.name}("
       methdef += (0..(m.params.size - 1)).to_a.collect { |n|
         "arg#{n}"
-      }.join(", ")
+      }.push("&reply_handler").join(", ")
       methdef += %{)
               msg = Message.new(Message::METHOD_CALL)
               msg.path = @object.path
@@ -365,26 +366,7 @@ module DBus
         idx += 1
       end
       methdef += "
-        ret = nil
-        if block_given?
-          @object.bus.on_return(msg) do |rmsg|
-            if rmsg.is_a?(Error)
-              yield(rmsg)
-            else
-              yield(rmsg, *rmsg.params)
-            end
-          end
-          @object.bus.send(msg.marshall)
-        else
-          @object.bus.send_sync(msg) do |rmsg|
-            if rmsg.is_a?(Error)
-              raise rmsg
-            else
-              ret = rmsg.params
-            end
-          end
-        end
-        ret
+        @object.bus.send_sync_or_async(msg, &reply_handler)
       end
       "
       singleton_class.class_eval(methdef)
@@ -448,7 +430,7 @@ module DBus
   # over the bus so that the method is executed remotely on the correctponding
   # object.
   class ProxyObject
-    # The subnodes of the object in the tree.
+    # The names of direct subnodes of the object in the tree.
     attr_accessor :subnodes
     # Flag determining whether the object has been introspected.
     attr_accessor :introspected
@@ -458,7 +440,7 @@ module DBus
     attr_reader :path
     # The bus the object is reachable via.
     attr_reader :bus
-    # The default interface of the object.
+    # The default interface of the object, as String.
     attr_accessor :default_iface
 
     # Creates a new proxy object living on the given _bus_ at destination _dest_
@@ -495,11 +477,12 @@ module DBus
 
     # Returns whether the object has an interface with the given _name_.
     def has_iface?(name)
-      raise "Cannot call has_iface? is not introspected" if not @introspected
+      raise "Cannot call has_iface? if not introspected" if not @introspected
       @interfaces.member?(name)
     end
 
     # Registers a handler, the code block, for a signal with the given _name_.
+    # It uses _default_iface_ which must have been set.
     def on_signal(name, &block)
       if @default_iface and has_iface?(@default_iface)
         @interfaces[@default_iface].on_signal(@bus, name, &block)
@@ -521,10 +504,9 @@ module DBus
         rescue NameError => e
           # interesting, foo.method("unknown")
           # raises NameError, not NoMethodError
-          match = /undefined method `([^']*)' for class `([^']*)'/.match e.to_s
-          raise unless match and match[2] == "DBus::ProxyObjectInterface"
+          raise unless e.to_s =~ /undefined method `#{name}'/
           # BTW e.exception("...") would preserve the class.
-          raise NoMethodError,"undefined method `#{match[1]}' for DBus interface `#{@default_iface}' on object `#{@path}'"
+          raise NoMethodError,"undefined method `#{name}' for DBus interface `#{@default_iface}' on object `#{@path}'"
         end
       else
         # TODO distinguish:

data/lib/dbus/marshall.rb

@@ -42,9 +42,7 @@ module DBus
         @uint16 = "v"
         @double = "E"
       else
-        # FIXME: shouldn't a more special exception be raised here?
-        # yes, idea for a good name ? :)
-        raise Exception, "Incorrect endianness"
+        raise InvalidPacketException, "Incorrect endianness #{@endianness}"
       end
       @idx = 0
     end
@@ -53,7 +51,7 @@ module DBus
     # Return an array of unmarshalled objects
     def unmarshall(signature, len = nil)
       if len != nil
-        if @buffy.size < @idx + len
+        if @buffy.bytesize < @idx + len
           raise IncompleteBufferException
         end
       end
@@ -73,7 +71,7 @@ module DBus
       when 2, 4, 8
         bits = a - 1
         @idx = @idx + bits & ~bits
-        raise IncompleteBufferException if @idx > @buffy.size
+        raise IncompleteBufferException if @idx > @buffy.bytesize
       else
         raise "Unsupported alignment #{a}"
       end
@@ -86,7 +84,7 @@ module DBus
 
     # Retrieve the next _nbytes_ number of bytes from the buffer.
     def get(nbytes)
-      raise IncompleteBufferException if @idx + nbytes > @buffy.size
+      raise IncompleteBufferException if @idx + nbytes > @buffy.bytesize
       ret = @buffy.slice(@idx, nbytes)
       @idx += nbytes
       ret
@@ -96,8 +94,8 @@ module DBus
     def get_nul_terminated
       raise IncompleteBufferException if not @buffy[@idx..-1] =~ /^([^\0]*)\0/
       str = $1
-      raise IncompleteBufferException if @idx + str.size + 1 > @buffy.size
-      @idx += str.size + 1
+      raise IncompleteBufferException if @idx + str.bytesize + 1 > @buffy.bytesize
+      @idx += str.bytesize + 1
       str
     end
 
@@ -107,7 +105,7 @@ module DBus
       align(4)
       str_sz = get(4).unpack(@uint32)[0]
       ret = @buffy.slice(@idx, str_sz)
-      raise IncompleteBufferException if @idx + str_sz + 1 > @buffy.size
+      raise IncompleteBufferException if @idx + str_sz + 1 > @buffy.bytesize
       @idx += str_sz
       if @buffy[@idx].ord != 0
         raise InvalidPacketException, "String is not nul-terminated"
@@ -122,7 +120,7 @@ module DBus
     def get_signature
       str_sz = get(1).unpack('C')[0]
       ret = @buffy.slice(@idx, str_sz)
-      raise IncompleteBufferException if @idx + str_sz + 1 >= @buffy.size
+      raise IncompleteBufferException if @idx + str_sz + 1 >= @buffy.bytesize
       @idx += str_sz
       if @buffy[@idx].ord != 0
         raise InvalidPacketException, "Type is not nul-terminated"
@@ -193,7 +191,7 @@ module DBus
         raise InvalidPacketException if array_sz > 67108864
 
         align(signature.child.alignment)
-        raise IncompleteBufferException if @idx + array_sz > @buffy.size
+        raise IncompleteBufferException if @idx + array_sz > @buffy.bytesize
 
         packet = Array.new
         start_idx = @idx
@@ -223,6 +221,7 @@ module DBus
         packet = get_string
       when Type::STRING
         packet = get_string
+        packet.force_encoding('UTF-8') if RUBY_VERSION >= '1.9'
       when Type::SIGNATURE
         packet = get_signature
       when Type::DICT_ENTRY
@@ -240,7 +239,7 @@ module DBus
 
   # D-Bus packet marshaller class
   #
-  # Class that handles the conversion (unmarshalling) of Ruby objects to
+  # Class that handles the conversion (marshalling) of Ruby objects to
   # (binary) payload data.
   class PacketMarshaller
     # The current or result packet.
@@ -267,18 +266,18 @@ module DBus
 
     # Align the buffer with NULL (\0) bytes on a byte length of _a_.
     def align(a)
-      @packet = @packet.ljust(num_align(@offset + @packet.length, a) - @offset, 0.chr)
+      @packet = @packet.ljust(num_align(@offset + @packet.bytesize, a) - @offset, 0.chr)
     end
 
     # Append the the string _str_ itself to the packet.
     def append_string(str)
       align(4)
-      @packet += [str.length].pack("L") + str + "\0"
+      @packet += [str.bytesize].pack("L") + [str].pack("Z*")
     end
 
     # Append the the signature _signature_ itself to the packet.
     def append_signature(str)
-      @packet += str.length.chr + str + "\0"
+      @packet += str.bytesize.chr + str + "\0"
     end
 
     # Append the array type _type_ to the packet and allow for appending
@@ -286,12 +285,12 @@ module DBus
     def array(type)
       # Thanks to Peter Rullmann for this line
       align(4)
-      sizeidx = @packet.size
+      sizeidx = @packet.bytesize
       @packet += "ABCD"
       align(type.alignment)
-      contentidx = @packet.size
+      contentidx = @packet.bytesize
       yield
-      sz = @packet.size - contentidx
+      sz = @packet.bytesize - contentidx
       raise InvalidPacketException if sz > 67108864
       @packet[sizeidx...sizeidx + 4] = [sz].pack("L")
     end
@@ -308,6 +307,8 @@ module DBus
     end
 
     # Append a value _val_ to the packet based on its _type_.
+    #
+    # Host native endianness is used, declared in Message#marshall
     def append(type, val)
       raise TypeException, "Cannot send nil" if val.nil?
 
@@ -372,7 +373,7 @@ module DBus
 
         append_signature(vartype.to_s)
         align(vartype.alignment)
-        sub = PacketMarshaller.new(@offset + @packet.length)
+        sub = PacketMarshaller.new(@offset + @packet.bytesize)
         sub.append(vartype, vardata)
         @packet += sub.packet
       when Type::ARRAY

data/lib/dbus/matchrule.rb

@@ -15,7 +15,7 @@ module DBus
   #
   # FIXME
   class MatchRule
-    # The list of possible match filters.
+    # The list of possible match filters. TODO argN, argNpath
     FILTERS = [:sender, :interface, :member, :path, :destination, :type]
     # The sender filter.
     attr_accessor :sender
@@ -94,6 +94,7 @@ module DBus
       return false if @interface and @interface != msg.interface
       return false if @member and @member != msg.member
       return false if @path and @path != msg.path
+      # FIXME sender and destination are ignored
       true
     end
   end # class MatchRule

data/lib/dbus/message.rb

@@ -152,7 +152,7 @@ module DBus
       @params.each do |param|
         params.append(param[0], param[1])
       end
-      @body_length = params.packet.length
+      @body_length = params.packet.bytesize
 
       marshaller = PacketMarshaller.new
       marshaller.append(Type::BYTE, HOST_END)

data/ruby-dbus-openplacos.gemspec

@@ -14,4 +14,5 @@ GEMSPEC = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.has_rdoc = true
   s.extra_rdoc_files = ["COPYING", "README", "NEWS"]
+  s.required_ruby_version = ">= 1.8.7"
 end

data/test/binding_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test the binding of dbus concepts to ruby concepts
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class BindingTest < Test::Unit::TestCase
   def setup

data/test/bus_driver_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test the methods of the bus driver
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 def d(msg)
   puts msg if $DEBUG

data/test/bus_test.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# Test the bus class
+require "test/unit"
+require "dbus-openplacos"
+
+class BusTest < Test::Unit::TestCase
+  def setup
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+    @svc.object("/").introspect
+  end
+
+  def test_introspection_not_leaking
+    # peek inside the object to see if a cleanup step worked or not
+    some_hash = @bus.instance_eval { @method_call_replies || Hash.new }
+    assert_equal 0, some_hash.size, "there are leftover method handlers"
+  end
+end

data/test/property_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class PropertyTest < Test::Unit::TestCase
   def setup

data/test/server_robustness_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test that a server survives various error cases
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class ServerRobustnessTest < Test::Unit::TestCase
   def setup
@@ -57,7 +57,7 @@ class ServerRobustnessTest < Test::Unit::TestCase
     ifc.not_the_answer
     assert false, "should have raised"
   rescue DBus::Error => e
-    assert_no_match(/timeout/, e)
+    assert_no_match(/timeout/, e.to_s)
   end
 
   def test_no_such_interface_without_introspection
@@ -67,6 +67,6 @@ class ServerRobustnessTest < Test::Unit::TestCase
     ifc.the_answer
     assert false, "should have raised"
   rescue DBus::Error => e
-    assert_no_match(/timeout/, e)
+    assert_no_match(/timeout/, e.to_s)
   end
 end

data/test/server_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test that a server survives various error cases
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class Foo < DBus::Object
   dbus_interface "org.ruby.ServerTest" do

data/test/service_newapi.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 # find the library without external help
 $:.unshift File.expand_path("../../lib", __FILE__)
 
-require 'dbus'
+require 'dbus-openplacos'
 
 def d(msg)
   puts "#{$$} #{msg}" if $DEBUG
@@ -56,6 +57,13 @@ class Test < DBus::Object
     dbus_method :Error, "in name:s, in description:s" do |name, description|
       raise DBus.error(name), description
     end
+  end
+
+  # closing and reopening the same interface
+  dbus_interface INTERFACE do
+    dbus_method :multibyte_string, "out string:s" do
+      "あいうえお"
+    end
 
     dbus_signal :SomethingJustHappened, "toto:s, tutu:u"
   end
@@ -186,7 +194,7 @@ bus.add_match(mr) do |msg|
   end
 end
 
-puts "listening"
+puts "listening, with ruby-#{RUBY_VERSION}"
 main = DBus::Main.new
 main << bus
 begin

data/test/session_bus_test_manual.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 def d(msg)
   puts msg if $DEBUG

data/test/signal_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test the signal handlers
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 def d(msg)
   puts "#{$$} #{msg}" if $DEBUG
@@ -33,7 +33,7 @@ class SignalHandlerTest < Test::Unit::TestCase
     end
 
     d "will begin"
-    @obj.LongTaskBegin 3
+    @obj.LongTaskBegin 0.5
 
     quitter = Thread.new do
       d "sleep before quit"

data/test/t2.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class ValueTest < Test::Unit::TestCase
   def setup
@@ -63,4 +64,9 @@ class ValueTest < Test::Unit::TestCase
     # "warning: default `to_a' will be obsolete"
     @obj.the_answer
   end
+
+  def test_multibyte_string
+    str = @obj.multibyte_string[0]
+    assert_equal "あいうえお", str
+  end
 end

data/test/t3-ticket27.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test passing a particular struct array through a variant
 # https://trac.luon.net/ruby-dbus/ticket/27
-require "dbus"
+require "dbus-openplacos"
 session_bus = DBus::ASessionBus.new
 svc = session_bus.service("org.ruby.service")
 obj = svc.object("/org/ruby/MyInstance")

data/test/t5-report-dbus-interface.rb

@@ -2,7 +2,7 @@
 # should report it missing on org.ruby.SampleInterface
 # (on object...) instead of on DBus::Proxy::ObjectInterface
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class ErrMsgTest < Test::Unit::TestCase
   def setup

data/test/t6-loop.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test the main loop
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 def d(msg)
   puts "#{$$} #{msg}" if $DEBUG

data/test/thread_safety_test.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# Test thread safety
+require "test/unit"
+require "dbus-openplacos"
+
+def d(msg)
+  puts "#{$$} #{msg}" if $DEBUG
+end
+
+class ThreadSafetyTest < Test::Unit::TestCase
+  def test_thread_competition
+    print "Thread competition: "
+    jobs = []
+    5.times do
+      jobs << Thread.new do
+        Thread.current.abort_on_exception = true
+
+        # use separate connections to avoid races
+        bus = DBus::ASessionBus.new
+        svc = bus.service("org.ruby.service")
+        obj = svc.object("/org/ruby/MyInstance")
+        obj.introspect
+        obj.default_iface = "org.ruby.SampleInterface"
+
+        10.times do |i|
+          print "#{i} "
+          $stdout.flush
+          assert_equal 42, obj.the_answer[0]
+          sleep 0.1 * rand
+        end
+      end
+    end
+    jobs.each do |thread| thread.join end
+  end
+end

data/test/variant_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Test marshalling variants according to ruby types
 require "test/unit"
-require "dbus"
+require "dbus-openplacos"
 
 class VariantTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-dbus-openplacos
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Openplacos Team
@@ -45,7 +45,7 @@ files:
 - examples/simple/properties.rb
 - examples/utils/listnames.rb
 - examples/utils/notify.rb
-- lib/dbus.rb
+- lib/dbus-openplacos.rb
 - lib/dbus/auth.rb
 - lib/dbus/bus.rb
 - lib/dbus/core_ext/class/attribute.rb
@@ -61,6 +61,7 @@ files:
 - ruby-dbus-openplacos.gemspec
 - test/binding_test.rb
 - test/bus_driver_test.rb
+- test/bus_test.rb
 - test/dbus-launch-simple
 - test/dbus-limited-session.conf
 - test/property_test.rb
@@ -76,6 +77,7 @@ files:
 - test/t6-loop.rb
 - test/test_env
 - test/test_server
+- test/thread_safety_test.rb
 - test/variant_test.rb
 - COPYING
 - README
@@ -94,10 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: