tweetskim 0.7.0 → 0.8.0

data/README.md

@@ -27,7 +27,7 @@ Options:
 
 -a, --show-all                   Show all tweets (200max), not just unread tweets
 
--e, --mentions:                  Show mentions instead of timeline
+-e, --mentions                   Show mentions instead of timeline
 
 -i, --inverse-order              Inverse/reverse ordered tweets
 
@@ -37,7 +37,7 @@ Options:
 
 -n, --last-n-tweets N            Show the last N tweets in your timeline
 
--o, --output-mode MODE           Output as 'lines', 'column' or 'html'
+-l, --html-output                Output tweets as more readable html file
 
 -v, --version                    Current version
 
@@ -61,12 +61,6 @@ TODO:
 =====
 
 
-show status identifier
-----
-
-option to prefix tweets with their status id and/or direct link (all modes)
-
-
 multiple accounts
 ------
 
@@ -76,11 +70,6 @@ split out authorization in separate, explicit step: tweetskim authorize USER
 
 set tokens per account (if username given)
 
-html output mode
------
-
-output single-page html version of tweets, do pretty and readable stuff here
-
 
 LICENSE:
 ========

data/bin/tweetskim

@@ -24,7 +24,6 @@ def parse_options
   return options
 end
 
-
 def fetch_tweets(options = {})
   settings = Tweetskim::Settings.new
   adapter = Tweetskim::TwitterAdapter.new
@@ -53,20 +52,25 @@ def fetch_tweets(options = {})
   return tweets
 end
 
+require 'launchy'
+def show_in_browser(html_body)  
+  File.open "/tmp/tweets.html", "w" do |filebody|
+    filebody.write(html_body)
+  end    
+  Launchy.open("/tmp/tweets.html")
+end
 
-def write_tweets_to_stdout(tweets, options = {})
+def output_tweets(tweets, options = {})
   formatter = Tweetskim::Formatter.new
-
-  if options[:html_output] # Print lines to stdout
-    result = formatter.html(tweets, options)
+  if options[:html_output] 
+    show_in_browser(formatter.html(tweets, options))
   else
-    result = formatter.lines(tweets, options)
+    puts formatter.lines(tweets, options)
   end
-  
-  puts result
 end
 
 
+# Run it
 options = parse_options
 tweets = fetch_tweets(options)
-write_tweets_to_stdout(tweets, options)
+output_tweets(tweets, options)

data/lib/tweetskim/version.rb

@@ -1,3 +1,3 @@
 module Tweetskim
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/tweetskim.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "twitter"
   s.add_runtime_dependency "oauth"
   s.add_runtime_dependency "OptionParser"
+  s.add_runtime_dependency "launchy"
   
   s.add_development_dependency "mocha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetskim
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &18714980 !ruby/object:Gem::Requirement
+  requirement: &9961660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18714980
+  version_requirements: *9961660
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &18714560 !ruby/object:Gem::Requirement
+  requirement: &9961240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18714560
+  version_requirements: *9961240
 - !ruby/object:Gem::Dependency
   name: OptionParser
-  requirement: &18714140 !ruby/object:Gem::Requirement
+  requirement: &9960820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18714140
+  version_requirements: *9960820
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &9960400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *9960400
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &18713720 !ruby/object:Gem::Requirement
+  requirement: &9959980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18713720
+  version_requirements: *9959980
 description: ! 'Usage: tweetskim [options]'
 email:
 - thomas@kjeldahlnilsson.net
@@ -69,7 +80,6 @@ files:
 - Rakefile
 - bin/tweetskim
 - lib/tweetskim.rb
-- lib/tweetskim/core.rb
 - lib/tweetskim/formatter.rb
 - lib/tweetskim/settings.rb
 - lib/tweetskim/twitter_adapter.rb

data/lib/tweetskim/core.rb

@@ -1,174 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-module Tweetskim
-  require 'rubygems'
-  require 'twitter'
-  require 'oauth'
-
-  class Settings
-    SETTINGS_TEMPLATE = {:token => nil,
-      :secret => nil,
-      :last_read_status_id => "111111"}
-
-    SETTINGS_FILE_PATH = File.expand_path "~/.tweetskim/default-account"
-
-    require "fileutils"
-    
-    def initialize
-      FileUtils.mkdir_p(File.expand_path("~/.tweetskim"))
-      FileUtils.touch SETTINGS_FILE_PATH
-    end
-    
-    def load
-      File.open SETTINGS_FILE_PATH, "r" do |filebody|
-        YAML::load(filebody) || SETTINGS_TEMPLATE
-      end
-    end
-
-    def save(settings)
-      yml_str = YAML::dump(settings)
-      File.open SETTINGS_FILE_PATH, "w" do |filebody|
-        filebody.write yml_str
-      end
-    end
-    
-    def user_credentials_stored?
-      if File.exists? SETTINGS_FILE_PATH
-        settings = load
-        return (settings[:token] && !settings[:token].empty? &&
-                settings[:secret] && !settings[:secret].empty?)
-      else
-        false
-      end
-    end
-    
-    def save_credentials(token, secret)
-      settings = load
-      settings[:token] = token
-      settings[:secret] = secret
-      save settings
-    end
-
-    def load_credentials
-      settings = load
-      return settings[:token], settings[:secret]
-    end
-
-    def load_last_read_status_id
-      settings = load
-      return settings[:last_read_status_id]
-    end
-
-    def save_last_read_status_id(id)
-      settings = load
-      settings[:last_read_status_id] = id
-      save settings
-    end
-    
-  end
-
-
-  
-  class TwitterAdapter
-    # TODO call for each user in config
-    # implicit for the user authenticated in client. Different user =
-    # different client
-    
-    def mentions(tweet_count, since_id)
-      client = authenticated_client 
-      mentions = client.mentions({:count => tweet_count.to_i, :since_id => since_id.to_i})
-    end
-
-    def timeline(tweet_count, since_id) 
-      client = authenticated_client
-      timeline = client.home_timeline({:count => tweet_count.to_i, :since_id => since_id.to_i})
-    end
-    
-    CONSUMER_KEY = "3oUZhYLZcaqqQePajIjnBg"
-    CONSUMER_SECRET = "mAYecEGPwy7BlkibFGHCACtY5x1Mm0YOvczxsll4OY"
-
-    # TODO call for specific user
-    def authenticated_client
-      settings = Tweetskim::Settings.new
-      
-      if settings.user_credentials_stored?
-        user_token, user_secret = settings.load_credentials
-      else
-        user_token, user_secret = oauth_pin_dance_for_token_and_secret
-        settings.save_credentials(user_token, user_secret)
-      end
-
-      Twitter.configure do |config|
-        config.consumer_key = CONSUMER_KEY
-        config.consumer_secret = CONSUMER_SECRET
-        config.oauth_token = user_token
-        config.oauth_token_secret = user_secret
-      end
-
-      client = Twitter::Client.new
-      client.verify_credentials
-      return client
-    end
-    
-    def oauth_pin_dance_for_token_and_secret
-      oauth_consumer = OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET,
-                                           :site => 'http://api.twitter.com',
-                                           :request_token_path => '/oauth/request_token',
-                                           :access_token_path => '/oauth/access_token',
-                                           :authorize_path => '/oauth/authorize')
-      
-      request_token = oauth_consumer.get_request_token
-      rtoken  = request_token.token
-      rsecret = request_token.secret
-      
-      puts "You have to set up Twitter authentication the first time you use tweetskim."
-      puts "Please authenticate by following this URL:"
-      puts request_token.authorize_url
-      
-      puts "What was the PIN that Twitter gave you? "
-      pin = gets.chomp
-     
-      OAuth::RequestToken.new(oauth_consumer, rtoken, rsecret)
-      access_token = request_token.get_access_token(:oauth_verifier => pin)
-      
-      return access_token.token, access_token.secret
-    end   
-  end
-  
-  
-  class Formatter
-    def lines(tweets, options = {})
-      tweet_texts = tweets.reverse.map {|tweet| "--#{tweet.user.name}-- #{text(tweet)}\n"}
-      lines = tweet_texts.join("")
-    end
-      
-    def column(tweets, options = {})
-      tweet_texts = tweets.reverse.map {|tweet| "--\\033[1;34m#{tweet.user.name}\\033[0m-- #{text(tweet)}"}
-      reflowed_tweets = tweet_texts.map {|tweet| `echo "#{tweet}" | fmt -w #{options[:width]}` }
-      column = reflowed_tweets.join "\n\n"
-    end
-
-    def html(tweets, options = {})
-     
-    end
-    
-    def pad(column, width)
-      padded_lines = []
-      column.each_line do |line|
-        chopped_line = line.chop
-        padded_lines.push `printf "%-#{width}s\n" "#{chopped_line}"`        
-      end
-      padded_lines.join ""
-    end
-
-    def text(tweet)
-      if tweet.retweeted_status
-        "RT @#{tweet.retweeted_status.user.screen_name}: #{tweet.retweeted_status.text}"
-      else
-        tweet.text
-      end
-    end
-  end
-
-  
-end