ruby-dbus 0.12.0 → 0.13.0

data/examples/doc/_extract_examples

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 if ARGV[0].nil?
-  puts "Usage: #{$0} file.md"
+  puts "Usage: #{$PROGRAM_NAME} file.md"
   exit
 end
 
@@ -11,7 +11,7 @@ File.open(ARGV[0]) do |f|
   f.each_line do |line|
     case line
     when /^#+ *(.*)/
-      new_title = $1
+      new_title = Regexp.last_match(1)
 
       # write previous example
       unless example.empty?
@@ -22,7 +22,7 @@ File.open(ARGV[0]) do |f|
           File.open("#{basename}.rb", "w") do |e|
             e.write setup
             e.write example
-            e.chmod(0755)
+            e.chmod(0o755)
           end
         end
       end
@@ -31,7 +31,7 @@ File.open(ARGV[0]) do |f|
       title = new_title
       example = ""
     when /^    (.*)/
-      example << $1 << "\n"
+      example << Regexp.last_match(1) << "\n"
     end
   end
 end

data/examples/gdbus/gdbus

@@ -5,19 +5,20 @@
 # stuff.
 # -- Arnaud
 
-require 'dbus'
+require "dbus"
 require "gtk2"
 
-$enable_system = false
+ENABLE_SYSTEM = false
 
 class MethodCallWindow
   def initialize(pwindow, intf, meth)
-    @intf, @meth = intf, meth
-    @entries = Array.new
+    @intf = intf
+    @meth = meth
+    @entries = []
     @dialog = Gtk::Dialog.new(meth.name, pwindow,
-                             Gtk::Dialog::MODAL | Gtk::Dialog::NO_SEPARATOR,
-                             [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
-                             [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL])
+                              Gtk::Dialog::MODAL | Gtk::Dialog::NO_SEPARATOR,
+                              [Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK],
+                              [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL])
 
     @meth.params.each do |param|
       shbox = Gtk::HBox.new(true, 0)
@@ -61,14 +62,13 @@ class MethodCallWindow
       end
       m.add_param(param[1], data)
     end
-    bus.on_return(m) do |retm|
+    bus.send_sync_or_async(m) do |retm|
       if retm.is_a?(DBus::Error)
         puts "Error: #{retm.inspect}"
       else
         puts "Method #{m.member} returns: #{retm.params.inspect}"
       end
     end
-    bus.send(m.marshall)
   end
 end
 
@@ -78,13 +78,13 @@ class DBusUI
     @glade << "gdbus.glade"
 
     @sessiontreeview = @glade.get_object("sessiontreeview")
-    setup_treeview_renderer(@sessiontreeview, 'D-Bus Objects')
+    setup_treeview_renderer(@sessiontreeview, "D-Bus Objects")
     @sessiontreeview.selection.signal_connect("changed") do |selection|
       on_treeview_selection_changed(selection)
     end
 
     @systemtreeview = @glade.get_object("systemtreeview")
-    setup_treeview_renderer(@systemtreeview, 'D-Bus Objects')
+    setup_treeview_renderer(@systemtreeview, "D-Bus Objects")
     @systemtreeview.selection.signal_connect("changed") do |selection|
       on_treeview_selection_changed(selection)
     end
@@ -92,6 +92,9 @@ class DBusUI
     @methsigtreeview = @glade.get_object("methsigtreeview")
     # ierk
     setup_methodview_renderer(@methsigtreeview)
+    @methsigtreeview.signal_connect("row-activated") do |view, path, column|
+      on_method_activated(view, path, column)
+    end
 
     @window = @glade.get_object("window1")
     @window.show_all
@@ -101,10 +104,10 @@ class DBusUI
   def beautify_method(meth)
     # Damn, this need to be rewritten :p
     s = meth.name + "("
-    if meth.kind_of?(DBus::Method)
+    if meth.is_a?(DBus::Method)
       s += (meth.params.collect { |a| "in #{a[0]}:#{a[1]}" } +
             meth.rets.collect { |a| "out #{a[0]}:#{a[1]}" }).join(", ")
-    elsif meth.kind_of?(DBus::Signal)
+    elsif meth.is_a?(DBus::Signal)
       s += (meth.params.collect { |a| "in #{a[0]}:#{a[1]}" }).join(", ")
     end
     s += ")"
@@ -117,7 +120,7 @@ class DBusUI
                                DBus::ProxyObjectInterface)
     @methsigtreeview.model = model
     if selected
-      if intf = selected[1]
+      if (intf = selected[1])
         intf.methods.keys.sort.each do |mi|
           m = intf.methods[mi]
           subiter = model.append
@@ -138,11 +141,10 @@ class DBusUI
     end
   end
 
-  def on_method_activated(view, path, column)
+  def on_method_activated(view, path, _column)
     name = view.model.get_iter(path)[0]
     puts "Clicked on: #{name.inspect}"
     type = view.model.get_iter(path)[1]
-    intf = view.model.get_iter(path)[2]
     if type == "M"
       method = view.model.get_iter(path)[2]
       intf = view.model.get_iter(path)[3]
@@ -151,34 +153,33 @@ class DBusUI
       signal = view.model.get_iter(path)[2]
       intf = view.model.get_iter(path)[3]
       mr = DBus::MatchRule.new.from_signal(intf, signal)
-      puts "*** Registering matchrule: #{mr.to_s} ***"
+      puts "*** Registering matchrule: #{mr} ***"
       intf.object.bus.add_match(mr) do |sig|
-        puts "Got #{sig.member}(#{sig.params.join(',')})"
+        puts "Got #{sig.member}(#{sig.params.join(",")})"
       end
     end
   end
 
-  def on_sessiontreeview_row_activated(view, path, column)
+  def on_sessiontreeview_row_activated(view, path, _column)
     name = view.model.get_iter(path)[0]
     puts "Clicked on: #{name.inspect}"
-    intf = view.model.get_iter(path)[1]
   end
 
-  def on_window_delete_event(window, event)
+  def on_window_delete_event(_window, _event)
     Gtk.main_quit
   end
 
   def setup_methodview_renderer(treeview)
     renderer = Gtk::CellRendererText.new
-    col_offset = treeview.insert_column(-1, "T", renderer, 'text' => 1)
-    col_offset = treeview.insert_column(-1, "Name", renderer, 'text' => 0)
+    _col_offset = treeview.insert_column(-1, "T", renderer, "text" => 1)
+    col_offset = treeview.insert_column(-1, "Name", renderer, "text" => 0)
     column = treeview.get_column(col_offset - 1)
     column.clickable = true
   end
 
   def setup_treeview_renderer(treeview, str)
     renderer = Gtk::CellRendererText.new
-    col_offset = treeview.insert_column(-1, str, renderer, 'text' => 0)
+    col_offset = treeview.insert_column(-1, str, renderer, "text" => 0)
     column = treeview.get_column(col_offset - 1)
     column.clickable = true
   end
@@ -196,15 +197,15 @@ class DBusUI
   def start_buses
     # call glibize to get dbus messages from the glib mainloop
     DBus::SessionBus.instance.glibize
-    DBus::SystemBus.instance.glibize if $enable_system
+    DBus::SystemBus.instance.glibize if ENABLE_SYSTEM
 
-    DBus::SessionBus.instance.proxy.ListNames do |msg, names|
+    DBus::SessionBus.instance.proxy.ListNames do |_msg, names|
       fill_treeview(DBus::SessionBus.instance, @sessiontreeview, names)
     end
-    if $enable_system
-      DBus::SystemBus.instance.proxy.ListNames do |msg, names|
-        fill_treeview(DBus::SystemBus.instance, @systemtreeview, names)
-      end
+
+    return unless ENABLE_SYSTEM
+    DBus::SystemBus.instance.proxy.ListNames do |_msg, names|
+      fill_treeview(DBus::SystemBus.instance, @systemtreeview, names)
     end
   end
 
@@ -214,18 +215,18 @@ class DBusUI
       subiter[0] = key
       walk_node(model, subiter, val)
     end
-    unless node.object.nil?
-      node.object.interfaces.sort.each do |ifname|
-        subiter = model.append(iter)
-        subiter[0] = ifname
-        subiter[1] = node.object[ifname]
-      end
+
+    return if node.object.nil?
+    node.object.interfaces.sort.each do |ifname|
+      subiter = model.append(iter)
+      subiter[0] = ifname
+      subiter[1] = node.object[ifname]
     end
   end
 
   def introspect_services(model, bus)
     el = @introspect_array.shift
-    if not el =~ /^:/
+    if !(el =~ /^:/)
       iter = model.append(nil)
       iter[0] = el
       puts "introspecting: #{el}"
@@ -238,14 +239,14 @@ class DBusUI
       end
     end
 
-    not @introspect_array.empty?
+    !@introspect_array.empty?
   end
 
   def fill_treeview(bus, treeview, array)
     model = Gtk::TreeStore.new(String, DBus::ProxyObjectInterface)
     treeview.model = model
     @introspect_array = array.sort
-    Gtk::idle_add { introspect_services(model, bus) }
+    Gtk.idle_add { introspect_services(model, bus) }
   end
 
   def main

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

@@ -3,7 +3,7 @@
 # Trivial network interface lister using NetworkManager.
 # NetworkManager does not support introspection, so the api is not that sexy.
 
-require 'dbus'
+require "dbus"
 
 bus = DBus::SystemBus.instance
 
@@ -17,5 +17,3 @@ rescue Exception
   poi.define_method("GetDevices", "") # NM 0.7
   p poi.GetDevices
 end
-
-

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

@@ -3,7 +3,7 @@
 # Trivial network interface lister using NetworkManager.
 # NetworkManager does not support introspection, so the api is not that sexy.
 
-require 'dbus'
+require "dbus"
 
 bus = DBus::SessionBus.instance
 
@@ -11,6 +11,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,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'dbus'
+require "dbus"
 bus = DBus::SessionBus.instance
 # get a rb object
 proxy = bus.introspect("org.gnome.Rhythmbox", "/org/gnome/Rhythmbox/Player")
@@ -22,4 +22,3 @@ proxyi.playPause(true)
 main = DBus::Main.new
 main << bus
 main.run
-

data/examples/service/call_service.rb

@@ -9,8 +9,6 @@ ruby_srv = session_bus.service("org.ruby.service")
 # Get the object from this service
 player = ruby_srv.object("/org/ruby/MyInstance")
 
-# Introspect it
-puts player.introspect
 player.default_iface = "org.ruby.SampleInterface"
 player.test_variant(["s", "coucou"])
 player.on_signal("SomethingJustHappened") do |u, v|
@@ -22,4 +20,3 @@ p player["org.ruby.AnotherInterface"].Reverse("Hello world!")
 main = DBus::Main.new
 main << session_bus
 main.run
-

data/examples/service/service_newapi.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'dbus'
-require 'thread'
+require "dbus"
+require "thread"
 Thread.abort_on_exception = true
 
 class Test < DBus::Object
@@ -37,7 +37,7 @@ service.export(myobj)
 
 Thread.new do
   i = 0
-  loop do 
+  loop do
     # Signal emission
     myobj.SomethingJustHappened("hey", i += 1)
     sleep(0.5)
@@ -48,4 +48,3 @@ puts "listening"
 main = DBus::Main.new
 main << bus
 main.run
-

data/examples/simple/call_introspect.rb

@@ -10,8 +10,6 @@ rhythmbox = session_bus.service("org.gnome.Rhythmbox")
 # Get the object from this service
 player = rhythmbox.object("/org/gnome/Rhythmbox/Player")
 
-# Introspect it
-player.introspect
 if player.has_iface? "org.gnome.Rhythmbox.Player"
   puts "We have Rhythmbox Player interface"
 end
@@ -31,4 +29,3 @@ end
 main = DBus::Main.new
 main << session_bus
 main.run
-

data/examples/simple/get_id.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 # find the library without external help
-$:.unshift File.expand_path("../../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../lib", __FILE__)
 
 require "dbus"
 
@@ -10,8 +10,6 @@ driver_svc = bus["org.freedesktop.DBus"]
 # p driver_svc
 driver_obj = driver_svc["/"]
 # p driver_obj
-driver_obj.introspect
-
 driver_ifc = driver_obj["org.freedesktop.DBus"]
 # p driver_ifc
 

data/examples/simple/properties.rb

@@ -1,10 +1,9 @@
 #! /usr/bin/env ruby
-require 'dbus'
+require "dbus"
 
 bus = DBus::SystemBus.instance
 nm_service = bus["org.freedesktop.NetworkManager"]
-network_manager_object = nm_service.object("/org/freedesktop/NetworkManager")
-network_manager_object.introspect
+network_manager_object = nm_service["/org/freedesktop/NetworkManager"]
 nm_iface = network_manager_object["org.freedesktop.NetworkManager"]
 
 # read a property
@@ -16,4 +15,4 @@ else
 end
 puts "Toggling wireless"
 # write a property
-nm_iface["WirelessEnabled"] = ! enabled
+nm_iface["WirelessEnabled"] = !enabled

data/examples/utils/listnames.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'dbus'
+require "dbus"
 
 d = if ARGV.member?("--system")
-  DBus::SystemBus.instance
-else
-  DBus::SessionBus.instance
-end
-d.proxy.ListNames[0].each{ |n| puts "\t#{n}" }
-
+      DBus::SystemBus.instance
+    else
+      DBus::SessionBus.instance
+    end
+d.proxy.ListNames[0].each { |n| puts "\t#{n}" }

data/examples/utils/notify.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'dbus'
+require "dbus"
 
 if ARGV.size < 2
   puts "Usage:"
@@ -9,11 +9,9 @@ if ARGV.size < 2
 end
 
 d = DBus::SessionBus.instance
-o = d.service("org.freedesktop.Notifications").object("/org/freedesktop/Notifications")
-o.introspect
+o = d["org.freedesktop.Notifications"]["/org/freedesktop/Notifications"]
 
 i = o["org.freedesktop.Notifications"]
 
-i.Notify('notify.rb', 0, 'info', ARGV[0], ARGV[1], [], {}, 2000) do |ret, param|
+i.Notify("notify.rb", 0, "info", ARGV[0], ARGV[1], [], {}, 2000) do |ret, param|
 end
-

data/lib/dbus.rb

@@ -34,26 +34,22 @@ require "thread"
 # Module containing all the D-Bus modules and classes.
 module DBus
   # Default socket name for the system bus.
-  SystemSocketName = "unix:path=/var/run/dbus/system_bus_socket"
+  SystemSocketName = "unix:path=/var/run/dbus/system_bus_socket".freeze
 
   # Byte signifying big endianness.
-  BIG_END = ?B
+  BIG_END = "B".freeze
   # Byte signifying little endianness.
-  LIL_END = ?l
+  LIL_END = "l".freeze
 
   # Byte signifying the host's endianness.
   HOST_END = if [0x01020304].pack("L").unpack("V")[0] == 0x01020304
-    LIL_END
-  else
-    BIG_END
-  end
+               LIL_END
+             else
+               BIG_END
+             end
 
   # General exceptions.
 
-  # Exception raised when an invalid packet is encountered.
-  class InvalidPacketException < Exception
-  end
-
   # Exception raised when there is a problem with a type (may be unknown or
   # mismatch).
   class TypeException < Exception
@@ -64,16 +60,8 @@ module DBus
   class IncompleteBufferException < Exception
   end
 
-  # Exception raised when a method has not been implemented (yet).
-  class MethodNotImplemented < Exception
-  end
-
-  # Exception raised when a method is invoked with invalid
-  # parameters (wrong number or type).
-  class InvalidParameters < Exception
-  end
-
   # Exception raised when an invalid method name is used.
+  # FIXME: use NameError
   class InvalidMethodName < Exception
   end