jugyo-termtter 0.8.2 → 0.8.3

data/README.rdoc

@@ -62,6 +62,15 @@ http://www.lingr.com/room/termtter
 
 http://wiki.github.com/jugyo/termtter/home (in Japanese)
 
+== TODO:
+
+- newgem を使わないようにする
+- rubytter を使うようにする
+- filter と plugin を統一する
+- plugin => plugins （ディレクトリ名変更）
+- $HOME 以下に plugin 用のディレクトリを置けるようにする
+- コマンドラインオプションでいろいろ指定できるようにする
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -1,64 +1,46 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/termtter'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('termtter', Termtter::VERSION) do |p|
-  p.author = %w[jugyo hakobe motemen koichiro Sixeight mattn ujihisa yanbe hitode909 bubblegum].sort_by{|i|i.downcase}
-  p.email = ['jugyo.org@gmail.com']
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_deps         = [
-    ['json_pure'],
-    ['configatron'],
-    ['highline'],
-  ]
-  #p.extra_dev_deps = [
-  #  ['newgem', ">= #{::Newgem::VERSION}"]
-  #]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
-
-require 'spec/rake/spectask'
-desc 'run all specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
-end
-
-def egrep(pattern)
-  res = []
-  Dir['**/*.rb'].each do |fn|
-    count = 0
-    open(fn) do |f|
-      while line = f.gets
-        count += 1
-        if line =~ pattern
-          res << [fn, count.to_s, line.gsub(/\A\s+/, '')]
-        end
-      end
-    end
-  end
-  fmax = res.map {|i| i[0] }.map(&:size).max
-  cmax = res.map {|i| i[1] }.map(&:size).max
-  res.each do |fn, count, line|
-    puts "%s :%s:%s" % [fn.ljust(fmax), count.rjust(cmax), line]
-  end
-end
-
-desc "Look for TODO and FIXME tags in the code"
-task :todo do
-  egrep /(FIXME|TODO)/
-end
-
+$:.unshift File.dirname(__FILE__) + '/lib'
+require 'termtter'
+
+require 'spec/rake/spectask'
+desc 'run all specs'
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['-c']
+end
+
+desc 'Generate gemspec'
+task :gemspec do |t|
+  open('termtter.gemspec', "wb" ) do |file|
+    file << <<-EOS
+Gem::Specification.new do |s|
+  s.name = 'termtter'
+  s.version = '#{Termtter::VERSION}'
+  s.summary = "Terminal based Twitter client"
+  s.description = "Termtter is a terminal based Twitter client"
+  s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
+                #{Dir['spec/**/*.rb'].join(' ')}
+                #{Dir['test/**/*.rb', 'test/**/*.json'].join(' ')}
+                README.rdoc
+                History.txt
+                Rakefile )
+  s.executables = ["kill_termtter", "termtter"]
+  s.add_dependency("json_pure", ">= 1.1.3")
+  s.add_dependency("configatron", ">= 2.2.2")
+  s.add_dependency("highline", ">= 1.5.0")
+  s.authors = %w(jugyo ujihisa)
+  s.email = 'jugyo.org@gmail.com'
+  s.homepage = 'http://wiki.github.com/jugyo/termtter'
+  s.rubyforge_project = 'termtter'
+  s.has_rdoc = true
+  s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
+  s.extra_rdoc_files = ["README.rdoc", "History.txt"]
+end
+    EOS
+  end
+  puts "Generate gemspec"
+end
+
+desc 'Generate gem'
+task :gem => :gemspec do |t|
+  system 'gem', 'build', 'termtter.gemspec'
+end

data/lib/filter/url_addspace.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  add_filter do |statuses|
+    statuses.each do |s|
+      s.text.gsub!(/(\S)(https?:\/\/)/, '\1 \2')
+    end
+    statuses
+  end
+end
+
+# url_addspace
+#   add space before URL without space
+# example:
+#   before: ABCDEhttp://~~~
+#   after:  ABCDE http://~~~

data/lib/plugin/april_fool.rb

@@ -5,7 +5,7 @@ def april_fool;april_fool? ? "今日はエイプリルフールではありま
 
 Termtter::Client.register_command(
   :name => :april_fool, :aliases => [:af],
-  :exec_proc => proc {|arg|
+  :exec_proc => lambda {|arg|
     if arg =~ /^\?you\s(\w+)/
       puts "=> #{Termtter::Client.update_status("@#{$1} #{april_fool}")}"
     else

data/lib/plugin/bomb.rb

@@ -10,7 +10,7 @@ module Termtter
   module Client
     register_command(
       :name => :bomb, :aliases => [],
-      :exec_proc => proc {|arg|
+      :exec_proc => lambda {|arg|
         text = "#{arg.strip} 爆発しろ!"
         Termtter::API::twitter.update_status(text)
         puts "=> #{text}"

data/lib/plugin/clear.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  register_command :name => :clear, :aliases => [:cls],
+    :help => ['clear,cls', "Clear termtter's buffer"],
+    :exec_proc => lambda {|args|
+      system 'clear'
+    }
+end
+
+# todo:
+#   support windows.
+#   i don't have windows machine and cannot test:P
+#   cls command?

data/lib/plugin/confirm.rb

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

data/lib/plugin/cool.rb

@@ -3,7 +3,7 @@
 module Termtter::Client
   register_macro(:cool, "update @%s cool.",
     :help => ['cool {SCREENNAME}', 'update "@{SCREENNAME} cool."'],
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     }
   )

data/lib/plugin/devel.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+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

data/lib/plugin/erb.rb

@@ -5,7 +5,7 @@ require 'erb'
 Termtter::Client.register_hook(
   :name => :erb,
   :points => [:pre_exec_update],
-  :exec_proc => proc {|cmd, arg|
+  :exec_proc => lambda {|cmd, arg|
     ERB.new(arg).result(binding)
   }
 )

data/lib/plugin/filter.rb

@@ -9,7 +9,7 @@ module Termtter::Client
 
   register_command(
     :name => :filter, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       begin
         result = filter arg.strip
       rescue LoadError
@@ -18,7 +18,7 @@ module Termtter::Client
         puts "=> #{result.inspect}"
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_filter_candidates args, "#{cmd} %s", filters
     },
     :help => ['filter FILE', 'Apply a filter']
@@ -26,7 +26,7 @@ module Termtter::Client
 
   register_command(
     :name => :unfilter, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       clear_filters
       public_storage[:filters].clear
       puts '=> filter cleared'
@@ -36,7 +36,7 @@ module Termtter::Client
 
   register_command(
     :name => :filters, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       unless public_storage[:filters].empty?
         puts public_storage[:filters].join(', ')
       else

data/lib/plugin/follow.rb

@@ -3,7 +3,7 @@
 module Termtter::Client
   register_command(
     :name => :follow, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       if arg =~ /^(\w+)/
         res = Termtter::API::twitter.social($1.strip, :follow)
         if res.code == '200'
@@ -13,7 +13,7 @@ module Termtter::Client
         end
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     },
 	:help => ['follow USER', 'Follow user']
@@ -21,9 +21,9 @@ module Termtter::Client
 
   register_command(
     :name => :leave, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       if arg =~ /^(\w+)/
-        res = t.social($1.strip, :leave)
+        res = Termtter::API::twitter.social($1.strip, :leave)
         if res.code == '200'
           puts "Leaved user @#{$1}"
         else
@@ -31,7 +31,7 @@ module Termtter::Client
         end
       end
     },
-    :completion_proc => proc {|cmd, args|
+    :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     },
 	:help => ['leave USER', 'Leave user']

data/lib/plugin/grass.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+module Termtter
+  module Client
+
+    configatron.plugins.grass.set_default(:rate, 0)
+
+    register_command(
+      :name => :w, :aliases => [:grass],
+      :exec_proc => lambda {|arg|
+        arg, rate = arg.split(/ /)
+        count = arg =~ /^[0-9]+$/ ? arg.to_i : 3
+        rate ||= configatron.plugins.grass.rate
+        grow = (count * rate.to_i).quo(100).round
+        grasses = ('w' * (count-grow) + 'W' * grow).split(//).shuffle.join
+        call_commands("update #{grasses}")
+      },
+      :help => ['grass, w', 'Grass it!']
+    )
+  end
+end
+
+# usage
+# > w 10
+# => wwwwwwwwww
+#
+# see also
+#   http://d.hatena.ne.jp/tomisima/20090204/1233762301

data/lib/plugin/group.rb

@@ -4,7 +4,7 @@ module Termtter
   class Status
     def is_member?(group = nil)
       if group
-        configatron.plugins.group.groups[:group].include? self.user_screen_name
+        configatron.plugins.group.groups[group].include? self.user_screen_name
       else
         configatron.plugins.group.groups.values.flatten.include? self.user_screen_name
       end
@@ -25,10 +25,14 @@ module Termtter::Client
   register_command(
    :name => :group,
    :aliases => [:g],
-   :exec_proc => proc {|arg|
+   :exec_proc => lambda {|arg|
      unless arg.empty?
        group_name = arg.to_sym
-       group = configatron.plugins.group.groups[group_name]
+       if group_name == :all
+         group = configatron.plugins.group.groups.values.flatten.uniq
+       else
+         group = configatron.plugins.group.groups[group_name]
+       end
        statuses = group ? public_storage[:log].select { |s|
          group.include?(s.user_screen_name) 
        } : []
@@ -39,7 +43,7 @@ module Termtter::Client
        end
      end
    },
-   :completion_proc => proc {|cmd, arg|
+   :completion_proc => lambda {|cmd, arg|
      find_group_candidates arg, "#{cmd} %s"
                    },
    :help => ['group,g GROUPNAME', 'Filter by group members']

data/lib/plugin/growl.rb

@@ -37,7 +37,7 @@ Thread.new do
     begin
       if s = queue.pop
         unless growl
-          arg = ['growlnotify', s.user_screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter', '-H', 'localhost']
+          arg = ['growlnotify', s.user_screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter']
           #icon_path = get_icon_path(s)
           #arg += ['--image', icon_path] if icon_path
           system *arg

data/lib/plugin/hatebu.rb

@@ -6,7 +6,7 @@ require 'atomutil'
 module Termtter::Client
   register_command(
     :name => :hatebu, :aliases => [],
-    :exec_proc => proc {|arg|
+    :exec_proc => lambda {|arg|
       if arg =~ /^(\d+)(.*)$/
         id = $1.strip
         comment = $2.strip
@@ -41,7 +41,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/history.rb

@@ -66,6 +66,15 @@ module Termtter::Client
       save_history
     end
   end
+
+  register_command(
+   :name => :save,
+   :exec_proc => lambda{|arg|
+     save_history
+   },
+   :help => ['save', 'Save hisory']
+   )
+
   
 end
 

data/lib/plugin/log.rb

@@ -19,7 +19,7 @@ module Termtter::Client
 
   register_command(
    :name => :log,
-   :exec_proc => proc{|arg|
+   :exec_proc => lambda{|arg|
      if arg.empty?
        # log
        statuses = public_storage[:log]
@@ -36,18 +36,26 @@ module Termtter::Client
        call_hooks(statuses[-print_max..-1], :search)
      end
    },
-   :completion_proc => proc {|cmd, arg|
+   :completion_proc => lambda {|cmd, arg|
      find_user_candidates arg, "#{cmd} %s"
    },
    :help => [ 'log (USER(S)) (MAX)', 'Show local log of the user(s)']
    )
 
-  # These are old code we must fix.
-  
-  add_help 'log', 'Show local log'
+  register_command(
+   :name => :search_log, :aliases => [:sl],
+   :exec_proc => lambda{|arg|
+    unless arg.strip.empty?
+      pat = Regexp.new arg
+      statuses = public_storage[:log].select { |s| s.text =~ pat }
+      call_hooks(statuses, :search)
+     end
+   },
+   :help => [ 'search_log WORD', 'Search log for WORD' ]
+   )
 
-  add_help '/WORD', 'Search log for WORD'
   add_command %r'^/(.+)' do |m, t|
+    warn '/WORD command will be removed. Use search_log command instead.'
     pat = Regexp.new(m[1])
     statuses = public_storage[:log].select { |s| s.text =~ pat }
     call_hooks(statuses, :search, t)