jugyo-termtter 0.8.2 → 0.8.3

data/lib/plugin/modify_arg_hook_sample.rb

@@ -3,5 +3,5 @@
 Termtter::Client.register_hook(
   :name => :modify_arg_hook_sample,
   :points => [:modify_arg_for_update],
-  :exec_proc => proc {|cmd, arg| arg + '＼(＾o＾)／'}
+  :exec_proc => lambda {|cmd, arg| arg + '＼(＾o＾)／'}
 )

data/lib/plugin/otsune.rb

@@ -3,7 +3,7 @@
 module Termtter::Client
   register_macro(:otsune, "update @%s 頭蓋骨の中身がお気の毒です.",
     :help => ['otsune {SCREENNAME}', 'update "@{SCREENNAME} 頭蓋骨の中身がお気の毒です"'],
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     }
   )
@@ -12,7 +12,7 @@ end
 module Termtter::Client
   register_macro(:otsnue, "update @%s 頭蓋骨の中身がお気の毒です.",
     :help => ['otsnue {SCREENNAME}', 'update @%s 頭が気の毒です.'],
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     }
   )

data/lib/plugin/plugin.rb

@@ -8,7 +8,7 @@ module Termtter::Client
 
   register_command(
     :name      => :plugin, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       begin
         result = plugin arg.strip
       rescue LoadError
@@ -16,7 +16,7 @@ module Termtter::Client
         puts "=> #{result.inspect}"
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
       unless args.empty?
         find_plugin_candidates args, "#{cmd} %s"
@@ -29,7 +29,7 @@ module Termtter::Client
 
   register_command(
     :name      => :plugins, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       puts public_storage[:plugins].sort.join("\n")
     },
     :help      => ['plugins', 'Show list of plugins']

data/lib/plugin/post_exec_hook_sample.rb

@@ -3,7 +3,7 @@
 Termtter::Client.register_hook(
   :name => :post_exec_hook_sample,
   :points => [:post_exec_list],
-  :exec_proc => proc {|cmd, arg, result|
+  :exec_proc => lambda {|cmd, arg, result|
     p result
   }
 )

data/lib/plugin/pre_exec_hook_sample.rb

@@ -3,7 +3,7 @@
 Termtter::Client.register_hook(
   :name => :pre_exec_hook_sample,
   :points => [:pre_exec_update],
-  :exec_proc => proc {|cmd, arg|
+  :exec_proc => lambda {|cmd, arg|
     false if /^y?$/i !~ Readline.readline("update? #{arg} [Y/n] ", false)
   }
 )

data/lib/plugin/reblog.rb

@@ -6,7 +6,7 @@ require 'tumblr'
 module Termtter::Client
   register_command(
     :name => :reblog, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       if arg =~ /^reblog\s+(\d+)(.*)$/
         id = $1.strip
         comment = $2.strip
@@ -22,7 +22,7 @@ module Termtter::Client
         end
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       if args =~ /^(\d*)$/
         find_status_id_candidates $1, "#{cmd} %s"
       end

data/lib/plugin/scrape.rb

@@ -18,7 +18,7 @@ module Termtter::Client
 
   register_command(
                    :name => :scrape_group,
-                   :exec_proc => proc{ |args|
+                   :exec_proc => lambda{ |args|
                      groups = args.split(' ').map{|g| g.to_sym}
                      if groups.include? :all
                        groups = configatron.plugins.group.groups.keys
@@ -31,7 +31,7 @@ module Termtter::Client
                      statuses = scrape_members(members.uniq.compact.sort)
                      call_hooks(statuses, :pre_filter)
                    },
-                   :completion_proc => proc {|cmd, args|
+                   :completion_proc => lambda {|cmd, args|
                      arg = args.split(' ').last
                      prefix = args.split(' ')[0..-2].join(' ')
                      find_group_candidates arg, "#{cmd} #{prefix} %s"

data/lib/plugin/shell.rb

@@ -3,7 +3,7 @@
 module Termtter::Client
   register_command :name => :shell, :aliases => [:sh],
     :help => ['shell,sh', 'Start your shell'],
-    :exec_proc => proc {|args|
+    :exec_proc => lambda {|args|
       begin
         pause
         system ENV['SHELL'] || ENV['COMSPEC']

data/lib/plugin/sl.rb

@@ -10,22 +10,22 @@ module Termtter
 
     register_command(
       :name      => :sl, :aliases => [],
-      :exec_proc => proc {|arg| system("sl") },
+      :exec_proc => lambda {|arg| system("sl") },
       :help      => ['sl', 'The train pass in front of your screen']
     )
 
     register_command(
       :name      => :pwd, :aliases => [],
-      :exec_proc => proc {|arg| public_storage[:current] },
+      :exec_proc => lambda {|arg| public_storage[:current] },
       :help      => ['pwd', 'Show current direcroty']
     )
 
     register_command(
       :name => :ls, :aliases => [],
-      :exec_proc => proc {|arg|
+      :exec_proc => lambda {|arg|
         call_commands("list #{arg.empty? ? public_storage[:current] : arg}", API.twitter)
       },
-      :completion_proc => proc {|cmd, args|
+      :completion_proc => lambda {|cmd, args|
         find_user_candidates args, "#{cmd} %s"
       },
       :help => ['ls', 'Show list in current directory']
@@ -33,12 +33,12 @@ module Termtter
 
     register_command(
       :name => :cd, :aliases => [],
-      :exec_proc => proc {|arg|
+      :exec_proc => lambda {|arg|
         public_storage[:current] =
           (arg.nil? || /\~/ =~ arg) ? '' : arg
         configatron.prompt = "~/#{public_storage[:current]} #{public_storage[:orig_prompt]}"
       },
-      :completion_proc => proc {|cmd, args|
+      :completion_proc => lambda {|cmd, args|
         find_user_candidates args, "#{cmd} %s"
       },
       :help => ['cd USER', 'Change current directory']

data/lib/plugin/standard_plugins.rb

@@ -8,12 +8,12 @@ module Termtter::Client
 
   register_command(
     :name => :update, :aliases => [:u],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       text = ERB.new(arg).result(binding).gsub(/\n/, ' ')
       Termtter::API.twitter.update_status(text)
       puts "=> #{text}"
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       if /(.*)@([^\s]*)$/ =~ args
         find_user_candidates $2, "#{cmd} #{$1}@%s"
       end
@@ -22,14 +22,14 @@ module Termtter::Client
 
   register_command(
     :name => :direct, :aliases => [:d],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       if arg =~ /^([^\s]+)\s+(.*)\s*$/
         user, text = $1, $2
         Termtter::API.twitter.direct_message(user, text)
         puts "=> to:#{user} message:#{text}"
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       if args =~ /^([^\s]+)$/
         find_user_candidates $1, "#{cmd} %s"
       end
@@ -38,7 +38,7 @@ module Termtter::Client
 
   register_command(
     :name => :profile, :aliases => [:p],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       user = Termtter::API.twitter.get_user_profile(arg)
       attrs = %w[ name screen_name url description profile_image_url location protected following
           friends_count followers_count statuses_count favourites_count
@@ -50,42 +50,51 @@ module Termtter::Client
         puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
       end
     },
-    :completion_proc => proc {|cmd, arg|
+    :completion_proc => lambda {|cmd, arg|
       find_user_candidates arg, "#{cmd} %s"
     }
   )
 
+  register_command(
+    :name => :followers,
+    :exec_proc => lambda {|arg|
+      followers = Termtter::API.twitter.followers
+      Termtter::Client.public_storage[:followers] = followers
+      p followers.map{|f|f.screen_name}
+    }
+  )
+
   register_command(
     :name => :list, :aliases => [:l],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       unless arg.empty?
         call_hooks(Termtter::API.twitter.get_user_timeline(arg), :list_user_timeline)
       else
         call_hooks(Termtter::API.twitter.get_friends_timeline(), :list_friends_timeline)
       end
     },
-    :completion_proc => proc {|cmd, arg|
+    :completion_proc => lambda {|cmd, arg|
       find_user_candidates arg, "#{cmd} %s"
     }
   )
 
   register_command(
     :name => :search, :aliases => [:s],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       call_hooks(Termtter::API.twitter.search(arg), :search)
     }
   )
 
   register_command(
     :name => :replies, :aliases => [:r],
-    :exec_proc => proc {
+    :exec_proc => lambda {|arg|
       call_hooks(Termtter::API.twitter.replies(), :replies)
     }
   )
 
   register_command(
     :name => :show,
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       id = arg.gsub(/.*:/, '')
       call_hooks(Termtter::API.twitter.show(id), :show)
     }
@@ -93,7 +102,7 @@ module Termtter::Client
 
   register_command(
     :name => :shows,
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       id = arg.gsub(/.*:/, '')
       call_hooks(Termtter::API.twitter.show(id, true), :show)
     }
@@ -103,7 +112,7 @@ module Termtter::Client
   # TODO: Simmulate remaining_hits.
   register_command(
     :name => :limit, :aliases => [:lm],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       limit = Termtter::API.twitter.get_rate_limit_status
       remaining_time = "%dmin %dsec" % (limit.reset_time - Time.now).divmod(60)
       remaining_color =
@@ -119,62 +128,71 @@ module Termtter::Client
 
   register_command( 
     :name => :pause,
-    :exec_proc => proc {|arg| pause},
+    :exec_proc => lambda {|arg| pause},
     :help => ["pause", "Pause updating"]
   )
 
   register_command(
     :name => :resume,
-    :exec_proc => proc {|arg| resume},
+    :exec_proc => lambda {|arg| resume},
     :help => ["resume", "Resume updating"]
   )
 
   register_command(
     :name => :exit, :aliases => [:e],
-    :exec_proc => proc {|arg| exit},
+    :exec_proc => lambda {|arg| exit},
     :help => ['exit,e', 'Exit']
   )
 
   register_hook(
     :name => :default_error_handler,
     :points => [:on_error],
-    :exec_proc => proc {|e|
+    :exec_proc => lambda {|e|
       puts "Error: #{e}"
-      if configatron.debug == true
+      if configatron.devel == true
         puts e.backtrace.join("\n")
       end
     }
   )
 
-  add_command /^(help|h)\s*$/ do |m, t|
-    # TODO: migrate to use Termtter::Command#help
-    helps = [
-      ["help,h", "Print this help message"],
-      ["list,l", "List the posts in your friends timeline"],
-      ["list,l USERNAME", "List the posts in the the given user's timeline"],
-      ["update,u TEXT", "Post a new message"],
-      ["direct,d @USERNAME TEXT", "Send direct message"],
-      ["profile,p USERNAME", "Show user's profile"],
-      ["replies,r", "List the most recent @replies for the authenticating user"],
-      ["search,s TEXT", "Search for Twitter"],
-      ["show ID", "Show a single status"]
-    ]
-    helps += @@helps
-    helps += @@new_commands.map {|name, command| command.help}
-    helps.compact!
-    puts formatted_help(helps)
-  end
+  register_command(
+    :name => :help, :aliases => [:h],
+    :exec_proc => lambda {|arg|
+      helps = [
+        ["help,h", "Print this help message"],
+        ["list,l", "List the posts in your friends timeline"],
+        ["list,l USERNAME", "List the posts in the the given user's timeline"],
+        ["update,u TEXT", "Post a new message"],
+        ["direct,d @USERNAME TEXT", "Send direct message"],
+        ["profile,p USERNAME", "Show user's profile"],
+        ["replies,r", "List the most recent @replies for the authenticating user"],
+        ["search,s TEXT", "Search for Twitter"],
+        ["show ID", "Show a single status"]
+      ]
+      helps += @@helps
+      helps += @@new_commands.map {|name, command| command.help}
+      helps.compact!
+      puts formatted_help(helps)
+    }
+  )
 
-  add_command /^eval\s+(.*)$/ do |m, t|
-    begin
-      result = eval(m[1]) unless m[1].empty?
-      puts "=> #{result.inspect}"
-    rescue SyntaxError => e
-      puts e
-    end
-  end
+  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?

data/lib/plugin/system_status.rb

@@ -2,7 +2,7 @@
 
 require 'erb'
 
-configatron.plugins.system_status.set_default(:default_status_proc, proc { Time.now.strftime("%x %X") })
+configatron.plugins.system_status.set_default(:default_status_proc, lambda { Time.now.strftime("%x %X") })
 configatron.plugins.system_status.set_default(:interval, 1)
 configatron.plugins.system_status.set_default(:default_color, :on_blue)
 configatron.plugins.system_status.set_default(:format, '<%= status %>')
@@ -27,7 +27,7 @@ end
 #   show system status on left side.
 #   output public_storage[:system_status] or Time.now.strftime("%x %X") if nil
 # example config
-#   configatron.plugins.system_status.default_status_proc = proc { Time.now.strftime("%x %X") }
+#   configatron.plugins.system_status.default_status_proc = lambda { Time.now.strftime("%x %X") }
 #   configatron.plugins.system_status.interval = 1
 #   configatron.plugins.system_status.default_color = :on_blue
 #   configatron.plugins.system_status.format = '<%= status %>'

data/lib/plugin/update_editor.rb

@@ -26,7 +26,7 @@ module Termtter::Client
 
   register_command(
                    :name => :update_editor, :aliases => [:ue],
-                   :exec_proc => proc{|arg|
+                   :exec_proc => lambda{|arg|
                      pause
                      text = input_editor
                      unless text.empty?

data/lib/plugin/wassr_post.rb

@@ -6,7 +6,7 @@ require 'net/http'
 Termtter::Client.register_hook(
   :name => :wassr_post,
   :points => [:modify_arg_for_update],
-  :exec_proc => proc {|cmd, arg|
+  :exec_proc => lambda {|cmd, arg|
     begin
       Net::HTTP.version_1_2
       req = Net::HTTP::Post.new("/statuses/update.json?")

data/lib/plugin/yhara.rb

@@ -127,12 +127,12 @@ end
 module Termtter::Client
   register_command(
                    :name => :yhara,
-                   :exec_proc => proc{|arg|
+                   :exec_proc => lambda{|arg|
                      text = "#{'@' if arg[0..0] != '@'}#{arg} #{Yharian::text}"
                      Termtter::API.twitter.update_status(text)
                      puts "=> #{text}"
                    },
-                   :completion_proc => proc {|cmd, args|
+                   :completion_proc => lambda {|cmd, args|
                      if /(.*)@([^\s]*)$/ =~ args
                        find_user_candidates $2, "#{cmd} #{$1}@%s"
                      end

data/lib/plugin/yonda.rb

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 
 module Termtter::Client
-  public_storage[:unread_count] = 0
-
-  add_help 'yonda,y', 'Mark as read'
-
-  add_command %r'^y(?:onda)?\s*$' do |m, t|
-    public_storage[:unread_count] = 0
-    print "\033[2J\033[H" # FIXME
-    call_hooks [], :plugin_yonda_yonda, t
-  end
+  register_command(
+   :name => :yonda, :aliases => [:y],
+   :exec_proc => proc{|arg|
+     public_storage[:unread_count] = 0
+     print "\033[2J\033[H" # FIXME
+     call_hooks [], :plugin_yonda_yonda
+   },
+   :help => ['yonda,y', 'Mark as read']
+   )
 
   add_hook do |statuses, event|
     case event