xmpp4r-robot 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a308d413ded47b43f1f6d1f978f00dd6871e21
-  data.tar.gz: a65354924d90b545c515010bacbeb8d069732bc3
+  metadata.gz: 69eac4120f6899a7ab40501a1d063896d19226e2
+  data.tar.gz: 4b01c17230863ee3bb9e9055f6976ed09a3319f9
 SHA512:
-  metadata.gz: 7485c9ef92e7cfff7bd9614da22e1dbddbe3b4e4f6b911d410d2f5fdb3fd573930e0b51cb1bee175f3d94e53e7e4233e9633c07b755863f1625909f3d7d1e099
-  data.tar.gz: e6a85af2d0de89655deb0ea08b1406c074e5ba2e0f9964d2cc088694810389c8da60efdc2d8385f6fee88969bcb051ed4dab5e6d1f843c5687697ed901c41359
+  metadata.gz: a3ec3c5ca0ebb09f75cd10a2e49f687175f6e6dd7cd985c05610f0d9abe67be5d1032545798c94ad38ce7dea38e8823afc4e4ec98bdd2bdcb55e5afaa1aa8509
+  data.tar.gz: aabd4acc8b4fa67b4a45906209731379bdd7a45e15def5d6b79d61d62905864bbaf7aa1b7b58c0141ff49b72c16520daf30d8e8dd2ac166d9d692dd36b3ea089

data/.travis.yml

@@ -4,6 +4,6 @@ script: 'ruby -r bundler/setup -S rake test'
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - ruby
   - rbx
   - jruby

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## xmpp4r-robot 0.3.0 -- 2014-04-08
+
+* Option :retry_time was removed. Instead, now we retry and wait
+  exponentially.
+
 ## xmpp4r-robot 0.2.3 -- 2014-03-12
 
 * Ignore nil exception. (why?)

data/README.md

@@ -20,7 +20,7 @@ This is an attempt to make it easy for such use cases.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 2.0.0, 2.1.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby), Rubinius and JRuby.
 
 ## INSTALLATION:
 
@@ -32,7 +32,6 @@ This is an attempt to make it easy for such use cases.
 require 'xmpp4r/robot'
 
 robot = Jabber::Robot.new('someone@gmail.com', 'awesome password',
-                          :retry_time => 10,
                           :auto_accept_subscription => true)
 
 robot.notify_presence do |from, status|

data/Rakefile

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

data/lib/xmpp4r/robot.rb

@@ -17,12 +17,14 @@ class Jabber::Robot
                  :away        => Set.new,
                  :unavailable => Set.new}
 
-    @retry_time               = Float(opts[:retry_time] || 0)
+    @retry_time               = 1
     @auto_accept_subscription = opts[:auto_accept_subscription]
 
     @roster_mutex = Mutex.new
     @helper_mutex = Mutex.new
-    @client = nil # eliminate warning
+    @client_mutex = Mutex.new
+    @client   = nil # eliminate warning
+    @sleeping = false
   end
 
   def inspect
@@ -41,16 +43,20 @@ class Jabber::Robot
   #
   # @api public
   def start
-    if @client # restart
-      stop
-      @client = nil
+    @client_mutex.synchronize do
+      @sleeping = false
+      if @client # restart
+        stop
+        @client = nil
+      end
+      initialize_callbacks
+      connect
+      login
+      available
+      roster
+      @retry_time = 1 # reset retry time after successfully connected
+      self
     end
-    initialize_callbacks
-    connect
-    login
-    available
-    roster
-    self
   end
 
   def stop
@@ -134,14 +140,19 @@ class Jabber::Robot
       next unless exp # why exp might be nil?
       errback.call(exp) if errback
 
-      next if retry_time == 0.0
+      @client_mutex.synchronize do
+        @sleeping = true
+        @retry_time *= 2
 
-      $stderr.puts "ERROR: #{exp}: #{exp.backtrace}" +
-                   " We'll sleep for #{retry_time} seconds and retry."
+        $stderr.puts "ERROR: #{exp}: #{exp.backtrace}" +
+                     " We'll sleep for #{retry_time} seconds and retry."
 
-      clear_roster_semaphore
-      sleep(retry_time)
-      start
+        clear_roster_semaphore
+        Thread.new do
+          sleep(retry_time)
+          start
+        end
+      end unless @sleeping
     end
 
     client.add_presence_callback do |presence|

data/xmpp4r-robot.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: xmpp4r-robot 0.2.3 ruby lib
+# stub: xmpp4r-robot 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "xmpp4r-robot"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   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-03-12"
+  s.date = "2014-04-08"
   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.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r