bbiff 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037966c6b4adc37eb5630c02746d1c0a6ef609ed
-  data.tar.gz: 87886e10129ef9ae257a78c52396bc0e3324ab39
+  metadata.gz: 8797d933872f35f189b8bb3314359f70e836beca
+  data.tar.gz: 8d528676d405351a60b78b35907b844c3ec5116a
 SHA512:
-  metadata.gz: 1116585b2aa1dd80258bf3e8d99bba5cac503790539faeb5e5fea99b6bfedb9ea1601b59f0b3e061264f758a0500e62ef8f611cc5a45fc99ac974703344f9c73
-  data.tar.gz: 7eb9d8a7d563b58cc52534604e7af91a2d40f416eb66bbe8ed5ac60cd3963030fd244d320c134e17da3c82b1b27a23aacafd0f7723f51c6e442598d89e7b3706
+  metadata.gz: 7c954728351a352e46a39b3cefa11b4d0971580d93b39967d4965ae00535e1e46e0fbf277e9b9b4af40698d06f971757c028a14d4046b4d43635b8d86cae6574
+  data.tar.gz: cd947dbca88dd1d6af438e60275417767ab208ba94d78465c9a69b75c25723046eed7d5fa732e6e8029c5b69614557473c3a6520adeb6ff4c7eb9264f3b9ef94

data/README.md

@@ -55,6 +55,10 @@ ver 0.3.0
   * 2ちゃんねる互換掲示板に対応したつもり。
   * 日付の相対表示を辞めた。
 
+ver 0.3.1
+  * エラー時にスタックトレースを表示しないようにした。
+  * ポート番号が指定してあってもURLを認識するようにした。
+
 ## 作者
 
 予定地 <plonk@piano.email.ne.jp>

data/lib/bbiff/bbs_reader.rb

@@ -4,6 +4,9 @@ require 'pp' if $DEBUG
 
 module Bbs
 
+  class NotFoundError < StandardError
+  end
+
   class Post
     class << self
       def from_s(str)
@@ -304,7 +307,7 @@ module Bbs
         def from_url(url)
           uri = URI.parse(url)
           board_name = uri.path.split('/').reject(&:empty?).first
-          raise 'bad url' if board_name.nil?
+          return nil if board_name.nil?
           Board.send(:new, uri.hostname, uri.port, board_name)
         end
       end
@@ -326,7 +329,7 @@ module Bbs
       end
     end
 
-    NICHAN_THREAD_URL_PATTERN = %r{\Ahttp://[a-zA-z\-\.]+/test/read\.cgi\/(\w+)/(\d+)($|/)}
+    NICHAN_THREAD_URL_PATTERN = %r{\Ahttp://[a-zA-z\-\.]+(?::\d+)/test/read\.cgi\/(\w+)/(\d+)($|/)}
 
     # 2ちゃんスレッド
     class Thread < ThreadBase
@@ -337,10 +340,10 @@ module Bbs
             uri = URI(url)
             board = Board.send(:new, uri.hostname, uri.port, board_name)
             thread = board.thread(thread_num)
-            raise 'no such thread' if thread.nil?
+            raise NotFoundError, 'no such thread' if thread.nil?
             return thread
           else
-            raise 'bad URL'
+            return nil
           end
         end
 

data/lib/bbiff/executable.rb

@@ -10,9 +10,12 @@ class Executable
     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")
@@ -28,20 +31,41 @@ class Executable
     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)
@@ -75,48 +99,54 @@ class Executable
     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
 
@@ -139,18 +169,20 @@ EOD
       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

data/lib/bbiff/version.rb

@@ -1,3 +1,3 @@
 module Bbiff
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbiff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler