bbiff 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336e7fd7ce040e5bf7ad2ca961c701a8d63067a3
-  data.tar.gz: fe3a180bc855cabb420c60e03d9bb0f7d0e6029b
+  metadata.gz: 0c1a06f19c088ba3f97fb5f001619c04457be919
+  data.tar.gz: 1ddafb3e022314b5faf792730855f8c208987199
 SHA512:
-  metadata.gz: 61480273f52a3b317b240374ccf6b00046562fe18a0a5057fb0411957a144577a4360cfcb7aae013d612503bad38e4f323ea63299d0219b6c717a82a8212d4e5
-  data.tar.gz: d16071eee474e1e909d74276f78b773110e4d1dd06f5652ef8a58d5b731d5b45245fcb2e28171e10364e0aa50678db6e162268adeb06d47082a10b756991fe1d
+  metadata.gz: 212dd524640a9dfbf8882ff9f91866f8c2953de159047226dd163815acc8b0d821c76a3c57dbb46caa2da503d54b6ef508b605280b422794adefc32d79b75927
+  data.tar.gz: a08cbd2ebed22e3504a5a03f3a2c13f3d14485e86147aedc0bd2a24e9585076e45da12ef69810ac5cdfc10f39dc0e50a72705827be0e27f568f3276a792f110c

data/README.md

@@ -17,6 +17,12 @@ notify-send コマンド
 スレッドのURLは http://jbbs.shitaraba.net/bbs/read.cgi/カテゴリ/板ID/スレID/
 の形式です。
 
+単に
+
+	bbiff
+
+とすると、前回監視したスレッドを監視します。
+
 ## 開発・TODO
 
 - .travis.ymlでテストするなら要編集
@@ -34,6 +40,11 @@ ver 0.1.2
 ver 0.1.3
   * インストールすると動かなくなっていたバグを修正。
 
+ver 0.2.0
+  * プログラムの動作状態を表示するようにした。
+  * 設定ファイルを ~/.config/bbiff 以下に置くようにした。
+  * 最後に監視したスレッドを覚えておいて、URLを省略した時のデフォルト
+    にするようにした。
 
 ## 作者
 

data/bbiff.gemspec

@@ -15,10 +15,13 @@ 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 "activesupport", "~> 4.0"
+  spec.add_dependency "unicode-display_width"
+  spec.add_dependency "toml-rb"
 end

data/bin/bbiff

@@ -5,4 +5,4 @@ $LOAD_PATH.unshift File.expand_path( '../../lib', __FILE__)
 
 require 'bbiff'
 
-main
+Bbiff::Executable.new.main

data/bin/bbiff-show

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

data/lib/bbiff.rb

@@ -2,64 +2,6 @@ require 'shellwords'
 require_relative 'bbiff/version'
 require_relative 'bbiff/bbs_reader'
 require_relative 'bbiff/res_format'
-
-def parse_range(str)
-  if str == "all"
-    1..Float::INFINITY
-  elsif str =~ /^\d+$/
-    str.to_i..str.to_i
-  elsif str =~ /^\d+-$/
-    str.to_i..Float::INFINITY
-  elsif str =~ /^(\d+)-(\d+)$/
-    $1.to_i..$2.to_i
-  else
-    fail ArgumentError
-  end
-end
-
-def start_polling(thread, start_no)
-  default_notify_command = 'notify-send'
-  notify_send = ENV['BBIFF_NOTIFY_SEND'] || (system("which #{default_notify_command}") ? default_notify_command : 'echo')
-  loop do
-    thread.posts(parse_range("#{start_no}-")).each do |post|
-      system("#{notify_send} #{Shellwords.escape(render_post(post))}")
-      sleep 1
-    end
-    start_no = thread.last + 1
-    break if start_no >= 1000
-    sleep 10
-  end
-rescue Interrupt
-rescue => e
-  STDERR.puts "error occured #{e.message}"
-  STDERR.puts "retrying..., ^C to quit"
-  sleep 3
-  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 <<"EOD"
-
-Bbiff version #{Bbiff::VERSION}
-Copyright © 2016 Yoteichi
-EOD
-end
-
-def main
-  unless ARGV.size >= 1
-    usage
-    exit 1
-  end
-  url = ARGV[0]
-
-  if url =~ %r{\Ah?ttp://jbbs.shitaraba.net/bbs/read.cgi/(\w+)/(\d+)/(\d+)/?\z}
-    ita = [$1, $2.to_i]
-    sure = $3.to_i
-  end
-
-  thread = Bbs::C板.new(*ita).thread(sure)
-  start_no = ARGV[1] ? ARGV[1].to_i : thread.last + 1
-  start_polling(thread, start_no)
-end
+require_relative 'bbiff/settings'
+require_relative 'bbiff/executable'
+require_relative 'bbiff/show'

data/lib/bbiff/bbs_reader.rb

@@ -20,7 +20,7 @@ class C板
       http.get(@設定URL.path)
     }
     r = 応答.body
-    return r.force_encoding("EUC-JP").encode("UTF-8")
+    return 設定をパーズする(r.force_encoding("EUC-JP").encode("UTF-8"))
   end
 
   def スレ一覧
@@ -52,10 +52,18 @@ class C板
       Thread.new(self, id, title, last)
     end
   end
+
+  private
+
+  def 設定をパーズする(文字列)
+    文字列.each_line.map { |line|
+      line.chomp.split(/=/, 2)
+    }.to_h
+  end
 end
 
 class Post
-  attr_reader :no, :name, :mail, :date, :body
+  attr_reader :no, :name, :mail, :body
 
   def self.from_line(line)
     no, name, mail, date, body, = line.split('<>')
@@ -66,10 +74,18 @@ class Post
     @no = no.to_i
     @name = name
     @mail = mail
-    @date = str2time(date)
+    @date = date
     @body = body
   end
 
+  def date
+    str2time(@date)
+  end
+
+  def to_s
+    [no, name, mail, @date, body].join('<>')
+  end
+
   private
 
   def str2time(str)

data/lib/bbiff/executable.rb

@@ -0,0 +1,155 @@
+require 'unicode/display_width'
+
+module Bbiff
+
+class Executable
+  class LineIndicator
+    def initialize(out = STDOUT)
+      @width = 0
+      @out = out
+    end
+
+    def set_line(str)
+      clear
+      if str[-1] == "\n"
+        if str.rindex("\n") != str.size-1 || str.index("\n") < str.rindex("\n")
+          raise 'multiline' 
+        end
+
+        @out.print str
+        @width = 0
+      else
+        @out.print str
+        @width = mbswidth(str)
+      end
+    end
+
+    def newline
+      @out.print "\n"
+      @width = 0
+    end
+
+    def clear
+      @out.print "\r#{' ' * @width}\r"
+      @width = 0
+    end
+
+    def puts(str)
+      set_line(str)
+      newline
+    end
+
+    private
+
+    def mbswidth(str)
+      Unicode::DisplayWidth.of(str)
+    end
+  end
+
+  def initialize
+    @settings  = Settings.new
+  end
+
+  def parse_range(str)
+    if str == "all"
+      1..Float::INFINITY
+    elsif str =~ /^\d+$/
+      str.to_i..str.to_i
+    elsif str =~ /^\d+-$/
+      str.to_i..Float::INFINITY
+    elsif str =~ /^(\d+)-(\d+)$/
+      $1.to_i..$2.to_i
+    else
+      fail ArgumentError
+    end
+  end
+
+  def start_polling(thread, start_no)
+    out = LineIndicator.new
+    delay = @settings.current['delay_seconds']
+    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']}"
+
+    loop do
+      out.set_line "#{thread.title}(#{thread.last}) 新着レス確認中"
+
+      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)
+
+        sleep 1
+      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
+      end
+    end
+  rescue Interrupt
+    STDERR.puts "\nユーザー割り込みにより停止"
+  rescue => e
+    STDERR.puts "error occured #{e.message}"
+    STDERR.puts "retrying..., ^C to quit"
+    sleep 3
+    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 <<"EOD"
+
+Bbiff version #{Bbiff::VERSION}
+Copyright © 2016 Yoteichi
+EOD
+  end
+
+  def main
+    if ARGV.include?('-h') || ARGV.include?('--help')
+      usage
+      exit 1
+    end
+
+    if ARGV.size < 1 && !@settings.current['thread_url']
+      raise UsageError
+    elsif ARGV.size < 1
+      url = @settings.current['thread_url']
+    else
+      url = ARGV[0]
+
+      if url =~ %r{\Ah?ttp://jbbs.shitaraba.net/bbs/read.cgi/(\w+)/(\d+)/(\d+)/?\z}
+        @settings.current['thread_url'] = url
+      else
+        puts "URLが変です"
+        usage
+        exit 1
+      end
+    end
+
+    if url =~ %r{\Ah?ttp://jbbs.shitaraba.net/bbs/read.cgi/(\w+)/(\d+)/(\d+)/?\z}
+      ita = [$1, $2.to_i]
+      sure = $3.to_i
+    end
+
+    thread = Bbs::C板.new(*ita).thread(sure)
+    start_no = ARGV[1] ? ARGV[1].to_i : thread.last + 1
+    start_polling(thread, start_no)
+  ensure
+    @settings.save
+  end
+end
+
+end

data/lib/bbiff/settings.rb

@@ -0,0 +1,47 @@
+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
+
+  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))
+    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/show.rb

@@ -0,0 +1,31 @@
+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_line(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
+

data/lib/bbiff/version.rb

@@ -1,3 +1,3 @@
 module Bbiff
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbiff
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,11 +66,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: toml-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - plonk@piano.email.ne.jp
 executables:
 - bbiff
+- bbiff-show
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,9 +112,13 @@ 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: