jugyo-termtter 1.0.8 → 1.1.0

data/lib/plugins/expand-tinyurl.rb

@@ -3,7 +3,8 @@
 URL_SHORTTERS = [
   { :host => "tinyurl.com", :pattern => %r'(http://tinyurl\.com(/[\w/]+))' },
   { :host => "is.gd", :pattern => %r'(http://is\.gd(/[\w/]+))' },
-#  { :host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))' }
+  { :host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))' },
+  { :host => "ff.im", :pattern => %r'(http://ff\.im(/[\w/]+))'},
 ]
 
 module Termtter::Client
@@ -27,7 +28,7 @@ def expand_url(host, path)
                                   config.proxy.user_name,
                                   config.proxy.password)
   end
-  res = http_class.new('tinyurl.com').head(path)
+  res = http_class.new(host).head(path)
   return nil unless res.code == "301" or res.code == "302"
   res['Location']
 end

data/lib/plugins/search_url.rb

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  register_command(
+   :name => :search_url, :aliases => [],
+   :exec_proc => lambda{|arg|
+      statuses = public_storage[:log].select {|s| s.text =~ %r!https?://!}
+      output(statuses, :search)
+   },
+   :help => ['search_url', 'Search log for URL']
+   )
+end

data/lib/plugins/standard_plugins.rb

@@ -334,7 +334,6 @@ module Termtter::Client
 
   public_storage[:users] ||= Set.new
   public_storage[:status_ids] ||= Set.new
-  public_storage[:last_status_id] ||= Hash.new
 
   register_hook(
     :name => :for_completion,
@@ -345,7 +344,6 @@ module Termtter::Client
         public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
         public_storage[:status_ids].add(s.id)
         public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
-        public_storage[:last_status_id].store(s.user.screen_name, s.id)
       end
     }
   )
@@ -427,7 +425,8 @@ module Termtter::Client
       when /(\d+)/
         find_status_ids(arg).map{|id| "#{cmd} #{id}"}
       end
-    }
+    },
+    :help => ["reply,re @USERNAME or STATUS_ID", "Send a reply"]
   )
 
   register_command(

data/lib/plugins/stdout.rb

@@ -2,6 +2,7 @@
 
 require 'termcolor'
 require 'erb'
+require 'tempfile'
 
 config.plugins.stdout.set_default(
   :colors,

data/lib/plugins/update_timeline.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  register_command(
+    :name => :_update_timeline,
+    :exec_proc => lambda {|arg|
+      begin
+        args = @since_id ? [{:since_id => @since_id}] : []
+        statuses = Termtter::API.twitter.friends_timeline(*args)
+        unless statuses.empty?
+          print "\e[1K\e[0G" unless win?
+          @since_id = statuses[0].id
+          output(statuses, :update_friends_timeline)
+          Readline.refresh_line
+        end
+      rescue OpenURI::HTTPError => e
+        if e.message == '401 Unauthorized'
+          puts 'Could not login'
+          puts 'plese check your account settings'
+          exit!
+        end
+      rescue => e
+        handle_error(e)
+      end
+    }
+  )
+
+  add_task(:name => :update_timeline, :interval => config.update_interval, :after => config.update_interval) do
+    call_commands('_update_timeline')
+  end
+
+  call_commands('_update_timeline')
+end

data/lib/termtter/client.rb

@@ -239,39 +239,6 @@ module Termtter
         end
       end
 
-      # TODO: Make pluggable
-      def setup_update_timeline_task()
-        register_command(
-          :name => :_update_timeline,
-          :exec_proc => lambda {|arg|
-            begin
-              args = @since_id ? [{:since_id => @since_id}] : []
-              statuses = Termtter::API.twitter.friends_timeline(*args)
-              unless statuses.empty?
-                print "\e[1K\e[0G" unless win?
-                @since_id = statuses[0].id
-                output(statuses, :update_friends_timeline)
-                Readline.refresh_line
-              end
-            rescue OpenURI::HTTPError => e
-              if e.message == '401 Unauthorized'
-                puts 'Could not login'
-                puts 'plese check your account settings'
-                exit!
-              end
-            rescue => e
-              handle_error(e)
-            end
-          }
-        )
-
-        add_task(:name => :update_timeline, :interval => config.update_interval, :after => config.update_interval) do
-          call_commands('_update_timeline')
-        end
-
-        call_commands('_update_timeline')
-      end
-
       def trap_setting()
         begin
           stty_save = `stty -g`.chomp
@@ -343,12 +310,22 @@ module Termtter
         setup_logger()
         post_config_load()
 
-        call_hooks(:initialize)
+        config.system.eval_scripts.each do |script|
+          begin
+            eval script
+          rescue Exception => e
+            handle_error(e)
+          end
+        end
 
-        setup_update_timeline_task()
+        config.system.run_commands.each { |cmd| call_commands(cmd) }
 
-        @task_manager.run()
-        start_input_thread()
+        unless config.system.cmd_mode
+          call_hooks(:initialize)
+          plugin('update_timeline')
+          @task_manager.run()
+          start_input_thread()
+        end
       end
 
       def handle_error(e)

data/lib/termtter/optparse.rb

@@ -1,14 +1,33 @@
 OptionParser.new { |opt|
-  opt.on('-f', '--file config_file', 'Set path to configfile') do |val|
+  opt.program_name = 'Termtter'
+
+  opt.on('-f', '--config-file file', 'Set path to configfile') do |val|
     config.system.__assign__(:conf_file, val)
   end
+
   opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
     config.system.__assign__(:conf_dir, val)
   end
+
   opt.on('-d', '--devel', 'Start in developer mode') do |flg|
     config.system.__assign__(:devel, true) if flg
   end
 
-  Version = Termtter::VERSION
+  config.system.cmd_mode = false
+  opt.on('-c', '--command-mode', 'Run as command mode') do |flg|
+    config.system.cmd_mode = flg
+  end
+
+  config.system.run_commands = []
+  opt.on('-r', '--run-command command', 'Run command') do |cmd|
+    config.system.run_commands << cmd
+  end
+
+  config.system.eval_scripts = []
+  opt.on('-e', '--eval-script script', 'Eval script') do |script|
+    config.system.eval_scripts << script
+  end
+
+  opt.version = Termtter::VERSION
   opt.parse!(ARGV)
 }

data/lib/termtter/version.rb

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

data/spec/termtter/client_spec.rb

@@ -181,8 +181,6 @@ module Termtter
       Client.should_receive(:load_config)
       Termtter::API.should_receive(:setup)
       Client.should_receive(:post_config_load)
-      Client.should_receive(:call_hooks)
-      Client.should_receive(:setup_update_timeline_task)
       Client.should_receive(:start_input_thread)
       Client.run
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors: 
 - jugyo
@@ -120,6 +120,7 @@ files:
 - lib/plugins/scrape.rb
 - lib/plugins/screen-notify.rb
 - lib/plugins/screen.rb
+- lib/plugins/search_url.rb
 - lib/plugins/shell.rb
 - lib/plugins/sl.rb
 - lib/plugins/spam.rb
@@ -136,6 +137,7 @@ files:
 - lib/plugins/translation.rb
 - lib/plugins/typable_id.rb
 - lib/plugins/update_editor.rb
+- lib/plugins/update_timeline.rb
 - lib/plugins/uri-open.rb
 - lib/plugins/wassr_post.rb
 - lib/plugins/yhara.rb