ruby-dbus 0.8.0 → 0.9.0

data/lib/dbus/xml.rb

@@ -122,7 +122,7 @@ module DBus
       end
       d = Time.now - t
       if d > 2
-        puts "Some XML took more that two secs to parse. Optimize me!" if $DEBUG
+        DBus.logger.debug "Some XML took more that two secs to parse. Optimize me!"
       end
       [interfaces, subnodes]
     end
@@ -138,10 +138,12 @@ module DBus
         dir = ae["direction"]
         sig = ae["type"]
 	if m.is_a?(DBus::Signal)
+          # Direction can only be "out", ignore it
           m.add_fparam(name, sig)
 	elsif m.is_a?(DBus::Method)
           case dir
-          when "in"
+          # This is a method, so dir defaults to "in"
+          when "in", nil
             m.add_fparam(name, sig)
           when "out"
 	    m.add_return(name, sig)

data/ruby-dbus.gemspec

@@ -6,15 +6,15 @@ GEMSPEC = Gem::Specification.new do |s|
   s.name = "ruby-dbus"
   # s.rubyforge_project = nil
   s.summary = "Ruby module for interaction with D-Bus"
-  # s.description = FIXME
+  s.description = "Pure Ruby module for interaction with D-Bus IPC system"
   s.version = File.read("VERSION").strip
   s.license = "LGPL v2.1"
   s.author = "Ruby DBus Team"
   s.email = "ruby-dbus-devel@lists.luon.net"
   s.homepage = "https://trac.luon.net/ruby-dbus"
-  s.files = FileList["{doc/tutorial,examples,lib,test}/**/*", "Rakefile", "ruby-dbus.gemspec", "VERSION"].to_a.sort
+  s.files = FileList["{doc,examples,lib,test}/**/*", "Rakefile", "ruby-dbus.gemspec", "VERSION"].to_a.sort
   s.require_path = "lib"
   s.has_rdoc = true
-  s.extra_rdoc_files = ["COPYING", "README", "NEWS"]
+  s.extra_rdoc_files = ["COPYING", "README.md", "NEWS"]
   s.required_ruby_version = ">= 1.8.7"
 end

data/test/bus_driver_test.rb

@@ -3,10 +3,6 @@
 require "test/unit"
 require "dbus"
 
-def d(msg)
-  puts msg if $DEBUG
-end
-
 class BusDriverTest < Test::Unit::TestCase
   def setup
     @bus = DBus::ASessionBus.new

data/test/introspection_test.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require "test/unit"
+require "dbus"
+
+class IntrospectionTest < Test::Unit::TestCase
+  def setup
+    session_bus = DBus::ASessionBus.new
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  def test_wrong_number_of_arguments
+    assert_raise(ArgumentError) { @obj.test_variant "too","many","args" }
+    assert_raise(ArgumentError) { @obj.test_variant } # not enough
+  end
+
+  def test_shortcut_methods
+    @obj.default_iface = nil
+    assert_equal(["varargs"], @obj.bounce_variant("varargs"))
+    # test for a duplicated method name
+    assert_raise(NoMethodError) { @obj.the_answer }
+    # ensure istance methods of ProxyObject aren't overwritten by remote
+    # methods
+    assert_nothing_raised { @obj.interfaces }
+
+    @obj.default_iface = "org.ruby.SampleInterface"
+    assert_equal [42], @obj.the_answer
+  end
+end

data/test/service_newapi.rb

@@ -6,10 +6,6 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 
 require 'dbus'
 
-def d(msg)
-  puts "#{$$} #{msg}" if $DEBUG
-end
-
 PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"
 
 class Test < DBus::Object
@@ -84,21 +80,32 @@ class Test < DBus::Object
     end
   end
 
+  dbus_interface "org.ruby.Duplicates" do
+    dbus_method :the_answer, "out answer:i" do
+      [0]
+    end
+    dbus_method :interfaces, "out answer:i" do
+      raise "This DBus method is currently shadowed by ProxyObject#interfaces"
+    end
+  end
+
   dbus_interface "org.ruby.Loop" do
     # starts doing something long, but returns immediately
     # and sends a signal when done
     dbus_method :LongTaskBegin, 'in delay:i' do |delay|
 # FIXME did not complain about mismatch between signature and block args
-      d "Long task began"
+      self.LongTaskStart
+      DBus.logger.debug "Long task began"
       task = Thread.new do
-        d "Long task thread started (#{delay}s)"
+        DBus.logger.debug "Long task thread started (#{delay}s)"
         sleep delay
-        d "Long task will signal end"
+        DBus.logger.debug "Long task will signal end"
         self.LongTaskEnd
       end
       task.abort_on_exception = true # protect from test case bugs
     end
 
+    dbus_signal :LongTaskStart
     dbus_signal :LongTaskEnd
   end
 
@@ -176,7 +183,7 @@ service.export(myobj)
 derived = Derived.new "/org/ruby/MyDerivedInstance"
 service.export derived
 test2 = Test2.new "/org/ruby/MyInstance2"
-service.export test2 
+service.export test2
 
 # introspect every other connection, Ticket #34
 #  (except the one that activates us - it has already emitted
@@ -186,7 +193,7 @@ mr = DBus::MatchRule.new.from_s "type='signal',interface='org.freedesktop.DBus',
 bus.add_match(mr) do |msg|
   new_unique_name = msg.params[2]
   unless new_unique_name.empty?
-    d "RRRING #{new_unique_name}"
+    DBus.logger.debug "RRRING #{new_unique_name}"
     bus.introspect_data(new_unique_name, "/") do
       # ignore the result
     end

data/test/session_bus_test_manual.rb

@@ -2,10 +2,6 @@
 require "test/unit"
 require "dbus"
 
-def d(msg)
-  puts msg if $DEBUG
-end
-
 class SessionBusAddressTest < Test::Unit::TestCase
   def setup
     # test getting the session bus address even if unset in ENV (Issue#4)

data/test/signal_test.rb

@@ -3,10 +3,6 @@
 require "test/unit"
 require "dbus"
 
-def d(msg)
-  puts "#{$$} #{msg}" if $DEBUG
-end
-
 class SignalHandlerTest < Test::Unit::TestCase
   def setup
     @session_bus = DBus::ASessionBus.new
@@ -14,6 +10,7 @@ class SignalHandlerTest < Test::Unit::TestCase
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect                  # necessary
     @obj.default_iface = "org.ruby.Loop"
+    @intf = @obj["org.ruby.Loop"]
 
     @loop = DBus::Main.new
     @loop << @session_bus
@@ -21,34 +18,62 @@ class SignalHandlerTest < Test::Unit::TestCase
 
   # testing for commit 017c83 (kkaempf)
   def test_overriding_a_handler
+    DBus.logger.debug "Inside test_overriding_a_handler"
     counter = 0
 
     @obj.on_signal "LongTaskEnd" do
-      d "+10"
+      DBus.logger.debug "+10"
       counter += 10
     end
     @obj.on_signal "LongTaskEnd" do
-      d "+1"
+      DBus.logger.debug "+1"
       counter += 1
     end
 
-    d "will begin"
+    DBus.logger.debug "will begin"
     @obj.LongTaskBegin 3
 
     quitter = Thread.new do
-      d "sleep before quit"
+      DBus.logger.debug "sleep before quit"
       # FIXME if we sleep for too long
       # the socket will be drained and we deadlock in a select.
       # It could be worked around by sending ourselves a Unix signal
       # (with a dummy handler) to interrupt the select
       sleep 1
-      d "will quit"
+      DBus.logger.debug "will quit"
+      @loop.quit
+    end
+    @loop.run
+    quitter.join
+
+    assert_equal 1, counter
+  end
+
+  def test_on_signal_overload
+    DBus.logger.debug "Inside test_on_signal_overload"
+    counter = 0
+    started = false
+    @intf.on_signal "LongTaskStart" do
+      started = true
+    end
+    # Same as intf.on_signal("LongTaskEnd"), just the old way
+    @intf.on_signal @obj.bus, "LongTaskEnd" do
+      counter += 1
+    end
+    @obj.LongTaskBegin 3
+    quitter = Thread.new do
+      DBus.logger.debug "sleep before quit"
+      sleep 1
+      DBus.logger.debug "will quit"
       @loop.quit
     end
     @loop.run
     quitter.join
 
+    assert_equal true, started
     assert_equal 1, counter
+    assert_raise(ArgumentError) {@intf.on_signal } # not enough
+    assert_raise(ArgumentError) {@intf.on_signal 'to', 'many', 'yarrrrr!'}
   end
 
   def test_too_many_rules

data/test/t6-loop.rb

@@ -3,10 +3,6 @@
 require "test/unit"
 require "dbus"
 
-def d(msg)
-  puts "#{$$} #{msg}" if $DEBUG
-end
-
 class MainLoopTest < Test::Unit::TestCase
   def setup
     @session_bus = DBus::ASessionBus.new
@@ -26,7 +22,7 @@ class MainLoopTest < Test::Unit::TestCase
     class << @session_bus
       alias :wait_for_message_orig :wait_for_message
       def wait_for_message_lazy
-        d "I am so lazy"
+        DBus.logger.debug "I am so lazy"
         sleep 1    # Give the server+bus a chance to join the messages
         wait_for_message_orig
       end
@@ -45,7 +41,7 @@ class MainLoopTest < Test::Unit::TestCase
 
   def test_loop_quit(delay = 1)
     @obj.on_signal "LongTaskEnd" do
-      d "Telling loop to quit"
+      DBus.logger.debug "Telling loop to quit"
       @loop.quit
     end
 
@@ -57,9 +53,9 @@ class MainLoopTest < Test::Unit::TestCase
 
     # this thread will make the test fail if @loop.run does not return
     dynamite = Thread.new do
-      d "Dynamite burning"
+      DBus.logger.debug "Dynamite burning"
       sleep 2
-      d "Dynamite explodes"
+      DBus.logger.debug "Dynamite explodes"
       # We need to raise in the main thread.
       # Simply raising here means the exception is ignored
       # (until dynamite.join which we don't call) or
@@ -68,7 +64,7 @@ class MainLoopTest < Test::Unit::TestCase
     end
 
     @loop.run
-    d "Defusing dynamite"
+    DBus.logger.debug "Defusing dynamite"
     # if we get here, defuse the bomb
     dynamite.exit
     # remove signal handler

data/test/thread_safety_test.rb

@@ -3,10 +3,6 @@
 require "test/unit"
 require "dbus"
 
-def d(msg)
-  puts "#{$$} #{msg}" if $DEBUG
-end
-
 class ThreadSafetyTest < Test::Unit::TestCase
   def test_thread_competition
     print "Thread competition: "

data/test/type_test.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# Test the type class
+require "test/unit"
+require "dbus"
+
+class TypeTest < Test::Unit::TestCase
+  def test_costants_are_defined
+    assert_equal DBus::Type::BYTE, ?y
+    assert_equal DBus::Type::BOOLEAN, ?b
+    #etc..
+  end
+
+  def test_parsing
+    %w{i ai a(ii) aai}.each do |s|
+      assert_equal s, DBus::type(s).to_s
+    end
+
+    %w{aa (ii ii) hrmp}.each do |s|
+      assert_raise(DBus::Type::SignatureException) { DBus::type(s) }
+    end
+  end
+end

metadata

@@ -1,37 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-dbus
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.9.0
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
 platform: ruby
-authors: 
+authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-20 00:00:00 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies: []
-
-description: 
+description: Pure Ruby module for interaction with D-Bus IPC system
 email: ruby-dbus-devel@lists.luon.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - COPYING
-- README
+- README.md
 - NEWS
-files: 
+files:
 - Rakefile
 - VERSION
-- doc/tutorial/index.markdown
+- doc/Reference.md
+- doc/Tutorial.md
+- doc/ex-calling-methods.body.rb
+- doc/ex-calling-methods.rb
+- doc/ex-properties.body.rb
+- doc/ex-properties.rb
+- doc/ex-setup.rb
+- doc/ex-signal.body.rb
+- doc/ex-signal.rb
+- doc/example-helper.rb
 - examples/gdbus/gdbus
 - examples/gdbus/gdbus.glade
 - examples/gdbus/launch.sh
@@ -50,6 +50,7 @@ files:
 - lib/dbus/error.rb
 - lib/dbus/export.rb
 - lib/dbus/introspect.rb
+- lib/dbus/logger.rb
 - lib/dbus/marshall.rb
 - lib/dbus/matchrule.rb
 - lib/dbus/message.rb
@@ -63,6 +64,7 @@ files:
 - test/bus_test.rb
 - test/dbus-launch-simple
 - test/dbus-limited-session.conf
+- test/introspection_test.rb
 - test/property_test.rb
 - test/server_robustness_test.rb
 - test/server_test.rb
@@ -77,44 +79,35 @@ files:
 - test/test_env
 - test/test_server
 - test/thread_safety_test.rb
+- test/type_test.rb
 - test/variant_test.rb
 - COPYING
-- README
+- README.md
 - NEWS
 homepage: https://trac.luon.net/ruby-dbus
-licenses: 
+licenses:
 - LGPL v2.1
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby module for interaction with D-Bus
 test_files: []
-
+has_rdoc: true