omnibot 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 233ee5244e80105785778284b2f5cd2ee53480a9
-  data.tar.gz: 1642c5f45e2ae5877ed2df27061c876823358dd5
+  metadata.gz: b4a1faa796bd0aab2e10b233a4495baa78d99a93
+  data.tar.gz: 59356390a693937918105d38168f0885100930fe
 SHA512:
-  metadata.gz: a6e2f6da4f1eeec5a36eded86fb94920313bd9e759a1bf8e8c1a5351bec059c15df336f4556c83358af6c4ea8137c0d08d4968c0ebe23858840b1169d2f14b70
-  data.tar.gz: afb68e27c45d534cd8a138b5a568abd68d08a997e89db2d9e23a64d7e5bbb77525896d8544e7f6dce6263a89e2b4d0b7da16089b2f8a1ede4f5a584d13ff1a08
+  metadata.gz: b063d086e8c164e79c27346943a716e6dcbcad285b613c3a5299dbea84543a6d86de063db37b269d96e8090bcde9226e6d13cceefab9ff277ea7fea588eea21c
+  data.tar.gz: 536134fb625d068bd3edd9d24ae7cf7fb0c97a4e9bbe64d42e313b4e284b571ab8e101d79cc87cb5804e3540bce5ca63ba01504833fe5b80ca8828ceb94f9ddb

data/README.md

@@ -32,4 +32,4 @@ Send messages to omnibot by AMQP by running:
 Support
 -------
 
-Tested with ruby 1.8.6 and 1.9.2, rabbitmq as an AMQP server, at OS X 10.6 and Debian Linux.
+Tested with ruby 1.8.6, 1.9 and 2.0, rabbitmq as an AMQP server, at OS X 10.6+ and Debian Linux.

data/examples/command_mail.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# You can specify this script in ~/.forward for mail forwarding
+IO.popen('omnisend','w') do |io|
+	IO.new(STDIN.fileno, 'r:UTF-8').each { |s| io.write s }
+end

data/lib/omnibot.rb

@@ -15,37 +15,39 @@ require 'socket'
 require 'date'
 require 'tmpdir'
 
+require "xray/thread_dump_signal_handler"
+
 # patch from https://github.com/ln/xmpp4r/issues/3
 
 if RUBY_VERSION < "1.9"
 # ...
 else
-    # Encoding patch
-    require 'socket'
-    class TCPSocket
-        def external_encoding
-            Encoding::BINARY
-        end
-    end
-
-    require 'rexml/source'
-    class REXML::IOSource
-        alias_method :encoding_assign, :encoding=
-        def encoding=(value)
-            encoding_assign(value) if value
-        end
-    end
-
-    begin
-        # OpenSSL is optional and can be missing
-        require 'openssl'
-        class OpenSSL::SSL::SSLSocket
-            def external_encoding
-                Encoding::BINARY
-            end
-        end
-    rescue
-    end
+	# Encoding patch
+	require 'socket'
+	class TCPSocket
+		def external_encoding
+			Encoding::BINARY
+		end
+	end
+
+	require 'rexml/source'
+	class REXML::IOSource
+		alias_method :encoding_assign, :encoding=
+			def encoding=(value)
+				encoding_assign(value) if value
+			end
+	end
+
+	begin
+		# OpenSSL is optional and can be missing
+		require 'openssl'
+		class OpenSSL::SSL::SSLSocket
+			def external_encoding
+				Encoding::BINARY
+			end
+		end
+	rescue
+	end
 end
 
 # -----------------

data/lib/omnibot/jabberbot.rb

@@ -37,7 +37,7 @@ module OmniBot
 		end
 
 		def on_exception_handler e, stream, sym_where
-			OmniLog::error "Jabber exception happens at symbol \"#{sym_where}\": #{e}\nbacktrace\n#{Helpers::backtrace e}"
+			OmniLog::error "Jabber exception of #{e ? e.class : nil} happens at symbol \"#{sym_where}\": #{e}\nbacktrace\n#{Helpers::backtrace e}"
 			OmniLog::debug "stream is #{stream} vs client #{@client}"
 			on_generic_exception_handler e
 		end
@@ -56,6 +56,7 @@ module OmniBot
 
 		def on_generic_exception_handler e
 			if e && (e.kind_of?(Jabber::ServerDisconnected) || e.class.to_s =~ /^Errno::.+/ || e.kind_of?(SocketError))
+				OmniLog::warn "Looking to error, ign=#{@ignore_reconnect}, tp=#{@timer_provider}"
 				OmniLog::error "No timer provider assigned" unless @timer_provider
 				# attempt counter is set when it's needed to connect
 				unless @ignore_reconnect
@@ -74,6 +75,7 @@ module OmniBot
 		end
 
 		def try_reconnect
+			OmniLog::debug "Called try_reconnect, #{@client.inspect}, #{@client.is_connected?}"
 			return if @client.is_connected?
 
 			OmniLog::debug 'Called try_reconnect'

data/lib/omnibot/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module OmniBot
-	VERSION = '0.0.18'
+	VERSION = '0.0.19'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omnibot
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.7
 description: Works with AMQP for sending messages at server side.Sends notifications
@@ -89,7 +89,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- bin/omnibot
+- bin/omnisend
+- examples/command_mail.rb
 - examples/config.yaml
+- lib/omnibot.rb
 - lib/omnibot/amqpconsumer.rb
 - lib/omnibot/helpers.rb
 - lib/omnibot/jabberbot.rb
@@ -99,12 +106,6 @@ files:
 - lib/omnibot/omnisend.rb
 - lib/omnibot/periodiccommand.rb
 - lib/omnibot/version.rb
-- lib/omnibot.rb
-- Rakefile
-- README.md
-- LICENSE
-- bin/omnibot
-- bin/omnisend
 homepage: http://github.com/theirix/omnibot
 licenses:
 - BSD
@@ -115,18 +116,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - AMQP-compatible server (for example, RabbitMQ)
 rubyforge_project: nowarning
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: Simple XMPP bot for server monitoring