twitter2jabber 0.1.8 → 0.1.9

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.1.8
+This documentation refers to twitter2jabber version 0.1.9
 
 
 == 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,4 +1,4 @@
-- threading?
+- threading? (decouple Twitter and Jabber event loops)
 - 'direct message' command
 - persistent cache? (friends_timeline: since/since_id?)
 - OAuth (register: http://twitter.com/oauth_clients/new)

data/bin/twitter2jabber

@@ -57,6 +57,8 @@ options = {
   :loop         => false,
   :pause        => nil,
   :last         => nil,
+  :wrap         => nil,
+  :log          => STDERR,
   :verbose      => false,
   :debug        => false
 }
@@ -118,6 +120,13 @@ OptionParser.new { |opts|
     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]  = File.open(l, 'a') if l
+  }
+
   opts.separator ' '
   opts.separator 'Generic options:'
 
@@ -161,15 +170,54 @@ 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]
-    warn Process.pid if options[:verbose]
+    twitter2jabber.send(:log_, Process.pid)
     twitter2jabber.loop(recipients, options[:pause] || config[:pause], options[:last])
   else
     twitter2jabber.run(recipients, options[:last])

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -56,7 +56,7 @@ class Twitter2Jabber
     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,8 +67,9 @@ class Twitter2Jabber
 
     @verbose = options[:verbose]
     @debug   = options[:debug]
+    @log     = options[:log]
 
-    log 'HAI!'
+    logm 'HAI!'
 
     @twitter = twitter_connect(options[:twitter])
     @jabber  = jabber_connect(options[:jabber])
@@ -101,7 +102,7 @@ class Twitter2Jabber
     i = 1
 
     trap(:INT) {
-      log 'SIGINT received, shutting down...'
+      logm 'SIGINT received, shutting down...'
       i = -1
     }
 
@@ -113,7 +114,7 @@ class Twitter2Jabber
       i += 1
     end
 
-    log 'KTHXBYE!'
+    logm 'KTHXBYE!'
 
     last
   end
@@ -350,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2jabber
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jens Wille
@@ -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: