ruby-dbus 0.16.0 → 0.25.0

data/examples/no-introspect/nm-test.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Trivial network interface lister using NetworkManager.
 # NetworkManager does not support introspection, so the api is not that sexy.

data/examples/no-introspect/tracker-test.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Trivial network interface lister using NetworkManager.
 # NetworkManager does not support introspection, so the api is not that sexy.
@@ -11,4 +13,4 @@ tracker_service = bus.service("org.freedesktop.Tracker")
 tracker_manager = tracker_service.object("/org/freedesktop/tracker")
 poi = DBus::ProxyObjectInterface.new(tracker_manager, "org.freedesktop.Tracker.Files")
 poi.define_method("GetMetadataForFilesInFolder", "in live_query_id:i, in uri:s, in fields:as, out values:aas")
-p poi.GetMetadataForFilesInFolder(-1, ENV["HOME"] + "/Desktop", ["File:Name", "File:Size"])
+p poi.GetMetadataForFilesInFolder(-1, "#{ENV["HOME"]}/Desktop", ["File:Name", "File:Size"])

data/examples/rhythmbox/playpause.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
 bus = DBus::SessionBus.instance
@@ -13,7 +14,7 @@ mr.type = "signal"
 mr.interface = "org.gnome.Rhythmbox.Player"
 mr.path = "/org/gnome/Rhythmbox/Player"
 bus.add_match(mr) do |msg, first_param|
-  print msg.member + " "
+  print "#{msg.member} "
   puts first_param
 end
 

data/examples/service/call_service.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
 
@@ -14,7 +15,7 @@ player.test_variant(["s", "coucou"])
 player.on_signal("SomethingJustHappened") do |u, v|
   puts "SomethingJustHappened: #{u} #{v}"
 end
-player.hello("8=======D", "(_._)")
+player.hello("Hey", "there!")
 p player["org.ruby.AnotherInterface"].Reverse("Hello world!")
 
 main = DBus::Main.new

data/examples/service/complex-property.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "dbus"
+
+# Complex property
+class Test < DBus::Object
+  dbus_interface "net.vidner.Scratch" do
+    dbus_attr_reader :progress, "(stttt)"
+  end
+
+  def initialize(opath)
+    @progress = ["working", 1, 0, 100, 42].freeze
+    super(opath)
+  end
+end
+
+bus = DBus::SessionBus.instance
+bus.object_server.export(Test.new("/net/vidner/Scratch"))
+bus.request_name("net.vidner.Scratch")
+DBus::Main.new.tap { |m| m << bus }.run

data/examples/service/service_newapi.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
-require "thread"
 Thread.abort_on_exception = true
 
 class Test < DBus::Object
@@ -31,9 +31,9 @@ class Test < DBus::Object
 end
 
 bus = DBus::SessionBus.instance
-service = bus.request_service("org.ruby.service")
 myobj = Test.new("/org/ruby/MyInstance")
-service.export(myobj)
+bus.object_server.export(myobj)
+bus.request_name("org.ruby.service")
 
 Thread.new do
   i = 0

data/examples/simple/call_introspect.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
 

data/examples/simple/get_id.rb

@@ -1,11 +1,14 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
 
 # find the library without external help
-$LOAD_PATH.unshift File.expand_path("../../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
 
 require "dbus"
 
-bus = DBus::SystemBus.instance
+busname = ARGV.fetch(0, "system")
+bus = busname == "session" ? DBus::SessionBus.instance : DBus::SystemBus.instance
+
 driver_svc = bus["org.freedesktop.DBus"]
 # p driver_svc
 driver_obj = driver_svc["/"]
@@ -14,4 +17,4 @@ driver_ifc = driver_obj["org.freedesktop.DBus"]
 # p driver_ifc
 
 bus_id = driver_ifc.GetId
-puts "The system bus id is #{bus_id}"
+puts "The #{busname} bus id is #{bus_id}"

data/examples/simple/properties.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 require "dbus"
 
 bus = DBus::SystemBus.instance

data/examples/utils/listnames.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
 
@@ -7,4 +8,12 @@ d = if ARGV.member?("--system")
     else
       DBus::SessionBus.instance
     end
-d.proxy.ListNames[0].each { |n| puts "\t#{n}" }
+d.proxy.ListNames[0].each do |n|
+  puts "\t#{n}"
+  qns = d.proxy.ListQueuedOwners(n)[0]
+  next if qns.size == 1 && qns.first == n
+
+  qns.each do |qn|
+    puts "\t\t#{qn}"
+  end
+end

data/examples/utils/notify.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "dbus"
 

data/lib/dbus/api_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is part of the ruby-dbus project
 # Copyright (C) 2016 Martin Vidner
 #
@@ -9,6 +11,13 @@
 module DBus
   class ApiOptions
     # https://github.com/mvidner/ruby-dbus/issues/30
+    # @return [Boolean]
+    #   - true: a proxy (client-side) method will return an array
+    #     even for the most common case where the method is declared
+    #     to have only one 'out parameter'
+    #   - false: a proxy (client-side) method will return
+    #     - one value for the only 'out parameter'
+    #     - an array with more 'out parameters'
     attr_accessor :proxy_method_returns_array
 
     A0 = ApiOptions.new