termtter 1.0.1 → 1.0.2

data/README.rdoc

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 = termtter
 
 http://github.com/jugyo/termtter
@@ -63,10 +64,10 @@ http://wiki.github.com/jugyo/termtter/home (in Japanese)
 
 == TODO:
 
-- filter と plugin を統一する
-- plugin => plugins （ディレクトリ名変更）
-- $HOME 以下に plugin 用のディレクトリを置けるようにする
-- コマンドラインオプションでいろいろ指定できるようにする
+- Enhance the document and spec
+- Finalize the Hook specification and integration
+- Improve the UI(a status view, etc...)
+- Build a logging function
 
 == LICENSE:
 

data/lib/termtter/client.rb

@@ -211,40 +211,11 @@ module Termtter
 
       def load_config
         legacy_config_support() if File.exist? Termtter::CONF_DIR
-        if File.exist? Termtter::CONF_FILE
-          load Termtter::CONF_FILE
-        else
-          ui = create_highline
-          username = ui.ask('your twitter username: ')
-          password = ui.ask('your twitter password: ') { |q| q.echo = false }
-
-          Dir.mkdir(Termtter::CONF_DIR)
-          File.open(Termtter::CONF_FILE, 'w') {|io|
-            io.puts '# -*- coding: utf-8 -*-'
-
-            plugins = Dir.glob(File.dirname(__FILE__) + "/../lib/plugins/*.rb").map  {|f|
-              f.match(%r|lib/plugin/(.*?).rb$|)[1]
-            }
-            plugins -= %w[stdout standard_plugins]
-            plugins.each do |p|
-              io.puts "#plugin '#{p}'"
-            end
-
-            io.puts
-            io.puts "config.user_name = '#{username}'"
-            io.puts "config.password = '#{password}'"
-            io.puts "#config.update_interval = 120"
-            io.puts "#config.proxy.host = 'proxy host'"
-            io.puts "#config.proxy.port = '8080'"
-            io.puts "#config.proxy.user_name = 'proxy user'"
-            io.puts "#config.proxy.password = 'proxy password'"
-            io.puts
-            io.puts "# vim: set filetype=ruby"
-          }
-          puts "generated: ~/.termtter/config"
-          puts "enjoy!"
-          load Termtter::CONF_FILE
+        unless File.exist?(Termtter::CONF_FILE)
+          require 'termtter/config_setup'
+          ConfigSetup.run
         end
+        load Termtter::CONF_FILE
       end
 
       def legacy_config_support
@@ -307,6 +278,7 @@ module Termtter
                 @@since_id = statuses[0].id
               end
               call_hooks(statuses, :update_friends_timeline)
+              Readline.refresh_line
               statuses
             rescue OpenURI::HTTPError => e
               if e.message == '401 Unauthorized'
@@ -374,20 +346,6 @@ module Termtter
         start_input_thread()
       end
 
-      def create_highline
-        HighLine.track_eof = false
-        if $stdin.respond_to?(:getbyte) # for ruby1.9
-          require 'delegate'
-          stdin_for_highline = SimpleDelegator.new($stdin)
-          def stdin_for_highline.getc
-            getbyte
-          end
-        else
-          stdin_for_highline = $stdin
-        end
-        HighLine.new(stdin_for_highline)
-      end
-
       def handle_error(e)
         call_new_hooks("on_error", e)
       rescue => e

data/lib/termtter/config_setup.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  module ConfigSetup
+    def run
+      ui = create_highline
+      username = ui.ask('your twitter username: ')
+      password = ui.ask('your twitter password: ') { |q| q.echo = false }
+
+      Dir.mkdir(Termtter::CONF_DIR) unless File.exists?(Termtter::CONF_DIR)
+      File.open(Termtter::CONF_FILE, 'w') {|io|
+        io.puts '# -*- coding: utf-8 -*-'
+
+        io.puts
+        io.puts "config.user_name = '#{username}'"
+        io.puts "config.password = '#{password}'"
+        io.puts "#config.update_interval = 120"
+        io.puts "#config.proxy.host = 'proxy host'"
+        io.puts "#config.proxy.port = '8080'"
+        io.puts "#config.proxy.user_name = 'proxy user'"
+        io.puts "#config.proxy.password = 'proxy password'"
+        io.puts
+        plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
+          f.match(%r|lib/plugins/(.*?).rb$|)[1]
+        }
+        plugins -= %w[stdout standard_plugins]
+        plugins.each do |p|
+          io.puts "#plugin '#{p}'"
+        end
+        io.puts
+        io.puts "# vim: set filetype=ruby"
+      }
+      puts "generated: ~/.termtter/config"
+      puts "enjoy!"
+    end
+
+    module_function :run
+
+    def self.create_highline
+      HighLine.track_eof = false
+      if $stdin.respond_to?(:getbyte) # for ruby1.9
+        require 'delegate'
+        stdin_for_highline = SimpleDelegator.new($stdin)
+        def stdin_for_highline.getc
+          getbyte
+        end
+      else
+        stdin_for_highline = $stdin
+      end
+      HighLine.new(stdin_for_highline)
+    end
+  end
+end

data/lib/termtter/system_extensions.rb

@@ -1,3 +1,21 @@
+# -*- coding: utf-8 -*-
+
+require 'dl/import'
+module Readline
+  begin
+    module LIBREADLINE
+      extend DL::Importable
+      dlload '/opt/local/lib/libreadline.dylib' # TODO: 環境によってパスを変える必要あり。どうやったらいいかはこれから調べる。
+      extern 'int rl_refresh_line(int, int)'
+    end
+    def self.refresh_line
+      LIBREADLINE.rl_refresh_line(0, 0)
+    end
+  rescue RuntimeError, NameError
+    def self.refresh_line;end
+  end
+end
+
 def win?
   RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
 end
@@ -86,3 +104,11 @@ if win?
     STDOUT.puts
   end
 end
+
+unless Symbol.instance_methods.include?('to_proc')
+  class Symbol
+    def to_proc
+      Proc.new { |*args| args.shift.__send__(self, *args) }
+    end
+  end
+end

data/lib/termtter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 +09:00
+date: 2009-03-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,7 @@ files:
 - lib/termtter/client.rb
 - lib/termtter/command.rb
 - lib/termtter/config.rb
+- lib/termtter/config_setup.rb
 - lib/termtter/connection.rb
 - lib/termtter/hook.rb
 - lib/termtter/optparse.rb