omnibot 0.0.15 → 0.0.16

data/lib/omnibot/amqpconsumer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	# AMQP consumer class
@@ -42,7 +44,7 @@ module OmniBot
 				OmniLog::info "==== AMQP is ready ===="
 
 				queue.subscribe do |msg|
-					message = Marshal.load msg
+					message = Marshal.load(Base64.decode64(msg)).force_encoding('UTF-8')
 					send_message message
 				end
 

data/lib/omnibot/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	class OmniLog

data/lib/omnibot/jabberbot.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	# Jabber bot with reconnection and dnd-care logic

data/lib/omnibot/launcher.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	# entry point

data/lib/omnibot/loggedcommand.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 	module LoggedCommand
 

data/lib/omnibot/mailchecker.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	class MailChecker

data/lib/omnibot/omnisend.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	class OmniSend
@@ -9,7 +11,7 @@ module OmniBot
 				message = args.join(' ')
 			end
 			puts "Sending message #{message}"
-			data = Marshal.dump(message)
+			data = Base64.encode64(Marshal.dump(message))
 
 			Signal.trap('INT') { AMQP.stop{ EM.stop } }
 

data/lib/omnibot/periodiccommand.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
 
 	# Send to jabber user result of a daily command

data/lib/omnibot/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OmniBot
-	VERSION = '0.0.15'
+	VERSION = '0.0.16'
 end

data/lib/omnibot.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+
 require 'yaml'
 require 'logger'
+require 'base64'
 
 require 'amqp'
 require 'eventmachine'
@@ -12,6 +15,41 @@ require 'socket'
 require 'date'
 require 'tmpdir'
 
+# 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
+end
+
+# -----------------
+
 module OmniBot
 
 	%w[ helpers jabberbot amqpconsumer omnisend launcher loggedcommand periodiccommand mailchecker ].each do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnibot
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &70158244688560 !ruby/object:Gem::Requirement
+  requirement: &70318921490600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158244688560
+  version_requirements: *70318921490600
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70158244687260 !ruby/object:Gem::Requirement
+  requirement: &70318921489380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158244687260
+  version_requirements: *70318921489380
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70158244686220 !ruby/object:Gem::Requirement
+  requirement: &70318921488200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158244686220
+  version_requirements: *70318921488200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70158244680540 !ruby/object:Gem::Requirement
+  requirement: &70318921487460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158244680540
+  version_requirements: *70318921487460
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70158244678280 !ruby/object:Gem::Requirement
+  requirement: &70318921486320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70158244678280
+  version_requirements: *70318921486320
 description: Works with AMQP for sending messages at server side.Sends notifications
   to an user via XMPP.Can monitor system by performing daily commands.
 email: theirix@gmail.com
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1310427366543892575
+      hash: 1695530432375130884
 requirements:
 - AMQP-compatible server (for example, RabbitMQ)
 rubyforge_project: nowarning