ruby-dbus 0.9.3 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d85683483eaee12e0221cc19843e3887a858269a
+  data.tar.gz: 8aa3af094fe0068807269591395d29d7eb37c7cf
+SHA512:
+  metadata.gz: 0493a1b55563d87d202b8cfda861a817d4ab63baa42724505976e64568fad392c2bdcf9a570ea99fe4c32c11ead7dfdc885fbe887e4fc9c7b67540d45c4b0b0d
+  data.tar.gz: 6d0f2704d4a30ef90b08b93c2e5f9f69750312914dfb7904ad5c9cb13aaaa6cef067dc0484d12b952c1885e747b831731b995526eeb9b39ef6c005ab29315124

data/NEWS

@@ -5,6 +5,15 @@ Note about bug numbers:
  Issue#1  - http://github.com/mvidner/ruby-dbus/issues#issue/1
  bnc#1    - https://bugzilla.novell.com/show_bug.cgi?id=1
 
+== Ruby D-Bus 0.10.0 - 2014-01-10
+
+Bug fixes:
+ * fixed "Interfaces added with singleton_class.instance_eval aren't
+   exported" (Issue#22, by miaoufkirsh)
+
+Requirements:
+ * Require ruby 1.9.3, stopped supporting 1.8.7.
+
 == Ruby D-Bus 0.9.3 - 2014-01-02
 
 Bug fixes:

data/README.md

@@ -5,7 +5,9 @@ D-Bus system can be used in the Ruby programming language.
 
 ## Requirements
 
-- Ruby 1.8.7, 1.9 or 2.0
+- Ruby 1.9.3 or 2.0
+
+[![Build Status](https://travis-ci.org/mvidner/ruby-dbus.png)](https://travis-ci.org/mvidner/ruby-dbus)
 
 ## Installation
 

data/Rakefile

@@ -13,6 +13,9 @@ Packaging.configuration do |conf|
   conf.obs_sr_project = "openSUSE:Factory"
   conf.skip_license_check << /^[^\/]*$/
   conf.skip_license_check << /^(doc|examples|test)\/.*/
+  # "Ruby on Rails is released under the MIT License."
+  # but the files are missing copyright headers
+  conf.skip_license_check << /^lib\/dbus\/core_ext\//
 end
 
 desc 'Default: run tests in the proper environment'
@@ -20,7 +23,7 @@ task :default => :test
 
 def common_test_task(t)
     t.libs << "lib"
-    t.test_files = FileList['test/*_test.rb', 'test/t[0-9]*.rb']
+    t.test_files = FileList['test/*_test.rb']
     t.verbose = true
 end
 Rake::TestTask.new("bare:test") {|t| common_test_task t }
@@ -35,7 +38,7 @@ end
 %w(test rcov).each do |tname|
   desc "Run bare:#{tname} in the proper environment"
   task tname do |t|
-    cd "test" do
+    cd "test/tools" do
       sh "./test_env rake bare:#{tname}"
     end
   end

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.10.0

data/lib/dbus.rb

@@ -8,6 +8,7 @@
 # License, version 2.1 as published by the Free Software Foundation.
 # See the file "COPYING" for the exact licensing terms.
 
+require 'dbus/core_ext/class/attribute'
 require 'dbus/type'
 require 'dbus/introspect'
 require 'dbus/error'
@@ -23,13 +24,6 @@ require 'dbus/xml'
 require 'socket'
 require 'thread'
 
-unless 0.respond_to?(:ord)
-  # Backward compatibility with Ruby 1.8.6, see http://www.pubbs.net/ruby/200907/65871/
-  class Integer
-    def ord; self; end
-  end
-end
-
 # = D-Bus main module
 #
 # Module containing all the D-Bus modules and classes.

data/lib/dbus/bus.rb

@@ -247,7 +247,8 @@ module DBus
           @socket.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
           init_connection
           @is_tcp = true
-        rescue
+        rescue Exception => e
+          puts "Oops:", e
           puts "Error: Could not establish connection to: #{@path}, will now exit."
           exit(1) #a little harsh
         end

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

@@ -0,0 +1,31 @@
+# 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/class/attribute.rb

@@ -0,0 +1,129 @@
+# 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'
+
+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.
+  #
+  #   class Base
+  #     class_attribute :setting
+  #   end
+  #
+  #   class Subclass < Base
+  #   end
+  #
+  #   Base.setting = true
+  #   Subclass.setting            # => true
+  #   Subclass.setting = false
+  #   Subclass.setting            # => false
+  #   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>
+  # 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:
+  #
+  #   Base.setting = []
+  #   Base.setting                # => []
+  #   Subclass.setting            # => []
+  #
+  #   # Appending in child changes both parent and child because it is the same object:
+  #   Subclass.setting << :foo
+  #   Base.setting               # => [:foo]
+  #   Subclass.setting           # => [:foo]
+  #
+  #   # Use setters to not propagate changes:
+  #   Base.setting = []
+  #   Subclass.setting += [:foo]
+  #   Base.setting               # => []
+  #   Subclass.setting           # => [:foo]
+  #
+  # For convenience, an instance predicate method is defined as well.
+  # To skip it, pass <tt>instance_predicate: false</tt>.
+  #
+  #   Subclass.setting?       # => false
+  #
+  # Instances may overwrite the class value in the same way:
+  #
+  #   Base.setting = true
+  #   object = Base.new
+  #   object.setting          # => true
+  #   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)
+
+    attrs.each do |name|
+      define_singleton_method(name) { nil }
+      define_singleton_method("#{name}?") { !!public_send(name) } if instance_predicate
+
+      ivar = "@#{name}"
+
+      define_singleton_method("#{name}=") do |val|
+        singleton_class.class_eval do
+          remove_possible_method(name)
+          define_method(name) { val }
+        end
+
+        if singleton_class?
+          class_eval do
+            remove_possible_method(name)
+            define_method(name) do
+              if instance_variable_defined? ivar
+                instance_variable_get ivar
+              else
+                singleton_class.send name
+              end
+            end
+          end
+        end
+        val
+      end
+
+      if instance_reader
+        remove_possible_method name
+        define_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
+      end
+    end
+end

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

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,14 @@
+# 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

data/lib/dbus/export.rb

@@ -19,10 +19,8 @@ module DBus
   class Object
     # The path of the object.
     attr_reader :path
-    # The interfaces that the object supports.
-    # intfs: Hash: String => Interface
-    # @@intfs_hash simulates a class attribute by being a hash Class => intfs
-    @@intfs_hash = {DBus::Object => nil}
+    # The interfaces that the object supports. Hash: String => Interface
+    class_attribute :intfs
     # The service that the object is exported by.
     attr_writer :service
 
@@ -36,26 +34,6 @@ module DBus
       @service = nil
     end
 
-    def self.intfs
-      if self.equal? DBus::Object
-        @@intfs_hash[DBus::Object]
-      else
-        @@intfs_hash[self] || self.superclass.intfs
-      end
-    end
-
-    def self.intfs= param
-      @@intfs_hash[self] = param
-    end
-
-    def intfs
-      self.class.intfs
-    end
-
-    def intfs= param
-      self.class.intfs = param
-    end
-
     # State that the object implements the given _intf_.
     def implements(intf)
       # use a setter

data/lib/dbus/introspect.rb

@@ -306,18 +306,7 @@ module DBus
     # Note that specifying _bus_ is discouraged and the option is kept only for
     # backward compatibility.
     # @return [void]
-    def on_signal(*args, &block)
-      # Since we must function under ruby 1.8.7, it isn't possible to define the
-      # function as on_signal(bus = nil, name, &block)
-      bus = case args.size
-              when 1
-                @object.bus
-              when 2
-                args.shift
-              else
-                raise ArgumentError, "wrong number of arguments (#{args.size} for 1-2)"
-            end
-      name = args.shift
+    def on_signal(bus = @object.bus, name, &block)
       mr = DBus::MatchRule.new.from_signal(self, name)
       if block.nil?
         bus.remove_match(mr)

data/lib/dbus/marshall.rb

@@ -90,15 +90,6 @@ module DBus
       ret
     end
 
-    # Retrieve the series of bytes until the next NULL (\0) byte.
-    def get_nul_terminated
-      raise IncompleteBufferException if not @buffy[@idx..-1] =~ /^([^\0]*)\0/
-      str = $1
-      raise IncompleteBufferException if @idx + str.bytesize + 1 > @buffy.bytesize
-      @idx += str.bytesize + 1
-      str
-    end
-
     # Get the string length and string itself from the buffer.
     # Return the string.
     def get_string
@@ -301,11 +292,6 @@ module DBus
       yield
     end
 
-    # Append a string of bytes without type.
-    def append_simple_string(s)
-      @packet += s + "\0"
-    end
-
     # Append a value _val_ to the packet based on its _type_.
     #
     # Host native endianness is used, declared in Message#marshall

data/ruby-dbus.gemspec

@@ -14,6 +14,6 @@ GEMSPEC = Gem::Specification.new do |s|
   s.homepage = "https://trac.luon.net/ruby-dbus"
   s.files = FileList["{doc,examples,lib,test}/**/*", "COPYING", "NEWS", "Rakefile", "README.md", "ruby-dbus.gemspec", "VERSION"].to_a.sort
   s.require_path = "lib"
-  s.required_ruby_version = ">= 1.8.7"
+  s.required_ruby_version = ">= 1.9.3"
   s.add_development_dependency("packaging_rake_tasks")
 end

data/test/binding_test.rb

@@ -54,4 +54,23 @@ class BindingTest < Test::Unit::TestCase
     assert_equal "org.freedesktop.DBus.Error.Failed", e.name
     assert_equal "failed as designed", e.message
   end
+  
+  def test_dynamic_interface_definition
+    # interfaces can be defined dynamicaly
+    derived = DBus::Object.new "/org/ruby/MyDerivedInstance"
+    
+    #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|
+          puts "hello(#{name}, #{name2})"
+        end
+      end
+    end
+    
+    # the object should have the new iface
+    ifaces = derived.intfs
+    assert ifaces and ifaces.include?("org.ruby.DynamicInterface")
+  end
+    
 end

data/test/{test_env → tools/test_env}

@@ -7,7 +7,7 @@
 #export RUBYOPT="-d"
 export RUBYOPT="$RUBYOPT -w"
 ./test_server \
-	./service_newapi.rb \
+	../service_newapi.rb \
 	-- \
 	./dbus-launch-simple \
 	"$@"

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

@@ -13,6 +13,15 @@ class ValueTest < Test::Unit::TestCase
     @obj.default_iface = "org.ruby.SampleInterface"
   end
 
+  def test_passing_an_array_of_structs_through_a_variant
+    triple = ['a(uuu)', []]
+    @obj.test_variant(triple)
+    quadruple = ['a(uuuu)', []]     # a(uuu) works fine
+    # The bus disconnects us because of malformed message,
+    # code 12: DBUS_INVALID_TOO_MUCH_DATA
+    @obj.test_variant(quadruple)
+  end
+
   def test_passing_an_array_through_a_variant
     # old explicit typing
     @obj.test_variant(["as", ["coucou", "kuku"]])

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Pure Ruby module for interaction with D-Bus IPC system
@@ -63,6 +60,10 @@ files:
 - lib/dbus.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/error.rb
 - lib/dbus/export.rb
 - lib/dbus/introspect.rb
@@ -79,51 +80,48 @@ files:
 - test/bus_driver_test.rb
 - test/bus_test.rb
 - test/byte_array_test.rb
-- test/dbus-launch-simple
-- test/dbus-limited-session.conf
+- 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/service_newapi.rb
 - test/session_bus_test_manual.rb
 - test/signal_test.rb
-- test/t1
-- test/t2.rb
-- test/t3-ticket27.rb
-- test/t5-report-dbus-interface.rb
-- test/t6-loop.rb
-- test/test_env
 - test/test_helper.rb
-- test/test_server
 - test/thread_safety_test.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
 homepage: https://trac.luon.net/ruby-dbus
 licenses:
 - LGPL v2.1
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby module for interaction with D-Bus
 test_files: []
 has_rdoc: 

data/test/t1

@@ -1,4 +0,0 @@
-#! /bin/sh
-SEND0="dbus-send  --session --dest=org.ruby.service"
-CALL="$SEND0 --type=method_call --print-reply"
-$CALL /org/ruby/MyInstance org.ruby.AnotherInterface.Reverse string:Hello

data/test/t3-ticket27.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# Test passing a particular struct array through a variant
-# https://trac.luon.net/ruby-dbus/ticket/27
-require File.expand_path("../test_helper", __FILE__)
-require "dbus"
-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"
-# The bug is probably alignment related so whether it triggers
-# depends also on the combined length of service, interface,
-# and method names. Luckily here it works out.
-triple = ['a(uuu)', []]
-obj.test_variant(triple)
-quadruple = ['a(uuuu)', []]     # a(uuu) works fine
-# The bus disconnects us because of malformed message,
-# code 12: DBUS_INVALID_TOO_MUCH_DATA
-obj.test_variant(quadruple)