blackwinter-twitter2jabber 0.1.2 → 0.1.3

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.1.2
+This documentation refers to twitter2jabber version 0.1.3
 
 
 == DESCRIPTION

data/lib/twitter2jabber.rb

@@ -97,7 +97,7 @@ class Twitter2Jabber
     i, seen = 1, Hash.new { |h, k| h[k] = true; false }
 
     trap(:INT) {
-      log "#{Time.now} SIGINT received, shutting down..."
+      log 'SIGINT received, shutting down...'
       i = -1
     }
 
@@ -109,7 +109,7 @@ class Twitter2Jabber
       i += 1
     end
 
-    log "#{Time.now} KTHXBYE!"
+    log 'KTHXBYE!'
   end
 
   def deliver_tweets(recipients, seen = {}, &block)
@@ -154,7 +154,7 @@ class Twitter2Jabber
     # verify credentials
     client.verify_credentials
 
-    logt "#{Time.now} connected"
+    logt 'connected'
 
     client
   rescue Twitter::TwitterError => err
@@ -164,7 +164,7 @@ class Twitter2Jabber
   def jabber_connect(options)
     client = Jabber::Simple.new(options[:user], options[:pass])
 
-    logj "#{Time.now} connected"
+    logj 'connected'
 
     client
   rescue Jabber::JabberError => err
@@ -172,7 +172,10 @@ class Twitter2Jabber
   end
 
   def get_tweets
-    twitter.friends_timeline.sort_by { |tweet|
+    tweets = twitter.friends_timeline
+    raise Twitter::TwitterError unless tweets.is_a?(Array)
+
+    tweets.sort_by { |tweet|
       tweet.created_at = Time.parse(tweet.created_at)
     }
   rescue Twitter::TwitterError, Timeout::Error
@@ -279,13 +282,27 @@ le[n[gth]] STATUS                 -- Determine length
           return
         end
 
-        if body.sub!(/\A(?:rt|retweet)?\s+#?(\d+)(?::?\s+|\z)/i, '')
-          tweet = twitter.status($1)
+        begin
+          if body.sub!(/\A(?:rt|retweet)?\s+#?(\d+)(:?)(?:\s+|\z)/i, '')
+            id, colon = $1, $2
+
+            tweet = twitter.status(id)
+
+            body << ' ' unless body.empty?
+            body << "RT @#{tweet.user.screen_name}#{colon} #{tweet.text}"
+          elsif body.sub!(/\Are(?:ply)?\s+#?(\d+)(:?)\s+/i, '')
+            id, colon = $1, $2
+
+            tweet = twitter.status(id)
 
-          body << ' ' unless body.empty?
-          body << "RT @#{tweet.user.screen_name}: #{tweet.text}"
-        elsif body.sub!(/\Are(?:ply)?\s+#?(\d+):?\s+/i, '')
-          options[:in_reply_to_status_id] = $1
+            body.insert(0, ' ') unless body.empty?
+            body.insert(0, "@#{tweet.user.screen_name}#{colon}")
+
+            options[:in_reply_to_status_id] = id
+          end
+        rescue Twitter::NotFound
+          deliver(from, "TWEET NOT FOUND: #{id}")
+          return
         end
 
         if body.sub!(/\A!(?:\s+|\z)/, '')
@@ -300,8 +317,9 @@ le[n[gth]] STATUS                 -- Determine length
 
         if force || body.length <= MAX_LENGTH
           update(body, options)
+          deliver(from, "MSG SENT: #{body.inspect}, #{options.inspect}")
         else
-          deliver(from, "MSG TOO LONG (> #{MAX_LENGTH}): #{body}")
+          deliver(from, "MSG TOO LONG (> #{MAX_LENGTH}): #{body.inspect}")
         end
     end
   end
@@ -325,7 +343,7 @@ le[n[gth]] STATUS                 -- Determine length
   end
 
   def log(msg, verbose = verbose)
-    warn "[#{id}] #{msg}" if verbose
+    warn "#{Time.now} [#{id}] #{msg}" if verbose
   end
 
   def logt(msg, verbose = verbose)

data/lib/twitter2jabber/version.rb

@@ -4,7 +4,7 @@ class Twitter2Jabber
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blackwinter-twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: twitter2jabber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,6 @@ files:
 - sample/templates/tweet.txt
 has_rdoc: false
 homepage: http://twitter2jabber.rubyforge.org/
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -116,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: twitter2jabber
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Twitter-to-Jabber gateway.