twitter2jabber 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21ae167fd1fabf00e9087a1e58786ad0e73e9c2
-  data.tar.gz: f178c4940a6e56a74b1b40b70a147d9bde19cfe6
+  metadata.gz: d434391b12803f08dec2790028dccd36ec5db99c
+  data.tar.gz: 7ab9bac4e82d981f0281f16990ef2fc7ea6d52fb
 SHA512:
-  metadata.gz: 1bac7ed5bd3aac7d566d18c4f779fd64bfaadc2adfa096d37a21e68f49e042ba4784fb64d4aa1729c0d07aa5bd6a7212e57cfb97ab62be00445740ec4a229ca5
-  data.tar.gz: b78d7192b69c42045e2df687160ec222faea9e979dcd186bf226b2b79a7d4af13bad1678d6c60003a60b712451cd09d28ca345c46175db266a62c8c7e9c1ba68
+  metadata.gz: f6909849d8bd8705a47aeb84c940841344e4a41f852d349108e0c8c7edd9ae44b78179ec6ccea5cfdbbe9f37f93dd252bcf34cbd549dab9efe42587b31daf1f2
+  data.tar.gz: ed809ca1fce70a4479d196232d506e4585dd77197e66f6b27b781177ccd6be0abba952c4ecee7b11facf8727a75ed0c719af8070ccbe77711ed19520555227f5

data/ChangeLog

@@ -2,6 +2,13 @@
 
 = Revision history for twitter2jabber
 
+== 0.8.0 [2014-04-15]
+
+* Dropped "write" functionality. Only forwards Twitter messages to Jabber.
+* Dropped Ruby 1.8 support.
+* Reduced external dependencies.
+* Cut down command line options.
+
 == 0.0.1 [2009-07-29]
 
 * Birthday :-)

data/README

@@ -2,12 +2,13 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.7.0
+This documentation refers to twitter2jabber version 0.8.0
 
 
 == DESCRIPTION
 
-Twitter-to-Jabber gateway.
+Allows you to read Twitter[https://twitter.com] streams with your
+favourite {Jabber client}[http://xmpp.org/xmpp-software/clients/].
 
 Based on a script[http://da.nmilne.com/?p=353] by dkam. See also his
 Jitter[http://github.com/dkam/jitter] project.
@@ -15,10 +16,9 @@ Jitter[http://github.com/dkam/jitter] project.
 
 == LINKS
 
-<b></b>
-Documentation:: http://blackwinter.github.com/twitter2jabber
-Source code::   http://github.com/blackwinter/twitter2jabber
-RubyGem::       http://rubygems.org/gems/twitter2jabber
+Documentation:: https://blackwinter.github.io/twitter2jabber/
+Source code::   https://github.com/blackwinter/twitter2jabber
+RubyGem::       https://rubygems.org/gems/twitter2jabber
 
 
 == AUTHORS
@@ -28,7 +28,7 @@ RubyGem::       http://rubygems.org/gems/twitter2jabber
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2009-2013 Jens Wille
+Copyright (C) 2009-2014 Jens Wille
 
 twitter2jabber is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/Rakefile

@@ -4,18 +4,18 @@ begin
   require 'hen'
 
   Hen.lay! {{
-    :gem => {
-      :name         => %q{twitter2jabber},
-      :version      => Twitter2Jabber::VERSION,
-      :summary      => %q{Twitter-to-Jabber gateway.},
-      :author       => %q{Jens Wille},
-      :email        => %q{jens.wille@gmail.com},
-      :license      => %q{AGPL},
-      :homepage     => :blackwinter,
-      :dependencies => %w[
-        elif highline longurl ruby-nuggets
-        shorturl xmpp4r-simple-19
-      ] << ['twitter', '>= 5.0']
+    gem: {
+      name:         %q{twitter2jabber},
+      version:      Twitter2Jabber::VERSION,
+      summary:      %q{Twitter-to-Jabber gateway.},
+      description:  %q{Read Twitter streams through Jabber.},
+      author:       %q{Jens Wille},
+      email:        %q{jens.wille@gmail.com},
+      license:      %q{AGPL-3.0},
+      homepage:     :blackwinter,
+      dependencies: %w[cyclops longurl xmpp4r] << ['twitter', '>= 5.0'],
+
+      required_ruby_version: '>= 1.9.3'
     }
   }}
 rescue LoadError => err

data/TODO

@@ -1,12 +1,6 @@
 - include_entities=true (http://dev.twitter.com/pages/tweet_entities)
 - include_rts=true (?)
-- daemon control script (twitter2jabber-ctl)
-- threading? (decouple Twitter and Jabber event loops)
 - use streaming API? (http://apiwiki.twitter.com/Streaming-API-Documentation)
 - persistent cache? (friends_timeline: since/since_id?)
-- better interrupt handling (in loop mode)
-- daemonize after asking for credentials (in loop mode)
-- additional commands? (full twitter API?)
-- refactor command handling!
 - SPECS!!!
 - DOCS!!

data/bin/twitter2jabber

@@ -5,7 +5,7 @@
 #                                                                             #
 # twitter2jabber - Twitter-to-Jabber gateway.                                 #
 #                                                                             #
-# Copyright (C) 2009-2013 Jens Wille                                          #
+# Copyright (C) 2009-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -26,210 +26,5 @@
 ###############################################################################
 #++
 
-$KCODE = 'u' if RUBY_VERSION < '1.9'
-
-require 'optparse'
-require 'yaml'
-
-require 'rubygems'
-require 'highline/import'
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'twitter2jabber'
-
-USAGE = "Usage: #{$0} [-h|--help] [options]"
-
-def ask(prompt)
-  super
-rescue Interrupt
-  puts
-  exit
-end
-
-options = {
-  :config         => 'config.yaml',
-  :consumer_token => nil,
-  :access_token   => nil,
-  :jid            => nil,
-  :recipients     => [],
-  :formats        => nil,
-  :template_dir   => nil,
-  :loop           => false,
-  :pause          => nil,
-  :last           => nil,
-  :wrap           => nil,
-  :log            => STDERR,
-  :verbose        => false,
-  :debug          => false
-}
-
-OptionParser.new { |opts|
-  opts.banner = USAGE
-
-  opts.separator ' '
-  opts.separator 'Options:'
-
-  opts.on('-c', '--config YAML', "Path to config file [Default: #{options[:config]}]") { |c|
-    options[:config] = c
-  }
-
-  opts.separator ' '
-
-  opts.on('-C', '--consumer-token TOKEN', 'Twitter consumer token') { |t|
-    options[:consumer_token] = t
-  }
-
-  opts.on('-A', '--access-token TOKEN', 'Twitter access token') { |t|
-    options[:access_token] = t
-  }
-
-  opts.on('-j', '--jid ID', 'Jabber ID') { |j|
-    options[:jid] = j
-  }
-
-  opts.separator ' '
-
-  opts.on('-r', '--recipients LIST', 'Comma-separated list of Jabber IDs') { |r|
-    options[:recipients] += r.split(',')
-  }
-
-  opts.on('-R', '--recipients-from-file FILE', 'File with one Jabber ID per line') { |r|
-    options[:recipients] += File.readlines(r).map { |l| l.chomp }
-  }
-
-  opts.separator ' '
-
-  opts.on('-f', '--formats LIST', "Comma-separated list of formats [Default: #{Twitter2Jabber::DEFAULT_FORMATS.join(',')}]") { |f|
-    options[:formats] = f.split(',')
-  }
-
-  opts.on('-t', '--template-dir PATH', 'Path to custom template directory', "[Default: #{Twitter2Jabber::DEFAULT_TEMPLATES}]") { |t|
-    abort "Template directory not found: #{t}" unless File.directory?(t)
-    options[:template_dir] = t
-  }
-
-  opts.separator ' '
-
-  opts.on('-l', '--loop', 'Run in a loop') {
-    options[:loop] = true
-  }
-
-  opts.on('-p', '--pause SECONDS', Integer, 'Number of seconds to pause between loops') { |p|
-    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:'
-
-  opts.on('-v', '--verbose', 'Be verbose') {
-    options[:verbose] = true
-  }
-
-  opts.on('-D', '--debug', "Print debug output and don't send or update anything") {
-    options[:debug] = true
-  }
-
-  opts.on('-h', '--help', 'Print this help message and exit') {
-    puts opts
-    exit
-  }
-
-  opts.on('--version', 'Print program version and exit') {
-    puts "#{File.basename($0)} v#{Twitter2Jabber::VERSION}"
-    exit
-  }
-}.parse!
-
-config = begin
-  YAML.load_file(options[:config])
-rescue Errno::ENOENT
-  {}
-end
-
-# twitter config
-config[:twitter] ||= {}
-config[:twitter][:consumer_token]    = options[:consumer_token] if options[:consumer_token]
-config[:twitter][:consumer_token]  ||= ask('Twitter consumer token: ')
-config[:twitter][:consumer_secret] ||= ask("Consumer secret for Twitter application #{config[:twitter][:consumer_token]}: ") { |q| q.echo = false }
-config[:twitter][:access_token]      = options[:access_token] if options[:access_token]
-config[:twitter][:access_token]    ||= ask('Twitter access token: ')
-config[:twitter][:access_secret]   ||= ask("Access secret for Twitter user #{config[:twitter][:access_token]}: ") { |q| q.echo = false }
-
-# jabber config
-config[:jabber] ||= {}
-config[:jabber][:user] = options[:jid] if options[:jid]
-config[:jabber][:user] ||= ask('Jabber ID: ')
-config[:jabber][:pass] ||= ask("Password for Jabber ID #{config[:jabber][:user]}: ") { |q| q.echo = false }
-
-recipients = options[:recipients] + (config.delete(:recipients) || [])
-recipients.uniq!
-
-[:formats, :template_dir, :log, :verbose, :debug].each { |key|
-  config[key] = options[key] if options[key]
-}
-
-begin
-  if options[:wrap]
-    options[:loop]   = true
-    config[: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.chomp
-          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.send(:log_, Process.pid)
-    twitter2jabber.loop(recipients, options[:pause] || config[:pause], options[:last])
-  else
-    twitter2jabber.run(recipients, options[:last])
-  end
-rescue RuntimeError => err
-  abort err
-end
+require 'twitter2jabber/cli'
+Twitter2Jabber::CLI.execute

data/example/config.yaml

@@ -1,4 +1,6 @@
 ---
+#:log: ~/twitter2jabber.log
+
 :twitter:
   :consumer_token:  c5ff16bd638c9acc6fb00197301008c5eb561f46
   :consumer_secret: ae2ad9454f3af7fcb18c83969f99b20a788eddd1
@@ -6,12 +8,8 @@
   :access_secret:   06c76739e3f4875a27a9e3ce36999e1af916a0e0
 
 :jabber:
-  :user: foo
-  :pass: foo
-
-:recipients:
-  - one
-  - two
-  - three
-
-:pause: 123
+  #:format: txt
+  #:templates: ~/twitter2jabber
+  :recipient: joe@example.org
+  :username: foo@example.com
+  :password: bar

data/lib/twitter2jabber.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # twitter2jabber - Twitter-to-Jabber gateway.                                 #
 #                                                                             #
-# Copyright (C) 2009-2013 Jens Wille                                          #
+# Copyright (C) 2009-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -24,404 +24,65 @@
 ###############################################################################
 #++
 
-require 'erb'
-
-require 'rubygems'
-require 'twitter'
-require 'xmpp4r-simple'
-require 'shorturl'
-require 'longurl'
-require 'nuggets/array/runiq'
-
-require 'twitter2jabber/version'
-
 class Twitter2Jabber
 
-  MAX_LENGTH = 140
-
-  DEFAULT_PAUSE = 60
-
-  DEFAULT_FORMATS = %w[txt]
-
-  DEFAULT_TEMPLATES = File.expand_path(File.join(File.dirname(__FILE__), %w[.. example templates]))
-
-  JABBER_NS = 'http://jabber.org/protocol/xhtml-im'
-  XHTML_NS  = 'http://www.w3.org/1999/xhtml'
-
-  def self.loop(options, recipients = [], pause = nil, last = nil, &block)
-    new(options).loop(recipients, pause, last, &block)
-  end
-
-  def self.run(options, recipients = [], last = nil, &block)
-    new(options).run(recipients, last, &block)
-  end
-
-  attr_reader :id, :verbose, :debug, :log, :twitter, :jabber, :filter, :formats, :templates, :_erb
-
-  def initialize(options, &block)
-    [:twitter, :jabber].each { |client|
-      raise ArgumentError, "#{client} config missing" unless options[client].is_a?(Hash)
-    }
-
-    @id = "#{options[:twitter][:consumer_token]} -> #{options[:jabber][:user]}"
-
-    @verbose = options[:verbose]
-    @debug   = options[:debug]
-    @log     = options[:log]
-
-    log.sync = true
-    logm 'HAI!'
-
-    twitter_connect(options[:twitter])
-    jabber_connect(options[:jabber])
-
-    @filter  = options[:filter]  || block
-    @formats = options[:formats] || DEFAULT_FORMATS
-
-    @templates = Dir[
-      File.join(options[:template_dir] || DEFAULT_TEMPLATES, 'tweet.*')
-    ].inject({}) { |hash, template|
-      hash.update(File.extname(template).sub(/\A\./, '') => File.read(template))
-    }
-
-    @_erb = Hash.new { |hash, format|
-      template = templates[format]
-      hash[format] = template && ERB.new(template)
-    }
-  end
-
-  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, last = nil, &block)
-    pause ||= DEFAULT_PAUSE
-
-    i = 1
+  class << self
 
-    trap(:INT) {
-      logm 'SIGINT received, shutting down...'
-      i = -1
-    }
-
-    while i > 0
-      last = run(recipients, last, i % pause == 1, &block)
-
-      sleep 1
-
-      i += 1
+    def run(options, since_id = nil)
+      new(options).connect.deliver_tweets(since_id)
     end
 
-    logm 'KTHXBYE!'
-
-    last
-  end
-
-  def deliver_tweets(recipients, last = nil, &block)
-    get_tweets(last).each { |tweet|
-      logt last = tweet.id
-
-      # apply filters
-      next if filter && !filter[tweet]
-      next if block  && !block[tweet]
-
-      msg = format_tweet(tweet)
-
-      recipients.each { |recipient|
-        deliver(recipient, msg)
-      }
-
-      sleep 1
-    }
-
-    last
-  end
-
-  def post_messages(recipients = [])
-    allowed = %r{\A(?:#{recipients.map { |r| Regexp.escape(r) }.join('|')})\z}i
-
-    jabber.received_messages { |msg|
-      next unless msg.type == :chat
-      next unless msg.from.bare.to_s =~ allowed
-
-      logj msg.id
-
-      handle_command(msg.body, msg.from)
-    }
-  end
-
-  private
-
-  def twitter_connect(options = @twitter_options)
-    @twitter_options = options
-
-    @twitter = Twitter::REST::Client.new(
-      :consumer_key        => options[:consumer_token],
-      :consumer_secret     => options[:consumer_secret],
-      :access_token        => options[:access_token],
-      :access_token_secret => options[:access_secret]
-    )
-
-    @twitter.verify_credentials
-
-    logt 'connected'
-
-    @twitter
-  rescue Twitter::Error => err
-    raise "Can't connect to Twitter with ID '#{options[:consumer_token]}': #{err}"
-  end
-
-  def jabber_connect(options = @jabber_options)
-    @jabber_options = options
-
-    @jabber = Jabber::Simple.new(options[:user], options[:pass])
-
-    logj 'connected'
-
-    @jabber
-  rescue Jabber::JabberError, Errno::ETIMEDOUT => err
-    raise "Can't connect to Jabber with JID '#{options[:user]}': #{err}"
-  end
-
-  def get_tweets(last = nil)
-    options = {}
-    options[:since_id] = last if last
-
-    tweets = twitter.home_timeline(options)
-    return [] unless tweets.is_a?(Array)
-
-    tweets.sort_by { |tweet| tweet.created_at }
-  rescue Twitter::Error, Timeout::Error
-    []
-  rescue => err
-    warn "#{err} (#{err.class})"
-    []
-  end
-
-  def format_tweet(tweet)
-    user = tweet.user
-
-    msg = Jabber::Message.new.set_type(:chat)
-
-    formats.each { |format|
-      if erb = _erb[format]
-        msg.add_element(format_element(format, erb.result(binding)))
-      end
-    }
-
-    msg
-  end
-
-  # cf. <http://devblog.famundo.com/articles/2006/10/18/ruby-and-xmpp-jabber-part-3-adding-html-to-the-messages>
-  def format_element(format, text)
-    text = process_message(text)
-    body = REXML::Element.new('body')
-
-    case format
-      when 'html'
-        REXML::Text.new(process_html(text), false, body, true, nil, /.^/)
-
-        html = REXML::Element.new('html').add_namespace(JABBER_NS)
-        html.add(body.add_namespace(XHTML_NS))
-        html
-      else
-        REXML::Text.new(process_text(text), true, body, true, nil, /.^/)
-        body
+    def client(client)
+      const_get("#{client.to_s.capitalize}Client")
     end
-  end
-
-  def process_message(text)
-    text.gsub(%r{https?://\S+}) { |match| LongURL.expand(match) rescue match }
-  end
-
-  def process_html(text)
-    text.gsub(/(?:\A|\W)@(\w+)/, '@<a href="https://twitter.com/\1">\1</a>').
-         gsub(/(?:\A|\W)#(\w+)/, '<a href="https://search.twitter.com/search?q=%23\1">#\1</a>')
-  end
 
-  def process_text(text)
-    text
   end
 
-  def handle_command(body, from, execute = true)
-    case body
-      when /\A(?:he?(?:lp)?|\?)\z/i
-        deliver(from, <<-HELP) if execute
-h[e[lp]]|?                                -- Print this help
-
-de[bug]                                   -- Print debug mode
-de[bug] on|off                            -- Turn debug mode on/off
-
-bl[ock] @USER                             -- Block USER
-fa[v[orite]] #ID                          -- Add ID to favorites
-
-bm|bookmark[s]                            -- List bookmarks
-bm|bookmark #ID                           -- Bookmark ID
-bm|bookmark -#ID                          -- Remove ID from bookmarks
+  def initialize(options)
+    @twitter = initialize_client(:twitter, options)
+    @jabber  = initialize_client(:jabber,  options)
 
-rt|retweet #ID [!] [STATUS]               -- Retweet ID
-re[ply] #ID [!] STATUS                    -- Reply to ID
-d[m]|direct[_message] @USER [!] STATUS    -- Send direct message to USER
+    if @debug = options[:debug] or options[:verbose]
+      @spec = "#{twitter.spec} -> #{jabber.spec}"
 
-le[n[gth]] STATUS                         -- Determine length
-[!] STATUS                                -- Update status
+      @log = options[:log] || $stderr
+      @log.sync = true
 
-(Note: STATUS must be under #{MAX_LENGTH} characters; force send with '!'.)
-        HELP
-      when /\Ade(?:bug)?(?:\s+(on|off))?\z/i
-        if execute
-          flag = $1.downcase if $1
-
-          case flag
-            when 'on'
-              @debug = true
-            when 'off'
-              @debug = false
-          end
-
-          deliver(from, "DEBUG = #{debug ? 'on' : 'off'}")
-        end
-      when /\Abl(?:ock)?\s+[@#]?(\w+)\z/i
-        twitter.block($1) if execute && !debug
-      when /\Afav?(?:orite)?\s+#?(\d+)\z/i
-        twitter.favorite_create($1) if execute && !debug
-      when /\A(?:bm|bookmarks?)\z/i
-        deliver(from, bookmarks.map { |bm|
-          st = begin; twitter.status(bm); rescue Twitter::Error::NotFound; end
-          st = "@#{st.user.screen_name}: #{st.text[0, 10]}..." if st.is_a?(Twitter::Tweet)
-          "#{bm} - #{st || '???'}"
-        }.join("\n")) if execute && !debug
-      when /\A(?:bm|bookmark)\s+(\d+)\z/i
-        if execute && !debug
-          bookmarks << $1
-          bookmarks.runiq!
-        end
-      when /\A(?:bm|bookmark)\s+-(\d+)\z/i
-        bookmarks.delete($1) if execute && !debug
-      else
-        command, options = nil, {}
-
-        if execute && body.sub!(/\Alen?(?:gth)?\s+/i, '')
-          if body = handle_command(body, from, false)
-            length = body.length
-            hint   = length <= MAX_LENGTH ? 'OK' : 'TOO LONG'
-
-            deliver(from, "#{length} [#{hint}]: #{body}")
-          end
-
-          return
-        end
-
-        begin
-          if body.sub!(/\A(?:rt|retweet)\s+#?(\d+)(:?)(?:\s+|\z)/i, '')
-            id, colon = $1, $2
-
-            tweet = twitter.status(id)
-
-            if body.empty?
-              options[:id] = id
-              command = :rt
-            else
-              body << " RT @#{tweet.user.screen_name}#{colon} #{tweet.text}"
-            end
-          elsif body.sub!(/\Are(?:ply)?\s+#?(\d+)(:?)\s+/i, '')
-            id, colon = $1, $2
-
-            tweet = twitter.status(id)
-
-            body.insert(0, ' ') unless body.empty?
-            body.insert(0, "@#{tweet.user.screen_name}#{colon}")
-
-            options[:in_reply_to_status_id] = id
-          end
-        rescue Twitter::Error::NotFound
-          deliver(from, "TWEET NOT FOUND: #{id}")
-          return
-        end
-
-        if body.sub!(/\A(?:dm?|direct(?:_message)?)\s+[@#]?(\w+):?\s+/i, '')
-          options[:user] = $1
-          command = :dm
-        end
-
-        if body.sub!(/\A!(?:\s+|\z)/, '')
-          force = true
-        end
-
-        body.gsub!(/https?:\/\/\S+/) { |match|
-          short = ShortURL.shorten(match, :tinyurl)
-          short && short.length < match.length ? short : match
-        }
-
-        return body unless execute
-
-        if force || body.length <= MAX_LENGTH
-          case command
-            when :rt
-              if debug
-                logt "RT: #{options.inspect}", true
-              else
-                twitter.retweet(options[:id])
-              end
-            when :dm
-              if debug
-                logt "DM: #{body} (#{options.inspect})", true
-              else
-                twitter.direct_message_create(options[:user], body)
-              end
-            else
-              update(body, options)
-          end
-
-          deliver(from, "MSG SENT: #{body.inspect}, #{options.inspect}")
-        else
-          deliver(from, "MSG TOO LONG (> #{MAX_LENGTH}): #{body.inspect}")
-        end
+      require 'time'
+    else
+      define_singleton_method(:log) { |_| }
     end
   end
 
-  def deliver(recipient, msg)
-    if debug
-      logj "#{recipient}: #{msg}", true
-      return
-    end
-
-    jabber.deliver(recipient, msg)
-  rescue => err
-    warn "#{err} (#{err.class})"
-    jabber_connect and retry if err.is_a?(Jabber::ServerDisconnected)
-  end
+  def connect
+    log 'Connecting...'
 
-  def update(msg, options = {})
-    if debug
-      logt "#{msg} (#{options.inspect})", true
-      return
-    end
+    twitter.connect
+    jabber.connect
 
-    twitter.update(msg, options)
+    self
   end
 
-  def log_(msg, verbose = verbose)
-    log.puts msg if verbose
-  end
+  attr_reader :twitter, :jabber, :debug
 
-  def logm(msg, verbose = verbose)
-    log_("#{Time.now} [#{id}] #{msg}", verbose)
+  def deliver_tweets(since_id = nil)
+    twitter.tweets(since_id) { |tweet| jabber.deliver(tweet) }
   end
 
-  def logt(msg, verbose = verbose)
-    logm("TWITTER #{msg}", verbose)
+  def log(msg)
+    @log.puts "#{Time.now.xmlschema} [#{@spec}] #{msg}"
   end
 
-  def logj(msg, verbose = verbose)
-    logm("JABBER #{msg}", verbose)
-  end
+  private
 
-  def bookmarks
-    @bookmarks ||= []
+  def initialize_client(client, options)
+    (config = options[client]).is_a?(Hash) ?
+      self.class.client(client).new(self, config) :
+      raise(ArgumentError, "#{client} config missing")
   end
 
 end
+
+require_relative 'twitter2jabber/version'
+require_relative 'twitter2jabber/twitter'
+require_relative 'twitter2jabber/jabber'

data/lib/twitter2jabber/cli.rb

@@ -0,0 +1,100 @@
+#--
+###############################################################################
+#                                                                             #
+# twitter2jabber - Twitter-to-Jabber gateway.                                 #
+#                                                                             #
+# Copyright (C) 2009-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# twitter2jabber is free software; you can redistribute it and/or modify it   #
+# under the terms of the GNU Affero General Public License as published by    #
+# the Free Software Foundation; either version 3 of the License, or (at your  #
+# option) any later version.                                                  #
+#                                                                             #
+# twitter2jabber is distributed in the hope that it will be useful, but       #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public      #
+# License for more details.                                                   #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with twitter2jabber. If not, see <http://www.gnu.org/licenses/>.      #
+#                                                                             #
+###############################################################################
+#++
+
+require 'cyclops'
+require 'twitter2jabber'
+
+class Twitter2Jabber
+
+  class CLI < Cyclops
+
+    class << self
+
+      def defaults
+        super.merge(
+          config:   'config.yaml',
+          since_id: nil,
+          verbose:  false,
+          debug:    false
+        )
+      end
+
+      def extract_since_id(log)
+        return unless File.readable?(log)
+
+        id, re = nil, /\bTWITTER\s+(\d+)\Z/
+
+        File.foreach(log) { |line|
+          id = $1 if line =~ re
+        }
+
+        id.to_i if id
+      end
+
+    end
+
+    def run(arguments)
+      if log = options[:log]
+        options[:log] = File.open(log, 'a')
+        options[:since_id] ||= self.class.extract_since_id(log)
+      end
+
+      Twitter2Jabber.run(options, options.delete(:since_id))
+    end
+
+    private
+
+    def parse_options(arguments)
+      super
+
+      options[:log] &&= File.expand_path(options[:log])
+
+      t = options[:twitter] ||= {}
+      t[:consumer_token]  ||= ask('Twitter consumer token: ')
+      t[:consumer_secret] ||= askpass("Consumer secret for Twitter application #{t[:consumer_token]}: ")
+      t[:access_token]    ||= ask('Twitter access token: ')
+      t[:access_secret]   ||= askpass("Access secret for Twitter user #{t[:access_token]}: ")
+
+      j = options[:jabber] ||= {}
+      j[:username] ||= ask('Jabber ID: ')
+      j[:password] ||= askpass("Password for Jabber ID #{j[:username]}: ")
+    end
+
+    def opts(opts)
+      opts.option(:since_id__ID, Integer, 'Return tweets with status IDs greater than ID')
+
+      opts.separator
+
+      opts.option(:log__FILE, 'Path to log file [Default: STDERR]')
+    end
+
+    def debug_message
+      "don't send any messages"
+    end
+
+  end
+
+end

data/lib/twitter2jabber/jabber.rb

@@ -0,0 +1,132 @@
+#--
+###############################################################################
+#                                                                             #
+# twitter2jabber - Twitter-to-Jabber gateway.                                 #
+#                                                                             #
+# Copyright (C) 2009-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# twitter2jabber is free software; you can redistribute it and/or modify it   #
+# under the terms of the GNU Affero General Public License as published by    #
+# the Free Software Foundation; either version 3 of the License, or (at your  #
+# option) any later version.                                                  #
+#                                                                             #
+# twitter2jabber is distributed in the hope that it will be useful, but       #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public      #
+# License for more details.                                                   #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with twitter2jabber. If not, see <http://www.gnu.org/licenses/>.      #
+#                                                                             #
+###############################################################################
+#++
+
+require 'erb'
+require 'xmpp4r'
+
+class Twitter2Jabber
+
+  class JabberClient
+
+    DEFAULT_TEMPLATES = File.expand_path('../../../example/templates', __FILE__)
+
+    DEFAULT_FORMAT = 'txt'
+
+    JABBER_NS = 'http://jabber.org/protocol/xhtml-im'
+    XHTML_NS  = 'http://www.w3.org/1999/xhtml'
+
+    def initialize(gw, config)
+      @gw, @config, @spec = gw, config, config[:username]
+
+      @format = config.fetch(:format, DEFAULT_FORMAT).to_s
+
+      if File.readable?(template = File.expand_path(File.join(
+        config[:templates] || DEFAULT_TEMPLATES, "tweet.#{@format}")))
+
+        @erb = ERB.new(File.read(template))
+      else
+        raise ArgumentError, "format not supported: #{@format}"
+      end
+    end
+
+    attr_reader :config, :spec
+
+    def client
+      @client ||= Jabber::Client.new(spec).tap { |client|
+        client.connect
+        client.auth(config[:password])
+      }
+    end
+
+    def connect
+      deliver(Jabber::Presence.new(nil, 'Available'), nil)
+      log 'connected'
+    rescue Jabber::JabberError, Errno::ETIMEDOUT => err
+      raise "Can't connect to Jabber with JID '#{spec}': #{err}"
+    end
+
+    def format(tweet)
+      user = tweet.user
+      text = @erb.result(binding)
+
+      msg = Jabber::Message.new.set_type(:chat)
+      msg.add_element(format_element(text))
+      msg
+    end
+
+    def deliver(msg, recipient = config[:recipient])
+      msg = format(msg) unless msg.is_a?(Jabber::XMPPStanza)
+      msg.to = Jabber::JID.new(recipient).strip if recipient
+
+      @gw.debug ? log("#{recipient}: #{msg}") : send_msg(msg)
+    rescue => err
+      warn "#{err} (#{err.class})"
+      retry if err.is_a?(Jabber::ServerDisconnected)
+    end
+
+    private
+
+    # cf. <http://devblog.famundo.com/articles/2006/10/18/ruby-and-xmpp-jabber-part-3-adding-html-to-the-messages>
+    def format_element(text)
+      twitter = @gw.twitter
+
+      text, body = twitter.process_message(text), REXML::Element.new('body')
+
+      if @format == 'html'
+        REXML::Text.new(twitter.process_html(text), false, body, true, nil, /.^/)
+
+        html = REXML::Element.new('html').add_namespace(JABBER_NS)
+        html.add(body.add_namespace(XHTML_NS))
+        html
+      else
+        REXML::Text.new(twitter.process_text(text), true, body, true, nil, /.^/)
+        body
+      end
+    end
+
+    def send_msg(msg, attempts = 0)
+      attempts += 1
+      client.send(msg)
+    rescue Errno::EPIPE, IOError
+      raise if attempts > 3
+
+      begin
+        @client.close
+      rescue Errno::EPIPE, IOError
+      end
+
+      @client = nil
+      sleep 1
+      retry
+    end
+
+    def log(msg)
+      @gw.log("JABBER #{msg}")
+    end
+
+  end
+
+end

data/lib/twitter2jabber/twitter.rb

@@ -0,0 +1,89 @@
+#--
+###############################################################################
+#                                                                             #
+# twitter2jabber - Twitter-to-Jabber gateway.                                 #
+#                                                                             #
+# Copyright (C) 2009-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# twitter2jabber is free software; you can redistribute it and/or modify it   #
+# under the terms of the GNU Affero General Public License as published by    #
+# the Free Software Foundation; either version 3 of the License, or (at your  #
+# option) any later version.                                                  #
+#                                                                             #
+# twitter2jabber is distributed in the hope that it will be useful, but       #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public      #
+# License for more details.                                                   #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with twitter2jabber. If not, see <http://www.gnu.org/licenses/>.      #
+#                                                                             #
+###############################################################################
+#++
+
+require 'twitter'
+require 'longurl'
+
+class Twitter2Jabber
+
+  class TwitterClient
+
+    def initialize(gw, config)
+      @gw, @config, @client = gw, config, Twitter::REST::Client.new(
+        consumer_key:        @spec = config[:consumer_token],
+        consumer_secret:     config[:consumer_secret],
+        access_token:        config[:access_token],
+        access_token_secret: config[:access_secret]
+      )
+    end
+
+    attr_reader :config, :spec, :client
+
+    def connect
+      client.verify_credentials
+      log 'connected'
+    rescue Twitter::Error => err
+      raise "Can't connect to Twitter with ID '#{spec}': #{err}"
+    end
+
+    def tweets(since_id = nil)
+      tweets = client.home_timeline(since_id: since_id)
+      return unless tweets.is_a?(Array)
+
+      tweets.sort_by { |tweet| tweet.created_at }.each { |tweet|
+        log since_id = tweet.id
+        yield tweet
+        sleep 1
+      }
+
+      since_id
+    rescue Twitter::Error, Timeout::Error
+    rescue => err
+      warn "#{err} (#{err.class})"
+    end
+
+    def process_message(text)
+      text.gsub(%r{https?://\S+}) { |match| LongURL.expand(match) rescue match }
+    end
+
+    def process_html(text)
+      text.gsub(/(?:\A|\W)@(\w+)/, '@<a href="https://twitter.com/\1">\1</a>')
+          .gsub(/(?:\A|\W)#(\w+)/, '<a href="https://search.twitter.com/search?q=%23\1">#\1</a>')
+    end
+
+    def process_text(text)
+      text
+    end
+
+    private
+
+    def log(msg)
+      @gw.log("TWITTER #{msg}")
+    end
+
+  end
+
+end

data/lib/twitter2jabber/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: twitter2jabber
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: elif
+  name: cyclops
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: longurl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: longurl
+  name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,27 +53,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: shorturl
+  name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,34 +81,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xmpp4r-simple-19
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: twitter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-description: Twitter-to-Jabber gateway.
+description: Read Twitter streams through Jabber.
 email: jens.wille@gmail.com
 executables:
 - twitter2jabber
@@ -118,29 +104,40 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
-- lib/twitter2jabber.rb
-- lib/twitter2jabber/version.rb
-- bin/twitter2jabber
 - COPYING
 - ChangeLog
 - README
 - Rakefile
 - TODO
+- bin/twitter2jabber
 - example/config.yaml
 - example/templates/tweet.html
 - example/templates/tweet.txt
+- lib/twitter2jabber.rb
+- lib/twitter2jabber/cli.rb
+- lib/twitter2jabber/jabber.rb
+- lib/twitter2jabber/twitter.rb
+- lib/twitter2jabber/version.rb
 homepage: http://github.com/blackwinter/twitter2jabber
 licenses:
-- AGPL
+- AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  twitter2jabber-0.8.0 [2014-04-15]:
+
+  * Dropped "write" functionality. Only forwards Twitter messages to Jabber.
+  * Dropped Ruby 1.8 support.
+  * Reduced external dependencies.
+  * Cut down command line options.
+
 rdoc_options:
+- "--title"
+- twitter2jabber Application documentation (v0.8.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
 - "--all"
-- "--title"
-- twitter2jabber Application documentation (v0.7.0)
 - "--main"
 - README
 require_paths:
@@ -149,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Twitter-to-Jabber gateway.