ruby-dbus-openplacos 0.6.2 → 0.7.0

data/NEWS

@@ -5,6 +5,22 @@ 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.7.0 - 2011-07-26
+
+Features:
+ * Added ASystemBus and ASessionBus, non-singletons useful in tests
+   and threads.
+
+Bug fixes:
+ * Fixed handling of multibyte strings (Issue#8, by Takayuki YAMAGUCHI).
+ * Allow reopening of a dbus_interface declaration (Issue#9, by T. YAMAGUCHI).
+ * Fixed ruby-1.9.2 compatibility again (Issue#12).
+ * Fixed authentication on BSD (Issue#11, by Jonathan Walker)
+ * Fixed exiting a nested event loop for synchronous calls
+   (reported by Timo Warns).
+ * Fixed introspection calls leaking reply handlers.
+ * "rake test" now works, doing what was called "rake env:test"
+
 == Ruby D-Bus 0.6.0 - 2010-12-11
 
 Features:

data/Rakefile

@@ -3,33 +3,32 @@ require 'rake'
 require 'rake/gempackagetask'
 require 'fileutils'
 include FileUtils
+require 'tmpdir'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
 desc 'Default: run tests in the proper environment'
-task :default => "env:test"
+task :default => :test
 
 def common_test_task(t)
     t.libs << "lib"
     t.test_files = FileList['test/*_test.rb', 'test/t[0-9]*.rb']
     t.verbose = true
 end
-Rake::TestTask.new {|t| common_test_task t }
+Rake::TestTask.new("bare:test") {|t| common_test_task t }
 
 begin
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new {|t| common_test_task t }
+  Rcov::RcovTask.new("bare:rcov") {|t| common_test_task t }
 rescue LoadError
   # no rcov, never mind
 end
 
 %w(test rcov).each do |tname|
-  namespace :env do
-    desc "Run #{tname} in the proper environment"
-    task tname do |t|
-      cd "test" do
-        system "./test_env rake #{tname}"
-      end
+  desc "Run bare:#{tname} in the proper environment"
+  task tname do |t|
+    cd "test" do
+      system "./test_env rake bare:#{tname}"
     end
   end
 end
@@ -40,6 +39,17 @@ Rake::GemPackageTask.new(GEMSPEC) do |pkg|
   # no other formats needed
 end
 
+desc "Build a package from a clone of the local Git repo"
+task :package_git do |t|
+  Dir.mktmpdir do |temp|
+    sh "git clone . #{temp}"
+    cd temp do
+      sh "rake package"
+    end
+    cp_r "#{temp}/pkg", "."
+  end
+end
+
 Rake::RDocTask.new do |rd|
   rd.rdoc_dir = 'doc/rdoc'
   rd.rdoc_files.include("README", "lib/**/*.rb")

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/lib/dbus/auth.rb

@@ -8,6 +8,8 @@
 
 $debug = $DEBUG #it's all over the state machine
 
+require 'rbconfig'
+
 module DBus
   # Exception raised when authentication fails somehow.
   class AuthenticationFailed < Exception
@@ -118,7 +120,11 @@ module DBus
 
     # Start the authentication process.
     def authenticate
-      @socket.write(0.chr)
+      if (RbConfig::CONFIG["target_os"] =~ /bsd/)
+        @socket.sendmsg(0.chr, 0, nil, [:SOCKET, :SCM_CREDS, ""])
+      else
+        @socket.write(0.chr)
+      end
       next_authenticator
       @state = :Starting
       while @state != :Authenticated
@@ -142,12 +148,12 @@ module DBus
     # Try authentication using the next authenticator.
     def next_authenticator
       begin
-        raise AuthException if @auth_list.size == 0
+        raise AuthenticationFailed if @auth_list.size == 0
         @authenticator = @auth_list.shift.new
         auth_msg = ["AUTH", @authenticator.name, @authenticator.authenticate]
         puts "DEBUG: auth_msg: #{auth_msg.inspect}" if $debug
         send(auth_msg)
-      rescue AuthException
+      rescue AuthenticationFailed
         @socket.close
         raise
       end

data/lib/dbus/bus.rb

@@ -30,11 +30,20 @@ module DBus
     attr_reader :root
 
     # Create a new service with a given _name_ on a given _bus_.
-    def initialize(name, bus)
+    def initialize(name, bus,threaded = false)
       @name, @bus = name, bus
+      @threaded = threaded
       @root = Node.new("/")
     end
-
+    
+    def threaded?
+      return @threaded
+    end
+    
+    def threaded=(threaded)
+      @threaded = threaded
+    end
+    
     # Determine whether the service name already exists.
     def exists?
       bus.proxy.ListNames[0].member?(@name)
@@ -242,11 +251,7 @@ module DBus
               @queue_used_by_thread[thread_in_wait] << ret # puts the message in the queue
             end
           else
-            if main_thread
-              @main_message_queue << ret             
-            else
-              process(ret) # there is no main.run thread, process the message
-            end
+            @main_message_queue << ret             
           end
         end
       }
@@ -630,9 +635,7 @@ module DBus
       if (@threaded)
         @queue_used_by_thread.delete(Thread.current)
       else
-        until [DBus::Message::ERROR,
-               DBus::Message::METHOD_RETURN].include?(retm.message_type) and
-            retm.reply_serial == m.serial
+        while @method_call_replies.has_key? m.serial
           retm = wait_for_message
           process(retm)
         end

data/lib/dbus/export.rb

@@ -42,6 +42,14 @@ module DBus
 
     # Dispatch a message _msg_ to call exported methods
     def dispatch(msg)
+      if @service.threaded?
+        Thread.new { process_dispatch(msg)}
+      else
+        process_dispatch(msg)
+      end
+    end
+
+    def process_dispatch(msg)
       case msg.message_type
       when Message::METHOD_CALL
         reply = nil
@@ -70,6 +78,7 @@ module DBus
       end
     end
 
+
     # Select (and create) the interface that the following defined methods
     # belong to.
     def self.dbus_interface(s)

data/ruby-dbus-openplacos.gemspec

@@ -8,6 +8,7 @@ GEMSPEC = Gem::Specification.new do |s|
   s.summary = "Fork from ruby-dbus"
   # s.description = FIXME
   s.version = File.read("VERSION").strip
+  s.license = "LGPL v2.1"
   s.author = "Openplacos Team"
   s.homepage = "https://github.com/flagos/ruby-dbus"
   s.files = FileList["{doc/tutorial,examples,lib,test}/**/*", "Rakefile", "ruby-dbus-openplacos.gemspec", "VERSION"].to_a.sort

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-dbus-openplacos
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Openplacos Team
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 +02:00
+date: 2012-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -84,8 +83,8 @@ files:
 - NEWS
 has_rdoc: true
 homepage: https://github.com/flagos/ruby-dbus
-licenses: []
-
+licenses: 
+- LGPL v2.1
 post_install_message: 
 rdoc_options: []
 
@@ -96,7 +95,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
@@ -107,14 +105,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fork from ruby-dbus