ruby-dbus 0.5.0

data/test/t1

@@ -0,0 +1,4 @@
+#! /bin/sh
+SEND0="dbus-send  --session --dest=org.ruby.service"
+CALL="$SEND0 --type=method_call --print-reply"
+$CALL /org/ruby/MyInstance org.ruby.AnotherInterface.Reverse string:Hello

data/test/t2.rb

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+require "test/unit"
+require "dbus"
+
+class ValueTest < Test::Unit::TestCase
+  def setup
+    session_bus = DBus::SessionBus.instance
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect                  # necessary
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  def test_passing_an_array_through_a_variant
+    # old explicit typing
+    @obj.test_variant(["as", ["coucou", "kuku"]])
+    # automatic typing
+    @obj.test_variant(["coucou", "kuku"])
+    @obj.test_variant(["saint", "was that a word or a signature?"])
+  end
+
+  def test_bouncing_a_variant
+    assert_equal "cuckoo", @obj.bounce_variant("cuckoo")[0]
+    assert_equal ["coucou", "kuku"], @obj.bounce_variant(["coucou", "kuku"])[0]
+    assert_equal [], @obj.bounce_variant([])[0]
+    empty_hash = {}
+    assert_equal empty_hash, @obj.bounce_variant(empty_hash)[0]
+  end
+  
+  # these are ambiguous
+  def test_pairs_with_a_string
+    
+    # deprecated
+    assert_equal "foo", @obj.bounce_variant(["s", "foo"])[0]
+    
+    assert_equal "foo", @obj.bounce_variant(DBus.variant("s", "foo"))[0]
+    assert_equal "foo", @obj.bounce_variant([DBus.type("s"), "foo"])[0]
+
+    # does not work, because the server side forgets the explicit typing
+#    assert_equal ["s", "foo"], @obj.bounce_variant(["av", ["s", "foo"]])[0]
+#    assert_equal ["s", "foo"], @obj.bounce_variant(["as", ["s", "foo"]])[0]
+
+    # instead, use this to demonstrate that the variant is passed as expected
+    assert_equal 4, @obj.variant_size(["s", "four"])[0]
+    # "av" is the simplest thing that will work,
+    # shifting the heuristic from a pair to the individual items
+    assert_equal 2, @obj.variant_size(["av", ["s", "four"]])[0]
+  end
+
+  def test_marshalling_an_array_of_variants
+    # https://trac.luon.net/ruby-dbus/ticket/30
+    @obj.default_iface = "org.ruby.Ticket30"
+    choices = []
+    choices << ['s', 'Plan A']
+    choices << ['s', 'Plan B']
+    # old explicit typing
+    assert_equal "Do Plan A", @obj.Sybilla(choices)[0]
+    # automatic typing
+    assert_equal "Do Plan A", @obj.Sybilla(["Plan A", "Plan B"])[0]
+  end
+
+  def test_service_returning_nonarray
+    # "warning: default `to_a' will be obsolete"
+    @obj.the_answer
+  end
+end

data/test/t3-ticket27.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# Test passing a particular struct array through a variant
+# https://trac.luon.net/ruby-dbus/ticket/27
+require "dbus"
+session_bus = DBus::SessionBus.instance
+svc = session_bus.service("org.ruby.service")
+obj = svc.object("/org/ruby/MyInstance")
+obj.introspect                  # necessary
+obj.default_iface = "org.ruby.SampleInterface"
+# The bug is probably alignment related so whether it triggers
+# depends also on the combined length of service, interface,
+# and method names. Luckily here it works out.
+triple = ['a(uuu)', []]
+obj.test_variant(triple)
+quadruple = ['a(uuuu)', []]     # a(uuu) works fine
+# The bus disconnects us because of malformed message,
+# code 12: DBUS_INVALID_TOO_MUCH_DATA
+obj.test_variant(quadruple)

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

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# should report it missing on org.ruby.SampleInterface
+# (on object...) instead of on DBus::Proxy::ObjectInterface
+require "test/unit"
+require "dbus"
+
+class ErrMsgTest < Test::Unit::TestCase
+  def setup
+    session_bus = DBus::SessionBus.instance
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect                  # necessary
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  def test_report_dbus_interface
+    begin
+      @obj.NoSuchMethod
+    # a specific exception...
+    rescue NameError => e
+      # mentioning DBus and the interface
+      assert_match(/DBus interface.*#{@obj.default_iface}/, e.to_s)
+    end
+  end
+
+  def test_report_short_struct
+    begin
+      @obj.test_variant ["(ss)", ["too few"] ]
+    rescue DBus::TypeException => e
+      assert_match(/1 elements but type info for 2/, e.to_s)
+    end
+  end
+
+  def test_report_long_struct
+    begin
+      @obj.test_variant ["(ss)", ["a", "b", "too many"] ]
+    rescue DBus::TypeException => e
+      assert_match(/3 elements but type info for 2/, e.to_s)
+    end
+  end
+
+  def test_report_nil
+    nils = [
+            ["(s)", [nil] ],    # would get disconnected
+            ["i", nil ],
+            ["a{ss}", {"foo" => nil} ],
+           ]
+    nils.each do |has_nil|
+      begin
+        @obj.test_variant has_nil
+      rescue DBus::TypeException => e
+        # TODO want backtrace from the perspective of the caller:
+        # rescue/reraise in send_sync?
+        assert_match(/Cannot send nil/, e.to_s)
+      end
+    end
+  end
+end

data/test/t6-loop.rb

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+# Test the main loop
+require "test/unit"
+require "dbus"
+
+def d(msg)
+  puts "#{$$} #{msg}" if $DEBUG
+end
+
+class MainLoopTest < Test::Unit::TestCase
+  def setup
+    @session_bus = DBus::SessionBus.instance
+    svc = @session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect                  # necessary
+    @obj.default_iface = "org.ruby.Loop"
+
+    @loop = DBus::Main.new
+    @loop << @session_bus
+  end
+
+  # Hack the library internals so that there is a delay between
+  # sending a DBus call and listening for its reply, so that
+  # the bus has a chance to join the server messages and a race is reproducible
+  def call_lazily
+    class << @session_bus
+      alias :wait_for_message_orig :wait_for_message
+      def wait_for_message_lazy
+        d "I am so lazy"
+        sleep 1    # Give the server+bus a chance to join the messages
+        wait_for_message_orig
+      end
+      alias :wait_for_message :wait_for_message_lazy
+    end
+
+    yield
+
+    # undo
+    class << @session_bus
+      remove_method :wait_for_message
+      remove_method :wait_for_message_lazy
+      alias :wait_for_message :wait_for_message_orig
+    end
+  end
+
+  def test_loop_quit(delay = 1)
+    @obj.on_signal "LongTaskEnd" do
+      d "Telling loop to quit"
+      @loop.quit
+    end
+
+    call_lazily do
+      # The method will sleep the requested amount of seconds
+      # (in another thread)  before signalling LongTaskEnd
+      @obj.LongTaskBegin delay
+    end
+
+    # this thread will make the test fail if @loop.run does not return
+    dynamite = Thread.new do
+      d "Dynamite burning"
+      sleep 2
+      d "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
+      # (if abort_on_exception is set) it terminates the whole script.
+      Thread.main.raise RuntimeError, "The main loop did not quit in time"
+    end
+
+    @loop.run
+    d "Defusing dynamite"
+    # if we get here, defuse the bomb
+    dynamite.exit
+    # remove signal handler
+    @obj.on_signal "LongTaskEnd"
+  end
+
+  # https://bugzilla.novell.com/show_bug.cgi?id=537401
+  def test_loop_drained_socket
+    test_loop_quit 0
+  end
+end

data/test/test_env

@@ -0,0 +1,13 @@
+#! /bin/bash
+# test_env: set up the environment needed to run tests:
+# - set up a private bus
+# - run a test server on it
+
+#export DBUS_VERBOSE=1
+#export RUBYOPT="-d"
+export RUBYOPT="$RUBYOPT -w"
+./test_server \
+	./service_newapi.rb \
+	-- \
+	./dbus-launch-simple \
+	"$@"

data/test/test_server

@@ -0,0 +1,39 @@
+#! /bin/sh
+# A wrapper for DBus tests
+# Run a server (directly or by dbus activation) and then the test
+# $0 server [args...] -- test [args...]
+set -o errexit
+
+while [ "$1" != "--" ]; do
+  SERVER="$SERVER $1"
+  shift
+done
+shift # --
+
+setup_activation () {
+    SDIR=$XDG_DATA_DIRS/dbus-1/services
+    mkdir -p $SDIR
+    # FIXME Name is hardcoded
+    cat <<EOF > $SDIR/test.service
+[D-BUS Service]
+Name=org.ruby.service
+Exec=$SERVER
+EOF
+}
+
+run_server () {
+    echo -n "Hey, server, get on da bus... "
+    # start the server
+    $SERVER & sleep 3
+    echo "off we go!"
+}
+
+export XDG_DATA_DIRS=`mktemp -d dbus.activation.XXXXXX`
+RM_FILES="$RM_FILES $XDG_DATA_DIRS"
+setup_activation
+#run_server
+
+# Clean up at exit.
+trap "rm -rf \$RM_FILES" EXIT TERM INT
+
+"$@"

data/test/variant_test.rb

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+# Test marshalling variants according to ruby types
+require "test/unit"
+require "dbus"
+
+class VariantTest < Test::Unit::TestCase
+  def setup
+    @bus = DBus::SessionBus.instance
+    @svc = @bus.service("org.ruby.service")
+  end
+
+  def make_variant(a)
+    DBus::PacketMarshaller.make_variant(a)
+  end
+
+  def test_make_variant_scalar
+    # special case: do not fail immediately, marshaller will do that
+    assert_equal ["b", nil], make_variant(nil)
+
+    assert_equal ["b", true], make_variant(true)
+    # Integers
+    # no byte
+    assert_equal ["i", 42], make_variant(42)
+    # 3_000_000_000 can be u or x.
+    # less specific test: just run it thru a loopback
+    assert_equal ["x", 3_000_000_000], make_variant(3_000_000_000)
+    assert_equal ["x", 5_000_000_000], make_variant(5_000_000_000)
+ 
+    assert_equal ["d", 3.14], make_variant(3.14)
+
+    assert_equal ["s", "foo"], make_variant("foo")
+    assert_equal ["s", "bar"], make_variant(:bar)
+
+    # left: strruct, array, dict
+    # object path: detect exported objects?, signature
+
+#    # by Ruby types
+#    class Foo
+#    end
+#    make_variant(Foo.new)
+# if we don;t understand a class, the error should be informative -> new exception
+  end
+
+  def test_make_variant_array
+    ai = [1, 2, 3]
+#    as = ["one", "two", "three"]
+   # which?
+#    assert_equal ["ai", [1, 2, 3]], make_variant(ai)
+    assert_equal ["av", [["i", 1],
+                         ["i", 2],
+                         ["i", 3]]], make_variant(ai)
+    a0 = []
+    assert_equal ["av", []], make_variant(a0)
+
+  end
+
+  def test_make_variant_hash
+    h = {"k1" => "v1", "k2" => "v2"}
+    assert_equal ["a{sv}", {
+                    "k1" => ["s", "v1"],
+                    "k2" => ["s", "v2"],
+                  }], make_variant(h)
+    h0 = {}
+    assert_equal ["a{sv}", {}], make_variant(h0)
+  end
+end

metadata

@@ -0,0 +1,117 @@
+--- !ruby/object:Gem::Specification 
+name: ruby-dbus
+version: !ruby/object:Gem::Version 
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
+platform: ruby
+authors: 
+- Ruby DBus Team
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-11-07 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: 
+email: ruby-dbus-devel@lists.luon.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- COPYING
+- README
+- NEWS
+files: 
+- Rakefile
+- VERSION
+- doc/tutorial/index.html
+- doc/tutorial/index.markdown
+- examples/gdbus/gdbus
+- examples/gdbus/gdbus.glade
+- examples/gdbus/launch.sh
+- examples/no-introspect/nm-test.rb
+- examples/no-introspect/tracker-test.rb
+- examples/rhythmbox/playpause.rb
+- examples/service/call_service.rb
+- examples/service/service_newapi.rb
+- examples/simple/call_introspect.rb
+- examples/utils/listnames.rb
+- examples/utils/notify.rb
+- lib/dbus.rb
+- lib/dbus/auth.rb
+- lib/dbus/bus.rb
+- lib/dbus/core_ext/class/attribute.rb
+- lib/dbus/core_ext/kernel/singleton_class.rb
+- lib/dbus/core_ext/module/remove_method.rb
+- lib/dbus/error.rb
+- lib/dbus/export.rb
+- lib/dbus/introspect.rb
+- lib/dbus/marshall.rb
+- lib/dbus/matchrule.rb
+- lib/dbus/message.rb
+- lib/dbus/type.rb
+- ruby-dbus.gemspec
+- test/binding_test.rb
+- test/bus_driver_test.rb
+- test/dbus-launch-simple
+- test/dbus-limited-session.conf
+- test/server_robustness_test.rb
+- test/server_test.rb
+- test/service_newapi.rb
+- test/session_bus_test_manual.rb
+- test/signal_test.rb
+- test/t1
+- test/t2.rb
+- test/t3-ticket27.rb
+- test/t5-report-dbus-interface.rb
+- test/t6-loop.rb
+- test/test_env
+- test/test_server
+- test/variant_test.rb
+- COPYING
+- README
+- NEWS
+has_rdoc: true
+homepage: http://trac.luon.net/data/ruby-dbus/
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Ruby module for interaction with D-Bus
+test_files: []
+