xmpp4r-robot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c1f2e10c7d3b9bbff8750f1c122e67e6e20665
-  data.tar.gz: eca785d782872d6076e81d2d872e9a8a5f0059bd
+  metadata.gz: 195565e3a667fb773fa9077f35bc261002fe8f81
+  data.tar.gz: 2348c990da4f5f2109282c25a1f53feaf624c19e
 SHA512:
-  metadata.gz: e11bfd191df92527c20cd4a1765e53336955af0c9878d121bfe9393e611c6fd56a455b915093f69e915b15cf95c062449249fb5e6c68780f74b6104e4bdb9e28
-  data.tar.gz: 3af9add9f15286f162cb96c5c250e4ff624d2f40f9ab9b106f7ac03a89f79dcdcf007ccb93473688c32b5d590378eb35081a353434c0ae1c28484cb5029bddd9
+  metadata.gz: d0495733f172b0c49c8bfd2a9a5b32eb8d9a3a8027ea35d4bea5cdca061445bdb01f2faa5d78c37ff07adabb992195466e69f919c8d63bf1407faf4eddefd120
+  data.tar.gz: a08516fd324c7b9377acc0c710337e6c906a6cb2bd728974f0531a765ea6993e4c1a8f221f66fc8ef9381f9b2010c60a1494fdf3b31ad7e47a5a093cff4ca831

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## xmpp4r-robot 0.2.1 -- 2014-01-25
+
+* Fixed retry_time bug.
+* Made roster thread safe.
+
 ## xmpp4r-robot 0.2.0 -- 2014-01-23
 
 * Jabber::Robot#start would now act as restart.

data/Rakefile

@@ -8,6 +8,6 @@ end
 
 Gemgem.init(dir) do |s|
   s.name    = 'xmpp4r-robot'
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.add_runtime_dependency('xmpp4r', '~> 0.5')
 end

data/lib/xmpp4r/robot.rb

@@ -1,5 +1,6 @@
 
 require 'set'
+require 'thread'
 
 require 'xmpp4r'
 require 'xmpp4r/roster'
@@ -18,6 +19,9 @@ class Jabber::Robot
 
     @retry_time               = Float(opts[:retry_time] || 0)
     @auto_accept_subscription = opts[:auto_accept_subscription]
+
+    @roster_mutex = Mutex.new
+    @helper_mutex = Mutex.new
   end
 
   def inspect
@@ -32,6 +36,9 @@ class Jabber::Robot
     @helper ||= Jabber::Roster::Helper.new(client, false)
   end
 
+  # Start the robot. This is not thread safe.
+  #
+  # @api public
   def start
     if @client # restart
       stop
@@ -41,6 +48,7 @@ class Jabber::Robot
     connect
     login
     available
+    roster
     self
   end
 
@@ -124,7 +132,7 @@ class Jabber::Robot
     client.on_exception do |exp|
       errback.call(exp) if errback
 
-      next unless retry_time == 0.0
+      next if retry_time == 0.0
 
       $stderr.puts "ERROR: #{exp}: #{exp.backtrace}" +
                    " We'll sleep for #{retry_time} seconds and retry."
@@ -140,13 +148,15 @@ class Jabber::Robot
     end
 
     notify_presence do |jid, status|
-      @roster[:unknown].delete(jid) if @roster[:unknown]
-
-      [:available, :away, :unavailable].each do |type|
-        if type == status
-          @roster[type].add(jid)
-        else
-          @roster[type].delete(jid)
+      @roster_mutex.synchronize do
+        @roster[:unknown].delete(jid) if @roster[:unknown]
+
+        [:available, :away, :unavailable].each do |type|
+          if type == status
+            @roster[type].add(jid)
+          else
+            @roster[type].delete(jid)
+          end
         end
       end
     end
@@ -163,12 +173,16 @@ class Jabber::Robot
   end
 
   def sync_roster
-    clear_roster_semaphore
-    helper.get_roster
-    helper.wait_for_roster
-    @roster[:unknown] =
-      Set.new(helper.items.keys.map(&method(:jid_to_username))) -
-      @roster[:available] - @roster[:away] - @roster[:unavailable]
+    @helper_mutex.synchronize do
+      clear_roster_semaphore
+      helper.get_roster
+      helper.wait_for_roster
+    end
+    @roster_mutex.synchronize do
+      @roster[:unknown] =
+        Set.new(helper.items.keys.map(&method(:jid_to_username))) -
+        @roster[:available] - @roster[:away] - @roster[:unavailable]
+    end
   end
 
   # a hack to let us always get the latest roster

data/xmpp4r-robot.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: xmpp4r-robot 0.2.0 ruby lib
+# stub: xmpp4r-robot 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "xmpp4r-robot"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-01-23"
+  s.date = "2014-01-25"
   s.description = "Simple XMPP client built upon xmpp4r. Intended for building simple robots."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmpp4r-robot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r