jnunemaker-twitter 0.2.8 → 0.3.1

data/History.txt

@@ -1,3 +1,9 @@
+0.3.1 - July 23, 2008
+			* added open to CLI twitter open jnunemaker would open default browser to http://twitter.com/jnunemaker
+			* added -f to timeline and replies which ignores the since_id and shows all results
+			* added clear_config to remove all cached since id's and such
+			* Majorly pimped the output of timelines and replies.
+			
 0.3.0 - July 22, 2008
 			* complete rewrite of CLI. Now supports multiple accounts and changing between them.
 			* added source, truncated, in_reply_to_status_id, in_reply_to_user_id, and favorited to Twitter::Status

data/Manifest.txt

@@ -3,6 +3,7 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
+TODO.txt
 bin/twitter
 config/hoe.rb
 config/requirements.rb
@@ -40,6 +41,7 @@ script/generate
 script/txt2html
 setup.rb
 spec/base_spec.rb
+spec/cli/helper_spec.rb
 spec/direct_message_spec.rb
 spec/fixtures/followers.xml
 spec/fixtures/friends.xml

data/TODO.txt

@@ -0,0 +1,3 @@
+* format the tweets in a more readable fashion (limit words per line so more scannable)
+* add timeout so it doesn't hang forever like it does now if twitter is down
+* add progress indicator for timeline and replies as posting has for more visual indication that work is happening

data/lib/twitter/base.rb

@@ -243,7 +243,7 @@ module Twitter
       
       # Converts a string response into an Hpricot xml element.
       def parse(response)
-        Hpricot.XML(response)
+        Hpricot.XML(response || '')
       end
   end
 end

data/lib/twitter/cli/helpers.rb

@@ -1,6 +1,31 @@
 module Twitter
   module CLI
     module Helpers
+      def output_tweets(collection, options={})
+        options.reverse_merge!({
+          :cache        => false,
+          :since_prefix => '',
+          :empty_msg    => 'Nothing new since your last check.'
+        })
+        if collection.size > 0
+          justify   = collection.collect { |s| s.user.screen_name }.max { |a,b| a.length <=> b.length }.length rescue 0
+          indention = ' ' * (justify + 3)
+          say("\n#{indention}#{collection.size} new tweet(s) found.\n\n")
+          collection.each do |s|
+            Tweet.create_from_tweet(current_account, s) if options[:cache]
+            occurred_at    = Time.parse(s.created_at).strftime('On %b %d at %l:%M%P')
+            formatted_time = '-' * occurred_at.length + "\n#{indention}#{occurred_at}"
+            formatted_name = s.user.screen_name.rjust(justify + 1)
+            formatted_msg  = ''
+            s.text.split(' ').in_groups_of(6, false) { |row| formatted_msg += row.join(' ') + "\n#{indention}" }
+            say "#{CGI::unescapeHTML(formatted_name)}: #{CGI::unescapeHTML(formatted_msg)}#{formatted_time}\n\n"
+          end
+          Configuration["#{options[:since_prefix]}_since_id"] = collection.first.id
+        else
+          say(options[:empty_msg])
+        end
+      end
+      
       def base(username=current_account.username, password=current_account.password)
         @base ||= Twitter::Base.new(username, password)
       end

data/lib/twitter/cli.rb

@@ -253,45 +253,57 @@ Main {
       description 'the timeline you wish to see (friends, public, me)'
       default 'friends'
     }
+    option('force', 'f') {
+      description "Ignore since_id and show first page of results even if there aren't new ones"
+    }
     
     def run
       do_work do
         timeline = params['timeline'].value == 'me' ? 'user' : params['timeline'].value
-        options, since_id = {}, Configuration["#{timeline}_last_id"]
-        options[:since_id] = since_id unless since_id.blank?
-        statuses = base.timeline(timeline.to_sym, options)
-        username_length = statuses.collect { |s| s.user.screen_name }.max { |a,b| a.length <=> b.length }.length rescue 0
-        if statuses.size > 0
-          statuses.each do |s|
-            Tweet.create_from_tweet(current_account, s) if timeline != :public
-            say "#{CGI::unescapeHTML(s.user.screen_name.ljust(username_length+1))}: #{CGI::unescapeHTML(s.text)} on #{Time.parse(s.created_at).strftime('%b %d at %l:%M%P')}"
-          end
-          Configuration["#{timeline}_last_id"] = statuses.first.id
-        else
-          say 'Nothing new since your last check'
-        end
+        options, since_id = {}, Configuration["#{timeline}_since_id"]
+        options[:since_id] = since_id if !since_id.blank? && !params['force'].given?
+        cache = [:friends, :user].include?(timeline)
+        collection = base.timeline(timeline.to_sym, options)
+        output_tweets(collection, {:cache => cache, :since_prefix => timeline})
       end
     end
   end
   
   mode 'replies' do
     description 'Allows you to view all @replies at you'
+    option('force', 'f') {
+      description "Ignore since_id and show first page of replies even if there aren't new ones"
+    }
     
     def run
       do_work do
         options, since_id = {}, Configuration["replies_since_id"]
-        options[:since_id] = since_id if !since_id.blank?
-        replies = base.replies(options)
-        username_length = replies.collect { |s| s.user.screen_name }.max { |a,b| a.length <=> b.length }.length rescue 0
-        if replies.size > 0 
-          replies.each do |s|
-            say "#{CGI::unescapeHTML(s.user.screen_name.ljust(username_length+1))}: #{CGI::unescapeHTML(s.text)} on #{Time.parse(s.created_at).strftime('%b %d at %l:%M%P')}"
-          end
-          Configuration["replies_since_id"] = replies.first.id
-        else
-          say 'No new replies since your last check'
-        end
+        options[:since_id] = since_id if !since_id.blank? && !params['force'].given?
+        collection = base.replies(options)
+        output_tweets(collection, {:since_prefix => 'replies'})
+      end
+    end
+  end
+  
+  mode 'clear_config' do
+    def run
+      do_work do
+        count = Configuration.count
+        Configuration.destroy_all
+        say("#{count} configuration entries cleared.")
       end
     end
   end
+  
+  mode 'open' do
+    description 'Opens the given twitter user in a browser window'
+    argument('username') {
+      required
+      description "username or id of twitterrer who's page you would like to see"
+    }
+    
+    def run
+      `open http://twitter.com/#{params['username'].value}`
+    end
+  end
 }

data/lib/twitter/version.rb

@@ -2,7 +2,7 @@ module Twitter #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/cli/helper_spec.rb

@@ -0,0 +1,35 @@
+require 'ostruct'
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../lib/twitter/cli/helpers'
+
+class Configuration; end
+
+def say(str)
+  puts str
+end
+
+describe Twitter::CLI::Helpers do
+  include Twitter::CLI::Helpers
+  
+  describe "outputting tweets" do
+    before do
+      Configuration.stub!(:[]=).and_return(true)
+      @collection = [
+        OpenStruct.new(
+          :text => 'This is my long message that I want to see formatted ooooh so pretty with a few words on each line so it is easy to scan.',
+          :created_at => Time.mktime(2008, 5, 1, 10, 15, 00).strftime('%Y-%m-%d %H:%M:%S'),
+          :user => OpenStruct.new(:screen_name => 'jnunemaker')
+        ),
+        OpenStruct.new(
+          :text => 'This is my long message that I want to see formatted ooooh so pretty with a.',
+          :created_at => Time.mktime(2008, 4, 1, 10, 15, 00).strftime('%Y-%m-%d %H:%M:%S'),
+          :user => OpenStruct.new(:screen_name => 'danielmorrison')
+        )
+      ]
+    end
+    
+    specify "should properly format" do
+      output_tweets(@collection)
+    end
+  end
+end

data/twitter.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{twitter}
-  s.version = "0.2.8"
+  s.version = "0.3.1"
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2008-07-6}
+  s.date = %q{2008-07-23}
   s.default_executable = %q{twitter}
   s.description = %q{a command line interface for twitter, also a library which wraps the twitter api}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["twitter"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/twitter", "config/hoe.rb", "config/requirements.rb", "examples/blocks.rb", "examples/direct_messages.rb", "examples/favorites.rb", "examples/friends_followers.rb", "examples/friendships.rb", "examples/location.rb", "examples/replies.rb", "examples/sent_messages.rb", "examples/timeline.rb", "examples/twitter.rb", "examples/verify_credentials.rb", "lib/twitter.rb", "lib/twitter/base.rb", "lib/twitter/cli.rb", "lib/twitter/cli/config.rb", "lib/twitter/cli/helpers.rb", "lib/twitter/cli/migrations/20080722194500_create_accounts.rb", "lib/twitter/cli/migrations/20080722194508_create_tweets.rb", "lib/twitter/cli/migrations/20080722214605_add_account_id_to_tweets.rb", "lib/twitter/cli/migrations/20080722214606_create_configurations.rb", "lib/twitter/cli/models/account.rb", "lib/twitter/cli/models/configuration.rb", "lib/twitter/cli/models/tweet.rb", "lib/twitter/direct_message.rb", "lib/twitter/easy_class_maker.rb", "lib/twitter/rate_limit_status.rb", "lib/twitter/status.rb", "lib/twitter/user.rb", "lib/twitter/version.rb", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/base_spec.rb", "spec/direct_message_spec.rb", "spec/fixtures/followers.xml", "spec/fixtures/friends.xml", "spec/fixtures/friends_for.xml", "spec/fixtures/friends_lite.xml", "spec/fixtures/friends_timeline.xml", "spec/fixtures/public_timeline.xml", "spec/fixtures/rate_limit_status.xml", "spec/fixtures/status.xml", "spec/fixtures/user.xml", "spec/fixtures/user_timeline.xml", "spec/spec.opts", "spec/spec_helper.rb", "spec/status_spec.rb", "spec/user_spec.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "twitter.gemspec", "website/css/common.css", "website/index.html"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO.txt", "bin/twitter", "config/hoe.rb", "config/requirements.rb", "examples/blocks.rb", "examples/direct_messages.rb", "examples/favorites.rb", "examples/friends_followers.rb", "examples/friendships.rb", "examples/location.rb", "examples/replies.rb", "examples/sent_messages.rb", "examples/timeline.rb", "examples/twitter.rb", "examples/verify_credentials.rb", "lib/twitter.rb", "lib/twitter/base.rb", "lib/twitter/cli.rb", "lib/twitter/cli/config.rb", "lib/twitter/cli/helpers.rb", "lib/twitter/cli/migrations/20080722194500_create_accounts.rb", "lib/twitter/cli/migrations/20080722194508_create_tweets.rb", "lib/twitter/cli/migrations/20080722214605_add_account_id_to_tweets.rb", "lib/twitter/cli/migrations/20080722214606_create_configurations.rb", "lib/twitter/cli/models/account.rb", "lib/twitter/cli/models/configuration.rb", "lib/twitter/cli/models/tweet.rb", "lib/twitter/direct_message.rb", "lib/twitter/easy_class_maker.rb", "lib/twitter/rate_limit_status.rb", "lib/twitter/status.rb", "lib/twitter/user.rb", "lib/twitter/version.rb", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/base_spec.rb", "spec/cli/helper_spec.rb", "spec/direct_message_spec.rb", "spec/fixtures/followers.xml", "spec/fixtures/friends.xml", "spec/fixtures/friends_for.xml", "spec/fixtures/friends_lite.xml", "spec/fixtures/friends_timeline.xml", "spec/fixtures/public_timeline.xml", "spec/fixtures/rate_limit_status.xml", "spec/fixtures/status.xml", "spec/fixtures/user.xml", "spec/fixtures/user_timeline.xml", "spec/spec.opts", "spec/spec_helper.rb", "spec/status_spec.rb", "spec/user_spec.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "twitter.gemspec", "website/css/common.css", "website/index.html"]
   s.has_rdoc = true
   s.homepage = %q{http://twitter.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-twitter
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-06 00:00:00 -07:00
+date: 2008-07-23 00:00:00 -07:00
 default_executable: twitter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- TODO.txt
 - bin/twitter
 - config/hoe.rb
 - config/requirements.rb
@@ -84,6 +85,7 @@ files:
 - script/txt2html
 - setup.rb
 - spec/base_spec.rb
+- spec/cli/helper_spec.rb
 - spec/direct_message_spec.rb
 - spec/fixtures/followers.xml
 - spec/fixtures/friends.xml