termtter 1.4.0 → 1.5.0

data/README.rdoc

@@ -1,20 +1,18 @@
-= termtter
-
-http://termtter.org/
-
-== DESCRIPTION:
+= Termtter
 
 Termtter is a terminal based Twitter client.
 
-== FEATURES/PROBLEMS:
+For more information, see http://termtter.org/ and http://lingr.com/room/termtter
 
-== SYNOPSIS:
+== INSTALL:
+
+  % sudo gem install termtter
 
-=== Run:
+== Run:
 
   % termtter
 
-=== Some Termtter Commands:
+== Commands:
 
 Show help
 
@@ -32,17 +30,6 @@ Search
 
   > search termtter
 
-== REQUIREMENTS:
-
-* json_pure or json
-* termcolor
-* rubytter
-* highline
-
-== INSTALL:
-
-  % sudo gem install termtter
-
 == CONFIGURATION:
 
 If you would like to use proxy server, add configurations like this:
@@ -61,15 +48,6 @@ You can to load plugins in this way:
 
 To update the config, just restart your termtter proccess.
 
-== FORUM:
-
-http://groups.google.co.jp/group/termtter
-
-== TODO:
-
-- Enhance the document and spec
-- Improve the UI(a status view, etc...)
-
 == ADVANCED USAGE:
 
   t.plug 'curry'
@@ -90,6 +68,18 @@ You can also type `<` as curry.
   > < u
   u >
 
+== REQUIREMENTS:
+
+* json_pure or json
+* termcolor
+* rubytter
+* highline
+
+== TODO:
+
+- Enhance the document and spec
+- Improve the UI(a status view, etc...)
+
 == LICENSE:
 
 (The MIT License)

data/lib/plugins/defaults/eval.rb

@@ -0,0 +1,6 @@
+module Termtter::Client
+  register_command(:eval, :help => ['eval EXPR', 'evaluate expression']) do |arg|
+    result = eval(arg) unless arg.empty?
+    puts "=> #{result.inspect}"
+  end
+end

data/lib/plugins/defaults/standard_commands.rb

@@ -139,20 +139,27 @@ module Termtter::Client
   register_command(
     :name => :list, :aliases => [:l],
     :exec_proc => lambda {|arg|
+      if arg =~ /\-([\d]+)/
+        options = {:count => $1}
+        arg = arg.gsub(/\-([\d]+)/, '')
+      else
+        options = {}
+      end
+
       if arg.empty?
         event = :list_friends_timeline
-        statuses = Termtter::API.twitter.friends_timeline
+        statuses = Termtter::API.twitter.friends_timeline(options)
       else
         event = :list_user_timeline
         statuses = []
         Array(arg.split).each do |user|
           user_name = normalize_as_user_name(user)
-          statuses += Termtter::API.twitter.user_timeline(user_name)
+          statuses += Termtter::API.twitter.user_timeline(user_name, options)
         end
       end
       output(statuses, event)
     },
-    :help => ["list,l [USERNAME]", "List the posts"]
+    :help => ["list,l [USERNAME] [-COUNT]", "List the posts"]
   )
 
   class SearchEvent; attr_reader :query; def initialize(query); @query = query end; end

data/lib/plugins/defaults/stdout.rb

@@ -12,7 +12,7 @@ config.plugins.stdout.set_default(
 )
 config.plugins.stdout.set_default(:time_format_today, '%H:%M:%S')
 config.plugins.stdout.set_default(:time_format_not_today, '%y/%m/%d %H:%M')
-config.plugins.stdout.set_default(:enable_pager, true)
+config.plugins.stdout.set_default(:enable_pager, false)
 config.plugins.stdout.set_default(:pager, 'less -R -f +G')
 config.plugins.stdout.set_default(:window_height, 50)
 config.plugins.stdout.set_default(:typable_ids, ('aa'..'zz').to_a)

data/lib/plugins/irc_gw.rb

@@ -74,10 +74,12 @@ class TermtterIrcGateway < Net::IRC::Server::Session
 
   def on_message(m)
     termtter_command = m.command.downcase + ' ' + m.params.join(' ')
-    unless Termtter::Client.find_commands(termtter_command).empty?
-      post '#termtter', NOTICE, main_channel, '> ' + termtter_command
-      Termtter::Client.call_commands(termtter_command)
-    end
+    return if Termtter::Client.find_commands(termtter_command).empty?
+    post '#termtter', NOTICE, main_channel, '> ' + termtter_command
+    Termtter::Client.call_commands(termtter_command)
+  rescue Exception => e
+    post '#termtter', NOTICE, main_channel, "#{e.class.to_s}: #{e.message}"
+    Termtter::Client.handle_error(e)
   end
 
   def on_user(m)
@@ -92,6 +94,9 @@ class TermtterIrcGateway < Net::IRC::Server::Session
     target, message = *m.params
     Termtter::Client.call_commands('update ' + message)
     post @prefix, TOPIC, main_channel, message
+  rescue Exception => e
+    post '#termtter', NOTICE, main_channel, "#{e.class.to_s}: #{e.message}"
+    Termtter::Client.handle_error(e)
   end
 
   def log(str)

data/lib/termtter.rb

@@ -14,7 +14,8 @@ require 'net/https'
 require 'open-uri'
 require 'optparse'
 require 'readline'
-require 'oauth'
+gem 'rubytter', '>= 0.9.2'
+require 'rubytter'
 
 require 'termtter/config'
 require 'termtter/version'
@@ -37,7 +38,4 @@ module Termtter
   config.system.set_default :conf_file, CONF_DIR + '/config'
   CONF_FILE = config.system.conf_file
   $:.unshift(Termtter::CONF_DIR)
-
-  CONSUMER_KEY = 'O80mRgLxHgpzB5yVOnxmiA'
-  CONSUMER_SECRET = 'jylXMjnIbfaNKpEQjgcVeZWJFTaKXFnj1RA4qTeEM'
 end

data/lib/termtter/api.rb

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-gem 'rubytter', '>= 0.6.5'
-require 'rubytter'
 
 config.set_default(:host, 'twitter.com')
 config.proxy.set_default(:port, '8080')
@@ -16,14 +14,11 @@ module Termtter
       attr_reader :connection, :twitter
       def setup
         @connection = Connection.new
-        if config.access_token.empty? && config.access_token_secret.empty?
-          @twitter = Rubytter.new(config.user_name, config.password, twitter_option)
-        else
-          consumer = OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, :site => 'http://twitter.com')
-          access_token = OAuth::AccessToken.new(consumer, config.access_token, config.access_token_secret)
-          @twitter = OAuthRubytter.new(access_token, twitter_option)
-          config.user_name = @twitter.verify_credentials[:name]
-        end
+
+        ui = create_highline
+        config.user_name = ui.ask('Username: ') if config.user_name.empty?
+        config.password = ui.ask('Password: ') { |q| q.echo = false} if config.password.empty?
+        @twitter = Rubytter.new(config.user_name, config.password, twitter_option)
       end
 
       def restore_user

data/lib/termtter/client.rb

@@ -16,7 +16,7 @@ module Termtter
     @task_manager = Termtter::TaskManager.new
 
     config.set_default(:logger, nil)
-    config.set_default(:update_interval, 300)
+    config.set_default(:update_interval, 120)
     config.set_default(:prompt, '> ')
     config.set_default(:devel, false)
 
@@ -297,7 +297,6 @@ module Termtter
 
       def load_plugins
         plug 'defaults'
-        plug 'devel' if config.devel
         plug config.system.load_plugins
       end
 
@@ -351,7 +350,13 @@ module Termtter
           else
             "\"#{message}".strip + "\" [N/y] "
           end
-        result = !!(/^y?$/i =~ Readline.readline(prompt, false))
+        readline = Readline.readline(prompt, false)
+        result =
+          if !!(/^$/ =~ readline) 
+            default_yes
+          else
+            !!(/^y/i =~ readline)
+          end
 
         if result && block
           block.call

data/lib/termtter/config_setup.rb

@@ -5,32 +5,9 @@ require 'erb'
 module Termtter
   module ConfigSetup
     module_function
-    # TODO: move this method to suitable place
-    def open_brawser(url)
-      case RUBY_PLATFORM
-      when /linux/
-        system 'firefox', url
-      when /mswin(?!ce)|mingw|bccwin/
-        system 'explorer', url
-      else
-        system 'open', url
-      end
-    end
-
     def run
-      puts 'connecting to twitter...'
-
-      consumer = OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, :site => 'http://twitter.com')
-      request_token = consumer.get_request_token
-
-      open_brawser(request_token.authorize_url)
-      sleep 2
-
       ui = create_highline
-      pin = ui.ask('Enter PIN: ')
-      access_token = request_token.get_access_token(:oauth_verifier => pin)
-      token = access_token.token
-      secret = access_token.secret
+      user_name = ui.ask('your twitter user name: ')
 
       plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
         f.match(%r|lib/plugins/(.*?).rb$|)[1]
@@ -46,10 +23,6 @@ module Termtter
       }
 
       puts "generated: ~/.termtter/config"
-      puts "enjoy!"
-    rescue OAuth::Unauthorized
-      puts 'failed to authentication!'
-      exit 1
     end
   end
 end

data/lib/termtter/config_template.erb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-config.access_token = '<%= token %>'
-config.access_token_secret = '<%= secret %>'
+config.user_name = '<%= user_name %>'
 #config.update_interval = 120
+#config.enable_ssl = true
 #config.proxy.host = 'proxy host'
 #config.proxy.port = '8080'
 #config.proxy.user_name = 'proxy user'

data/lib/termtter/system_extensions.rb

@@ -157,3 +157,14 @@ def create_highline
   end
   HighLine.new($stdin)
 end
+
+def open_brawser(url)
+  case RUBY_PLATFORM
+  when /linux/
+    system 'firefox', url
+  when /mswin(?!ce)|mingw|bccwin/
+    system 'explorer', url
+  else
+    system 'open', url
+  end
+end

data/lib/termtter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Termtter
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/plugins/whois_spec.rb

@@ -9,6 +9,7 @@ describe Termtter::Client, 'when the plugin whois is loaded' do
   end
 
   it 'should be whois define' do # What does "be whois define" mean?
+    pending "This spec doesn't pass in Japan too"
     Termtter::Client.plug 'whois'
     name = 'jp-in-f104.google.com'
     ip = '66.249.89.104'
@@ -16,5 +17,10 @@ describe Termtter::Client, 'when the plugin whois is loaded' do
     whois?(name).should == ip
     whois?(ip).should == name
     # FIXME: This spec doesn't pass in Canada
+    #  1)  
+    #  'Termtter::Client when the plugin whois is loaded should be whois define' FAILED
+    #  expected: "66.249.89.104",
+    #       got: "no address for jp-in-f104.google.com" (using ==)
+    #  ./spec/plugins/whois_spec.rb:16:
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +09:00
+date: 2009-10-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ files:
 - lib/plugins/defaults/alias.rb
 - lib/plugins/defaults/auto_reload.rb
 - lib/plugins/defaults/command_line.rb
+- lib/plugins/defaults/eval.rb
 - lib/plugins/defaults/exec.rb
 - lib/plugins/defaults/fib.rb
 - lib/plugins/defaults/retweet.rb
@@ -97,7 +98,6 @@ files:
 - lib/plugins/defaults/standard_completion.rb
 - lib/plugins/defaults/stdout.rb
 - lib/plugins/defaults.rb
-- lib/plugins/devel.rb
 - lib/plugins/en2ja.rb
 - lib/plugins/english.rb
 - lib/plugins/erb.rb
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: termtter
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Terminal based Twitter client.

data/lib/plugins/devel.rb

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-begin
-  require 'ruby-debug'
-rescue LoadError
-end
-
-module Termtter::Client
-  register_command(
-   :name => :eval,
-   :aliases => [],
-   :exec_proc => lambda {|arg|
-     result = eval(arg) unless arg.empty?
-     puts "=> #{result.inspect}"
-   },
-   :help => ['eval EXPR', 'evaluate expression']
-  )
-end