RubyGems - bitclust-core - Versions diffs - 1.7.0 → 1.8.0 - Mend

bitclust-core 1.7.0 → 1.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

checksums.yaml +4 -4
data/data/bitclust/template/class-index +0 -1
data/data/bitclust/template.epub/class +5 -5
data/data/bitclust/template.epub/class-index +0 -1
data/data/bitclust/template.epub/contents +7 -4
data/data/bitclust/template.epub/layout +4 -4
data/data/bitclust/template.offline/class-index +0 -1
data/lib/bitclust/generators/epub.rb +69 -5
data/lib/bitclust/irb.rb +14 -8
data/lib/bitclust/markdown_bridge.rb +11 -6
data/lib/bitclust/markdown_tree.rb +118 -11
data/lib/bitclust/methoddatabase.rb +17 -4
data/lib/bitclust/nameutils.rb +13 -0
data/lib/bitclust/preprocessor.rb +0 -36
data/lib/bitclust/remote.rb +405 -0
data/lib/bitclust/runner.rb +5 -10
data/lib/bitclust/screen.rb +2 -1
data/lib/bitclust/searcher.rb +43 -24
data/lib/bitclust/subcommands/chm_command.rb +1 -1
data/lib/bitclust/subcommands/epub_command.rb +2 -2
data/lib/bitclust/subcommands/extract_command.rb +7 -0
data/lib/bitclust/subcommands/htmlfile_command.rb +7 -0
data/lib/bitclust/subcommands/methods_command.rb +5 -28
data/lib/bitclust/subcommands/query_command.rb +1 -0
data/lib/bitclust/subcommands/server_command.rb +21 -10
data/lib/bitclust/subcommands/setup_command.rb +28 -10
data/lib/bitclust/syntax_highlighter.rb +65 -4
data/lib/bitclust/user_dirs.rb +62 -0
data/lib/bitclust/version.rb +1 -1
data/test/test_chm_command.rb +22 -0
data/test/test_epub_command.rb +60 -0
data/test/test_epub_generator.rb +330 -0
data/test/test_extract_command.rb +45 -0
data/test/test_irb_plugin.rb +100 -6
data/test/test_markdown_bridge.rb +35 -0
data/test/test_markdown_tree.rb +144 -0
data/test/test_mdparser.rb +39 -0
data/test/test_methods_command.rb +32 -0
data/test/test_opensearchdescription_screen.rb +39 -0
data/test/test_query_command.rb +30 -0
data/test/test_remote.rb +374 -0
data/test/test_runner.rb +61 -1
data/test/test_searcher.rb +63 -0
data/test/test_server_command.rb +41 -0
data/test/test_setup_command.rb +143 -0
data/test/test_syntax_highlighter.rb +124 -0
data/test/test_user_dirs.rb +62 -0
metadata +37 -2
data/lib/bitclust/ridatabase.rb +0 -359

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f02fb9cdddf44a8c30df3e0e9d2fa51159db37abb39220e090a5bc94b61c9cf
-  data.tar.gz: ceffcab8cd2c8bdd34d555e104cd8ac0d774f89b4e42296ff26b64f16570ccbd
+  metadata.gz: 299762c07571e6e3b72eebe00c9d1e1d520ef9f5c3b68de759adc0c173d2ee18
+  data.tar.gz: beab538e8caec8fb1f7265808adceaa5574b22793dfb11a521651687204416d1
 SHA512:
-  metadata.gz: 66e1b74b7651e3c12be4d9f55facd88ab6a29def01fae1deb67670191d861a070d95a05c21309e61edf7f43ee7a6f3a948aff410a3bc400eb4b96b5ec6822634
-  data.tar.gz: 680e2945c4225e31b0417495c72945a90824105a7af7d9151a006a30d690fc7b36bd04b9fd4427fad46ab6b1513517c7c052ce49c9ec7913ed3b155402f9fa20
+  metadata.gz: a4d23713bd97acaa6cb98de51e95766c87f09329c0dba4c2b42152838023ec4ce681f1c7f38db582b7e3e20809a2749152da84a74399741dc113ad9251f0875d
+  data.tar.gz: ce441c5b5a4abc9cbef8a46bf9efa2a57a5cae8bdd827c9edf7af095e60bea9c95a85ceee54baa73e850b0a7a4682b1d5afd41ce41e386040e78761ca88038fd

data/data/bitclust/template/class-index CHANGED Viewed

@@ -29,5 +29,4 @@
     end
     headline_pop
 %>
-</ul>

data/data/bitclust/template.epub/class CHANGED Viewed

@@ -24,20 +24,20 @@
 <% end %>
 <% unless @entry.extended.empty? %>
-<br>extend: <%= @entry.extended.map {|c| class_link(c.name) }.join(', ') %>
+<br />extend: <%= @entry.extended.map {|c| class_link(c.name) }.join(', ') %>
 <% end %>
 <% unless @entry.aliases.empty? %>
-<br>aliases: <%=h @entry.aliases.map{|c| c.name}.join(', ') %>
+<br />aliases: <%=h @entry.aliases.map{|c| c.name}.join(', ') %>
 <% end %>
 <% unless @entry.dynamically_included.empty? %>
-<br> dynamic include:
+<br /> dynamic include:
  <%= @entry.dynamically_included.map{|m|
        class_link(m.name) + " (by " + library_link(m.library.name) + ")"
      }.join(", ")
  %>
 <% end %>
 <% unless @entry.dynamically_extended.empty? %>
-<br> dynamic extend:
+<br /> dynamic extend:
  <%= @entry.dynamically_extended.map{|m|
        class_link(m.name) + " (by " + library_link(m.library.name) + ")"
      }.join(", ")
@@ -72,7 +72,7 @@
   entries.each do |m|
     m.names.each do |mname|
 %>
-<a href="#<%= m.index_id %>"><%= "#{prefix}#{mname}" %></a>
+<a href="#<%= m.index_id %>"><%= escape_html "#{prefix}#{mname}" %></a>
 <%
     end
   end

data/data/bitclust/template.epub/class-index CHANGED Viewed

@@ -25,4 +25,3 @@
     end
     headline_pop
 %>
-</ul>

data/data/bitclust/template.epub/contents CHANGED Viewed

@@ -8,15 +8,18 @@
   </metadata>
   <manifest>
     <item id="toc" properties="nav" href="nav.xhtml" media-type="application/xhtml+xml" />
-    <item id="index" href="OEBPS/doc/index.html" media-type="application/xhtml+xml" />
-<% items.each do |item| -%>
-    <item id="<%= item[:id] %>" href="<%= item[:path] %>" media-type="application/xhtml+xml" />
+    <item id="index" href="OEBPS/doc/index.xhtml" media-type="application/xhtml+xml" />
+<% class_items.each do |item| -%>
+    <item id="<%= item[:id] %>" href="<%= item[:path] %>" media-type="<%= item[:media_type] %>" />
+<% end -%>
+<% other_items.each do |item| -%>
+    <item id="<%= item[:id] %>" href="<%= item[:path] %>" media-type="<%= item[:media_type] %>" />
 <% end -%>
   </manifest>
   <spine>
     <itemref idref="toc" />
     <itemref idref="index" />
-<% items.each do |item| -%>
+<% class_items.each do |item| -%>
     <itemref idref="<%= item[:id] %>" />
 <% end -%>
   </spine>

data/data/bitclust/template.epub/layout CHANGED Viewed

@@ -2,10 +2,10 @@
 <!DOCTYPE html>
 <html lang="ja-JP">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%=h charset() %>">
-  <meta http-equiv="Content-Language" content="ja-JP">
-  <link rel="stylesheet" type="text/css" href="<%=h css_url() %>">
-  <link rel="icon" type="image/png" href="<%=h favicon_url() %>">
+  <meta http-equiv="Content-Type" content="text/html; charset=<%=h charset() %>" />
+  <meta http-equiv="Content-Language" content="ja-JP" />
+  <link rel="stylesheet" type="text/css" href="<%=h css_url() %>" />
+  <link rel="icon" type="image/png" href="<%=h favicon_url() %>" />
   <title><%=h @title %> (Ruby <%=h ruby_version %>)</title>
 </head>
 <body>

data/data/bitclust/template.offline/class-index CHANGED Viewed

@@ -54,5 +54,4 @@
     end
     headline_pop
 %>
-</ul>
 </main>

data/lib/bitclust/generators/epub.rb CHANGED Viewed

@@ -24,11 +24,17 @@ module BitClust
       CONTENTS_DIR_NAME = 'OEBPS'
+      # StatichtmlCommand が出力ルートに書く 2 行のリダイレクト用スタブ
+      # (<meta http-equiv="refresh"> と <a>)。ルート要素が無く XHTML として
+      # 整形式でない。EPUB の入口は nav.xhtml なのでスタブは同梱せず削除する
+      INDEX_STUB_NAME = 'index.xhtml'
       def generate
         make_epub_directory do |epub_directory|
           contents_directory = epub_directory + CONTENTS_DIR_NAME
           copy_static_files(epub_directory)
           generate_xhtml_files(contents_directory)
+          remove_index_stub(contents_directory)
           generate_contents_opf(epub_directory)
           pack_epub(epub_directory)
         end
@@ -71,15 +77,45 @@ module BitClust
         cmd.exec(argv, options)
       end
+      # manifest に id="index" で固定的に載せる doc/index ページの href
+      # (epub_directory 相対)。other_items からは除いて二重掲載を避ける
+      INDEX_PATH = Pathname.new("#{CONTENTS_DIR_NAME}/doc/index.xhtml")
+      MEDIA_TYPES = {
+        '.xhtml' => 'application/xhtml+xml',
+        '.css'   => 'text/css',
+        '.js'    => 'application/javascript',
+        '.png'   => 'image/png',
+        '.jpg'   => 'image/jpeg',
+        '.jpeg'  => 'image/jpeg',
+        '.gif'   => 'image/gif',
+        '.svg'   => 'image/svg+xml',
+      }.freeze
       def generate_contents_opf(epub_directory)
-        items = [] #: Array[{:id => String, :path => Pathname}]
+        class_items = [] #: Array[{:id => String, :path => Pathname, :media_type => String}]
         glob_relative_path(epub_directory, "#{CONTENTS_DIR_NAME}/class/*.xhtml").each do |path|
-          items << {
-            :id => decodename_package(path.basename(".*").to_s),
-            :path => path
+          class_items << {
+            :id => "class-#{decodename_package(path.basename(".*").to_s)}",
+            :path => path,
+            :media_type => media_type_for(path),
           }
         end
-        items.sort_by!{|item| item[:path] }
+        class_items.sort_by!{|item| item[:path] }
+        excluded_paths = class_items.map{|item| item[:path] } + [INDEX_PATH]
+        other_items = [] #: Array[{:id => String, :path => Pathname, :media_type => String}]
+        oebps_file_paths(epub_directory).each do |path|
+          next if excluded_paths.include?(path)
+          other_items << {
+            :id => manifest_id_for(path),
+            :path => path,
+            :media_type => media_type_for(path),
+          }
+        end
+        other_items.sort_by!{|item| item[:path] }
         template = (@templatedir + "contents").read
         if ::ERB.instance_method(:initialize).parameters.last.first == :key
           erb = ::ERB.new(template, trim_mode: '-')
@@ -92,6 +128,34 @@ module BitClust
         end
       end
+      # OEBPS 配下の通常ファイル全部(method/library/doc/function ページと、
+      # statichtml がコピーした CSS・画像)を epub_directory 相対で返す。
+      # class ページも含む(呼び出し側で class_items と重複排除する)
+      def oebps_file_paths(epub_directory)
+        glob_relative_path(epub_directory, "#{CONTENTS_DIR_NAME}/**/*").select do |relative_path|
+          (epub_directory + relative_path).file?
+        end
+      end
+      def media_type_for(path)
+        MEDIA_TYPES[path.extname.downcase] || 'application/octet-stream'
+      end
+      # class ページ以外("OEBPS/method/Array/i/each.xhtml" 等)の manifest
+      # item id。XML の NCName として妥当で一意になるよう、使えない文字は "-" に
+      # 置き換え、ディレクトリ境界は "--" にして encodename 由来の "-" と
+      # 区別する
+      def manifest_id_for(path)
+        relative = path.to_s.sub(%r{\A#{Regexp.escape(CONTENTS_DIR_NAME)}/}, "")
+        segments = relative.split("/").map{|segment| segment.gsub(/[^A-Za-z0-9_.-]/, "-") }
+        "item-#{segments.join('--')}"
+      end
+      def remove_index_stub(contents_directory)
+        stub_path = contents_directory + INDEX_STUB_NAME
+        FileUtils.rm_f(stub_path.to_s, :verbose => @verbose) if stub_path.file?
+      end
       def pack_epub(epub_directory)
         epub_filename = @outputdir + @filename
         Dir.chdir(epub_directory.to_s) do

data/lib/bitclust/irb.rb CHANGED Viewed

@@ -2,8 +2,9 @@
 #
 # irb からるりま(Ruby リファレンスマニュアル)を引く refe コマンド。
 # ~/.irbrc に `require "bitclust/irb"` と書くと irb に `refe` コマンドが
-# 登録される。検索対象の DB は refe コマンドと同じ場所
-# (bitclust setup が作る ~/.bitclust/config)から探す。
+# 登録される。検索対象の DB は refe コマンドと同じ場所(bitclust setup が
+# 作る設定ファイル)から探し、DB が無ければ docs.ruby-lang.org の検索索引と
+# Markdown 配信から取得する(BitClust::Remote)。
 require 'stringio'
 require 'bitclust'
@@ -18,15 +19,18 @@ module BitClust
         refe String#gsub     インスタンスメソッド
         refe Array.new       特異メソッド
         refe Comparable      クラス・モジュール
-        refe printf          名前だけでの検索
+        refe each            名前だけでの検索(該当が複数なら一覧)
-      DB が無い場合は `bitclust setup` で作成してください。
+      DB が無い場合は docs.ruby-lang.org から取得します(1 日キャッシュ)。
+      `bitclust setup` で DB を作ると手元で検索できます。
     USAGE
     # pattern を検索して整形済みテキストを io へ書く。db が nil なら
-    # 既定の場所から探す。検索の失敗は例外にせず io へメッセージを書く
-    # (irb セッションを止めないため)
-    def self.lookup(pattern, io: $stdout, db: nil)
+    # 既定の場所から探し、そこにも無ければ remote(省略時は
+    # Remote.default。nil ならフォールバックしない)で検索する。
+    # 検索の失敗は例外にせず io へメッセージを書く(irb セッションを
+    # 止めないため)
+    def self.lookup(pattern, io: $stdout, db: nil, remote: Remote.default)
       words = pattern.to_s.split
       if words.empty?
         io.puts USAGE
@@ -35,7 +39,9 @@ module BitClust
       view = TerminalView.new(Plain.new,
                               { describe_all: false, line: false, encoding: nil },
                               io: io)
-      Searcher.new.run_query(db, words, view)
+      searcher = Searcher.new
+      searcher.remote = remote
+      searcher.run_query(db, words, view)
     rescue BitClust::UserError => err
       io.puts err.message
     end

data/lib/bitclust/markdown_bridge.rb CHANGED Viewed

@@ -134,12 +134,17 @@ module BitClust
         reopen_only = members[path][:kinds].all? { |kind, _| %w[reopen redefine].include?(kind) }
         [reopen_only ? 1 : 0, path]
       end
-      "\n" + sorted.map { |path|
-        m = members[path][:memberships].find { |mm| mm[:library] == libname } || raise
-        inc = "\#@include(#{relative(emitted[path], base)})\n"
-        inc = "\#@since #{m[:since]}\n#{inc}\#@end\n" if m[:since]
-        inc = "\#@until #{m[:until]}\n#{inc}\#@end\n" if m[:until]
-        inc
+      # 同じライブラリへの membership が複数ある（#%version A...B の #%else =
+      # A 未満と B 以上）ときは、それぞれのゲートで include サイトを繰り返す
+      "\n" + sorted.flat_map { |path|
+        members[path][:memberships].select { |mm| mm[:library] == libname }.map { |m|
+          inc = "\#@include(#{relative(emitted[path], base)})\n"
+          inc = "\#@since #{m[:since]}\n#{inc}\#@end\n" if m[:since]
+          inc = "\#@until #{m[:until]}\n#{inc}\#@end\n" if m[:until]
+          inc = "\#@if (version == \"#{m[:version]}\")\n#{inc}\#@end\n" if m[:version]
+          (m[:except] || []).each { |x| inc = "\#@if (version != \"#{x}\")\n#{inc}\#@end\n" }
+          inc
+        }
       }.join
     end

data/lib/bitclust/markdown_tree.rb CHANGED Viewed

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
+require 'bitclust/exception'
+require 'bitclust/preprocessor'
 module BitClust
   # 新パイプラインのファイル発見（MARKUP_SPEC §1.1）。
   #
@@ -116,36 +119,45 @@ module BitClust
       if lines[0] =~ /\A---\s*\z/
         i = 1
         in_library_block = false
-        gate_stack = [] #: Array[[Symbol, String?]]
+        gate_stack = [] #: Array[list_gate]
         while i < lines.length && lines[i] !~ /\A---\s*\z/
           line = lines[i]
           if in_library_block
-            # 多重所属のゲート付きリスト（MARKUP_SPEC §1.2）。
+            # 多重所属のゲート付きリスト（MARKUP_SPEC §1.2.1）。
             # 項目は積まれているゲートをすべてまとって membership になる
             case line
             when /\A\s+- (\S+)/
-              m = { library: $1 }
-              gate_stack.each { |kind, ver| m[kind] = ver }
-              info[:memberships] << m
+              info[:memberships].concat gated_memberships($1 || raise, gate_stack)
+              i += 1; next
+            when /\A\#[@%]\#/   # 前処理コメント（Preprocessor と同じく無視）
+              i += 1; next
+            when /\A\#[@%]/
+              list_directive(line, gate_stack, path, i + 1)
+              i += 1; next
+            when /\A\s+\#[@%]/
+              # 列 0 でない #% 行は Preprocessor でも指令にならない（YAML の
+              # コメント扱い）。ゲートが無音で無視されないようエラーにする
+              raise ParseError, "#{path}:#{i + 1}: preprocessor directive must start at column 0: #{line.strip}"
+            when /\A\s+\#/   # YAML コメント
               i += 1; next
-            when /\A\#[@%]since\s+(\S+)/ then gate_stack.push([:since, $1]); i += 1; next
-            when /\A\#[@%]until\s+(\S+)/ then gate_stack.push([:until, $1]); i += 1; next
-            when /\A\#[@%]end\s*\z/ then gate_stack.pop; i += 1; next
             else
-              in_library_block = false  # ブロック終端。この行は通常キーとして処理
+              # ブロック終端。この行は通常キーとして処理
+              list_end(gate_stack, path, i + 1)
+              in_library_block = false
             end
           end
           case line
           when /\Atype:\s*library\s*\z/ then info[:library_file] = true
           when /\Aname:\s*(\S+)/ then info[:name] = $1
-          when /\Alibrary:\s*\z/ then in_library_block = true; gate_stack = [] #: Array[[Symbol, String?]]
-          when /\Alibrary:\s*(\S+)/ then info[:memberships] << { library: $1 }
+          when /\Alibrary:\s*\z/ then in_library_block = true; gate_stack = [] #: Array[list_gate]
+          when /\Alibrary:\s*(\S+)/ then info[:memberships] << { library: $1 || raise }
           when /\Asince:\s*"?([^"\s]+)"?/ then info[:since] = $1
           when /\Auntil:\s*"?([^"\s]+)"?/ then info[:until] = $1
           when RELATION_KEY_RE then info[:front_matter_relations] = true
           end
           i += 1
         end
+        list_end(gate_stack, path, i + 1) if in_library_block
         i += 1
       end
       info[:library] = info[:memberships].dig(0, :library)
@@ -190,6 +202,101 @@ module BitClust
       info
     end
+    # --- front matter ゲート付きリストのディレクティブ ---
+    # 本文側 Preprocessor と同じ集合のうち #%since/#%until/#%version/#%else/#%end
+    # を解釈する。#%if（任意の条件式）は非対応。解釈できない行は無音で
+    # リストを打ち切らず ParseError にする（本文側の unknown directive と同じ扱い）。
+    #
+    # ゲート1段は clause の選言。clause は since（以上）/until（未満）/
+    # version（その版のみ）/except（その版以外）の交差で、#%else は直前ゲートの
+    # 補集合（#%version A...B なら「A 未満」または「B 以上」の 2 clause）
+    def list_directive(line, stack, path, lineno)
+      err = ->(msg) { raise ParseError, "#{path}:#{lineno}: #{msg}: #{line.strip}" }
+      case line
+      when /\A\#[@%](since|until)\b(.*)/
+        kind, raw = $1, $2 || raise
+        ver = version_literal(raw.strip) or err.("wrong conditional expr")
+        clause = kind == 'since' ? { since: ver } : { until: ver } #: gate_clause
+        stack.push({ clauses: [clause], elsed: false })
+      when /\A\#[@%]version\b(.*)/
+        clause = version_range(($1 || raise).strip) or
+          err.("wrong version range (expected V / A...B / A... / ...B)")
+        stack.push({ clauses: [clause], elsed: false })
+      when /\A\#[@%]if\b/
+        err.("#%if is not supported in front matter library list (use #%since/#%until/#%version/#%else)")
+      when /\A\#[@%]else\s*\z/
+        gate = stack.last or err.("no matching #%since/#%until/#%version")
+        err.("duplicate #%else") if gate[:elsed]
+        stack[-1] = { clauses: gate[:clauses].flat_map { |c| complement(c) }, elsed: true }
+      when /\A\#[@%]end\s*\z/
+        stack.pop or err.("no matching #%since/#%until/#%version")
+      else
+        err.("unknown preprocessor directive")
+      end
+    end
+    def list_end(stack, path, lineno)
+      return if stack.empty?
+      raise ParseError, "#{path}:#{lineno}: unterminated #%since/#%until/#%version in front matter library list"
+    end
+    VERSION_LITERAL = Preprocessor::VERSION_LITERAL
+    def version_literal(raw)
+      raw =~ /\A#{VERSION_LITERAL}\z/o ? ($1 || $2) : nil
+    end
+    # #%version の版範囲（Preprocessor#build_cond_by_range と同じ記法）
+    def version_range(raw)
+      case raw
+      when /\A#{VERSION_LITERAL}\.\.\.#{VERSION_LITERAL}\z/o
+        { since: $1 || $2 || raise, until: $3 || $4 || raise }
+      when /\A#{VERSION_LITERAL}\.\.\.\z/o then { since: $1 || $2 || raise }
+      when /\A\.\.\.#{VERSION_LITERAL}\z/o then { until: $1 || $2 || raise }
+      when /\A#{VERSION_LITERAL}\z/o then { version: $1 || $2 || raise }
+      end
+    end
+    def complement(clause)
+      return [{ except: [clause[:version] || raise] }] if clause[:version]
+      alts = [] #: Array[gate_clause]
+      alts << { until: clause[:since] || raise } if clause[:since]
+      alts << { since: clause[:until] || raise } if clause[:until]
+      alts
+    end
+    # 積まれた全ゲートの交差。各段が選言なので組合せごとに1つの membership
+    # （矛盾する組合せ = 異なる単一版どうしは捨てる）
+    def gated_memberships(library, stack)
+      seed = [{}] #: Array[gate_clause]
+      combos = stack.inject(seed) { |acc, gate|
+        acc.product(gate[:clauses]).filter_map { |a, b| intersect(a, b) }
+      }
+      combos.map { |c|
+        m = { library: library } #: membership
+        m[:since] = c[:since] || raise if c[:since]
+        m[:until] = c[:until] || raise if c[:until]
+        m[:version] = c[:version] || raise if c[:version]
+        m[:except] = c[:except] || raise if c[:except]
+        m
+      }
+    end
+    def intersect(a, b)
+      r = {} #: gate_clause
+      sinces = [a[:since], b[:since]].compact
+      r[:since] = sinces.max_by { |v| Gem::Version.new(v) } || raise unless sinces.empty?
+      untils = [a[:until], b[:until]].compact
+      r[:until] = untils.min_by { |v| Gem::Version.new(v) } || raise unless untils.empty?
+      versions = [a[:version], b[:version]].compact.uniq
+      return nil if versions.size > 1
+      r[:version] = versions.first if versions.size == 1
+      excepts = (a[:except] || []) + (b[:except] || [])
+      r[:except] = excepts.uniq unless excepts.empty?
+      r
+    end
     # 大文字小文字のみが異なる名前は macOS/Windows の case-insensitive FS で
     # チェックアウト不能になるため、衝突を警告する（途中のディレクトリ名も見る）
     def warn_case_collisions(files)

data/lib/bitclust/methoddatabase.rb CHANGED Viewed

@@ -186,7 +186,7 @@ module BitClust
         # membership を持つライブラリだけがメンバーとして取り込む
         members = tree.entities.select { |_, e|
           e[:memberships].any? { |m|
-            m[:library] == libname && md_version_covers?(version, m[:since], m[:until])
+            m[:library] == libname && md_gate_covers?(version, m)
           }
         }
         sorted = members.keys.sort_by { |path|
@@ -211,12 +211,25 @@ module BitClust
     # since は「その版以降」、until は「その版未満」（ブリッジの
     # #@since/#@until ラッパーと同じ意味論）
     def md_version_covers?(version, since_version, until_version)
+      gate = {} #: MarkdownTree::gate_clause
+      gate[:since] = since_version if since_version
+      gate[:until] = until_version if until_version
+      md_gate_covers?(version, gate)
+    end
+    private :md_version_covers?
+    # membership のゲート（MarkdownTree の since/until/version/except）がこの版を
+    # 含むか。version は「その版のみ」、except は「その版以外」（#%version V と
+    # その #%else）。比較は Gem::Version なので 3.4 と 3.4.0 は同じ版
+    def md_gate_covers?(version, gate)
       v = Gem::Version.new(version)
-      return false if since_version && v < Gem::Version.new(since_version)
-      return false if until_version && v >= Gem::Version.new(until_version)
+      return false if (s = gate[:since]) && v < Gem::Version.new(s)
+      return false if (u = gate[:until]) && v >= Gem::Version.new(u)
+      return false if (only = gate[:version]) && v != Gem::Version.new(only)
+      return false if (except = gate[:except]) && except.any? { |x| v == Gem::Version.new(x) }
       true
     end
-    private :md_version_covers?
+    private :md_gate_covers?
     def refs
       @refs ||= RefsDatabase.load(realpath('refs'))

data/lib/bitclust/nameutils.rb CHANGED Viewed

@@ -222,6 +222,19 @@ module BitClust
       Gem::Version.new(version) >= Gem::Version.new('4.0') ? '?.' : mark
     end
+    # refe の検索パターン("String#gsub"・"Array.new"・"Kernel.#printf" や
+    # "," を "#" の代用にした "String,gsub" など)を [クラス名, typemark,
+    # メソッド名] に分ける。区切りは反転文字列上で探す。"?." は 4.0 以降の
+    # module function の表示形式(反転すると ".?")で、内部表記の ".#" に
+    # 正規化する
+    def parse_method_spec_pattern(pat)
+      _m, _t, _c = pat.reverse.split(/([\#,]\.|\.[\#,]|\.\?|[\#\.\,])/, 2)
+      c = (_c || raise).reverse
+      t = (_t || raise).tr(',', '#').sub(/\#\.|\.\?/, '.#')
+      m = (_m || raise).reverse
+      return c, t, m
+    end
     def functionname?(n)
       /\A\w+\z/ =~ n ? true : false
     end

data/lib/bitclust/preprocessor.rb CHANGED Viewed

@@ -343,40 +343,4 @@ module BitClust
       end
     end
   end
-  # Used by tools/stattodo.rb
-  class LineCollector < LineFilter
-    def LineCollector.process(path)
-      fopen(path) {|f|
-        return wrap(f).to_a
-      }
-    end
-    def LineCollector.wrap(f)
-      new(LineStream.new(f))
-    end
-    private
-    def next_line(f)
-      while line = f.gets
-        if /\A\#[@%]include\s*\((.*?)\)/ =~ line
-          begin
-            file = ($1 || raise).strip
-            basedir = File.dirname(line.location.file || raise)
-            @buf.concat LineCollector.process("#{basedir}/#{file}")
-          rescue Errno::ENOENT => _err
-            raise WrongInclude, "#{line.location}: \#@include'ed file not exist: #{file}"
-          end
-        else
-          @buf.push line
-        end
-        break unless @buf.empty?
-      end
-      @buf.shift
-    end
-  end
 end