termtter 1.3.1 → 1.4.0

data/lib/plugins/searchline.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.searchline.set_default(:interval, 300)
+
+module Termtter::Client
+  class << self
+    def delete_task(key)
+      @task_manager.delete_task(key) # returns nil if task for key is not exist
+    end
+  end
+
+  register_command(
+    :name => :searchline,
+    :exec => lambda {|arg|
+      delete_task(:searchline)
+      if arg == '-d'
+        puts 'Stopped searchline.'
+      else
+        public_storage[:searchline_since_id] = 0
+        add_task(:name => :searchline,
+                 :interval => config.plugins.searchline.interval ) do
+          begin
+            statuses = Termtter::API.twitter.search(
+              arg, 'since_id' => public_storage[:searchline_since_id] )
+            unless statuses.empty?
+              print "\e[0G" + "\e[K" unless win?
+              public_storage[:searchline_since_id] = statuses[0].id
+              output(statuses, SearchEvent.new(arg))
+              Readline.refresh_line
+            end
+          rescue Exception => e
+            handle_error(e)
+          end
+        end
+      end
+    },
+    :help => ["searchline [TEXT|-d]", "Search for Twitter with auto reload"]
+  )
+end
+
+# searchline.rb:
+#   Search for Twitter with auto reload like friends_timeline.
+# Caution:
+#   Be aware of API limit.

data/lib/plugins/tinyurl.rb

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 
 SHORTURL_MAKERS = [
-  { :host => "tinyurl.com", :format => '/api-create.php?url=%s' },
+  { :host => "api.bit.ly",
+    :format => '/shorten?version=2.0.1&longUrl=%s&login=termtter&apiKey=R_e7f22d523a803dbff7f67de18c109856' },
+  { :host => "to.ly", :format => '/api.php?longurl=%s' },
   { :host => "is.gd", :format => '/api.php?longurl=%s' },
+  { :host => "tinyurl.com", :format => '/api-create.php?url=%s' },
 ]
 TINYURL_HOOK_COMMANDS = [:update, :reply]
 URI_REGEXP = URI.regexp(%w(http https ftp))
@@ -27,6 +30,9 @@ Termtter::Client.register_hook(
         res = http_class.new(site[:host]).get(site[:format] % url_enc)
         if res.code == '200'
           result = res.body
+          if result =~ /"shortUrl": "(http.*)"/
+            result = $1
+          end
           break
         end
       end

data/lib/plugins/train.rb

@@ -0,0 +1,24 @@
+# あ
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  def self.train(length)
+    text = "ε="
+    length.times{ text << "⋤⋥" }
+    text
+  end
+
+  register_command(:train, :help => ['train [LENGTH]', 'Post a train']) do |arg|
+    length = arg.empty? ? 1 : arg.to_i
+    result = Termtter::API.twitter.update(train(length))
+    puts "=> " << result.text
+  end
+
+  register_command(:trainyou, :help => ['trainyou [USER] [LENGTH] [(Optional) MESSAGE]', 'Post a train for a user']) do |arg|
+    /(\w+)\s(\d+)(.*)/ =~ arg
+    name = normalize_as_user_name($1)
+    length = $2.to_i
+    msg = $3
+    result = Termtter::API.twitter.update("@#{name} #{train(length)}#{msg}")
+    puts "=> " << result.text
+  end
+end

data/lib/termtter/active_rubytter.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+gem 'rubytter', '>= 0.6.5'
+require 'rubytter'
+
+module Termtter
+  class ActiveRubytter
+    def initialize(data)
+      self.attributes = data
+    end
+
+    def method_missing(name, *args)
+      if @data.key?(name)
+        return @data[name]
+      else
+        super
+      end
+    end
+
+    def attributes=(raw_hash)
+      @data = {}
+      raw_hash.each do |key, value|
+        key_symbol = key.to_s.to_sym
+        if value.kind_of? Hash
+          @data[key_symbol] = ActiveRubytter.new(raw_hash[key])
+        else
+          @data[key_symbol] = raw_hash[key]
+        end
+      end
+    end
+
+    def to_hash
+      @data.inject({}) do |memo, (key, value)|
+        memo[key] =
+          (value.kind_of? self.class) ? value.to_hash : value
+        memo
+      end
+    end
+  end
+end

data/lib/termtter/api.rb

@@ -16,7 +16,14 @@ module Termtter
       attr_reader :connection, :twitter
       def setup
         @connection = Connection.new
-        @twitter = create_twitter(config.user_name, config.password)
+        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
       end
 
       def restore_user
@@ -30,26 +37,22 @@ module Termtter
         @twitter = create_twitter(username, password)
       end
 
-      def create_twitter(user_name, password)
-        Rubytter.new(
-          user_name,
-          password,
-          {
-            :app_name => config.app_name.empty? ? Termtter::APP_NAME : config.app_name,
-            :host => config.host,
-            :header => {
-              'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
-              'X-Twitter-Client' => 'Termtter',
-              'X-Twitter-Client-URL' => 'http://github.com/jugyo/termtter',
-              'X-Twitter-Client-Version' => Termtter::VERSION
-            },
-            :enable_ssl => config.enable_ssl,
-            :proxy_host => config.proxy.host,
-            :proxy_port => config.proxy.port,
-            :proxy_user_name => config.proxy.user_name,
-            :proxy_password => config.proxy.password
-          }
-        )
+      def twitter_option
+        {
+          :app_name => config.app_name.empty? ? Termtter::APP_NAME : config.app_name,
+          :host => config.host,
+          :header => {
+            'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
+            'X-Twitter-Client' => 'Termtter',
+            'X-Twitter-Client-URL' => 'http://github.com/jugyo/termtter',
+            'X-Twitter-Client-Version' => Termtter::VERSION
+          },
+          :enable_ssl => config.enable_ssl,
+          :proxy_host => config.proxy.host,
+          :proxy_port => config.proxy.port,
+          :proxy_user_name => config.proxy.user_name,
+          :proxy_password => config.proxy.password
+        }
       end
     end
   end

data/lib/termtter/client.rb

@@ -4,7 +4,6 @@ require 'logger'
 require 'termcolor'
 
 module Termtter
-
   class CommandNotFound < StandardError; end
   class CommandCanceled < StandardError; end
 
@@ -13,7 +12,6 @@ module Termtter
     @hooks = {}
     @commands = {}
     @filters = []
-    @aliases = {}
     @since_id = nil
     @task_manager = Termtter::TaskManager.new
 
@@ -42,10 +40,6 @@ module Termtter
         Termtter::Client.handle_error(e)
       end
 
-      def alias(name, value)
-        @aliases[name] = value
-      end
-
       def public_storage
         @public_storage ||= {}
       end
@@ -130,17 +124,6 @@ module Termtter
         register_command(command)
       end
 
-      def add_alias(from, to, confirm = true)
-        if confirm
-          raise 'Already exist' if @aliases[from]
-        end
-        @aliases[from] = to
-      end
-
-      def remove_alias(target)
-        @aliases.delete target
-      end
-
       # statuses => [status, status, ...]
       # status => {
       #             :id => status id,
@@ -159,7 +142,7 @@ module Termtter
         statuses = statuses.sort_by(&:id)
         call_hooks(:pre_filter, statuses, event)
 
-        filtered = apply_filters_for_hook(:filter_for_output, statuses.map(&:dup), event)
+        filtered = apply_filters_for_hook(:filter_for_output, statuses.map(&:clone), event)
 
         @filters.each do |f|  # TODO: code for compatibility. delete someday.
           filtered = f.call(filtered, event)
@@ -312,16 +295,22 @@ module Termtter
         @init_block = block
       end
 
+      def load_plugins
+        plug 'defaults'
+        plug 'devel' if config.devel
+        plug config.system.load_plugins
+      end
+
+      def eval_init_block
+        @init_block.call(self) if @init_block
+      end
+
       def run
         load_config()
         Termtter::API.setup()
         setup_logger()
-
-        @init_block.call(self) if @init_block
-
-        plug 'defaults'
-        plug 'devel' if config.devel
-        plug config.system.load_plugins
+        load_plugins()
+        eval_init_block()
 
         config.system.eval_scripts.each do |script|
           begin
@@ -356,14 +345,13 @@ module Termtter
       def confirm(message, default_yes = true, &block)
         pause # TODO: TaskManager から呼ばれるならこれいらないなぁ
 
-        result = # Boolean in duck typing
+        prompt =
           if default_yes
-            prompt = "\"#{message}".strip + "\" [Y/n] "
-            /^y?$/i =~ Readline.readline(prompt, false)
+            "\"#{message}".strip + "\" [Y/n] "
           else
-            prompt = "\"#{message}".strip + "\" [N/y] "
-            /^n?$/i =~ Readline.readline(prompt, false)
+            "\"#{message}".strip + "\" [N/y] "
           end
+        result = !!(/^y?$/i =~ Readline.readline(prompt, false))
 
         if result && block
           block.call

data/lib/termtter/config_setup.rb

@@ -5,10 +5,32 @@ 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
-      user_name = ui.ask('your twitter user name: ')
-      password = ui.ask('your twitter password: ') { |q| q.echo = false }
+      pin = ui.ask('Enter PIN: ')
+      access_token = request_token.get_access_token(:oauth_verifier => pin)
+      token = access_token.token
+      secret = access_token.secret
 
       plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
         f.match(%r|lib/plugins/(.*?).rb$|)[1]
@@ -25,6 +47,9 @@ 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,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-config.user_name = '<%= user_name %>'
-config.password = '<%= password %>'
+config.access_token = '<%= token %>'
+config.access_token_secret = '<%= secret %>'
 #config.update_interval = 120
 #config.proxy.host = 'proxy host'
 #config.proxy.port = '8080'

data/lib/termtter/version.rb

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

data/lib/termtter.rb

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 
-$KCODE="u" unless Object.const_defined? :Encoding
+$KCODE = "u" unless Object.const_defined? :Encoding
 
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
+
+require 'cgi'
+require 'enumerator'
 require 'json'
 require 'net/https'
 require 'open-uri'
-require 'cgi'
-require 'readline'
-require 'enumerator'
 require 'optparse'
+require 'readline'
+require 'oauth'
 
 require 'termtter/config'
 require 'termtter/version'
@@ -35,4 +37,7 @@ 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/spec/plugins/db_spec.rb

@@ -37,7 +37,7 @@ describe 'db' do
   end
 
   it 'calls hook' do
-    user_struct = Struct.new(:id, :screen_name)
+    user_struct = Struct.new(:id, :screen_name, :protected)
     user_1 = user_struct.new(1, 'jugyo')
     user_2 = user_struct.new(2, 'oyguj')
 

data/spec/plugins/fib_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Termtter::Client, 'when the plugin fib is loaded' do
   it 'should add command fib' do
-    Termtter::Client.should_receive(:register_command).twice
+    Termtter::Client.should_receive(:register_command).once
     Termtter::Client.plug 'defaults/fib'
   end
 

data/spec/plugins/standard_commands_spec.rb

@@ -20,4 +20,8 @@ module Termtter
       end
     end
   end
+
+  describe 'standard_commands' do
+    it 'needs more specs!'
+  end
 end

data/spec/plugins/whois_spec.rb

@@ -3,18 +3,18 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Termtter::Client, 'when the plugin whois is loaded' do
-  it 'should add command whois' do
+  it 'adds the command whois' do
     Termtter::Client.should_receive(:register_command).once
     Termtter::Client.plug 'whois'
   end
 
-  it 'should be whois define' do
+  it 'should be whois define' do # What does "be whois define" mean?
     Termtter::Client.plug 'whois'
-    name = "jp-in-f104.google.com"
-    ip = "66.249.89.104"
-    
+    name = 'jp-in-f104.google.com'
+    ip = '66.249.89.104'
+
     whois?(name).should == ip
-    whois?(ip).should == name 
+    whois?(ip).should == name
+    # FIXME: This spec doesn't pass in Canada
   end
-  
 end

data/spec/termtter/active_rubytter_spec.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'termtter/active_rubytter'
+
+module Termtter
+  describe ActiveRubytter do
+
+    it 'Hashをクラス化できる' do
+      d = ActiveRubytter.new(:name => 'termtter', :age => 16)
+      d.name.should == 'termtter'
+      d.age.should == 16
+    end
+
+    it '元のHashを得られること' do
+      data = { :test => 'test' }
+      d = ActiveRubytter.new(data)
+      d.to_hash.should == data
+    end
+
+    describe '入れ子のHashの処理' do
+
+      before(:all) do
+        @data = {
+          :hoge => "hogehoge",
+          :fuga => "fugafuga",
+          :hage => {
+            :foo => "foofoo",
+            :bar => {
+              :nest => "nestnest"
+            }
+          }
+        }
+      end
+
+      before(:each) do
+        @d = ActiveRubytter.new(@data)
+      end
+
+      it "入れ子のHashをクラス化できる" do
+        @d.should be_instance_of(ActiveRubytter)
+
+        #array.map{ |elem| ActiveRubytter.new(elem)})}
+      end
+
+      it "Hashからクラス化して`.'でアクセスできる" do
+        @d.hoge.should == "hogehoge"
+
+        #array.map{ |elem| ActiveRubytter.new(elem)})}
+      end
+
+      it "Hashからクラス化して`.'で入れ子でもアクセスできる" do
+        @d.hage.foo.should == "foofoo"
+
+        #array.map{ |elem| ActiveRubytter.new(elem)})}
+      end
+
+      it "Hashからクラス化して`.'で入れ子の入れ子でもアクセスできる" do
+        @d.hage.bar.nest.should == "nestnest"
+
+        #array.map{ |elem| ActiveRubytter.new(elem)})}
+      end
+
+      it "入れ子でも元のHashを得られること" do
+        @d.to_hash.should == @data
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 +09:00
+date: 2009-10-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubytter
@@ -51,7 +51,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.9.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.6
     version: 
 description: Termtter is a terminal based Twitter client.
 email: jugyo.org@gmail.com
@@ -77,6 +87,7 @@ files:
 - lib/plugins/countter.rb
 - lib/plugins/curry.rb
 - lib/plugins/db.rb
+- lib/plugins/defaults/alias.rb
 - lib/plugins/defaults/auto_reload.rb
 - lib/plugins/defaults/command_line.rb
 - lib/plugins/defaults/exec.rb
@@ -93,6 +104,7 @@ files:
 - lib/plugins/exec_and_update.rb
 - lib/plugins/expand-tinyurl.rb
 - lib/plugins/fib_filter.rb
+- lib/plugins/fibyou.rb
 - lib/plugins/filter.rb
 - lib/plugins/github-issues.rb
 - lib/plugins/graduatter.rb
@@ -102,6 +114,7 @@ files:
 - lib/plugins/growl2.rb
 - lib/plugins/hatebu.rb
 - lib/plugins/hatebu_and_update.rb
+- lib/plugins/hi.rb
 - lib/plugins/history.rb
 - lib/plugins/http_server/favicon.ico
 - lib/plugins/http_server/index.html
@@ -110,6 +123,8 @@ files:
 - lib/plugins/ignore.rb
 - lib/plugins/irb.rb
 - lib/plugins/irc_gw.rb
+- lib/plugins/itunes.rb
+- lib/plugins/jakigan.rb
 - lib/plugins/keyword.rb
 - lib/plugins/l2.rb
 - lib/plugins/list_with_opts.rb
@@ -118,24 +133,29 @@ files:
 - lib/plugins/me.rb
 - lib/plugins/modify_arg_hook_sample.rb
 - lib/plugins/msagent.rb
+- lib/plugins/multi_output.rb
 - lib/plugins/multi_post.rb
 - lib/plugins/multi_reply.rb
 - lib/plugins/notify-send.rb
 - lib/plugins/notify-send2.rb
 - lib/plugins/notify-send3.rb
+- lib/plugins/open.rb
 - lib/plugins/open_url.rb
 - lib/plugins/otsune.rb
 - lib/plugins/outputz.rb
+- lib/plugins/paranoid.rb
 - lib/plugins/pause.rb
 - lib/plugins/pool.rb
 - lib/plugins/post_exec_hook_sample.rb
 - lib/plugins/pre_exec_hook_sample.rb
 - lib/plugins/primes.rb
 - lib/plugins/protected_filter.rb
+- lib/plugins/quick_exit.rb
 - lib/plugins/quicklook.rb
 - lib/plugins/random.rb
 - lib/plugins/reblog.rb
 - lib/plugins/reload.rb
+- lib/plugins/replace.rb
 - lib/plugins/reply.rb
 - lib/plugins/reverse.rb
 - lib/plugins/say.rb
@@ -144,6 +164,7 @@ files:
 - lib/plugins/screen-notify.rb
 - lib/plugins/screen.rb
 - lib/plugins/search_url.rb
+- lib/plugins/searchline.rb
 - lib/plugins/shell.rb
 - lib/plugins/sl.rb
 - lib/plugins/spam.rb
@@ -155,6 +176,7 @@ files:
 - lib/plugins/system_status.rb
 - lib/plugins/timer.rb
 - lib/plugins/tinyurl.rb
+- lib/plugins/train.rb
 - lib/plugins/translation.rb
 - lib/plugins/trends.rb
 - lib/plugins/twitpic.rb
@@ -167,6 +189,7 @@ files:
 - lib/plugins/yhara.rb
 - lib/plugins/yhara_filter.rb
 - lib/plugins/yonda.rb
+- lib/termtter/active_rubytter.rb
 - lib/termtter/api.rb
 - lib/termtter/client.rb
 - lib/termtter/command.rb
@@ -197,6 +220,7 @@ files:
 - spec/plugins/storage/status_spec.rb
 - spec/plugins/whois_spec.rb
 - spec/spec_helper.rb
+- spec/termtter/active_rubytter_spec.rb
 - spec/termtter/client_spec.rb
 - spec/termtter/command_spec.rb
 - spec/termtter/config_spec.rb
@@ -208,7 +232,7 @@ files:
 - test/friends_timeline.json
 - test/search.json
 has_rdoc: true
-homepage: http://wiki.github.com/jugyo/termtter
+homepage: http://termtter.org/
 licenses: []
 
 post_install_message: