ruby-dbus 0.12.0 → 0.13.0

data/ruby-dbus.gemspec

@@ -12,9 +12,21 @@ GEMSPEC = Gem::Specification.new do |s|
   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,examples,lib,spec}/**/*", "COPYING", "NEWS", "Rakefile", "README.md", "ruby-dbus.gemspec", "VERSION", ".rspec"].to_a.sort
+  s.files = FileList[
+    "{doc,examples,lib,spec}/**/*",
+    "COPYING", "NEWS.md", "Rakefile", "README.md",
+    "ruby-dbus.gemspec", "VERSION", ".rspec"].to_a.sort
   s.require_path = "lib"
+
   s.required_ruby_version = ">= 2.0.0"
-  s.add_development_dependency("packaging_rake_tasks")
-  s.add_development_dependency("rspec")
+
+  # This is optional
+  # s.add_runtime_dependency "nokogiri"
+
+  s.add_development_dependency "coveralls"
+  s.add_development_dependency "packaging_rake_tasks"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 3"
+  s.add_development_dependency "rubocop", "= 0.41.2"
+  s.add_development_dependency "simplecov"
 end

data/spec/async_spec.rb

@@ -8,7 +8,6 @@ describe "AsyncTest" do
     @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @obj = @svc.object "/org/ruby/MyInstance"
-    @obj.introspect
     @obj.default_iface = "org.ruby.SampleInterface"
   end
 
@@ -17,7 +16,7 @@ describe "AsyncTest" do
     loop = DBus::Main.new
     loop << @bus
 
-    immediate_answer = @obj.the_answer do |msg, retval|
+    immediate_answer = @obj.the_answer do |_msg, retval|
       expect(retval).to eq(42)
       loop.quit
     end
@@ -33,7 +32,7 @@ describe "AsyncTest" do
     loop << @bus
 
     ifc = @obj["org.ruby.AnotherInterface"]
-    immediate_answer = ifc.Reverse("abcd") do |msg, retval|
+    immediate_answer = ifc.Reverse("abcd") do |_msg, retval|
       expect(retval).to eq("dcba")
       loop.quit
     end
@@ -43,5 +42,4 @@ describe "AsyncTest" do
     # wait for the async reply
     loop.run
   end
-
 end

data/spec/binding_spec.rb

@@ -9,14 +9,12 @@ describe "BindingTest" do
     @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @base = @svc.object "/org/ruby/MyInstance"
-    @base.introspect
     @base.default_iface = "org.ruby.SampleInterface"
   end
 
   # https://trac.luon.net/ruby-dbus/ticket/36#comment:3
   it "tests class inheritance" do
     derived = @svc.object "/org/ruby/MyDerivedInstance"
-    derived.introspect
 
     # it should inherit from the parent
     expect(derived["org.ruby.SampleInterface"]).not_to be_nil
@@ -26,7 +24,6 @@ describe "BindingTest" do
   # Interfaces and methods/signals appeared on all classes
   it "tests separation of classes" do
     test2 = @svc.object "/org/ruby/MyInstance2"
-    test2.introspect
 
     # it should have its own interface
     expect(test2["org.ruby.Test2"]).not_to be_nil
@@ -57,7 +54,7 @@ describe "BindingTest" do
     # interfaces can be defined dynamicaly
     derived = DBus::Object.new "/org/ruby/MyDerivedInstance"
 
-    #define a new interface
+    # define a new interface
     derived.singleton_class.instance_eval do
       dbus_interface "org.ruby.DynamicInterface" do
         dbus_method :hello2, "in name:s, in name2:s" do |name, name2|
@@ -70,5 +67,4 @@ describe "BindingTest" do
     ifaces = derived.intfs
     expect(ifaces).to include "org.ruby.DynamicInterface"
   end
-
 end

data/spec/bus_and_xml_backend_spec.rb

@@ -2,8 +2,8 @@
 # Test the bus class
 require_relative "spec_helper"
 
-require 'rubygems'
-require 'nokogiri'
+require "rubygems"
+require "nokogiri"
 require "dbus"
 
 describe "BusAndXmlBackendTest" do
@@ -15,12 +15,11 @@ describe "BusAndXmlBackendTest" do
     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
+    obj.default_iface = "org.ruby.SampleInterface"
     # "should respond to :the_answer"
     expect(obj.the_answer[0]).to eq(42)
     # "should work with multiple interfaces"
-    expect(obj["org.ruby.AnotherInterface"].Reverse('foo')[0]).to eq("oof")
+    expect(obj["org.ruby.AnotherInterface"].Reverse("foo")[0]).to eq("oof")
   end
 
   it "tests introspection reading nokogiri" do
@@ -28,12 +27,10 @@ describe "BusAndXmlBackendTest" do
     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
+    obj.default_iface = "org.ruby.SampleInterface"
     # "should respond to :the_answer"
     expect(obj.the_answer[0]).to eq(42)
     # "should work with multiple interfaces"
-    expect(obj["org.ruby.AnotherInterface"].Reverse('foo')[0]).to eq("oof")
+    expect(obj["org.ruby.AnotherInterface"].Reverse("foo")[0]).to eq("oof")
   end
-
 end

data/spec/bus_spec.rb

@@ -13,7 +13,7 @@ describe "BusTest" do
 
   it "tests introspection not leaking" do
     # peek inside the object to see if a cleanup step worked or not
-    some_hash = @bus.instance_eval { @method_call_replies || Hash.new }
+    some_hash = @bus.instance_eval { @method_call_replies || {} }
     # fail: "there are leftover method handlers"
     expect(some_hash.size).to eq(0)
   end

data/spec/byte_array_spec.rb

@@ -8,11 +8,9 @@ describe "ByteArrayTest" do
     @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @obj = @svc.object("/org/ruby/MyInstance")
-    @obj.introspect
     @obj.default_iface = "org.ruby.SampleInterface"
   end
 
-
   it "tests passing byte array" do
     data = [0, 77, 255]
     result = @obj.mirror_byte_array(data).first

data/spec/err_msg_spec.rb

@@ -9,34 +9,37 @@ describe "ErrMsgTest" do
     session_bus = DBus::ASessionBus.new
     svc = session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
-    @obj.introspect                  # necessary
     @obj.default_iface = "org.ruby.SampleInterface"
   end
 
   it "tests report dbus interface" do
     # a specific exception...
     # mentioning DBus and the interface
-    expect { @obj.NoSuchMethod }.to raise_error(NameError, /DBus interface.*#{@obj.default_iface}/)
+    expect { @obj.NoSuchMethod }
+      .to raise_error(NameError, /DBus interface.*#{@obj.default_iface}/)
   end
 
   it "tests report short struct" do
-    expect { @obj.test_variant ["(ss)", ["too few"] ] }.to raise_error(DBus::TypeException, /1 elements but type info for 2/)
+    expect { @obj.test_variant ["(ss)", ["too few"]] }
+      .to raise_error(DBus::TypeException, /1 elements but type info for 2/)
   end
 
   it "tests report long struct" do
-    expect { @obj.test_variant ["(ss)", ["a", "b", "too many"] ] }.to raise_error(DBus::TypeException, /3 elements but type info for 2/)
+    expect { @obj.test_variant ["(ss)", ["a", "b", "too many"]] }
+      .to raise_error(DBus::TypeException, /3 elements but type info for 2/)
   end
 
   it "tests report nil" do
     nils = [
-            ["(s)", [nil] ],    # would get disconnected
-            ["i", nil ],
-            ["a{ss}", {"foo" => nil} ],
-           ]
+      ["(s)", [nil]], # would get disconnected
+      ["i", nil],
+      ["a{ss}", { "foo" => nil }]
+    ]
     nils.each do |has_nil|
-      # TODO want backtrace from the perspective of the caller:
+      # TODO: want backtrace from the perspective of the caller:
       # rescue/reraise in send_sync?
-      expect { @obj.test_variant has_nil }.to raise_error(DBus::TypeException, /Cannot send nil/)
+      expect { @obj.test_variant has_nil }
+        .to raise_error(DBus::TypeException, /Cannot send nil/)
     end
   end
 end

data/spec/introspect_xml_parser_spec.rb

@@ -18,9 +18,9 @@ describe "IntrospectXMLParserTest" do
 </node>
 EOS
 
-    interfaces, _ = DBus::IntrospectXMLParser.new(xml).parse
+    interfaces, _subnodes = DBus::IntrospectXMLParser.new(xml).parse
 
-    foo = interfaces.find {|i| i.name == "org.example.Foo" }
+    foo = interfaces.find { |i| i.name == "org.example.Foo" }
     expect(foo.methods.keys.size).to eq(2)
   end
 end

data/spec/introspection_spec.rb

@@ -12,7 +12,7 @@ describe "IntrospectionTest" do
   end
 
   it "tests wrong number of arguments" do
-    expect { @obj.test_variant "too","many","args" }.to raise_error(ArgumentError)
+    expect { @obj.test_variant "too", "many", "args" }.to raise_error(ArgumentError)
     # not enough
     expect { @obj.test_variant }.to raise_error(ArgumentError)
   end

data/spec/main_loop_spec.rb

@@ -8,7 +8,6 @@ describe "MainLoopTest" do
     @session_bus = DBus::ASessionBus.new
     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
@@ -20,13 +19,13 @@ describe "MainLoopTest" do
   # 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
+      alias_method :wait_for_message_orig, :wait_for_message
       def wait_for_message_lazy
         DBus.logger.debug "I am so lazy"
-        sleep 1    # Give the server+bus a chance to join the messages
+        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
+      alias_method :wait_for_message, :wait_for_message_lazy
     end
 
     yield
@@ -35,7 +34,7 @@ describe "MainLoopTest" do
     class << @session_bus
       remove_method :wait_for_message
       remove_method :wait_for_message_lazy
-      alias :wait_for_message :wait_for_message_orig
+      alias_method :wait_for_message, :wait_for_message_orig
     end
   end
 

data/spec/property_spec.rb

@@ -7,7 +7,6 @@ describe "PropertyTest" do
     session_bus = DBus::ASessionBus.new
     @svc = session_bus.service("org.ruby.service")
     @obj = @svc.object("/org/ruby/MyInstance")
-    @obj.introspect
     @iface = @obj["org.ruby.SampleInterface"]
   end
 
@@ -17,7 +16,6 @@ describe "PropertyTest" do
 
   it "tests property reading on a V1 object" do
     obj = @svc["/org/ruby/MyInstance"]
-    obj.introspect
     iface = obj["org.ruby.SampleInterface"]
 
     expect(iface["ReadMe"]).to eq("READ ME")
@@ -53,7 +51,6 @@ describe "PropertyTest" do
 
   it "tests get all on a V1 object" do
     obj = @svc["/org/ruby/MyInstance"]
-    obj.introspect
     iface = obj["org.ruby.SampleInterface"]
 
     all = iface.all_properties

data/spec/proxy_object_spec.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe DBus::ProxyObject do
+  around(:each) do |example|
+    with_private_bus do
+      with_service_by_activation(&example)
+    end
+  end
+
+  let(:bus) { DBus::ASessionBus.new }
+
+  context "when calling org.ruby.service" do
+    let(:svc) { bus["org.ruby.service"] }
+
+    context "when introspection mode is not specified" do
+      describe "#bounce_variant" do
+        it "works without an explicit #introspect call" do
+          obj = svc["/org/ruby/MyInstance"]
+          ifc = obj["org.ruby.SampleInterface"]
+          expect(ifc.bounce_variant(42)).to be_eql 42
+        end
+
+        it "works with one #introspect call" do
+          obj = svc["/org/ruby/MyInstance"]
+          obj.introspect
+          ifc = obj["org.ruby.SampleInterface"]
+          expect(ifc.bounce_variant(42)).to be_eql 42
+        end
+
+        it "works with two #introspect calls" do
+          obj = svc["/org/ruby/MyInstance"]
+          obj.introspect
+          obj.introspect
+          ifc = obj["org.ruby.SampleInterface"]
+          expect(ifc.bounce_variant(42)).to be_eql 42
+        end
+      end
+    end
+  end
+end

data/spec/server_robustness_spec.rb

@@ -29,7 +29,6 @@ describe "ServerRobustnessTest" do
 
   it "tests a method that raises" do
     obj = @svc.object "/org/ruby/MyInstance"
-    obj.introspect
     obj.default_iface = "org.ruby.SampleInterface"
     expect { obj.will_raise }.to raise_error(DBus::Error) do |e|
       expect(e).to_not match(/timeout/)
@@ -38,7 +37,6 @@ describe "ServerRobustnessTest" do
 
   it "tests a method that raises name error" do
     obj = @svc.object "/org/ruby/MyInstance"
-    obj.introspect
     obj.default_iface = "org.ruby.SampleInterface"
     expect { obj.will_raise_name_error }.to raise_error(DBus::Error) do |e|
       expect(e).to_not match(/timeout/)

data/spec/service_newapi.rb

@@ -4,14 +4,14 @@
 require_relative "spec_helper"
 SimpleCov.command_name "Service Tests" if Object.const_defined? "SimpleCov"
 # find the library without external help
-$:.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
-require 'dbus'
+require "dbus"
 
-PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"
+PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties".freeze
 
 class Test < DBus::Object
-  INTERFACE = "org.ruby.SampleInterface"
+  INTERFACE = "org.ruby.SampleInterface".freeze
   def initialize(path)
     super path
     @read_me = "READ ME"
@@ -81,7 +81,7 @@ class Test < DBus::Object
   end
 
   dbus_interface "org.ruby.Ticket30" do
-    dbus_method :Sybilla, 'in choices:av, out advice:s' do |choices|
+    dbus_method :Sybilla, "in choices:av, out advice:s" do |choices|
       ["Do #{choices[0]}"]
     end
   end
@@ -98,8 +98,8 @@ class Test < DBus::Object
   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
+    dbus_method :LongTaskBegin, "in delay:i" do |delay|
+      # FIXME: did not complain about mismatch between signature and block args
       self.LongTaskStart
       DBus.logger.debug "Long task began"
       task = Thread.new do
@@ -121,50 +121,61 @@ class Test < DBus::Object
   # ReadOrWriteMe:string, returns "READ OR WRITE ME" at first
   dbus_interface PROPERTY_INTERFACE do
     dbus_method :Get, "in interface:s, in propname:s, out value:v" do |interface, propname|
-      if interface == INTERFACE
-        if propname == "ReadMe"
-          [@read_me]
-        elsif propname == "ReadOrWriteMe"
-          [@read_or_write_me]
-        elsif propname == "WriteMe"
-          raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"), "Property '#{interface}.#{propname}' (on object '#{@path}') is not readable"
-        else
-          raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"), "Property '#{interface}.#{propname}' not found on object '#{@path}'"
-        end
+      unless interface == INTERFACE
+        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"),
+              "Interface '#{interface}' not found on object '#{@path}'"
+      end
+
+      case propname
+      when "ReadMe"
+        [@read_me]
+      when "ReadOrWriteMe"
+        [@read_or_write_me]
+      when "WriteMe"
+        raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"),
+              "Property '#{interface}.#{propname}' (on object '#{@path}') is not readable"
       else
-        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"), "Interface '#{interface}' not found on object '#{@path}'"
+        # what should happen for unknown properties
+        # plasma: InvalidArgs (propname), UnknownInterface (interface)
+        raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"),
+              "Property '#{interface}.#{propname}' not found on object '#{@path}'"
       end
-# what should happen for unknown properties
-# plasma: InvalidArgs (propname), UnknownInterface (interface)
     end
 
     dbus_method :Set, "in interface:s, in propname:s, in  value:v" do |interface, propname, value|
-      if interface == INTERFACE
-        if propname == "ReadMe"
-          raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"), "Property '#{interface}.#{propname}' (on object '#{@path}') is not writable"
-        elsif propname == "ReadOrWriteMe"
-          @read_or_write_me = value
-          self.PropertiesChanged(interface, {propname => value}, [])
-        elsif propname == "WriteMe"
-          @read_me = value
-          self.PropertiesChanged(interface, {"ReadMe" => value}, [])
-        else
-          raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"), "Property '#{interface}.#{propname}' not found on object '#{@path}'"
-        end
+      unless interface == INTERFACE
+        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"),
+              "Interface '#{interface}' not found on object '#{@path}'"
+      end
+
+      case propname
+      when "ReadMe"
+        raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"),
+              "Property '#{interface}.#{propname}' (on object '#{@path}') is not writable"
+      when "ReadOrWriteMe"
+        @read_or_write_me = value
+        self.PropertiesChanged(interface, { propname => value }, [])
+      when "WriteMe"
+        @read_me = value
+        self.PropertiesChanged(interface, { "ReadMe" => value }, [])
       else
-        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"), "Interface '#{interface}' not found on object '#{@path}'"
+        raise DBus.error("org.freedesktop.DBus.Error.InvalidArgs"),
+              "Property '#{interface}.#{propname}' not found on object '#{@path}'"
       end
     end
 
     dbus_method :GetAll, "in interface:s, out value:a{sv}" do |interface|
-      if interface == INTERFACE
-        [ {
-            "ReadMe" => @read_me,
-            "ReadOrWriteMe" =>@read_or_write_me,
-          } ]
-      else
-        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"), "Interface '#{interface}' not found on object '#{@path}'"
+      unless interface == INTERFACE
+        raise DBus.error("org.freedesktop.DBus.Error.UnknownInterface"),
+              "Interface '#{interface}' not found on object '#{@path}'"
       end
+
+      [
+        {
+          "ReadMe" => @read_me,
+          "ReadOrWriteMe" => @read_or_write_me
+        }
+      ]
     end
 
     dbus_signal :PropertiesChanged, "interface:s, changed_properties:a{sv}, invalidated_properties:as"
@@ -214,4 +225,3 @@ begin
 rescue SystemCallError
   # the test driver will kill the bus, that's OK
 end
-