blackwinter-twitter2jabber 0.1.6 → 0.2.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.1.6
+This documentation refers to twitter2jabber version 0.2.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -16,7 +16,7 @@ begin
       :homepage     => %q{http://twitter2jabber.rubyforge.org/},
       :files        => FileList['lib/**/*.rb', 'bin/*'].to_a,
       :extra_files  => FileList['[A-Z]*', 'sample/**/*'].to_a,
-      :dependencies => %w[twitter xmpp4r-simple highline shorturl longurl]
+      :dependencies => %w[twitter xmpp4r-simple highline shorturl longurl elif]
     }
   }}
 rescue LoadError

data/TODO

@@ -1,6 +1,8 @@
+- threading? (decouple Twitter and Jabber event loops)
 - 'direct message' command
-- persistent cache! (friends_timeline: since/since_id?)
+- persistent cache? (friends_timeline: since/since_id?)
 - OAuth (register: http://twitter.com/oauth_clients/new)
 - better interrupt handling (in loop mode)
 - daemonize after asking for credentials (in loop mode)
 - additional commands?
+- SPECS!!!

data/bin/twitter2jabber

@@ -26,6 +26,8 @@
 ###############################################################################
 #++
 
+$KCODE = 'u' unless RUBY_VERSION >= '1.9'
+
 require 'optparse'
 require 'yaml'
 
@@ -54,6 +56,9 @@ options = {
   :template_dir => nil,
   :loop         => false,
   :pause        => nil,
+  :last         => nil,
+  :wrap         => nil,
+  :log          => STDERR,
   :verbose      => false,
   :debug        => false
 }
@@ -109,6 +114,19 @@ OptionParser.new { |opts|
     options[:pause] = p
   }
 
+  opts.separator ' '
+
+  opts.on('-S', '--since-id ID', 'Return tweets with status IDs greater than ID') { |i|
+    options[:last] = i
+  }
+
+  opts.separator ' '
+
+  opts.on('-L', '--loop-wrap [LOG]', "Convenience switch: implies '--loop', '--verbose', and", "'--since-id'; kills existing process and logs output to LOG") { |l|
+    options[:wrap] = true
+    options[:log]  = l && File.open(l, 'a')
+  }
+
   opts.separator ' '
   opts.separator 'Generic options:'
 
@@ -152,17 +170,57 @@ config[:jabber][:pass] ||= ask("Password for Jabber ID #{config[:jabber][:user]}
 recipients = options[:recipients] + (config.delete(:recipients) || [])
 recipients.uniq!
 
-[:formats, :template_dir, :verbose, :debug].each { |key|
+[:formats, :template_dir, :log, :verbose, :debug].each { |key|
   config[key] = options[key] if options[key]
 }
 
 begin
+  if options[:wrap]
+    options[:loop]    = true
+    options[:verbose] = true
+
+    case log = config[:log]
+      when String
+        config[:log] = File.open(log, 'a')
+      when File
+        log = log.path
+      when IO
+        abort "Invalid log file: #{log.tty? ? "FILENO=#{log.fileno}" : log}"
+      else
+        abort 'Log file missing!'
+    end
+
+    if File.readable?(log)
+      require 'elif'
+
+      pid = nil
+
+      Elif.foreach(log) { |line|
+        case line
+          when /\A(\d+)\z/
+            pid ||= $1.to_i
+            break if options[:last]
+          when / TWITTER (\d+)\z/
+            options[:last] ||= $1.to_i
+            break if pid
+        end
+      }
+
+      begin
+        Process.kill(:INT, pid)
+        sleep 1
+      rescue Errno::ESRCH
+      end if pid
+    end
+  end
+
   twitter2jabber = Twitter2Jabber.new(config)
 
   if options[:loop]
-    twitter2jabber.loop(recipients, options[:pause] || config[:pause])
+    twitter2jabber.send(:log_, Process.pid)
+    twitter2jabber.loop(recipients, options[:pause] || config[:pause], options[:last])
   else
-    twitter2jabber.run(recipients)
+    twitter2jabber.run(recipients, options[:last])
   end
 rescue RuntimeError => err
   abort err

data/lib/twitter2jabber.rb

@@ -48,15 +48,15 @@ class Twitter2Jabber
   JABBER_NS = 'http://jabber.org/protocol/xhtml-im'
   XHTML_NS  = 'http://www.w3.org/1999/xhtml'
 
-  def self.loop(options, recipients = [], pause = nil, &block)
-    new(options).loop(recipients, pause, &block)
+  def self.loop(options, recipients = [], pause = nil, last = nil, &block)
+    new(options).loop(recipients, pause, last, &block)
   end
 
-  def self.run(options, recipients = [], &block)
-    new(options).run(recipients, &block)
+  def self.run(options, recipients = [], last = nil, &block)
+    new(options).run(recipients, last, &block)
   end
 
-  attr_reader :id, :verbose, :debug, :twitter, :jabber, :filter, :formats, :templates, :_erb
+  attr_reader :id, :verbose, :debug, :log, :twitter, :jabber, :filter, :formats, :templates, :_erb
 
   def initialize(options, &block)
     [:twitter, :jabber].each { |client|
@@ -67,6 +67,9 @@ class Twitter2Jabber
 
     @verbose = options[:verbose]
     @debug   = options[:debug]
+    @log     = options[:log]
+
+    logm 'HAI!'
 
     @twitter = twitter_connect(options[:twitter])
     @jabber  = jabber_connect(options[:jabber])
@@ -86,37 +89,39 @@ class Twitter2Jabber
     }
   end
 
-  def run(recipients = [], seen = {}, flag = true, &block)
-    deliver_tweets(recipients, seen, &block) if flag
+  def run(recipients = [], last = nil, flag = true, &block)
+    last = deliver_tweets(recipients, last, &block) if flag
     post_messages(recipients)
+
+    last
   end
 
-  def loop(recipients = [], pause = nil, &block)
+  def loop(recipients = [], pause = nil, last = nil, &block)
     pause ||= DEFAULT_PAUSE
 
-    i, seen = 1, Hash.new { |h, k| h[k] = true; false }
+    i = 1
 
     trap(:INT) {
-      log 'SIGINT received, shutting down...'
+      logm 'SIGINT received, shutting down...'
       i = -1
     }
 
     while i > 0
-      run(recipients, seen, i % pause == 1, &block)
+      last = run(recipients, last, i % pause == 1, &block)
 
       sleep 1
 
       i += 1
     end
 
-    log 'KTHXBYE!'
-  end
+    logm 'KTHXBYE!'
 
-  def deliver_tweets(recipients, seen = {}, &block)
-    get_tweets.each { |tweet|
-      next if seen[tweet.id]
+    last
+  end
 
-      logt tweet.id
+  def deliver_tweets(recipients, last = nil, &block)
+    get_tweets(last).each { |tweet|
+      logt last = tweet.id
 
       # apply filters
       next if filter && !filter[tweet]
@@ -130,6 +135,8 @@ class Twitter2Jabber
 
       sleep 1
     }
+
+    last
   end
 
   def post_messages(recipients = [])
@@ -171,8 +178,11 @@ class Twitter2Jabber
     raise "Can't connect to Jabber with JID '#{options[:user]}': #{err}"
   end
 
-  def get_tweets
-    tweets = twitter.friends_timeline
+  def get_tweets(last = nil)
+    options = {}
+    options[:since_id] = last if last
+
+    tweets = twitter.friends_timeline(options)
     return [] unless tweets.is_a?(Array)
 
     tweets.sort_by { |tweet|
@@ -222,8 +232,8 @@ class Twitter2Jabber
   end
 
   def process_html(text)
-    text.gsub(/(?=\A|\W)@(\w+)/, '@<a href="http://twitter.com/\1">\1</a>').
-         gsub(/(?=\A|\W)#(\w+)/, '<a href="http://search.twitter.com/search?q=%23\1">#\1</a>')
+    text.gsub(/(\A|\W)@(\w+)/, '\1@<a href="http://twitter.com/\2">\2</a>').
+         gsub(/(\A|\W)#(\w+)/, '\1<a href="http://search.twitter.com/search?q=%23\2">#\2</a>')
   end
 
   def process_text(text)
@@ -341,16 +351,20 @@ le[n[gth]] STATUS                 -- Determine length
     twitter.update(msg, options)
   end
 
-  def log(msg, verbose = verbose)
-    warn "#{Time.now} [#{id}] #{msg}" if verbose
+  def log_(msg, verbose = verbose)
+    log.puts msg if verbose
+  end
+
+  def logm(msg, verbose = verbose)
+    log_("#{Time.now} [#{id}] #{msg}", verbose)
   end
 
   def logt(msg, verbose = verbose)
-    log("TWITTER #{msg}", verbose)
+    logm("TWITTER #{msg}", verbose)
   end
 
   def logj(msg, verbose = verbose)
-    log("JABBER #{msg}", verbose)
+    logm("JABBER #{msg}", verbose)
   end
 
 end

data/lib/twitter2jabber/version.rb

@@ -3,8 +3,8 @@ class Twitter2Jabber
   module Version
 
     MAJOR = 0
-    MINOR = 1
-    TINY  = 6
+    MINOR = 2
+    TINY  = 0
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blackwinter-twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: twitter2jabber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: elif
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Twitter-to-Jabber gateway.
 email: jens.wille@uni-koeln.de
 executables: