ruby-dbus 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5578c5ae560c5c6a45df876f49b57d165ba04f
-  data.tar.gz: 3f6ae11937fb008b74c8ddfa208288b5d6b0e584
+  metadata.gz: 12bb637315162a316a583bcbd48c77eb7904fdc1
+  data.tar.gz: 93baea47e50c7f48fad776508949dea27ab9c6e7
 SHA512:
-  metadata.gz: d3c0e16681e04bac203929ba4470e68431a88318d6b07cf34b6219e9ff9b19dd922874387bb43c8378eee0909703466aebd78882de20b5aec02065b4ec16226c
-  data.tar.gz: 30cdab56d6793c7027b2bce10b75fd6b1a9c31395fea2b741deb85ce00d79dc02a97ad79187416adebb36c612562d9ae03dc1750be69914adde4f9f6b65c46e1
+  metadata.gz: 5fc62a23577d52c11d8496090e9740e09a8be730ac115e08796568eb055c4282ddba09dafb66527272d25e7f8a50fd8f447a9876df377691b23e364a9c230b07
+  data.tar.gz: 41d4b093c212b6e5854060dd314274ef7847db14c3cb287f7e35e6703a090ab77d5c9bda1b3061da26c6a8d89c461642815a95e74a7f0862d27a34a198680585

data/NEWS

@@ -5,6 +5,14 @@ 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
 
+== Unreleased
+
+== Ruby D-Bus 0.11.2 - 2016-09-11
+
+Bug fixes:
+ * Fixed reading a quoted session bus address, as written by dbus-1.10.10
+   (Yasuhiro Asaka)
+
 == Ruby D-Bus 0.11.1 - 2016-05-12
 
 Bug fixes:

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/lib/dbus/bus.rb

@@ -621,7 +621,8 @@ module DBus
 
       File.open(bus_file_path).each_line do |line|
         if line =~ /^DBUS_SESSION_BUS_ADDRESS=(.*)/
-          return $1
+          address = $1
+          return address[/\A'(.*)'\z/, 1] || address[/\A"(.*)"\z/, 1] || address
         end
       end
     end

data/spec/session_bus_spec.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe DBus::ASessionBus do
+  subject(:dbus_session_bus_address) { "unix:abstract=/tmp/dbus-foo,guid=123" }
+
+  describe "#session_bus_address" do
+    around(:each) do |example|
+      @original_dbus_session_bus_address = ENV["DBUS_SESSION_BUS_ADDRESS"]
+      example.call
+      ENV["DBUS_SESSION_BUS_ADDRESS"] = @original_dbus_session_bus_address
+    end
+
+    it "returns DBUS_SESSION_BUS_ADDRESS as it is" do
+      ENV["DBUS_SESSION_BUS_ADDRESS"] = dbus_session_bus_address
+      expect(DBus::ASessionBus.session_bus_address).to eq(dbus_session_bus_address)
+    end
+  end
+
+  describe "#address_from_file" do
+    let(:session_bus_file_path) { /\.dbus\/session-bus\/baz-\d/ }
+
+    before do
+      # mocks of files for address_from_file method
+      machine_id_path = File.expand_path("/etc/machine-id", __FILE__)
+      expect(Dir).to receive(:[]).with(any_args) {[machine_id_path] }
+      expect(File).to receive(:read).with(machine_id_path) { "baz" }
+      expect(File).to receive(:exists?).with(session_bus_file_path) { true }
+    end
+
+    around(:each) do |example|
+      with_env("DISPLAY", ":0.0") do
+        example.call
+      end
+    end
+
+    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*/, '') }
+          DBUS_SESSION_BUS_ADDRESS='#{dbus_session_bus_address}'
+          DBUS_SESSION_BUS_PID=12345
+          DBUS_SESSION_BUS_WINDOWID=12345678
+        EOS
+        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*/, '') }
+          DBUS_SESSION_BUS_ADDRESS="#{dbus_session_bus_address}"
+          DBUS_SESSION_BUS_PID=12345
+          DBUS_SESSION_BUS_WINDOWID=12345678
+        EOS
+        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*/, '') }
+          DBUS_SESSION_BUS_ADDRESS=#{dbus_session_bus_address}
+          DBUS_SESSION_BUS_PID=12345
+          DBUS_SESSION_BUS_WINDOWID=12345678
+        EOS
+        expect(DBus::ASessionBus.address_from_file).to eq(dbus_session_bus_address)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
@@ -101,6 +101,7 @@ files:
 - spec/server_robustness_spec.rb
 - spec/server_spec.rb
 - spec/service_newapi.rb
+- spec/session_bus_spec.rb
 - spec/session_bus_spec_manual.rb
 - spec/signal_spec.rb
 - spec/spec_helper.rb