twitter2jabber 0.2.6 → 0.3.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to twitter2jabber version 0.2.6
+This documentation refers to twitter2jabber version 0.3.0
 
 
 == DESCRIPTION

data/TODO

@@ -1,8 +1,9 @@
+- 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)
-- explicit retweet (http://apiwiki.twitter.com/Twitter-REST-API-Method:-statuses-retweet)
 - 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? (full twitter API?)

data/bin/twitter2jabber

@@ -48,19 +48,20 @@ rescue Interrupt
 end
 
 options = {
-  :config       => 'config.yaml',
-  :user         => nil,
-  :jid          => nil,
-  :recipients   => [],
-  :formats      => nil,
-  :template_dir => nil,
-  :loop         => false,
-  :pause        => nil,
-  :last         => nil,
-  :wrap         => nil,
-  :log          => STDERR,
-  :verbose      => false,
-  :debug        => false
+  :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|
@@ -75,8 +76,12 @@ OptionParser.new { |opts|
 
   opts.separator ' '
 
-  opts.on('-u', '--user NAME', 'Twitter user') { |u|
-    options[:user] = u
+  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|
@@ -157,9 +162,12 @@ end
 
 # twitter config
 config[:twitter] ||= {}
-config[:twitter][:user] = options[:user] if options[:user]
-config[:twitter][:user] ||= ask('Twitter user: ')
-config[:twitter][:pass] ||= ask("Password for Twitter user #{config[:twitter][:user]}: ") { |q| q.echo = false }
+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] ||= {}

data/lib/twitter2jabber/version.rb

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

data/lib/twitter2jabber.rb

@@ -64,7 +64,7 @@ class Twitter2Jabber
       raise ArgumentError, "#{client} config missing" unless options[client].is_a?(Hash)
     }
 
-    @id = "#{options[:twitter][:user]} -> #{options[:jabber][:user]}"
+    @id = "#{options[:twitter][:consumer_token]} -> #{options[:jabber][:user]}"
 
     @verbose = options[:verbose]
     @debug   = options[:debug]
@@ -157,7 +157,9 @@ class Twitter2Jabber
   private
 
   def twitter_connect(options)
-    auth   = Twitter::HTTPAuth.new(options[:user], options[:pass])
+    auth   = Twitter::OAuth.new(options[:consumer_token], options[:consumer_secret])
+    auth.authorize_from_access(options[:access_token], options[:access_secret])
+
     client = Twitter::Base.new(auth)
 
     # verify credentials
@@ -167,7 +169,7 @@ class Twitter2Jabber
 
     client
   rescue Twitter::TwitterError => err
-    raise "Can't connect to Twitter with ID '#{options[:user]}': #{err}"
+    raise "Can't connect to Twitter with ID '#{options[:consumer_token]}': #{err}"
   end
 
   def jabber_connect(options)
@@ -387,6 +389,8 @@ le[n[gth]] STATUS                         -- Determine length
     end
 
     jabber.deliver(recipient, msg)
+  rescue => err
+    warn "#{err} (#{err.class})"
   end
 
   def update(msg, options = {})

data/sample/config.yaml

@@ -1,11 +1,13 @@
 ---
 :twitter:
-  :user: foo
-  :pass: bar
+  :consumer_token:  c5ff16bd638c9acc6fb00197301008c5eb561f46
+  :consumer_secret: ae2ad9454f3af7fcb18c83969f99b20a788eddd1
+  :access_token:    f1b640bee7b738e8f18758990a61c07a17eab637
+  :access_secret:   06c76739e3f4875a27a9e3ce36999e1af916a0e0
 
 :jabber:
-  :user: quix
-  :pass: quux
+  :user: foo
+  :pass: foo
 
 :recipients:
   - one

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jens Wille
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +01:00
+date: 2010-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: twitter
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,6 +34,7 @@ dependencies:
   name: xmpp4r-simple
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -45,6 +47,7 @@ dependencies:
   name: shorturl
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,6 +60,7 @@ dependencies:
   name: longurl
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -69,6 +73,7 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -81,6 +86,7 @@ dependencies:
   name: elif
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -93,6 +99,7 @@ dependencies:
   name: ruby-nuggets
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -115,32 +122,33 @@ files:
 - lib/twitter2jabber.rb
 - lib/twitter2jabber/version.rb
 - bin/twitter2jabber
+- COPYING
+- Rakefile
 - README
 - ChangeLog
-- Rakefile
 - TODO
-- COPYING
-- sample/templates/tweet.txt
-- sample/templates/tweet.html
 - sample/config.yaml
+- sample/templates/tweet.html
+- sample/templates/tweet.txt
 has_rdoc: true
 homepage: http://twitter2jabber.rubyforge.org/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
+- --line-numbers
+- --inline-source
 - --charset
 - UTF-8
-- --title
-- twitter2jabber Application documentation
 - --main
 - README
-- --line-numbers
-- --inline-source
+- --title
+- twitter2jabber Application documentation
 - --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -148,6 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -157,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: twitter2jabber
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Twitter-to-Jabber gateway.