hayato1980-clitwitter 0.1.0 → 0.1.1

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "pit"
     gem.add_development_dependency "twitter"
-    gem.add_development_dependency "term-ansicolor"
+    gem.add_development_dependency "highline"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/clitwit-get

@@ -1,36 +1,26 @@
+#!/bin/env ruby
 require 'rubygems'
 require 'clitwitter'
-
+require 'highline'
 require 'cgi'
 
-require 'term/ansicolor'
-class String
-  include Term::ANSIColor
+HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
+  cs[:username] = [ :red ]
+  cs[:close_friends] = [ :yellow ]
+  cs[:reply] = [:green]
 end
 
-include Term::ANSIColor
-
-class Color
-  class << self
-    include Term::ANSIColor
-  end
-end
+hl = HighLine.new
 
 twit = ::Clitwitter::Twitter.new
 loop do
-  begin
-    timeline = twit.friends_timeline({})
-  rescue ::Twitter::Unavailable
-    puts "Twitter Service Unavailable #{Time.now}"
-    timeline = []
-  rescue ::Timeout::Error
-    puts "Twitter Timeout #{Time.now}"
-    timeline = []
-  end
-  timeline.each do |s|
-    username = s.user.name.red 
-    username = s.user.name.yellow if twit.close_friends.include? s.user.screen_name
-    text = s.text.gsub(/(@[\w]+)/, Color.green { '\1' } )
+  twit.friends_timeline.each do |s|
+    if twit.close_friends.include? s.user.screen_name
+      username = hl.color(s.user.name , :close_friends )
+    else
+      username = hl.color(s.user.name , :username )
+    end
+    text = s.text.gsub(/(@[\w]+)/, hl.color('\1',:reply) )
     text = CGI.unescapeHTML(text)
     puts "-- #{username} : #{text}"
   end

data/bin/clitwit-post

@@ -1,23 +1,25 @@
+#!/bin/env ruby
+
 require 'rubygems'
 require 'clitwitter'
 require 'optparse'
 
 message = nil
-OptionParser.new {|opts|
-  opts.on("--mail") {|v|
+OptionParser.new do |opts|
+  opts.on("--mail") do |v|
     require 'tmail'
     message = Proc.new do
       stdin = STDIN.readlines.join
       mail = TMail::Mail.parse stdin
       mail.body
     end
-  }
+  end
 
-  opts.on("--message MESSAGE") {|v|
+  opts.on("--message MESSAGE") do |v|
     message = Proc.new { v }
-  }
+  end
   opts.parse!(ARGV)
-}
+end
 
-Clitwitter::Twit.new.post message.call
+::Clitwitter::Twit.new.post message.call
 

data/clitwitter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clitwitter}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hayato"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-08-15}
   s.description = %q{command line twitter client}
   s.email = %q{haya10.ito+github@gmail.com}
   s.executables = ["clitwit-get", "clitwit-post"]
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hayato1980/ruby-clitwitter}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{command line twitter client}
   s.test_files = [
     "spec/ruby-clitwitter_spec.rb",
@@ -52,17 +52,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<pit>, [">= 0"])
       s.add_development_dependency(%q<twitter>, [">= 0"])
-      s.add_development_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_development_dependency(%q<highline>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<pit>, [">= 0"])
       s.add_dependency(%q<twitter>, [">= 0"])
-      s.add_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<pit>, [">= 0"])
     s.add_dependency(%q<twitter>, [">= 0"])
-    s.add_dependency(%q<term-ansicolor>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
   end
 end

data/lib/clitwitter/twit.rb

@@ -1,44 +1,87 @@
 require 'rubygems'
 require 'twitter'
 require 'pit'
+require 'highline'
 
 module Clitwitter
-class Twitter
-  attr_accessor :message
+  class Twitter
+    attr_accessor :message
 
-  def initialize
-    @tw = Pit.get("twitter.com")
+    def initialize
+      @tw = Pit.get("twitter.com")
 
-    if ENV.include?('HTTP_PROXY')
-      host,port= ENV['HTTP_PROXY'].sub(/^http:\/\//,"").split /:/
-      ::Twitter::HTTPAuth.http_proxy( host, port)
+      if ENV.include?('HTTP_PROXY')
+        host,port= ENV['HTTP_PROXY'].sub(/^http:\/\//,"").split /:/
+        ::Twitter::HTTPAuth.http_proxy( host, port)
+      end
+
+      authorize
     end
 
-    client = ::Twitter::HTTPAuth.new(@tw["username"], @tw["password"])
-    @twitter = ::Twitter::Base.new(client)
-  end
+    def post message
+      begin
+        @twitter.update(message)
+      rescue ::Twitter::Unavailable
+        warn "Twitter Service Unavailable #{Time.now}"
+        retry
+      rescue ::Timeout::Error
+        warn "Twitter Timeout #{Time.now}"
+        retry
+      rescue ::Twitter::Unauthorized
+        reenterAuth
+        authorize
+        retry
+      end
+    end
 
-  def post message
-    @twitter.update(message)
-  end
+    def friends_timeline(query={})
+      query[:since_id] = @last_id if @last_id
 
-  def friends_timeline query
-    query[:since_id] = @last_id if @last_id
-    result = @twitter.friends_timeline(query).reverse
+      begin
+        result = @twitter.friends_timeline(query).reverse
+      rescue ::Twitter::Unavailable
+        warn "Twitter Service Unavailable #{Time.now}"
+        result = []
+      rescue ::Timeout::Error
+        warn "Twitter Timeout #{Time.now}"
+        result = []
+      rescue ::Twitter::Unauthorized
+        reenterAuth
+        authorize
+        retry
+      end
 
-    @last_id = result.last.id unless result.empty?
+      @last_id = result.last.id unless result.empty?
 
-    result
-  end
+      result
+    end
 
-  def close_friends
-    if @tw["close_friends"]
-      @tw["close_friends"] 
-    else
-      {}
+    def close_friends
+      if @tw["close_friends"]
+        @tw["close_friends"]
+      else
+        {}
+      end
     end
-  end
 
-end
+    private
+
+    def reenterAuth
+      ::HighLine.track_eof = false
+      puts "Enter Twitter Account"
+      @tw["username"] = ::HighLine.new.ask('username:') do |q|
+        q.default = @tw["username"]
+      end
+      @tw["password"] = ::HighLine.new.ask('password:') do |q|
+        q.echo = '*'
+      end
+      Pit.set("twitter.com",:data => @tw)
+    end
+
+    def authorize
+      client = ::Twitter::HTTPAuth.new(@tw["username"], @tw["password"])
+      @twitter = ::Twitter::Base.new(client)
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hayato1980-clitwitter
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Hayato
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: term-ansicolor
+  name: highline
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement