termtter 0.8.13 → 0.8.14

data/Rakefile

@@ -45,3 +45,13 @@ desc 'Generate gem'
 task :gem => :gemspec do |t|
   system 'gem', 'build', 'termtter.gemspec'
 end
+
+namespace :gem do
+  desc 'Install needed gems'
+  task :install do
+    %w[ json_pure configatron highline termcolor ].each do |gem|
+      sh "sudo gem install #{gem} -r"
+    end
+  end
+end
+

data/lib/plugin/standard_plugins.rb

@@ -60,7 +60,7 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       followers = Termtter::API.twitter.followers
       Termtter::Client.public_storage[:followers] = followers
-      p followers.map{|f|f.screen_name}
+      puts followers.map{|f|f.screen_name}.join(' ')
     }
   )
 
@@ -95,17 +95,31 @@ module Termtter::Client
   register_command(
     :name => :show,
     :exec_proc => lambda {|arg|
-      id = arg.gsub(/.*:/, '')
+      id = arg.gsub(/.*:\s*/, '')
       call_hooks(Termtter::API.twitter.show(id), :show)
+    },
+    :completion_proc => lambda {|cmd, arg|
+      case arg
+      when /(\w+):\s*(\d+)\s*$/
+        find_status_ids($2).map{|id| "#{cmd} #{$1}: #{id}"}
+      else
+        users = find_users(arg)
+        unless users.empty?
+          users.map{|user| "#{cmd} #{user}:"}
+        else
+          find_status_ids(arg).map{|id| "#{cmd} #{id}"}
+        end
+      end
     }
   )
 
   register_command(
     :name => :shows,
     :exec_proc => lambda {|arg|
-      id = arg.gsub(/.*:/, '')
+      id = arg.gsub(/.*:\s*/, '')
       call_hooks(Termtter::API.twitter.show(id, true), :show)
-    }
+    },
+    :completion_proc => get_command(:show).completion_proc
   )
 
   # TODO: Change colors when remaining_hits is low.
@@ -158,6 +172,7 @@ module Termtter::Client
   register_command(
     :name => :help, :aliases => [:h],
     :exec_proc => lambda {|arg|
+      # TODO: move to each commands
       helps = [
         ["help,h", "Print this help message"],
         ["list,l", "List the posts in your friends timeline"],
@@ -177,32 +192,19 @@ module Termtter::Client
   )
 
   register_command(
-   :name => :execute,
-   :exec_proc => lambda{|arg|
-     if arg
-       `#{arg}`.each_line do |line|
-           unless line.strip.empty?
-             Termtter::API.twitter.update_status(line)
-             puts "=> #{line}"
-           end
-       end
-     end
-   },
-   :help => ['execute COMMAND', 'execute the command']
-   )
-
-  add_command /^!(!)?\s*(.*)$/ do |m, t|
-    warn '!COMMAND command will be removed. Use command execute instead.'
-    begin
-      result = `#{m[2]}` unless m[2].empty?
-      unless m[1].nil? || result.empty?
-        t.update_status(result.gsub("\n", " "))
+    :name => :execute,
+    :exec_proc => lambda{|arg|
+    if arg
+      `#{arg}`.each_line do |line|
+        unless line.strip.empty?
+          Termtter::API.twitter.update_status(line)
+          puts "=> #{line}"
+        end
       end
-      puts "=> #{result}"
-    rescue => e
-      puts e
     end
-  end
+    },
+    :help => ['execute COMMAND', 'execute the command']
+  )
 
   def self.formatted_help(helps)
     helps = helps.sort_by{|help| help[0]}
@@ -228,17 +230,12 @@ module Termtter::Client
     end
   end
 
-  def self.find_status_id_candidates(a, b, u = nil)
-    candidates = public_storage[:status_ids].to_a
-    if u && c = public_storage[:log].select {|s| s.user_screen_name == u }.map {|s| s.id.to_s }
-      candidates = c unless c.empty?
-    end
-    if a.empty?
-      candidates
-    else
-      candidates.grep(/#{Regexp.quote a}/)
-    end.
-    map {|u| b % u }
+  def self.find_status_ids(text)
+    public_storage[:status_ids].select{|id| id =~ /#{Regexp.quote(text)}/}
+  end
+
+  def self.find_users(text)
+    public_storage[:users].select{|user| user =~ /#{Regexp.quote(text)}/}
   end
 
   def self.find_user_candidates(a, b)
@@ -250,20 +247,4 @@ module Termtter::Client
     map {|u| b % u }
   end
 
-  add_completion do |input|
-    standard_commands = %w[exit help list pause profile update direct resume replies search show limit]
-    case input
-    when /^show(s)?\s+(([\w\d]+):)?\s*(.*)/
-      if $2
-        find_status_id_candidates $4, "show#{$1} #{$2}%s", $3
-      else
-        result = find_user_candidates $4, "show#{$1} %s:"
-        result = find_status_id_candidates $4, "show#{$1} %s"  if result.empty?
-        result
-      end
-    else
-      standard_commands.grep(/^#{Regexp.quote input}/)
-    end
-  end
-
 end

data/lib/termtter/client.rb

@@ -23,6 +23,7 @@ module Termtter
         configatron.set_default(:prompt, '> ')
         configatron.set_default(:enable_ssl, false)
         configatron.proxy.set_default(:port, '8080')
+        configatron.set_default(:devel, false)
         Thread.abort_on_exception = true
       end
 
@@ -209,10 +210,6 @@ module Termtter
       def load_default_plugins
         plugin 'standard_plugins'
         plugin 'stdout'
-        configatron.set_default(:devel, false)
-        if configatron.devel
-          plugin 'devel'
-        end
       end
 
       def load_config
@@ -256,6 +253,12 @@ module Termtter
         end
       end
 
+      def pre_config_load()
+        if configatron.devel
+          plugin 'devel'
+        end
+      end
+
       def setup_readline
         if Readline.respond_to?(:basic_word_break_characters=)
           Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
@@ -339,6 +342,7 @@ module Termtter
         load_default_plugins()
         load_config()
         Termtter::API.setup()
+        pre_config_load()
 
         call_hooks([], :initialize)
         call_new_hooks(:initialize)

data/lib/termtter/twitter.rb

@@ -44,10 +44,14 @@ module Termtter
     def get_user_timeline(screen_name)
       return get_timeline(url_for("/statuses/user_timeline/#{screen_name}.json"))
     rescue OpenURI::HTTPError => e
-      puts "No such user: #{screen_name}"
-      nears = near_users(screen_name)
-      puts "near users: #{nears}" unless nears.empty?
-      return []
+      case e.message
+      when /404/
+        warn "No such user: #{screen_name}"
+        nears = near_users(screen_name)
+        puts "near users: #{nears}" unless nears.empty?
+        return []
+      end
+      raise
     end
 
     configatron.search.set_default(:highlihgt_text_format, '<on_magenta><white>\1</white></on_magenta>')
@@ -69,8 +73,8 @@ module Termtter
       get_status = lambda { get_timeline(url_for("/statuses/show/#{id}.json"))[0] }
       statuses = []
       statuses << status = Array(Client.public_storage[:log]).detect(get_status) {|s| s.id == id.to_i }
-      statuses << show(id, true) if rth && id = status.in_reply_to_status_id
-      statuses.flatten
+      statuses << show(id, true) if rth && status && id = status.in_reply_to_status_id
+      statuses.flatten.compact
     end
 
     def replies
@@ -130,6 +134,13 @@ module Termtter
 
     def fetch_as_json(uri)
       JSON.parse(open_uri(uri).read)
+    rescue OpenURI::HTTPError => e
+      case e.message
+      when /403/, /401/
+        warn '[PROTECTED USER] You must add to show his/her tweet.'
+        return []
+      end
+      raise
     end
 
     def open_uri(uri)

data/lib/termtter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 +09:00
+date: 2009-03-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency