tweetskim 0.6.0 → 0.7.0

data/bin/tweetskim

@@ -14,7 +14,7 @@ def parse_options
     o.on("-h", "--help", "Help page") { puts o; exit }
     o.on("-m", "--mark-all-read", "Mark everything up to now as read") { |b| options[:mark_all_read] = b }
     o.on("-n N", "--last-n-tweets N", "Show only the last N tweets") { |n| options[:last_n_tweets] = n }
-    o.on("-o MODE", "--output-mode MODE", "Output as 'lines', 'column' or 'html'") { |mode| options[:output_mode] = mode }
+    o.on("-l", "--html-output", "Output as html") { |b| options[:html_output] = true}
    #TODO  o.on("-u USER", "--user USER", "Which twitter user I am. Example: tweetskim -u thomanil") { |u| options[:user] = u }
     o.on("-v", "--version", "Spit out version") { |b| puts Tweetskim::VERSION; exit }
 
@@ -56,16 +56,11 @@ end
 
 def write_tweets_to_stdout(tweets, options = {})
   formatter = Tweetskim::Formatter.new
-  output_mode = options[:output_mode]
 
-  if !output_mode || output_mode == "lines"
-    result = formatter.lines(tweets, options)
-  elsif output_mode == "column"
-    result = formatter.column(tweets, {:width => 60})
-  elsif output_mode == "html"
-    puts "Html mode not done yet."; exit
+  if options[:html_output] # Print lines to stdout
+    result = formatter.html(tweets, options)
   else
-    puts "Invalid output mode."; exit
+    result = formatter.lines(tweets, options)
   end
   
   puts result

data/lib/tweetskim.rb

@@ -1,5 +1,7 @@
 require "tweetskim/version"
-require "tweetskim/core"
+require "tweetskim/settings"
+require "tweetskim/twitter_adapter"
+require "tweetskim/formatter"
 
 module Tweetskim
   

data/lib/tweetskim/core.rb

@@ -5,39 +5,6 @@ module Tweetskim
   require 'twitter'
   require 'oauth'
 
-
-  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 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
-
-
   class Settings
     SETTINGS_TEMPLATE = {:token => nil,
       :secret => nil,
@@ -168,4 +135,40 @@ module Tweetskim
     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

data/lib/tweetskim/formatter.rb

@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+
+module Tweetskim
+
+  class Formatter
+
+    def lines(tweets, options = {})
+      tweet_texts = tweets.reverse.map {|tweet| "--#{tweet.user.name}-- #{text(tweet)}\n"}
+      lines = tweet_texts.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
+
+    def htmlize(tweet)
+      text = text(tweet).gsub('\n', '<br/>')
+      "<div class='tweet'><h1>#{tweet.user.name} <span class='time'>#{time(tweet)}</span></h1><p>#{text}<p></div>"
+    end
+
+    def time(tweet)
+      tweet_time = tweet.created_at
+      now = Time.now
+      if now.day != tweet_time.day
+        "#{tweet_time.day} / #{tweet_time.mon}"
+      else
+        "#{tweet_time.hour}:#{tweet_time.min}"
+      end
+    end
+    
+    def html(tweets, options = {})
+      html_tweets = tweets.reverse.map {|tweet| htmlize(tweet)}.join("")
+
+      body = <<HTML
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Tweetskim</title>
+  </head>
+  <body>
+    <style>
+      #tweets {
+        width: 500px;
+        margin-left: 50px;
+      }
+
+      .tweet {
+         margin-top: 50px;
+         margin-bottom: 50px;
+      }
+
+      .tweet h1 {
+        color: #ADADAD;
+        font-size: 2.0em;
+        margin-bottom: 0px;
+      }
+
+      .tweet .time {
+        color: #ADADAD;
+        font-size: 0.5em;
+      }
+
+      .tweet p {
+        font-size: 1.2em;
+        margin: 0 0 0 0;
+        margin-left: 50px;
+        font-family: sans-serif;
+      }
+    </style>
+    <div id="tweets">
+      #{html_tweets}
+    </div>
+  </body>
+</html>
+HTML
+      return body
+    end
+    
+  end
+  
+end

data/lib/tweetskim/settings.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+
+module Tweetskim
+
+  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
+  
+end

data/lib/tweetskim/twitter_adapter.rb

@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+
+require 'rubygems'
+require 'twitter'
+require 'oauth'
+
+module Tweetskim
+
+  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
+
+end

data/lib/tweetskim/version.rb

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

data/test/test_tweetskim.rb

@@ -14,16 +14,6 @@ class TestTweetskim < Test::Unit::TestCase
     status.stubs(:user).returns user
     return status
   end
-  
-  def test_column_creation
-    tweets = [t("Ut enimad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."), t("Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "), t("Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")]
-    
-    expected = "--\e[1;34mMock User\e[0m-- Excepteur sint\noccaecat cupidatat non proident, sunt\nin culpa qui officia deserunt mollit\nanim id est laborum.\n\n\n--\e[1;34mMock User\e[0m-- Duis aute\nirure dolor in reprehenderit in\nvoluptate velit esse cillum dolore eu\nfugiat nulla pariatur.\n\n\n--\e[1;34mMock User\e[0m-- Ut enimad\nminim veniam, quis nostrud exercitation\nullamco laboris nisi ut aliquip ex ea\ncommodo consequat.\n"
-
-    actual = @f.column(tweets, {:width => 40})
-    
-    assert_equal expected, actual
-  end
 
   def test_line_creation
     tweets = [t("Ut enimad minim veniam, quis nostrud."), t("Duis aute irure dolor in reprehenderit"), t("Excepteur sint occaecat cupidatat non proident")]
@@ -38,40 +28,6 @@ LINES
 
     assert_equal expected, actual
   end
-
-
-  def test_whitespace_padding
-
-    col = <<COL
-aaaaaa
-aaaaa
-aaaa
-aaa
-aa
-a
-
-COL
-    
-    expected = <<COL
-aaaaaa
-aaaaa 
-aaaa  
-aaa   
-aa    
-a     
-      
-COL
-       
-    assert_equal expected, @f.pad(col, 6)
-  end
-
-  def test_settings_persistence
-    
-
-    
-  end
-
-
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetskim
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &9038620 !ruby/object:Gem::Requirement
+  requirement: &18714980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9038620
+  version_requirements: *18714980
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &9038200 !ruby/object:Gem::Requirement
+  requirement: &18714560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9038200
+  version_requirements: *18714560
 - !ruby/object:Gem::Dependency
   name: OptionParser
-  requirement: &9037780 !ruby/object:Gem::Requirement
+  requirement: &18714140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9037780
+  version_requirements: *18714140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &9037360 !ruby/object:Gem::Requirement
+  requirement: &18713720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9037360
+  version_requirements: *18713720
 description: ! 'Usage: tweetskim [options]'
 email:
 - thomas@kjeldahlnilsson.net
@@ -70,6 +70,9 @@ files:
 - bin/tweetskim
 - lib/tweetskim.rb
 - lib/tweetskim/core.rb
+- lib/tweetskim/formatter.rb
+- lib/tweetskim/settings.rb
+- lib/tweetskim/twitter_adapter.rb
 - lib/tweetskim/version.rb
 - test/test_helper.rb
 - test/test_tweetskim.rb