adhearsion-xmpp 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 471aeab4faa7b19b8eaafe5b4b3725da5877a145
+  data.tar.gz: f4a596fad4a6eb235168a1513f13f0dce3242d77
+SHA512:
+  metadata.gz: 00e18e12c76a4218d2f1cf5c52622e2437e7b8d963b09b9fd4337da1a0de00e45e7c4efa5116c339587c3c13f027c8accb099b99a3f4af6886d8614a716579b2
+  data.tar.gz: 6321d090900c706fc2a95f16419e87a9262e7f4f4195077e595c765cc6b87d81e3e49f9c7dfe0727f33bcb162c916ea08df0bcbff68906b10fff1314727d6dd1

data/.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode # currently in active development, may or may not work for your project
+  - 2.0.0
+  - 2.1.0
+  - jruby
+  - rbx-2.1.1
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-2.1.1
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# develop
+
+# v1.0.2
+  * Bugfix: Reconnect after connection failures or connections dropping
+
 # v1.0.1
   * Bugfix: Get everything working in standalone connection mode (not sharing with Punchblock)
 

data/adhearsion-xmpp.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "adhearsion", "~> 2.0"
   s.add_runtime_dependency "activesupport", [">= 3.0.10"]
   s.add_runtime_dependency "i18n", ">= 0.5.0"
-  s.add_runtime_dependency "blather", ">= 0.5.7"
+  s.add_runtime_dependency "blather", "~> 1.0"
   s.add_runtime_dependency "jruby-openssl" if defined?(JRUBY_VERSION)
 
   s.add_development_dependency "rspec", "~> 2.7.0"

data/lib/adhearsion/xmpp/connection.rb

@@ -11,16 +11,33 @@ module Adhearsion
         Blather.logger = logger
         Blather.default_log_level = :trace if Blather.respond_to? :default_log_level
         register_default_client_handlers
+        @shutting_down = false
         Adhearsion::Events.after_initialized { connect }
-        Adhearsion::Events.shutdown { shutdown }
+        Adhearsion::Events.shutdown do
+          @shutting_down = true
+          shutdown
+        end
       end
 
       private
 
       def connect
-        logger.info "Connecting to XMPP"
         Adhearsion::Process.important_threads << Thread.new do
-          EventMachine.run { client.connect }
+          begin
+            until @shutting_down
+              logger.info "Connecting to XMPP"
+              EventMachine.run { client.connect }
+              logger.info "XMPP connection closed"
+            end
+          rescue Blather::Stream::ConnectionFailed
+            reconnect_timer = Adhearsion.config.punchblock.reconnect_timer
+            logger.error "XMPP connection failed. Retrying connection in #{reconnect_timer}s"
+            sleep reconnect_timer
+            retry
+          rescue => e
+            logger.fatal e
+            raise
+          end
         end
       end
 

data/lib/adhearsion/xmpp/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   class XMPP
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-xmpp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Juan de Bravo
@@ -12,102 +11,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: This gem provides the XMPP plugin to Adhearsion, allowing your Adhearsion
@@ -121,9 +108,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,33 +127,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/adhearsion/adhearsion-xmpp
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 844702008144568214
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 844702008144568214
 requirements: []
 rubyforge_project: adhearsion-xmpp
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Send and receive XMPP messages in your Adhearsion application
 test_files:
 - spec/adhearsion/xmpp/plugin_spec.rb