Merge branch 'master' of git@github.com:jugyo/termtter

lib/termtter.rb

@@ -343,8 +343,9 @@ def resume
 
       def exit
         call_hooks([], :exit, nil)
-        @@update_thread.exit!
-        @@input_thread.exit!
+        @@main_thread.kill
+        @@update_thread.kill
+        @@input_thread.kill
       end
 
       def run
@@ -354,6 +355,7 @@ def run
         tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
         call_hooks([], :initialize, tw)
 
+        @@input_thread = nil
         @@update_thread = Thread.new do
           since_id = nil
           loop do
@@ -364,9 +366,10 @@ def run
               unless statuses.empty?
                 since_id = statuses[0].id
               end
+              # TODO: erase prompt
               call_hooks(statuses, :update_friends_timeline, tw)
               initialized = true
-
+              @@input_thread.kill if @@input_thread && !statuses.empty?
             rescue OpenURI::HTTPError => e
               if e.message == '401 Unauthorized'
                 puts 'Could not login'
@@ -389,7 +392,23 @@ def run
           Readline.__send__("#{vi_or_emacs}_editing_mode")
         end
 
-        @@input_thread = Thread.new do
+        begin
+          stty_save = `stty -g`.chomp
+          trap("INT") { system "stty", stty_save; exit }
+        rescue Errno::ENOENT
+        end
+
+        @@main_thread = Thread.new do
+          loop do
+            @@input_thread = create_input_thread(tw)
+            @@input_thread.join
+          end
+        end
+        @@main_thread.join
+      end
+
+      def create_input_thread(tw)
+        Thread.new do
           erb = ERB.new(configatron.prompt)
           while buf = Readline.readline(erb.result(tw.__send__(:binding)), true)
             begin
@@ -403,14 +422,6 @@ def run
             end
           end
         end
-
-        begin
-          stty_save = `stty -g`.chomp
-          trap("INT") { system "stty", stty_save; exit }
-        rescue Errno::ENOENT
-        end
-
-        @@input_thread.join
       end
     end
   end