safubot 0.0.7 → 0.0.8

data/lib/safubot/test_helper.rb

@@ -50,7 +50,7 @@ module Safubot
 
 	# Find or create a Request sourced from this Query.
     def make_request
-	  self.request || Request.create(:user => self.user, :text => self.text, :source => self)
+	  self.request || self.request = Request.create(:user => self.user, :text => self.text, :source => self)
     end
 
 	def username

data/lib/safubot/twitter.rb

@@ -109,7 +109,7 @@ module Safubot
 
 	  # Finds or creates a Request sourced from this Tweet.
 	  def make_request
-		self.request || Request.create(:user => user, :source => self, :text => self.targetless_text)
+		self.request || self.request = Request.create(:user => user, :source => self, :text => self.targetless_text)
 	  end
 	end
 
@@ -152,7 +152,7 @@ module Safubot
 
 	  # Finds or creates a Request sourced from this DirectMessage.
 	  def make_request
-		self.request || Request.create(:user => user, :source => self, :text => self.text)
+		self.request || self.request = Request.create(:user => user, :source => self, :text => self.text)
 	  end
 	end
 
@@ -269,7 +269,7 @@ module Safubot
 		  else
 			Log.error "TweetStream client exited unexpectedly: #{error_report(e)}"
 			Log.error "Restarting TweetStream client in 5 seconds."
-			EM::Timer.new(5) { init_stream; run_stream }
+			sleep 5; init_stream; run_stream
 		  end
 		end
 	  end

data/lib/safubot/version.rb

@@ -1,3 +1,3 @@
 module Safubot
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/safubot/xmpp.rb

@@ -65,7 +65,7 @@ module Safubot
 
 	  # Retrieves or creates an associated Request.
 	  def make_request
-		self.request || Request.create(:user => user, :source => self, :text => self.text)
+		self.request || self.request = Request.create(:user => user, :source => self, :text => self.text)
 	  end
 	end
 
@@ -95,10 +95,10 @@ module Safubot
 		end
 
 		@client.register_handler(:disconnected) do 
-		  sleep 1 # HACK (Mispy): Give the state a chance to change when we're stopped.
+		  sleep 2 # HACK (Mispy): Give the state a chance to change when we're stopped.
 		  if @state == :running
 			Log.warn("XMPP disconnected; attempting reconnection in 5 seconds.") 
-			EM::Timer.new(5) { @client.connect }
+			sleep 5; @client.connect
 		  end
 		end
 
@@ -121,7 +121,7 @@ module Safubot
 		  elsif @state == :running
 			Log.error "XMPP client exited unexpectedly: #{error_report(e)}"
 			Log.error "Restarting XMPP client in 5 seconds."
-			EM::Timer.new(5) { init_blather; run_blather }
+			sleep 5; init_blather; run_blather
 		  end
 		end
 	  end
@@ -148,7 +148,7 @@ module Safubot
 		  @client = nil
 		  Log.info "XMPP client shutdown complete."
 		elsif @pid
-		  Process.kill("TERM", @pid)
+		  Process.kill("KILL", @pid)
 		end
 	  end
 

data/lib/safubot.rb

@@ -1,3 +1,9 @@
+require 'rubygems'
+require 'multi_json'
+require 'yajl'
+MultiJson.engine = :yajl
+$KCODE = "UTF8"
+
 require "eventmachine"
 require "mongo_mapper"
 

data/safubot.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activesupport", "= 3.1.0" # mongo_mapper seems to need this without specifying it.
   s.add_dependency "eventmachine", "~> 0.12.10"
-  s.add_dependency "bson_ext", "~> 1.4.0"
-  s.add_dependency "mongo_mapper", "~> 0.10.1"
-  s.add_dependency "twitter", "~> 2.0.0"
+  s.add_dependency "yajl-ruby", "~> 1.1.0"
+  s.add_dependency "bson_ext", "~> 1.5.2"
+  s.add_dependency "mongo_mapper", "~> 0.11.0"
+  s.add_dependency "twitter", "~> 2.1.0"
   s.add_dependency "tweetstream", "~> 1.1.3"
-  s.add_dependency "blather", "~> 0.5.8"
+  s.add_dependency "blather", "~> 0.5.12"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "yard"

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: safubot
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 0.0.7
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jaiden Mispy
@@ -10,28 +15,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-02-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
+        version: 0.12.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.12.10
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,7 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,7 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
+        version: 0.11.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -64,7 +89,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -75,6 +105,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
   type: :runtime
   version_requirements: *id006
@@ -86,7 +121,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.8
+        hash: 19
+        segments: 
+        - 0
+        - 5
+        - 12
+        version: 0.5.12
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -97,6 +137,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -108,6 +151,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -119,6 +165,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -130,6 +179,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -141,6 +193,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id012
@@ -226,20 +281,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: safubot
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A friendly event-driven chatbot framework. Supports Twitter and XMPP.
 test_files: []
 
-has_rdoc: