bbiff 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390245509f3595fee671a77bca02daf4592e2747cd01543de817ae804b509122
-  data.tar.gz: 3fb134823404b0ce3e93b01ada05e7d1dbd152bfb193e01c1931e3b5ce1afc51
+  metadata.gz: 4758c8dd5e687a8cafc4950aff149891315912f57c9c6089d411ca40f64af251
+  data.tar.gz: 05201ef427ddafaa0d8319d32da510afdd26363463961b8f70ee115d983a7e0f
 SHA512:
-  metadata.gz: 5f1cac9cfc598df67c23fbeaf572f824b2fa775693ccb4d5e99f6ab875edc6843acb3314450bfad11262cf14555616aa8e147d66361e719def0102c431c385b4
-  data.tar.gz: a499ad13b6f5616df60bfc456373f28705164d1fb1f547c8492f8eac7038c38ec728c06e574071e5a011cc24b46e1a63eebb4fda67a787eec04b343a2635eb04
+  metadata.gz: cdb83ce8f345ffedb08e7778f1498aa22cf23e317266b77befb643fbeefe3d470f6c289704a0674e308516f1064513ea8f4410d54012240419b6f56cccb76c63
+  data.tar.gz: f3cab0dd96adc6d675491aac3bf2978148474ba8d94680f31422e902db360533e43790da75358d1401e40166069337a1fa0cf62af258ef14429b60363ef61b60

data/README.md

@@ -7,6 +7,10 @@
 
     sudo apt-get install libnotify-bin
 
+`BBIFF_NOTIFY_SEND` 環境変数をセットすることで、notify-send 以外のコマ
+ンドをレスの通知に使うこともできます。１つ目の引数にはスレッドタイトル
+が、2つ目の引数には投稿の内容が渡されます。
+
 ## インストール
 
 `gem install bbiff` でインストールできます。
@@ -20,12 +24,6 @@
 んねる互換掲示板の場合は、`http://ホスト名/test/read.cgi/板名/スレID/`
 のような形式になります。
 
-単に
-
-	bbiff
-
-とすると、前回監視したスレッドを監視します。
-
 ## リリース
 
 ver 0.1.0
@@ -68,6 +66,14 @@ ver 0.3.3
 ver 0.3.4
   * 通知でレスの最後に <><> が表示されるのを修正。
 
+ver 0.3.5
+  * httpsなしたらば掲示板のURLが使えるようにした。
+
+ver 0.4.0
+  * ロングポーリングに対応。(--long-pollingオプション)
+  * スタンドアローンなレンダリングの抑制。(--no-renderオプション)
+  * 設定ファイル(~/.config/bbiff/settings.tml)を廃止した。
+
 ## 作者
 
 予定地 <plonk@piano.email.ne.jp>

data/bbiff.gemspec

@@ -15,12 +15,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
   spec.executables   << 'bbiff'
-  spec.executables   << 'bbiff-show'
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_dependency "unicode-display_width", "~>1.4.1"
-  spec.add_dependency "toml-rb", "~>0.3.12"
 end

data/lib/bbiff.rb

@@ -4,4 +4,3 @@ require_relative 'bbiff/bbs_reader'
 require_relative 'bbiff/res_format'
 require_relative 'bbiff/settings'
 require_relative 'bbiff/executable'
-require_relative 'bbiff/show'

data/lib/bbiff/bbs_reader.rb

@@ -1,12 +1,14 @@
 require 'net/http'
 require 'uri'
-require 'pp' if $DEBUG
 
 module Bbs
 
   class NotFoundError < StandardError
   end
 
+  class FormatError < StandardError
+  end
+
   class Post
     class << self
       def from_s(str)
@@ -79,14 +81,15 @@ module Bbs
     # ASCII-8BIT エンコーディングの文字列を返す。
     def download_binary(uri)
       resource = @resource_cache[uri]
-      if resource
+      if resource && resource.data.size > 0
+
         Net::HTTP.start(uri.host, uri.port) do |http|
           request = Net::HTTP::Get.new(uri)
           request['range'] = "bytes=#{resource.data.bytesize}-"
           response = http.request(request)
           response.body.force_encoding('ASCII-8BIT')
-          pp response.code if $DEBUG
-          pp response.to_hash if $DEBUG
+          p response.code if $DEBUG
+          p response.to_hash if $DEBUG
           case response
           when Net::HTTPPartialContent
             p :partial if $DEBUG
@@ -117,8 +120,8 @@ module Bbs
         request = Net::HTTP::Get.new(uri)
         response = http.request(request)
         response.body.force_encoding('ASCII-8BIT')
-        pp response.code if $DEBUG
-        pp response.to_hash if $DEBUG
+        p response.code if $DEBUG
+        p response.to_hash if $DEBUG
         case response
         when Net::HTTPOK
         else
@@ -272,7 +275,7 @@ module Bbs
         super
       end
 
-      def posts(range)
+      def posts(range, opts = {})
         fail ArgumentError unless range.is_a? Range
         dat_for_range(range).each_line.map do |line|
           post = create_post(line.chomp)
@@ -329,14 +332,14 @@ module Bbs
       end
     end
 
-    NICHAN_THREAD_URL_PATTERN = %r{\Ahttp://[a-zA-z\-\.]+(?::\d+)/test/read\.cgi\/(\w+)/(\d+)($|/)}
+    NICHAN_THREAD_URL_PATTERN = %r{\Ahttp://[0-9a-zA-z\-\.]+(:\d+)?/test/read\.cgi\/(\w+)/(\d+)($|/)}
 
     # 2ちゃんスレッド
     class Thread < ThreadBase
       class << self
         def from_url(url)
           if url.to_s =~ NICHAN_THREAD_URL_PATTERN
-            board_name, thread_num = $1, $2.to_i
+            board_name, thread_num = $2, $3.to_i
             uri = URI(url)
             board = Board.send(:new, uri.hostname, uri.port, board_name)
             thread = board.thread(thread_num)
@@ -360,15 +363,24 @@ module Bbs
         super
       end
 
-      def posts(range)
+      def posts(range, opts = {})
         fail ArgumentError unless range.is_a? Range
         url = URI(dat_url)
-        lines = @board.send(:download_text, url)
+        lines = @board.send(:download_text,
+                            if opts[:long_polling] then
+                              url + "?long_polling=1"
+                            else
+                              url
+                            end)
         ary = []
         lines.each_line.with_index(1) do |line, res_no|
           next unless range.include?(res_no)
 
-          name, mail, date, body, title = line.chomp.split('<>', 5)
+          fields = line.chomp.split('<>', 5)
+          if fields.size != 5
+            raise FormatError, "invalid line #{line.inspect}"
+          end
+          name, mail, date, body, title = fields
           post = Post.new(res_no.to_s, name, mail, date, body)
           ary << post
           @last = [post.no, last].max

data/lib/bbiff/executable.rb

@@ -19,7 +19,7 @@ class Executable
       clear
       if str[-1] == "\n"
         if str.rindex("\n") != str.size-1 || str.index("\n") < str.rindex("\n")
-          raise 'multiline' 
+          raise 'multiline'
         end
 
         @out.print str
@@ -99,6 +99,11 @@ class Executable
     return {'BBS_TITLE'=>'＜不明＞'}
   end
 
+  def show(title, post)
+    notify_send = ENV['BBIFF_NOTIFY_SEND'] || (`which notify-send` != "" ? 'notify-send' : 'echo')
+    system("#{notify_send} #{Shellwords.escape(title)} #{Shellwords.escape(render_post(post))}")
+  end
+
   RETRY_INTERVAL_SECONDS = 3
 
   def start_polling(thread, start_no)
@@ -114,25 +119,28 @@ class Executable
       loop do
         out.set_line "#{thread.title}(#{thread.last}) 新着レス確認中"
 
-        thread.posts(parse_range("#{start_no}-")).each do |post|
+        posts = thread.posts(parse_range("#{start_no}-"),
+          { long_polling: @settings.current['long_polling'] })
+        t = Time.now
+        posts.each do |post|
           out.puts "-----"
-          puts render_post(post)
-
-          system(@settings.current['bbiff_show'],
-                 thread.title, post.to_s)
+          unless @settings.current['no_render']
+            puts render_post(post)
+          end
 
-          sleep 1
+          show(thread.title, post)
         end
 
         start_no = thread.last + 1
         if start_no > thread_stop
           out.puts "スレッドストップ"
-          break 
+          break
         end
 
-        delay.times do |i|
+        d = [delay-(Time.now-t), 0].max.round
+        d.times do |i|
           j = i + 1
-          out.set_line "#{thread.title}(#{thread.last}) 待機中 [#{'.'*j}#{' '*(delay - j)}]"
+          out.set_line "#{thread.title}(#{thread.last}) 待機中 [#{'.'*j}#{' '*(d - j)}]"
           sleep 1
         end
       end
@@ -147,30 +155,58 @@ class Executable
     STDERR.puts e.backtrace if $DEBUG
     STDERR.puts "#{RETRY_INTERVAL_SECONDS}秒後にリトライ"
     sleep RETRY_INTERVAL_SECONDS
+    thread = Bbs::create_thread(@settings.current['thread_url'])
     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]"
-    
+    STDERR.puts "Usage: bbiff [OPTIONS] [http://jbbs.shitaraba.net/bbs/read.cgi/CATEGORY/BOARD_ID/THREAD_ID/] [START_NUMBER]"
+
     STDERR.puts <<"EOD"
 
 Bbiff version #{Bbiff::VERSION}
 Copyright © 2016-2019 Yoteichi
+
+          -h, --help
+          --no-render
+          --debug
+          --long-polling (for Genkai)
+          --delay-seconds=N
 EOD
   end
 
   def main
-    if ARGV.include?('-h') || ARGV.include?('--help')
-      raise UsageError
+    args = []
+    ARGV.each do |arg|
+      case arg
+      when '-h', '--help'
+        raise UsageError
+      when '--no-render'
+        @settings.current['no_render'] = true
+      when '--debug'
+        $DEBUG = true
+      when '--long-polling'
+        @settings.current['long_polling'] = true
+      when /\A--delay-seconds=(.+)\z/
+        s = $1
+        if s =~ /\A\d+\z/
+          @settings.current['delay_seconds'] = s.to_i
+        else
+          STDERR.puts "delay-seconds must be a non-negative integer"
+          raise UsageError
+        end
+      when /\A-/
+        STDERR.puts "invalid option #{arg.inspect}"
+        raise UsageError
+      else
+        args << arg
+      end
     end
 
-    if ARGV.size < 1 && !@settings.current['thread_url']
+    if args.size < 1
       raise UsageError
-    elsif ARGV.size < 1
-      url = @settings.current['thread_url']
     else
-      url = ARGV[0]
+      url = args[0]
     end
 
     begin
@@ -188,13 +224,11 @@ EOD
       exit 1
     end
 
-    start_no = ARGV[1] ? ARGV[1].to_i : thread.last + 1
+    start_no = args[1] ? args[1].to_i : thread.last + 1
     start_polling(thread, start_no)
   rescue UsageError
     usage
     exit 1
-  ensure
-    @settings.save
   end
 end
 

data/lib/bbiff/settings.rb

@@ -1,47 +1,16 @@
-require 'fileutils'
-require 'toml'
-
 module Bbiff
 
-class Settings
-  attr_accessor :current
-
-  APP_NAME = 'bbiff'
-
-  def initialize
-    @current = default.dup
-    @config_dir = "#{ ENV['HOME'] }/.config/#{ APP_NAME }"
-    load
-  end
-
-  def default
-    { 'delay_seconds' => 10, 'bbiff_show' => 'bbiff-show' }
-  end
-
-  def load
-    if File.readable?("#{@config_dir}/settings.tml")
-      prefs = TOML.load_file("#{@config_dir}/settings.tml")
-      self.current = current.merge(prefs)
-    end
-  end
+  class Settings
+    attr_accessor :current
 
-  def save
-    FileUtils.mkdir_p(@config_dir)
-    prefs = (current.to_a - default.to_a).to_h
-    File.open("#{@config_dir}/settings.tml", 'w') do |f|
-      f.write(TOML.dump(prefs))
+    def initialize
+      @current = {
+        'delay_seconds' => 7,
+        'bbiff_show' => 'bbiff-show',
+        'no_render' => false,
+        'long_polling' => false,
+      }
     end
   end
 
 end
-
-end
-
-# settings = Bbiff::Settings.new
-
-# p settings.default
-# p settings.current
-
-# settings.current['delay_seconds'] = 7
-# settings.current['thread_url'] = 'http://jbbs.shitaraba.net/bbs/read.cgi/game/48538/1454983964'
-# settings.save

data/lib/bbiff/version.rb

@@ -1,3 +1,3 @@
 module Bbiff
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbiff
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,26 +66,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: toml-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.12
 description: 
 email:
 - plonk@piano.email.ne.jp
 executables:
 - bbiff
-- bbiff-show
 extensions: []
 extra_rdoc_files: []
 files:
@@ -98,13 +83,11 @@ files:
 - Rakefile
 - bbiff.gemspec
 - bin/bbiff
-- bin/bbiff-show
 - lib/bbiff.rb
 - lib/bbiff/bbs_reader.rb
 - lib/bbiff/executable.rb
 - lib/bbiff/res_format.rb
 - lib/bbiff/settings.rb
-- lib/bbiff/show.rb
 - lib/bbiff/version.rb
 homepage: https://github.com/plonk/bbiff
 licenses:

data/bin/bbiff-show

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bbiff'
-
-Bbiff::Show.new.main

data/lib/bbiff/show.rb

@@ -1,31 +0,0 @@
-module Bbiff
-
-class Show
-  class UsageError < StandardError
-  end
-
-  NOTIFY_SEND = 'notify-send'
-
-  def usage
-    STDERR.puts 'Usage: bbiff-show TITLE RES_LINE'
-  end
-
-  def main
-    if ARGV.size != 2
-      raise UsageError
-    end
-
-    title = ARGV[0]
-    post = Bbs::Post.from_s(ARGV[1])
-    notify_send = ENV['BBIFF_NOTIFY_SEND'] || 
-                  (`which #{NOTIFY_SEND}` != "" ? NOTIFY_SEND : 'echo')
-    system("#{notify_send} #{Shellwords.escape(title)} #{Shellwords.escape(render_post(post))}")
-    
-  rescue UsageError
-    usage
-  end
-
-end
-
-end
-