ruby-dbus 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca1c79fb320bdde63e80e01a065481bbb705b75
-  data.tar.gz: 3a85e1c88c87d352fc2e838f64df72ccf90e4ddf
+  metadata.gz: 06e7540fb8468a14731fd8d988828dfe349e687a
+  data.tar.gz: 86dbf9d6e8c1947bb87ef4f1ef1a4aefa337f1f6
 SHA512:
-  metadata.gz: cced70bcf377786b5e5b28d29fbccdc0513e9535af05dcc2b0580b5eb860fbe0f1822c46aedc910c4c8479ba0f21e5b3927df48d283fd121fc980a49bd015d9b
-  data.tar.gz: e38930b71af6c62a9dad723001ccdd8bb059d1130b7089b210c1e35334faa3e6d413823abdf70ccaf2af6d49a9116b0afa4fc68135ff7f1936504f7b77d729cf
+  metadata.gz: 9347931528a1e83c9b4747b232c3f6e9f8da3968efa7f5fe4a473d6333783a0643823973e91efb35f1c7676a6da0ee6a16eade4176842de6fb4e7aa58c6d5304
+  data.tar.gz: c814265c6472dc3b715a0f99ca5c6ea920d26a08dcde3eff573a889779320dc00292d637f976067ba3f6e5ae86cbccc099e56430adf8109147e910169f59e44a

data/NEWS.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## Ruby D-Bus 0.15.0 - 2018-04-30
+
+API:
+ * Accessing an unknown interface will raise instead of returning nil ([#74]).
+
+Bug fixes:
+ * Fixed a conflict with activesupport 5.2 ([#71])
+
+[#71]: https://github.com/mvidner/ruby-dbus/issues/71
+[#74]: https://github.com/mvidner/ruby-dbus/pull/74
+
 ## Ruby D-Bus 0.14.1 - 2018-01-05
 
 Bug fixes:

data/README.md

@@ -18,7 +18,7 @@ Ruby D-Bus is a pure Ruby library for writing clients and services for D-Bus.
 [Coverage Status]: https://coveralls.io/r/mvidner/ruby-dbus
 
 [GV img]: https://badge.fury.io/rb/ruby-dbus.png
-[BS img]: https://travis-ci.org/mvidner/ruby-dbus.png
+[BS img]: https://travis-ci.org/mvidner/ruby-dbus.png?branch=master
 [DS img]: https://gemnasium.com/mvidner/ruby-dbus.png
 [CC img]: https://codeclimate.com/github/mvidner/ruby-dbus.png
 [CS img]: https://coveralls.io/repos/mvidner/ruby-dbus/badge.png?branch=master

data/Rakefile

@@ -29,7 +29,7 @@ task test: :spec
 
 RSpec::Core::RakeTask.new("bare:spec")
 
-%w(spec).each do |tname|
+["spec"].each do |tname|
   desc "Run bare:#{tname} in the proper environment"
   task tname do |_t|
     cd "spec/tools" do

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.15.0

data/examples/gdbus/gdbus

@@ -226,7 +226,7 @@ class DBusUI
 
   def introspect_services(model, bus)
     el = @introspect_array.shift
-    if !(el =~ /^:/)
+    if el !~ /^:/
       iter = model.append(nil)
       iter[0] = el
       puts "introspecting: #{el}"

data/lib/dbus.rb

@@ -11,7 +11,6 @@
 require_relative "dbus/api_options"
 require_relative "dbus/auth"
 require_relative "dbus/bus"
-require_relative "dbus/core_ext/class/attribute"
 require_relative "dbus/error"
 require_relative "dbus/export"
 require_relative "dbus/introspect"

data/lib/dbus/auth.rb

@@ -73,7 +73,7 @@ module DBus
       path = File.join(ENV["HOME"], ".dbus-keyrings", context)
       DBus.logger.debug "path: #{path.inspect}"
       File.foreach(path) do |line|
-        if line.index(id) == 0
+        if line.index(id).zero?
           # Right line of file, read cookie
           cookie = line.split(" ")[2].chomp
           DBus.logger.debug "cookie: #{cookie.inspect}"

data/lib/dbus/bus.rb

@@ -387,7 +387,7 @@ module DBus
         # introspect in synchronous !
         data = introspect_data(dest, path)
         pof = DBus::ProxyObjectFactory.new(data, self, dest, path)
-        return pof.build
+        pof.build
       else
         introspect_data(dest, path) do |async_data|
           yield(DBus::ProxyObjectFactory.new(async_data, self, dest, path).build)

data/lib/dbus/core_ext/class/attribute.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
 # copied from activesupport/core_ext from Rails, MIT license
-# https://github.com/rails/rails/tree/5aa869861c192daceafe3a3ee50eb93f5a2b7bd2/activesupport/lib/active_support/core_ext
-require 'dbus/core_ext/kernel/singleton_class'
-require 'dbus/core_ext/module/remove_method'
-require 'dbus/core_ext/array/extract_options'
+# https://github.com/rails/rails/tree/9794e85351243cac6d4e78adaba634b8e4ecad0a/activesupport/lib/active_support/core_ext
+
+require "dbus/core_ext/module/redefine_method"
 
 class Class
   # Declare a class-level attribute whose value is inheritable by subclasses.
   # Subclasses can change their own value and it will not impact parent class.
   #
+  # ==== Examples
+  #
   #   class Base
-  #     class_attribute :setting
+  #     my_class_attribute :setting
   #   end
   #
   #   class Subclass < Base
@@ -22,14 +24,14 @@ class Class
   #   Base.setting                # => true
   #
   # In the above case as long as Subclass does not assign a value to setting
-  # by performing <tt>Subclass.setting = _something_ </tt>, <tt>Subclass.setting</tt>
+  # by performing <tt>Subclass.setting = _something_</tt>, <tt>Subclass.setting</tt>
   # would read value assigned to parent class. Once Subclass assigns a value then
   # the value assigned by Subclass would be returned.
   #
   # This matches normal Ruby method inheritance: think of writing an attribute
   # on a subclass as overriding the reader method. However, you need to be aware
   # when using +class_attribute+ with mutable structures as +Array+ or +Hash+.
-  # In such cases, you don't want to do changes in places but use setters:
+  # In such cases, you don't want to do changes in place. Instead use setters:
   #
   #   Base.setting = []
   #   Base.setting                # => []
@@ -59,39 +61,25 @@ class Class
   #   object.setting = false
   #   object.setting          # => false
   #   Base.setting            # => true
-  #
-  # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
-  #
-  #   object.setting          # => NoMethodError
-  #   object.setting?         # => NoMethodError
-  #
-  # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
-  #
-  #   object.setting = false  # => NoMethodError
-  #
-  # To opt out of both instance methods, pass <tt>instance_accessor: false</tt>.
-  def class_attribute(*attrs)
-    options = attrs.extract_options!
-    instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
-    instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
-    instance_predicate = options.fetch(:instance_predicate, true)
+  def my_class_attribute(*attrs)
+    instance_reader    = true
+    instance_writer    = true
 
     attrs.each do |name|
+      singleton_class.silence_redefinition_of_method(name)
       define_singleton_method(name) { nil }
-      define_singleton_method("#{name}?") { !!public_send(name) } if instance_predicate
 
-      ivar = "@#{name}"
+      ivar = "@#{name}".to_sym
 
+      singleton_class.silence_redefinition_of_method("#{name}=")
       define_singleton_method("#{name}=") do |val|
         singleton_class.class_eval do
-          remove_possible_method(name)
-          define_method(name) { val }
+          redefine_method(name) { val }
         end
 
         if singleton_class?
           class_eval do
-            remove_possible_method(name)
-            define_method(name) do
+            redefine_method(name) do
               if instance_variable_defined? ivar
                 instance_variable_get ivar
               else
@@ -104,26 +92,20 @@ class Class
       end
 
       if instance_reader
-        remove_possible_method name
-        define_method(name) do
+        redefine_method(name) do
           if instance_variable_defined?(ivar)
             instance_variable_get ivar
           else
             self.class.public_send name
           end
         end
-        define_method("#{name}?") { !!public_send(name) } if instance_predicate
       end
 
-      attr_writer name if instance_writer
-    end
-  end
-
-  private
-
-    unless respond_to?(:singleton_class?)
-      def singleton_class?
-        ancestors.first != self
+      if instance_writer
+        redefine_method("#{name}=") do |val|
+          instance_variable_set ivar, val
+        end
       end
     end
+  end
 end

data/lib/dbus/core_ext/module/redefine_method.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+# copied from activesupport/core_ext from Rails, MIT license
+# https://github.com/rails/rails/tree/a713fdae4eb4f7ccd34932edc61561a96b8d9f35/activesupport/lib/active_support/core_ext/module
+
+class Module
+  if RUBY_VERSION >= "2.3"
+    # Marks the named method as intended to be redefined, if it exists.
+    # Suppresses the Ruby method redefinition warning. Prefer
+    # #redefine_method where possible.
+    def silence_redefinition_of_method(method)
+      if method_defined?(method) || private_method_defined?(method)
+        # This suppresses the "method redefined" warning; the self-alias
+        # looks odd, but means we don't need to generate a unique name
+        alias_method method, method
+      end
+    end
+  else
+    def silence_redefinition_of_method(method)
+      if method_defined?(method) || private_method_defined?(method)
+        alias_method :__rails_redefine, method
+        remove_method :__rails_redefine
+      end
+    end
+  end
+
+  # Replaces the existing method definition, if there is one, with the passed
+  # block as its body.
+  def redefine_method(method, &block)
+    visibility = method_visibility(method)
+    silence_redefinition_of_method(method)
+    define_method(method, &block)
+    send(visibility, method)
+  end
+
+  # Replaces the existing singleton method definition, if there is one, with
+  # the passed block as its body.
+  def redefine_singleton_method(method, &block)
+    singleton_class.redefine_method(method, &block)
+  end
+
+  def method_visibility(method) # :nodoc:
+    case
+    when private_method_defined?(method)
+      :private
+    when protected_method_defined?(method)
+      :protected
+    else
+      :public
+    end
+  end
+end

data/lib/dbus/export.rb

@@ -9,6 +9,7 @@
 # See the file "COPYING" for the exact licensing terms.
 
 require "thread"
+require "dbus/core_ext/class/attribute"
 
 module DBus
   # Exported object type
@@ -20,7 +21,7 @@ module DBus
     # The path of the object.
     attr_reader :path
     # The interfaces that the object supports. Hash: String => Interface
-    class_attribute :intfs
+    my_class_attribute :intfs
     self.intfs = {}
 
     # The service that the object is exported by.

data/lib/dbus/introspect.rb

@@ -50,9 +50,9 @@ module DBus
       raise InvalidIntrospectionData if name.bytesize > 255
       raise InvalidIntrospectionData if name =~ /^\./ || name =~ /\.$/
       raise InvalidIntrospectionData if name =~ /\.\./
-      raise InvalidIntrospectionData if !(name =~ /\./)
+      raise InvalidIntrospectionData if name !~ /\./
       name.split(".").each do |element|
-        raise InvalidIntrospectionData if !(element =~ INTERFACE_ELEMENT_RE)
+        raise InvalidIntrospectionData if element !~ INTERFACE_ELEMENT_RE
       end
     end
 

data/lib/dbus/marshall.rb

@@ -69,6 +69,7 @@ module DBus
     def align(a)
       case a
       when 1
+        nil
       when 2, 4, 8
         bits = a - 1
         @idx = @idx + bits & ~bits

data/lib/dbus/proxy_object.rb

@@ -54,7 +54,9 @@ module DBus
     # @return [ProxyObjectInterface]
     def [](intfname)
       introspect unless introspected
-      @interfaces[intfname]
+      ifc = @interfaces[intfname]
+      raise DBus::Error, "no such interface `#{intfname}' on object `#{@path}'" unless ifc
+      ifc
     end
 
     # Maps the given interface name _intfname_ to the given interface _intf.

data/lib/dbus/xml.rb

@@ -41,21 +41,17 @@ module DBus
 
         # required methods
         # returns node attribute value
-        def [](key)
-        end
+        def [](key); end
 
         # yields child nodes which match xpath of type AbstractXML::Node
-        def each(xpath)
-        end
+        def each(xpath); end
       end
       # required methods
       # initialize parser with xml string
-      def initialize(xml)
-      end
+      def initialize(xml); end
 
       # yields nodes which match xpath of type AbstractXML::Node
-      def each(xpath)
-      end
+      def each(xpath); end
     end
 
     class NokogiriParser < AbstractXML

data/ruby-dbus.gemspec

@@ -9,8 +9,8 @@ GEMSPEC = Gem::Specification.new do |s|
   s.version = File.read("VERSION").strip
   s.license = "LGPL v2.1"
   s.author = "Ruby DBus Team"
-  s.email = "ruby-dbus-devel@lists.luon.net"
-  s.homepage = "https://trac.luon.net/ruby-dbus"
+  s.email = "martin.github@vidner.net"
+  s.homepage = "https://github.com/mvidner/ruby-dbus"
   s.files = Dir[
     "{doc,examples,lib,spec}/**/*",
     "COPYING", "NEWS.md", "Rakefile", "README.md",

data/spec/binding_spec.rb

@@ -28,10 +28,14 @@ describe "BindingTest" do
     # it should have its own interface
     expect(test2["org.ruby.Test2"]).not_to be_nil
     # but not an interface of the Test class
-    expect(test2["org.ruby.SampleInterface"]).to be_nil
+    expect { test2["org.ruby.SampleInterface"] }.to raise_error(DBus::Error) do |e|
+      expect(e.message).to match(/no such interface/)
+    end
 
     # and the parent should not get polluted by the child
-    expect(@base["org.ruby.Test2"]).to be_nil
+    expect { @base["org.ruby.Test2"] }.to raise_error(DBus::Error) do |e|
+      expect(e.message).to match(/no such interface/)
+    end
   end
 
   it "tests translating errors into exceptions" do

data/spec/introspect_xml_parser_spec.rb

@@ -4,19 +4,19 @@ require "dbus"
 
 describe "IntrospectXMLParserTest" do
   it "tests split interfaces" do
-    xml = <<EOS
-<node>
-   <interface name="org.example.Foo">
-     <method name="Dwim"/>
-   </interface>
-   <interface name="org.example.Bar">
-     <method name="Drink"/>
-   </interface>
-   <interface name="org.example.Foo">
-     <method name="Smurf"/>
-   </interface>
-</node>
-EOS
+    xml = <<-XML
+      <node>
+        <interface name="org.example.Foo">
+          <method name="Dwim"/>
+        </interface>
+        <interface name="org.example.Bar">
+          <method name="Drink"/>
+        </interface>
+        <interface name="org.example.Foo">
+          <method name="Smurf"/>
+        </interface>
+      </node>
+    XML
 
     interfaces, _subnodes = DBus::IntrospectXMLParser.new(xml).parse
 

data/spec/proxy_object_spec.rb

@@ -38,5 +38,14 @@ describe DBus::ProxyObject do
         end
       end
     end
+
+    describe "#[]" do
+      it "raises when the interface is not found" do
+        obj = svc["/org/ruby/MyInstance"]
+        expect { obj["org.ruby.NoSuchInterface"] }.to raise_error(DBus::Error) do |e|
+          expect(e.message).to match(/no such interface/)
+        end
+      end
+    end
   end
 end

data/spec/session_bus_spec.rb

@@ -37,31 +37,31 @@ describe DBus::ASessionBus do
 
     context "when DBUS_SESSION_BUS_ADDRESS from file is surrounded by quotation marks" do
       it "returns session bus address without single quotation marks" do
-        expect(File).to receive(:open).with(session_bus_file_path) { <<-EOS.gsub(/^\s*/, "") }
+        expect(File).to receive(:open).with(session_bus_file_path) { <<-TEXT.gsub(/^\s*/, "") }
           DBUS_SESSION_BUS_ADDRESS='#{dbus_session_bus_address}'
           DBUS_SESSION_BUS_PID=12345
           DBUS_SESSION_BUS_WINDOWID=12345678
-        EOS
+        TEXT
         expect(DBus::ASessionBus.address_from_file).to eq(dbus_session_bus_address)
       end
 
       it "returns session bus address without double quotation marks" do
-        expect(File).to receive(:open).with(session_bus_file_path) { <<-EOS.gsub(/^\s*/, "") }
+        expect(File).to receive(:open).with(session_bus_file_path) { <<-TEXT.gsub(/^\s*/, "") }
           DBUS_SESSION_BUS_ADDRESS="#{dbus_session_bus_address}"
           DBUS_SESSION_BUS_PID=12345
           DBUS_SESSION_BUS_WINDOWID=12345678
-        EOS
+        TEXT
         expect(DBus::ASessionBus.address_from_file).to eq(dbus_session_bus_address)
       end
     end
 
     context "when DBUS_SESSION_BUS_ADDRESS from file is not surrounded by any quotation marks" do
       it "returns session bus address as it is" do
-        expect(File).to receive(:open).with(session_bus_file_path) { <<-EOS.gsub(/^\s*/, "") }
+        expect(File).to receive(:open).with(session_bus_file_path) { <<-TEXT.gsub(/^\s*/, "") }
           DBUS_SESSION_BUS_ADDRESS=#{dbus_session_bus_address}
           DBUS_SESSION_BUS_PID=12345
           DBUS_SESSION_BUS_WINDOWID=12345678
-        EOS
+        TEXT
         expect(DBus::ASessionBus.address_from_file).to eq(dbus_session_bus_address)
       end
     end

data/spec/spec_helper.rb

@@ -92,11 +92,11 @@ def with_service_by_activation(&block)
   FileUtils.mkdir_p service_dir
   # file name actually does not need to match the service name
   File.open("#{service_dir}/#{name}.service", "w") do |f|
-    s = <<EOS
-[D-BUS Service]
-Name=#{name}
-Exec=#{exec}
-EOS
+    s = <<-TEXT.gsub(/^\s*/, "")
+      [D-BUS Service]
+      Name=#{name}
+      Exec=#{exec}
+    TEXT
     f.write(s)
   end
 

data/spec/type_spec.rb

@@ -4,13 +4,13 @@ require "dbus"
 
 describe DBus do
   describe ".type" do
-    %w{i ai a(ii) aai}.each do |s|
+    ["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|
+    ["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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Pure Ruby module for interaction with D-Bus IPC system
-email: ruby-dbus-devel@lists.luon.net
+email: martin.github@vidner.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -127,10 +127,8 @@ files:
 - lib/dbus/api_options.rb
 - lib/dbus/auth.rb
 - lib/dbus/bus.rb
-- lib/dbus/core_ext/array/extract_options.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/core_ext/module/redefine_method.rb
 - lib/dbus/error.rb
 - lib/dbus/export.rb
 - lib/dbus/introspect.rb
@@ -172,7 +170,7 @@ files:
 - spec/type_spec.rb
 - spec/value_spec.rb
 - spec/variant_spec.rb
-homepage: https://trac.luon.net/ruby-dbus
+homepage: https://github.com/mvidner/ruby-dbus
 licenses:
 - LGPL v2.1
 metadata: {}

data/lib/dbus/core_ext/array/extract_options.rb

@@ -1,31 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-# https://github.com/rails/rails/tree/5aa869861c192daceafe3a3ee50eb93f5a2b7bd2/activesupport/lib/active_support/core_ext
-class Hash
-  # By default, only instances of Hash itself are extractable.
-  # Subclasses of Hash may implement this method and return
-  # true to declare themselves as extractable. If a Hash
-  # is extractable, Array#extract_options! pops it from
-  # the Array when it is the last element of the Array.
-  def extractable_options?
-    instance_of?(Hash)
-  end
-end
-
-class Array
-  # Extracts options from a set of arguments. Removes and returns the last
-  # element in the array if it's a hash, otherwise returns a blank hash.
-  #
-  #   def options(*args)
-  #     args.extract_options!
-  #   end
-  #
-  #   options(1, 2)        # => {}
-  #   options(1, 2, a: :b) # => {:a=>:b}
-  def extract_options!
-    if last.is_a?(Hash) && last.extractable_options?
-      pop
-    else
-      {}
-    end
-  end
-end

data/lib/dbus/core_ext/kernel/singleton_class.rb

@@ -1,8 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-# https://github.com/rails/rails/tree/5aa869861c192daceafe3a3ee50eb93f5a2b7bd2/activesupport/lib/active_support/core_ext
-module Kernel
-  # class_eval on an object acts like singleton_class.class_eval.
-  def class_eval(*args, &block)
-    singleton_class.class_eval(*args, &block)
-  end
-end

data/lib/dbus/core_ext/module/remove_method.rb

@@ -1,14 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-# https://github.com/rails/rails/tree/5aa869861c192daceafe3a3ee50eb93f5a2b7bd2/activesupport/lib/active_support/core_ext
-class Module
-  def remove_possible_method(method)
-    if method_defined?(method) || private_method_defined?(method)
-      undef_method(method)
-    end
-  end
-
-  def redefine_method(method, &block)
-    remove_possible_method(method)
-    define_method(method, &block)
-  end
-end