ruby-dbus 0.10.0 → 0.11.0

data/test/{signal_test.rb → signal_spec.rb}

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # Test the signal handlers
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
 require "dbus"
 
-class SignalHandlerTest < Test::Unit::TestCase
-  def setup
+describe "SignalHandlerTest" do
+  before(:each) do
     @session_bus = DBus::ASessionBus.new
     svc = @session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
@@ -18,7 +17,7 @@ class SignalHandlerTest < Test::Unit::TestCase
   end
 
   # testing for commit 017c83 (kkaempf)
-  def test_overriding_a_handler
+  it "tests overriding a handler" do
     DBus.logger.debug "Inside test_overriding_a_handler"
     counter = 0
 
@@ -47,10 +46,10 @@ class SignalHandlerTest < Test::Unit::TestCase
     @loop.run
     quitter.join
 
-    assert_equal 1, counter
+    expect(counter).to eq(1)
   end
 
-  def test_on_signal_overload
+  it "tests on signal overload" do
     DBus.logger.debug "Inside test_on_signal_overload"
     counter = 0
     started = false
@@ -71,13 +70,13 @@ class SignalHandlerTest < Test::Unit::TestCase
     @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!'}
+    expect(started).to eq(true)
+    expect(counter).to eq(1)
+    expect { @intf.on_signal }.to raise_error(ArgumentError) # not enough
+    expect { @intf.on_signal 'to', 'many', 'yarrrrr!' }.to raise_error(ArgumentError)
   end
 
-  def test_too_many_rules
+  it "tests too many rules" do
     100.times do
       @obj.on_signal "Whichever" do
         puts "not called"
@@ -85,7 +84,7 @@ class SignalHandlerTest < Test::Unit::TestCase
     end
   end
 
-  def test_removing_a_nonexistent_rule
+  it "tests removing a nonexistent rule" do
     @obj.on_signal "DoesNotExist"
   end
 end

data/test/spec_helper.rb

@@ -0,0 +1,33 @@
+if ENV["COVERAGE"]
+  coverage = ENV["COVERAGE"] == "true"
+else
+  # heuristics: enable for interactive builds (but not in OBS) or in Travis
+  coverage = !!ENV["DISPLAY"] || ENV["TRAVIS"]
+end
+
+if coverage
+  require "simplecov"
+  SimpleCov.root File.expand_path("../..", __FILE__)
+
+  # do not cover specs
+  SimpleCov.add_filter "_spec.rb"
+  # do not cover the activesupport helpers
+  SimpleCov.add_filter "/core_ext/"
+
+  # use coveralls for on-line code coverage reporting at Travis CI
+  if ENV["TRAVIS"]
+    require "coveralls"
+  end
+  SimpleCov.start
+end
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+if Object.const_defined? "RSpec"
+  # http://betterspecs.org/#expect
+  RSpec.configure do |config|
+    config.expect_with :rspec do |c|
+      c.syntax = :expect
+    end
+  end
+end

data/test/{thread_safety_test.rb → thread_safety_spec.rb}

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # Test thread safety
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
 require "dbus"
 
-class ThreadSafetyTest < Test::Unit::TestCase
-  def test_thread_competition
+describe "ThreadSafetyTest" do
+  it "tests thread competition" do
     print "Thread competition: "
     jobs = []
     5.times do
@@ -22,7 +21,7 @@ class ThreadSafetyTest < Test::Unit::TestCase
         10.times do |i|
           print "#{i} "
           $stdout.flush
-          assert_equal 42, obj.the_answer[0]
+          expect(obj.the_answer[0]).to eq(42)
           sleep 0.1 * rand
         end
       end

data/test/type_spec.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe DBus do
+  describe ".type" do
+    %w{i ai a(ii) aai}.each do |s|
+      it "parses some type #{s}" do
+        expect(DBus::type(s).to_s).to be_eql s
+      end
+    end
+
+    %w{aa (ii ii) hrmp}.each do |s|
+      it "raises exception for invalid type #{s}" do
+        expect {DBus::type(s).to_s}.to raise_error DBus::Type::SignatureException
+      end
+    end
+  end
+end

data/test/{value_test.rb → value_spec.rb}

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # -*- coding: utf-8 -*-
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
 require "dbus"
 
-class ValueTest < Test::Unit::TestCase
-  def setup
+describe "ValueTest" do
+  before(:each) do
     session_bus = DBus::ASessionBus.new
     svc = session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
@@ -13,7 +12,7 @@ class ValueTest < Test::Unit::TestCase
     @obj.default_iface = "org.ruby.SampleInterface"
   end
 
-  def test_passing_an_array_of_structs_through_a_variant
+  it "tests passing an array of structs through a variant" do
     triple = ['a(uuu)', []]
     @obj.test_variant(triple)
     quadruple = ['a(uuuu)', []]     # a(uuu) works fine
@@ -22,7 +21,7 @@ class ValueTest < Test::Unit::TestCase
     @obj.test_variant(quadruple)
   end
 
-  def test_passing_an_array_through_a_variant
+  it "tests passing an array through a variant" do
     # old explicit typing
     @obj.test_variant(["as", ["coucou", "kuku"]])
     # automatic typing
@@ -30,53 +29,53 @@ class ValueTest < Test::Unit::TestCase
     @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]
+  it "tests bouncing a variant" do
+    expect(@obj.bounce_variant("cuckoo")[0]).to eq("cuckoo")
+    expect(@obj.bounce_variant(["coucou", "kuku"])[0]).to eq(["coucou", "kuku"])
+    expect(@obj.bounce_variant([])[0]).to eq([])
     empty_hash = {}
-    assert_equal empty_hash, @obj.bounce_variant(empty_hash)[0]
+    expect(@obj.bounce_variant(empty_hash)[0]).to eq(empty_hash)
   end
   
   # these are ambiguous
-  def test_pairs_with_a_string
+  it "tests pairs with a string" do
     
     # deprecated
-    assert_equal "foo", @obj.bounce_variant(["s", "foo"])[0]
+    expect(@obj.bounce_variant(["s", "foo"])[0]).to eq("foo")
     
-    assert_equal "foo", @obj.bounce_variant(DBus.variant("s", "foo"))[0]
-    assert_equal "foo", @obj.bounce_variant([DBus.type("s"), "foo"])[0]
+    expect(@obj.bounce_variant(DBus.variant("s", "foo"))[0]).to eq("foo")
+    expect(@obj.bounce_variant([DBus.type("s"), "foo"])[0]).to eq("foo")
 
     # 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]
+    expect(@obj.variant_size(["s", "four"])[0]).to eq(4)
     # "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]
+    expect(@obj.variant_size(["av", ["s", "four"]])[0]).to eq(2)
   end
 
-  def test_marshalling_an_array_of_variants
+  it "tests marshalling an array of variants" do
     # 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]
+    expect(@obj.Sybilla(choices)[0]).to eq("Do Plan A")
     # automatic typing
-    assert_equal "Do Plan A", @obj.Sybilla(["Plan A", "Plan B"])[0]
+    expect(@obj.Sybilla(["Plan A", "Plan B"])[0]).to eq("Do Plan A")
   end
 
-  def test_service_returning_nonarray
+  it "tests service returning nonarray" do
     # "warning: default `to_a' will be obsolete"
     @obj.the_answer
   end
 
-  def test_multibyte_string
+  it "tests multibyte string" do
     str = @obj.multibyte_string[0]
-    assert_equal "あいうえお", str
+    expect(str).to eq("あいうえお")
   end
 end

data/test/variant_spec.rb

@@ -0,0 +1,66 @@
+#!/usr/bin/env rspec
+# Test marshalling variants according to ruby types
+require_relative "spec_helper"
+require "dbus"
+
+describe "VariantTest" do
+  before(:each) do
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+  end
+
+  def make_variant(a)
+    DBus::PacketMarshaller.make_variant(a)
+  end
+
+  it "tests make variant scalar" do
+    # special case: do not fail immediately, marshaller will do that
+    expect(make_variant(nil)).to eq(["b", nil])
+
+    expect(make_variant(true)).to eq(["b", true])
+    # Integers
+    # no byte
+    expect(make_variant(42)).to eq(["i", 42])
+    # 3_000_000_000 can be u or x.
+    # less specific test: just run it thru a loopback
+    expect(make_variant(3_000_000_000)).to eq(["x", 3_000_000_000])
+    expect(make_variant(5_000_000_000)).to eq(["x", 5_000_000_000])
+ 
+    expect(make_variant(3.14)).to eq(["d", 3.14])
+
+    expect(make_variant("foo")).to eq(["s", "foo"])
+    expect(make_variant(:bar)).to eq(["s", "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
+
+  it "tests make variant array" do
+    ai = [1, 2, 3]
+#    as = ["one", "two", "three"]
+   # which?
+#    expect(make_variant(ai)).to eq(["ai", [1, 2, 3]])
+    expect(make_variant(ai)).to eq(["av", [["i", 1],
+                         ["i", 2],
+                         ["i", 3]]])
+    a0 = []
+    expect(make_variant(a0)).to eq(["av", []])
+
+  end
+
+  it "tests make variant hash" do
+    h = {"k1" => "v1", "k2" => "v2"}
+    expect(make_variant(h)).to eq(["a{sv}", {
+                    "k1" => ["s", "v1"],
+                    "k2" => ["s", "v2"],
+                  }])
+    h0 = {}
+    expect(make_variant(h0)).to eq(["a{sv}", {}])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pure Ruby module for interaction with D-Bus IPC system
 email: ruby-dbus-devel@lists.luon.net
 executables: []
@@ -71,34 +85,38 @@ files:
 - lib/dbus/marshall.rb
 - lib/dbus/matchrule.rb
 - lib/dbus/message.rb
+- lib/dbus/message_queue.rb
+- lib/dbus/proxy_object.rb
+- lib/dbus/proxy_object_factory.rb
+- lib/dbus/proxy_object_interface.rb
 - lib/dbus/type.rb
 - lib/dbus/xml.rb
 - ruby-dbus.gemspec
-- test/async_test.rb
-- test/binding_test.rb
-- test/bus_and_xml_backend_test.rb
-- test/bus_driver_test.rb
-- test/bus_test.rb
-- test/byte_array_test.rb
-- test/err_msg_test.rb
-- test/introspect_xml_parser_test.rb
-- test/introspection_test.rb
-- test/main_loop_test.rb
-- test/property_test.rb
-- test/server_robustness_test.rb
-- test/server_test.rb
+- test/async_spec.rb
+- test/binding_spec.rb
+- test/bus_and_xml_backend_spec.rb
+- test/bus_driver_spec.rb
+- test/bus_spec.rb
+- test/byte_array_spec.rb
+- test/err_msg_spec.rb
+- test/introspect_xml_parser_spec.rb
+- test/introspection_spec.rb
+- test/main_loop_spec.rb
+- test/property_spec.rb
+- test/server_robustness_spec.rb
+- test/server_spec.rb
 - test/service_newapi.rb
-- test/session_bus_test_manual.rb
-- test/signal_test.rb
-- test/test_helper.rb
-- test/thread_safety_test.rb
+- test/session_bus_spec_manual.rb
+- test/signal_spec.rb
+- test/spec_helper.rb
+- test/thread_safety_spec.rb
 - test/tools/dbus-launch-simple
 - test/tools/dbus-limited-session.conf
 - test/tools/test_env
 - test/tools/test_server
-- test/type_test.rb
-- test/value_test.rb
-- test/variant_test.rb
+- test/type_spec.rb
+- test/value_spec.rb
+- test/variant_spec.rb
 homepage: https://trac.luon.net/ruby-dbus
 licenses:
 - LGPL v2.1

data/test/bus_and_xml_backend_test.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-# Test the bus class
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
-require 'rubygems'
-require 'nokogiri'
-require "dbus"
-
-class BusAndXmlBackendTest < Test::Unit::TestCase
-  def setup
-    @bus = DBus::ASessionBus.new
-  end
-
-  def test_introspection_reading_rexml
-    DBus::IntrospectXMLParser.backend = DBus::IntrospectXMLParser::REXMLParser
-    @svc = @bus.service("org.ruby.service")
-    obj = @svc.object("/org/ruby/MyInstance")
-    obj.default_iface = 'org.ruby.SampleInterface'
-    obj.introspect
-    assert_nothing_raised do
-      assert_equal 42, obj.the_answer[0], "should respond to :the_answer"
-    end
-    assert_nothing_raised do
-      assert_equal "oof", obj["org.ruby.AnotherInterface"].Reverse('foo')[0], "should work with multiple interfaces"
-    end
-  end
-
-  def test_introspection_reading_nokogiri
-    # peek inside the object to see if a cleanup step worked or not
-    DBus::IntrospectXMLParser.backend = DBus::IntrospectXMLParser::NokogiriParser
-    @svc = @bus.service("org.ruby.service")
-    obj = @svc.object("/org/ruby/MyInstance")
-    obj.default_iface = 'org.ruby.SampleInterface'
-    obj.introspect
-    assert_nothing_raised do
-      assert_equal 42, obj.the_answer[0], "should respond to :the_answer"
-    end
-    assert_nothing_raised do
-      assert_equal "oof", obj["org.ruby.AnotherInterface"].Reverse('foo')[0], "should work with multiple interfaces"
-    end
-  end
-
-end