lib/bbiff/executable.rb in bbiff-0.3.0 vs lib/bbiff/executable.rb in bbiff-0.3.1

@@ -8,13 +8,16 @@
 
   class LineIndicator
     def initialize(out = STDOUT)
       @width = 0
       @out = out
+      @closed = false
     end
 
     def set_line(str)
+      raise_if_closed!
+
       clear
       if str[-1] == "\n"
         if str.rindex("\n") != str.size-1 || str.index("\n") < str.rindex("\n")
           raise 'multiline' 
         end
@@ -26,24 +29,45 @@
         @width = mbswidth(str)
       end
     end
 
     def newline
+      raise_if_closed!
+
       @out.print "\n"
       @width = 0
     end
 
     def clear
+      raise_if_closed!
+
       @out.print "\r#{' ' * @width}\r"
       @width = 0
     end
 
     def puts(str)
+      raise_if_closed!
+
       set_line(str)
       newline
     end
 
+    def raise_if_closed!
+      if @closed
+        raise 'Closed LineIndicator'
+      end
+    end
+
+    def close
+      if @closed
+        raise 'already closed LineIndicator'
+      else
+        @out.puts if @width > 0
+        @closed = true
+      end
+    end
+
     private
 
     def mbswidth(str)
       Unicode::DisplayWidth.of(str)
     end
@@ -73,52 +97,58 @@
     STDERR.puts "Warning: 以下の場所から掲示板の設定が取得できませんでした。(#{e.response.message})"
     STDERR.puts board.settings_url
     return {'BBS_TITLE'=>'＜不明＞'}
   end
 
+  RETRY_INTERVAL_SECONDS = 3
+
   def start_polling(thread, start_no)
     out = LineIndicator.new
-    delay = @settings.current['delay_seconds']
-    board_settings = get_board_settings(thread.board)
-    thread_stop = (board_settings['BBS_THREAD_STOP'] || '1000').to_i
+    begin
+      delay = @settings.current['delay_seconds']
+      board_settings = get_board_settings(thread.board)
+      thread_stop = (board_settings['BBS_THREAD_STOP'] || '1000').to_i
 
-    puts "#{board_settings['BBS_TITLE']} − #{thread.title}(#{thread.last})"
-    puts "    #{@settings.current['thread_url']}"
+      puts "#{board_settings['BBS_TITLE']} − #{thread.title}(#{thread.last})"
+      puts "    #{@settings.current['thread_url']}"
 
-    loop do
-      out.set_line "#{thread.title}(#{thread.last}) 新着レス確認中"
+      loop do
+        out.set_line "#{thread.title}(#{thread.last}) 新着レス確認中"
 
-      thread.posts(parse_range("#{start_no}-")).each do |post|
-        out.puts "-----"
-        puts render_post(post)
+        thread.posts(parse_range("#{start_no}-")).each do |post|
+          out.puts "-----"
+          puts render_post(post)
 
-        system(@settings.current['bbiff_show'],
-               thread.title, post.to_s)
+          system(@settings.current['bbiff_show'],
+                 thread.title, post.to_s)
 
-        sleep 1
-      end
+          sleep 1
+        end
 
-      start_no = thread.last + 1
-      if start_no >= thread_stop
-        out.puts "スレッドストップ"
-        break 
-      end
+        start_no = thread.last + 1
+        if start_no >= thread_stop
+          out.puts "スレッドストップ"
+          break 
+        end
 
-      delay.times do |i|
-        j = i + 1
-        out.set_line "#{thread.title}(#{thread.last}) 待機中 [#{'.'*j}#{' '*(delay - j)}]"
-        sleep 1
+        delay.times do |i|
+          j = i + 1
+          out.set_line "#{thread.title}(#{thread.last}) 待機中 [#{'.'*j}#{' '*(delay - j)}]"
+          sleep 1
+        end
       end
+    ensure
+      out.close
     end
   rescue Interrupt
-    STDERR.puts "\nユーザー割り込みにより停止"
+    STDERR.puts "ユーザー割り込みにより停止"
   rescue => e
-    STDERR.puts "error occured"
-    puts e.message
-    puts e.backtrace
-    STDERR.puts "retrying..., ^C to quit"
-    sleep 3
+    STDERR.print "Error: "
+    STDERR.puts e.message
+    STDERR.puts e.backtrace if $DEBUG
+    STDERR.puts "#{RETRY_INTERVAL_SECONDS}秒後にリトライ"
+    sleep RETRY_INTERVAL_SECONDS
     start_polling(thread, start_no)
   end
 
   def usage
     STDERR.puts "Usage: bbiff [http://jbbs.shitaraba.net/bbs/read.cgi/CATEGORY/BOARD_ID/THREAD_ID/] [START_NUMBER]"
@@ -137,21 +167,23 @@
 
     if ARGV.size < 1 && !@settings.current['thread_url']
       raise UsageError
     elsif ARGV.size < 1
       url = @settings.current['thread_url']
-      thread = Bbs::create_thread(url)
     else
       url = ARGV[0]
+    end
 
-      begin
-        thread = Bbs::create_thread(url)
-        @settings.current['thread_url'] = url
-      rescue
-        puts "URLが変です"
-        usage
-        exit 1
-      end
+    begin
+      thread = Bbs::create_thread(url)
+      @settings.current['thread_url'] = url
+    rescue => e
+      STDERR.puts e
+      exit 1
+    end
+    if thread.nil?
+      STDERR.puts "スレッドのURLとして解釈できませんでした。(#{url})"
+      exit 1
     end
 
     start_no = ARGV[1] ? ARGV[1].to_i : thread.last + 1
     start_polling(thread, start_no)
   rescue UsageError