jugyo-termtter 1.0.0 → 1.0.3

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/Rakefile

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("highline", ">= 1.5.0")
   s.add_dependency("termcolor", ">= 0.3.1")
   s.add_dependency("rubytter", ">= 0.4.8")
+  s.add_dependency("sqlite3-ruby", ">= 1.2.4")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'
   s.homepage = 'http://wiki.github.com/jugyo/termtter'
@@ -48,7 +49,7 @@ end
 namespace :gem do
   desc 'Install needed gems'
   task :install do
-    %w[ json_pure highline termcolor ].each do |gem|
+    %w[ json_pure highline termcolor rubytter ].each do |gem|
       sh "sudo gem install #{gem} -r"
     end
   end

data/lib/plugins/outputz.rb

@@ -12,7 +12,7 @@ module Termtter::Client
       :name => :outputz,
       :points => [:pre_exec_update],
       :exec_proc => lambda {|cmd, arg|
-        Thead.new do
+        Thread.new do
           Termtter::API.connection.start('outputz.com', 80) do |http|
               key  = CGI.escape key
               uri  = CGI.escape config.plugins.outputz.uri

data/lib/plugins/standard_plugins.rb

@@ -11,7 +11,7 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       unless arg =~ /^\s*$/
         text = ERB.new(arg).result(binding).gsub(/\n/, ' ')
-        result = Termtter::API.twitter.update(text)
+        result = Termtter::API.twitter.update(text, :source=>Termtter::APP_NAME)
         puts "=> #{text}"
         result
       end

data/lib/termtter.rb

@@ -25,37 +25,3 @@ require 'termtter/task_manager'
 require 'termtter/client'
 require 'termtter/api'
 require 'termtter/system_extensions'
-
-module Termtter
-  APP_NAME = 'termtter'
-
-  config.system.set_default :conf_dir, File.expand_path('~/.termtter')
-  CONF_DIR = config.system.conf_dir
-
-  config.system.set_default :conf_file, CONF_DIR + '/config'
-  CONF_FILE = config.system.conf_file
-end
-
-if RUBY_VERSION < '1.8.7'
-  class Array
-    def take(n) self[0...n] end
-  end
-end
-
-def plugin(name, init = {})
-  unless init.empty?
-    init.each do |key, value|
-      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
-    end
-  end
-  # FIXME: below path should be replaced by optparsed path
-  if File.exist?(path = File.expand_path("~/.termtter/plugins/#{name}"))
-    require path
-  else
-    require "plugins/#{name}"
-  end
-rescue LoadError => e
-  Termtter::Client.handle_error(e)
-end
-
-$:.unshift(Termtter::CONF_DIR) # still does not use

data/lib/termtter/client.rb

@@ -1,6 +1,16 @@
 # -*- coding: utf-8 -*-
+require 'fileutils'
 
 module Termtter
+  APP_NAME = 'termtter'
+
+  config.system.set_default :conf_dir, File.expand_path('~/.termtter')
+  CONF_DIR = config.system.conf_dir
+
+  config.system.set_default :conf_file, CONF_DIR + '/config'
+  CONF_FILE = config.system.conf_file
+  $:.unshift(Termtter::CONF_DIR)
+
   class CommandNotFound < StandardError; end
 
   module Client
@@ -210,40 +220,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
@@ -306,6 +287,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'
@@ -373,20 +355,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,42 @@
+# -*- coding: utf-8 -*-
+
+def plugin(name, init = {})
+  unless init.empty?
+    init.each do |key, value|
+      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
+    end
+  end
+  # FIXME: below path should be replaced by optparsed path
+  if File.exist?(path = File.expand_path("~/.termtter/plugins/#{name}"))
+    require path
+  else
+    require "plugins/#{name}"
+  end
+rescue LoadError => e
+  Termtter::Client.handle_error(e)
+end
+
+def filter(name, init = {})
+  warn "filter method will be removed. Use plugin instead."
+  plugin(name, init)
+end
+
+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 +125,17 @@ if win?
     STDOUT.puts
   end
 end
+
+unless Array.instance_methods.include?('take')
+  class Array
+    def take(n) self[0...n] end
+  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.0'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors: 
 - jugyo
@@ -53,6 +53,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.8
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.4
+    version: 
 description: Termtter is a terminal based Twitter client
 email: jugyo.org@gmail.com
 executables: 
@@ -131,6 +141,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