ruby-dbus 0.22.1 → 0.23.0.beta2

data/spec/tools/dbus-limited-session.conf

@@ -43,6 +43,9 @@
     <allow eavesdrop="true"/>
     <!-- Allow anyone to own anything -->
     <allow own="*"/>
+
+    <!-- To test how request_name handles bus errors -->
+    <deny own="org.rubygems.ruby_dbus.NobodyCanOwnThisName"/>
   </policy>
 
   <!-- Do not increase the limits.

data/spec/tools/test_env

@@ -2,13 +2,33 @@
 # test_env: set up the environment needed to run tests:
 # - set up a private bus
 # - run a test server on it
+set -o errexit
 
 #export DBUS_VERBOSE=1
 #export RUBYOPT="-d"
 export RUBYOPT="$RUBYOPT -w"
-DIR=$(dirname $0)
-$DIR/test_server \
-	$DIR/../service_newapi.rb \
-	-- \
-	$DIR/dbus-launch-simple \
-	"$@"
+MYDIR=$(dirname $0)
+TOPDIR=$(realpath $MYDIR/../..)
+
+
+# Clean up at exit.
+trap "rm -rf \$RM_FILES" EXIT TERM INT
+
+export XDG_DATA_DIRS=`mktemp -d dbus.activation.XXXXXX`
+RM_FILES="$RM_FILES $XDG_DATA_DIRS"
+
+SVCDIR=$XDG_DATA_DIRS/dbus-1/services
+mkdir -p $SVCDIR
+for SVC in $TOPDIR/spec/mock-service/*.service; do
+  SVCBASE=${SVC##*/}
+  sed -e "s@\(Exec\)=/usr/bin/@\1=$TOPDIR/spec/mock-service/@" $SVC > $SVCDIR/$SVCBASE
+done
+
+
+# no command given -> run an interactive shell
+if [ $# = 0 ]; then
+  set -- env PS1="TEST_ENV \w> " bash
+fi
+
+$MYDIR/dbus-launch-simple \
+	"$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0.beta2
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -124,6 +124,7 @@ files:
 - doc/Tutorial.md
 - examples/doc/README.md
 - examples/doc/_extract_examples
+- examples/no-bus/pulseaudio.rb
 - examples/no-introspect/nm-test.rb
 - examples/no-introspect/tracker-test.rb
 - examples/rhythmbox/playpause.rb
@@ -140,6 +141,7 @@ files:
 - lib/dbus/auth.rb
 - lib/dbus/bus.rb
 - lib/dbus/bus_name.rb
+- lib/dbus/connection.rb
 - lib/dbus/core_ext/class/attribute.rb
 - lib/dbus/core_ext/module/redefine_method.rb
 - lib/dbus/data.rb
@@ -147,17 +149,22 @@ files:
 - lib/dbus/error.rb
 - lib/dbus/introspect.rb
 - lib/dbus/logger.rb
+- lib/dbus/main.rb
 - lib/dbus/marshall.rb
 - lib/dbus/matchrule.rb
 - lib/dbus/message.rb
 - lib/dbus/message_queue.rb
+- lib/dbus/node_tree.rb
 - lib/dbus/object.rb
 - lib/dbus/object_manager.rb
 - lib/dbus/object_path.rb
+- lib/dbus/object_server.rb
+- lib/dbus/org.freedesktop.DBus.xml
 - lib/dbus/platform.rb
 - lib/dbus/proxy_object.rb
 - lib/dbus/proxy_object_factory.rb
 - lib/dbus/proxy_object_interface.rb
+- lib/dbus/proxy_service.rb
 - lib/dbus/raw_message.rb
 - lib/dbus/type.rb
 - lib/dbus/xml.rb
@@ -166,21 +173,31 @@ files:
 - spec/auth_spec.rb
 - spec/binding_spec.rb
 - spec/bus_and_xml_backend_spec.rb
-- spec/bus_driver_spec.rb
+- spec/bus_connection_spec.rb
 - spec/bus_name_spec.rb
 - spec/bus_spec.rb
 - spec/byte_array_spec.rb
 - spec/client_robustness_spec.rb
+- spec/connection_spec.rb
+- spec/coverage_helper.rb
 - spec/data/marshall.yaml
 - spec/data_spec.rb
+- spec/dbus_spec.rb
 - spec/emits_changed_signal_spec.rb
 - spec/err_msg_spec.rb
 - spec/introspect_xml_parser_spec.rb
 - spec/introspection_spec.rb
 - spec/main_loop_spec.rb
+- spec/message_spec.rb
+- spec/mock-service/cockpit-dbustests.rb
+- spec/mock-service/com.redhat.Cockpit.DBusTests.xml
+- spec/mock-service/org.ruby.service.service
+- spec/mock-service/org.rubygems.ruby_dbus.DBusTests.service
+- spec/mock-service/spaghetti-monster.rb
 - spec/node_spec.rb
 - spec/object_manager_spec.rb
 - spec/object_path_spec.rb
+- spec/object_server_spec.rb
 - spec/object_spec.rb
 - spec/packet_marshaller_spec.rb
 - spec/packet_unmarshaller_spec.rb
@@ -188,11 +205,9 @@ files:
 - spec/property_spec.rb
 - spec/proxy_object_interface_spec.rb
 - spec/proxy_object_spec.rb
+- spec/proxy_service_spec.rb
 - spec/raw_message_spec.rb
 - spec/server_robustness_spec.rb
-- spec/server_spec.rb
-- spec/service_newapi.rb
-- spec/service_spec.rb
 - spec/session_bus_spec.rb
 - spec/session_bus_spec_manual.rb
 - spec/signal_spec.rb
@@ -201,14 +216,13 @@ files:
 - spec/tools/dbus-launch-simple
 - spec/tools/dbus-limited-session.conf
 - spec/tools/test_env
-- spec/tools/test_server
 - spec/type_spec.rb
 - spec/value_spec.rb
 - spec/variant_spec.rb
 - spec/zzz_quit_spec.rb
 homepage: https://github.com/mvidner/ruby-dbus
 licenses:
-- LGPL-2.1
+- LGPL-2.1-or-later
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -221,9 +235,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: 

data/spec/server_spec.rb

@@ -1,55 +0,0 @@
-#!/usr/bin/env rspec
-# frozen_string_literal: true
-
-# Test that a server survives various error cases
-require_relative "spec_helper"
-require "dbus"
-
-class Foo < DBus::Object
-  dbus_interface "org.ruby.ServerTest" do
-    dbus_signal :signal_without_arguments
-    dbus_signal :signal_with_argument, "epsilon:d"
-  end
-
-  dbus_signal :signal_without_interface
-rescue DBus::Object::UndefinedInterface
-  # raised by the preceding signal declaration
-end
-
-class Bar < DBus::Object
-  dbus_interface "org.ruby.ServerTest" do
-    # a valid Ruby symbol but an invalid DBus name; Ticket#38
-    dbus_signal :signal_with_a_bang!
-  end
-rescue DBus::InvalidMethodName
-  # raised by the preceding signal declaration
-end
-
-describe "ServerTest" do
-  before(:each) do
-    @bus = DBus::ASessionBus.new
-    @svc = @bus.request_service "org.ruby.server-test"
-  end
-
-  after(:each) do
-    @bus.proxy.ReleaseName "org.ruby.server-test"
-  end
-
-  it "tests unexporting an object" do
-    obj = Foo.new "/org/ruby/Foo"
-    @svc.export obj
-    expect(@svc.unexport(obj)).to be_a DBus::Object
-  end
-
-  it "tests unexporting an object not exported" do
-    obj = Foo.new "/org/ruby/Foo"
-    expect(@svc.unexport(obj)).to be false
-  end
-
-  it "tests emiting signals" do
-    obj = Foo.new "/org/ruby/Foo"
-    @svc.export obj
-    obj.signal_without_arguments
-    obj.signal_with_argument(-0.1)
-  end
-end

data/spec/service_spec.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env rspec
-# frozen_string_literal: true
-
-require_relative "spec_helper"
-require "dbus"
-
-describe "DBus::Service (server role)" do
-  let(:bus) { DBus::ASessionBus.new }
-  # This is the client role, but the server role API is bad
-  # and for the one test there is no difference
-  let(:service) { bus["org.ruby.service"] }
-
-  describe "#descendants_for" do
-    it "raises for not existing path" do
-      expect { service.descendants_for("/notthere") }.to raise_error(ArgumentError)
-    end
-  end
-end

data/spec/tools/test_server

@@ -1,39 +0,0 @@
-#! /bin/sh
-# A wrapper for DBus tests
-# Run a server (directly or by dbus activation) and then the test
-# $0 server [args...] -- test [args...]
-set -o errexit
-
-while [ "$1" != "--" ]; do
-  SERVER="$SERVER $1"
-  shift
-done
-shift # --
-
-setup_activation () {
-    SDIR=$XDG_DATA_DIRS/dbus-1/services
-    mkdir -p $SDIR
-    # FIXME Name is hardcoded
-    cat <<EOF > $SDIR/test.service
-[D-BUS Service]
-Name=org.ruby.service
-Exec=$SERVER
-EOF
-}
-
-run_server () {
-    echo -n "Hey, server, get on da bus... "
-    # start the server
-    $SERVER & sleep 3
-    echo "off we go!"
-}
-
-export XDG_DATA_DIRS=`mktemp -d dbus.activation.XXXXXX`
-RM_FILES="$RM_FILES $XDG_DATA_DIRS"
-setup_activation
-#run_server
-
-# Clean up at exit.
-trap "rm -rf \$RM_FILES" EXIT TERM INT
-
-"$@"