bitclust-core 1.3.0 → 1.6.0

data/lib/bitclust/subcommands/setup_command.rb

@@ -20,7 +20,7 @@ module BitClust
         @prepare = nil
         @cleanup = nil
         @purge = nil
-        @versions = ["2.4.0", "2.5.0", "2.6.0"]
+        @versions = ["3.3.0", "3.4.0", "4.0.0"]
         @update = true
         @parser.banner = "Usage: #{File.basename($0, '.*')} setup [options]"
         @parser.on('--prepare', 'Prepare config file and checkout repository. Do not create database.') {
@@ -40,6 +40,11 @@ module BitClust
         }
       end
 
+      # DB は ~/.bitclust 配下に自前で作るのでグローバル --database は不要
+      def needs_database?
+        false
+      end
+
       def exec(argv, options)
         purge if @purge
         prepare
@@ -49,18 +54,18 @@ module BitClust
           prefix = "#{@config[:database_prefix]}-#{version}"
           FileUtils.rm_rf(prefix) if @cleanup
           init_argv = ["version=#{version}", "encoding=#{@config[:encoding]}"]
-          init_options = { :prefix => prefix }
+          # @type var init_options: Subcommand::options
+          init_options = { :prefix => prefix, :capi => false }
           InitCommand.new.exec(init_argv, init_options)
-          update_method_database(prefix, ["--stdlibtree=#{@config[:stdlibtree]}"])
-          update_argv = Pathname(@config[:capi_src]).children.select(&:file?).map{|v| v.realpath.to_s }
-          update_function_database(prefix, update_argv)
+          update_method_database(prefix, ["--markdowntree=#{@config[:mdtree]}"])
+          update_function_database(prefix, ["--markdowntree=#{@config[:capi_mdtree]}"])
         end
       end
 
       private
 
       def purge
-        home_directory = Pathname(ENV["HOME"])
+        home_directory = Pathname(ENV.fetch("HOME"))
         config_dir = home_directory + ".bitclust"
         print "Remove all generated files..."
         FileUtils.rm_rf(config_dir.to_s)
@@ -69,7 +74,7 @@ module BitClust
       end
 
       def prepare
-        home_directory = Pathname(ENV["HOME"]).expand_path
+        home_directory = Pathname(ENV.fetch("HOME")).expand_path
         config_dir = home_directory + ".bitclust"
         config_dir.mkpath
         config_path = config_dir + "config"
@@ -79,17 +84,24 @@ module BitClust
           :encoding        => "utf-8",
           :versions        => @versions,
           :default_version => @versions.max,
-          :stdlibtree      => (rubydoc_dir + "refm/api/src").to_s,
-          :capi_src        => (rubydoc_dir + "refm/capi/src/").to_s,
+          :mdtree          => (rubydoc_dir + "manual/api").to_s,
+          :capi_mdtree     => (rubydoc_dir + "manual/capi").to_s,
           :baseurl         => "http://localhost:10080",
           :port            => "10080",
           :pid_file        => "/tmp/bitclust.pid",
         }
         if config_path.exist?
           @config = YAML.load_file(config_path)
+          unless @config[:mdtree]
+            # Markdown 移行(2026-07)前の設定ファイル。ソースの取得形態が
+            # 変わっているため、作り直しを案内する
+            warn "Old config file (before the Markdown migration) found: #{config_path}"
+            warn "Run `#{File.basename($0, '.*')} setup --purge` and setup again."
+            exit 1
+          end
           unless @config[:versions].sort == @versions.sort
             print("overwrite config file? > [y/N]")
-            if /\Ay\z/i =~ $stdin.gets.chomp
+            if /\Ay\z/i =~ $stdin.gets&.chomp
               @config[:versions] = @versions
               @config[:default_version] = @versions.max
               generate_config(config_path, @config)
@@ -132,6 +144,7 @@ module BitClust
       end
 
       def update_method_database(prefix, argv)
+        # @type var options: Subcommand::options
         options = {
           :prefix => prefix,
           :capi => false,
@@ -142,6 +155,7 @@ module BitClust
       end
 
       def update_function_database(prefix, argv)
+        # @type var options: Subcommand::options
         options = {
           :prefix => prefix,
           :capi => true,

data/lib/bitclust/subcommands/statichtml_command.rb

@@ -12,6 +12,7 @@ require 'bitclust/nameutils'
 require 'bitclust/subcommand'
 require 'bitclust/progress_bar'
 require 'bitclust/silent_progress_bar'
+require 'bitclust/search_index_generator'
 
 module BitClust
   module Subcommands
@@ -45,7 +46,7 @@ module BitClust
         end
 
         def method_url(spec)
-          cname, tmark, mname = *split_method_spec(spec)
+          cname, tmark, mname = split_method_spec(spec)
           filename = html_filename(encodename_package(mname), @suffix)
           @bitclust_html_base +
             "/method/#{encodename_package(cname)}/#{typemark2char(tmark)}/#{filename}"
@@ -90,7 +91,7 @@ module BitClust
         end
 
         def edit_url(location)
-          "#{@edit_base_url}/#{location.file}#L#{location.line}".sub(/([^:])\/\/+/, "\\1/")
+          "#{@edit_base_url}/#{location.file}".sub(/([^:])\/\/+/, "\\1/")
         end
 
         def encodename_package(str)
@@ -120,6 +121,10 @@ module BitClust
         @gtm_tracking_id = nil
         @meta_robots_content = ["noindex"]
         @stop_on_syntax_error = true
+        @eol_warning = false
+        @run_ruby_wasm = nil
+        @sitemap_baseurl = nil
+        @sitemap_paths = []
         @parser.banner = "Usage: #{File.basename($0, '.*')} statichtml [options]"
         @parser.on('-o', '--outputdir=PATH', 'Output directory') do |path|
           begin
@@ -156,6 +161,15 @@ module BitClust
         @parser.on('--meta-robots-content=VALUE1,VALUE2,...', Array, 'HTML <meta> element: <meta name="robots" content="VALUE1,VALUE2..."') do |values|
           @meta_robots_content = values
         end
+        @parser.on('--[no-]eol-warning', 'Show a warning banner that this Ruby version is no longer maintained') do |boolean|
+          @eol_warning = boolean
+        end
+        @parser.on('--run-ruby-wasm=WASM_URL', 'Add a RUN button to Ruby sample code, executing it in-browser with the given ruby.wasm') do |url|
+          @run_ruby_wasm = url
+        end
+        @parser.on('--sitemap-baseurl=URL', 'Generate sitemap.xml under the output directory, with <loc> built from this base URL (e.g. https://docs.ruby-lang.org/ja/3.4/). Omit to skip sitemap.xml generation (default)') do |url|
+          @sitemap_baseurl = url
+        end
         @parser.on('--no-stop-on-syntax-error', 'Do not stop on syntax error') do |boolean|
           @stop_on_syntax_error = boolean
         end
@@ -173,7 +187,7 @@ module BitClust
         manager = ScreenManager.new(@manager_config)
 
         db.transaction do
-          methods = {}
+          methods = {} #: Hash[String, Array[MethodEntry]]
           db.methods.each_with_index do |entry, i|
             next if entry.undefined?
 
@@ -193,22 +207,33 @@ module BitClust
         end
 
         @urlmapper.bitclust_html_base = '..'
-        create_file(@outputdir + "library/#{html_filename("index", @suffix)}",
+        library_index_path = @outputdir + "library/#{html_filename("index", @suffix)}"
+        create_file(library_index_path,
                     manager.library_index_screen(db.libraries.sort, {:database => db}).body,
                     :verbose => @verbose)
-        create_file(@outputdir + "class/#{html_filename("index", @suffix)}",
+        record_sitemap_path(library_index_path)
+        class_index_path = @outputdir + "class/#{html_filename("index", @suffix)}"
+        create_file(class_index_path,
                     manager.class_index_screen(db.classes.sort, {:database => db}).body,
                     :verbose => @verbose)
-        create_file(@outputdir + "function/#{html_filename("index", @suffix)}",
+        record_sitemap_path(class_index_path)
+        function_index_path = @outputdir + "function/#{html_filename("index", @suffix)}"
+        create_file(function_index_path,
                     manager.function_index_screen(fdb.functions.sort, { :database => fdb }).body,
                     :verbose => @verbose)
+        record_sitemap_path(function_index_path)
         create_index_html(@outputdir)
+        create_search_index(@outputdir, db, fdb)
+        if baseurl = @sitemap_baseurl
+          create_sitemap(@outputdir, baseurl)
+        end
         FileUtils.cp(@manager_config[:themedir] + @manager_config[:css_url],
                      @outputdir.to_s, :verbose => @verbose, :preserve => true)
         FileUtils.cp(@manager_config[:themedir] + "syntax-highlight.css",
                      @outputdir.to_s, :verbose => @verbose, :preserve => true)
         FileUtils.cp(@manager_config[:themedir] + "script.js",
                      @outputdir.to_s, :verbose => @verbose, :preserve => true)
+        copy_run_ruby_wasm_script if @run_ruby_wasm
         FileUtils.cp(@manager_config[:themedir] + @manager_config[:favicon_url],
                      @outputdir.to_s, :verbose => @verbose, :preserve => true)
         Dir.mktmpdir do |tmpdir|
@@ -240,6 +265,8 @@ module BitClust
           :gtm_tracking_id => @gtm_tracking_id,
           :meta_robots_content => @meta_robots_content,
           :stop_on_syntax_error => @stop_on_syntax_error,
+          :eol_warning => @eol_warning,
+          :run_ruby_wasm => @run_ruby_wasm,
         }
         @manager_config[:urlmapper] = URLMapperEx.new(@manager_config)
         @urlmapper = @manager_config[:urlmapper]
@@ -290,6 +317,101 @@ HERE
         }
       end
 
+      SEARCH_JS_FILES = %w[
+        search_navigation.js search_ranker.js search_controller.js search_init.js
+      ].freeze
+
+      def create_search_index(outputdir, db, fdb)
+        generator = SearchIndexGenerator.new(suffix: @suffix,
+                                             fs_casesensitive: @fs_casesensitive)
+        jsdir = outputdir + "js"
+        FileUtils.mkdir_p(jsdir) unless jsdir.directory?
+        create_file(jsdir + "search_data.js",
+                    generator.to_js(db, fdb),
+                    :verbose => @verbose)
+        themedir = @manager_config[:themedir]
+        SEARCH_JS_FILES.each do |js|
+          FileUtils.cp(themedir + "js" + js, jsdir.to_s,
+                       :verbose => @verbose, :preserve => true)
+        end
+        # Ship the MIT notice for the vendored Aliki files alongside them.
+        FileUtils.cp(themedir + "js" + "NOTICE", jsdir.to_s,
+                     :verbose => @verbose, :preserve => true)
+        FileUtils.cp(themedir + "search.css", outputdir.to_s,
+                     :verbose => @verbose, :preserve => true)
+      end
+
+      # A single sitemap.xml file supports at most 50,000 URLs
+      # (https://www.sitemaps.org/protocol.html#index). Splitting into a
+      # sitemap index is out of scope for now (small start); if the site
+      # grows past this, only the first MAX_SITEMAP_URLS pages are listed
+      # and a warning is printed.
+      MAX_SITEMAP_URLS = 50_000
+
+      # The 5 characters that need escaping to embed arbitrary text as XML
+      # character data (used for the <loc> contents below).
+      XML_ESCAPES = {
+        '&' => '&amp;',
+        '<' => '&lt;',
+        '>' => '&gt;',
+        '"' => '&quot;',
+        "'" => '&apos;',
+      }.freeze
+
+      def escape_xml(str)
+        str.gsub(/[&<>"']/) {|c| XML_ESCAPES.fetch(c) }
+      end
+
+      # Remember +path+ (an HTML page actually written under @outputdir) so
+      # that create_sitemap can list it later. A no-op unless
+      # --sitemap-baseurl was given, so sitemap generation has no effect on
+      # the rest of the run when the option is not used.
+      def record_sitemap_path(path)
+        return unless @sitemap_baseurl
+        @sitemap_paths << path.relative_path_from(@outputdir).to_s
+      end
+
+      # Generate outputdir/sitemap.xml: a plain XML sitemap
+      # (https://www.sitemaps.org/protocol.html) listing every page
+      # recorded via record_sitemap_path, as baseurl + relative path.
+      def create_sitemap(outputdir, baseurl)
+        paths = @sitemap_paths
+        if paths.size > MAX_SITEMAP_URLS
+          $stderr.puts "warning: #{paths.size} pages found, but a single sitemap.xml supports at most #{MAX_SITEMAP_URLS} URLs; only the first #{MAX_SITEMAP_URLS} are included. Consider a sitemap index if you need the rest."
+          paths = paths.first(MAX_SITEMAP_URLS)
+        end
+        base = baseurl.end_with?('/') ? baseurl : "#{baseurl}/"
+        xml = +%(<?xml version="1.0" encoding="UTF-8"?>\n)
+        xml << %(<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n)
+        paths.each do |path|
+          xml << "<url><loc>#{escape_xml(base + path)}</loc></url>\n"
+        end
+        xml << "</urlset>\n"
+        create_file(outputdir + "sitemap.xml", xml, :verbose => @verbose)
+      end
+
+      # Scripts for the RUN-button feature (statichtml --run-ruby-wasm):
+      # run.js sets up the button and compiles the wasm module on the main
+      # thread; run-worker.js is the module Worker it spawns per execution
+      # (see theme/default/js/run.js for why: STOP/timeout both just
+      # Worker#terminate() it). Both are required for the feature to work.
+      RUN_RUBY_WASM_JS_FILES = %w[run.js run-worker.js].freeze
+
+      # Copy the RUN-button scripts. A themedir missing one of them is
+      # tolerated: warn and skip instead of aborting the whole build.
+      def copy_run_ruby_wasm_script
+        jsdir = @outputdir + "js"
+        RUN_RUBY_WASM_JS_FILES.each do |name|
+          src = @manager_config[:themedir] + "js" + name
+          unless src.file?
+            $stderr.puts "warning: #{src} not found; RUN button script not copied"
+            next
+          end
+          FileUtils.mkdir_p(jsdir) unless jsdir.directory?
+          FileUtils.cp(src.to_s, jsdir.to_s, :verbose => @verbose, :preserve => true)
+        end
+      end
+
       def create_html_file(entry, manager, outputdir, db)
         e = entry.is_a?(Array) ? entry.sort.first : entry
         case e.type_id
@@ -328,6 +450,7 @@ HERE
         path.open('w') do |f|
           f.write(html)
         end
+        record_sitemap_path(path)
       end
 
       def create_file(path, str, options = {})

data/lib/bitclust/subcommands/update_command.rb

@@ -16,11 +16,15 @@ module BitClust
       def initialize
         super
         @root = nil
+        @markdowntree = nil
         @library = nil
         @parser.banner = "Usage: #{File.basename($0, '.*')} update [<file>...]"
         @parser.on('--stdlibtree=ROOT', 'Process stdlib source directory tree.') {|path|
           @root = path
         }
+        @parser.on('--markdowntree=ROOT', 'Process Markdown source directory tree.') {|path|
+          @markdowntree = path
+        }
         @parser.on('--library-name=NAME', 'Use NAME for library name in file mode.') {|name|
           @library = name
         }
@@ -28,25 +32,129 @@ module BitClust
 
       def parse(argv)
         super
-        if not @root and argv.empty?
+        if not @root and not @markdowntree and argv.empty?
           error "no input file given"
         end
       end
 
       def exec(argv, options)
         super
+        if @markdowntree
+          # ネイティブ md パース（M3）。source には md が入り、描画は
+          # MDCompiler（GFM）が選択される。ブリッジは検証用に温存
+          # （BITCLUST_MD_BRIDGE=1 で旧経路）
+          if ENV['BITCLUST_MD_BRIDGE'] == '1'
+            argv = @db.is_a?(FunctionDatabase) ? prepare_capi_markdowntree
+                                               : (prepare_markdowntree; argv)
+          else
+            @db.transaction {
+              @db.update_by_markdowntree(@markdowntree || raise)
+            }
+            return
+          end
+        end
         @db.transaction {
           if @root
-            @db.update_by_stdlibtree @root
+            db = @db
+            db.is_a?(MethodDatabase) or raise
+            db.update_by_stdlibtree(@root || raise)
           end
           argv.each do |path|
             @db.update_by_file path, @library || guess_library_name(path)
           end
         }
+        remap_source_locations if @markdowntree
+      ensure
+        FileUtils.remove_entry(@bridge_dir) if @bridge_dir
       end
 
       private
 
+      # Markdown ツリーを旧形式の rd ツリーへブリッジし、既存の
+      # stdlibtree 更新機構にそのまま渡す。
+      # doc（散文ページ）は stdlibtree/../../doc から読まれるため、
+      # md ツリー側に doc/ が同居していればレイアウトを合わせる
+      # （manual/api を渡すと manual/doc を拾う。md ならブリッジ変換、
+      # .rd のまま（移行中）なら symlink）。
+      def prepare_markdowntree
+        require 'tmpdir'
+        require 'bitclust/markdown_bridge'
+        @bridge_dir = Dir.mktmpdir('bitclust-md-bridge')
+        root = File.join(@bridge_dir, 'api/src')
+        bridge = MarkdownBridge.build(@markdowntree || raise, root)
+        @location_map = { root => [@markdowntree, bridge.source_map] }
+        # markdowntree と同じ渡され方（相対/絶対）を保った隣接 doc パス。
+        # copy_doc は stdlibtree 相対（../../doc/...）の location を記録する
+        doc = File.join(File.dirname(@markdowntree || raise), 'doc')
+        if File.directory?(doc)
+          if Dir.glob(File.join(doc, '**/*.md')).any?
+            doc_map = MarkdownBridge.build_doc(doc, File.join(@bridge_dir, 'doc'))
+          else
+            FileUtils.ln_s(File.expand_path(doc), File.join(@bridge_dir, 'doc'))
+            doc_map = nil
+          end
+          @location_map[File.join(@bridge_dir, 'doc')] = [doc, doc_map]
+          @location_map['../../doc'] = [doc, doc_map]
+        end
+        @root ||= root
+      end
+
+      # C API の Markdown ツリー（manual/capi）を旧形式の .rd 群へ変換し、
+      # ファイル引数として返す（--capi update <files> の経路に載せる）
+      def prepare_capi_markdowntree
+        require 'tmpdir'
+        require 'bitclust/markdown_to_rrd'
+        @bridge_dir = Dir.mktmpdir('bitclust-capi-bridge')
+        # src/ 配下に置く: guess_library_name が src/ 以降を id とするため
+        # （関数の filename が旧経路と同じ「eval.c」等になる）
+        src = File.join(@bridge_dir, 'src')
+        FileUtils.mkdir_p(src)
+        capi_map = {} #: Hash[String, String]
+        files = Dir.glob(File.join(@markdowntree || raise, '*.md')).sort.map do |f|
+          name = "#{File.basename(f, '.md')}.rd"
+          rd = File.join(src, name)
+          File.write(rd, MarkdownToRRD.convert(File.read(f), capi: true))
+          capi_map[name] = "#{File.basename(f, '.md')}.md"
+          rd
+        end
+        @location_map = { src => [@markdowntree, capi_map] }
+        files
+      end
+
+      # source_location のブリッジ一時パスを manual/ の md パスへ再マップする。
+      # 編集リンク（statichtml --edit-base-url）が凍結 refm でなく編集対象の
+      # md を指すようにするため。行番号はブリッジ rd 基準の近似で、
+      # front matter 等の分だけ md とずれることがある
+      def remap_source_locations
+        db = @db
+        entries =
+          if db.is_a?(FunctionDatabase)
+            db.functions
+          else
+            db.is_a?(MethodDatabase) or raise
+            db.libraries + db.classes + db.methods + db.docs
+          end
+        entries.each do |entry|
+          loc = entry.source_location or next
+          remapped = remap_location(loc) or next
+          entry.source_location = remapped
+          entry.save
+        end
+      end
+
+      def remap_location(loc)
+        file = loc.file
+        file.is_a?(String) or raise
+        @location_map.each do |bridge_root, (md_root, map)|
+          prefix = "#{bridge_root}/"
+          next unless file.start_with?(prefix)
+          rel = file.delete_prefix(prefix)
+          rel = map[rel] || rel if map
+          return Location.new(File.join(md_root, rel), loc.line)
+        end
+        nil
+      end
+
       def guess_library_name(path)
         if %r<(\A|/)src/> =~ path
           path.sub(%r<.*(\A|/)src/>, '').sub(/\.rd\z/, '')

data/lib/bitclust/syntax_highlighter.rb

@@ -56,6 +56,7 @@ module BitClust
       nl: nil,                         # \n
       op: "o",                         # operator
       period: "p",                     # .
+      qsymbols_beg: "ss",              # %i(
       qwords_beg: "sx",                # %w(
       rbrace: "p",                     # }
       rbracket: "p",                   # ]
@@ -65,6 +66,7 @@ module BitClust
       semicolon: nil,                  # ;
       sp: nil,                         # space
       symbeg: "ss",                    # :
+      symbols_beg: "ss",               # %I(
       tlambda: "o",                    # ->
       tlambeg: "p",                    # (->) {
       tstring_beg: nil,                # " (string")
@@ -131,7 +133,7 @@ module BitClust
     end
 
     def on_default(event, token, data)
-      event_name = event.to_s.sub(/\Aon_/, "")   # :on_event --> "event"
+      event_name = event.to_s.sub(/\Aon_/, "")   ## :on_event --> "event"
       style = COLORS[event_name.to_sym]
       escaped_token = escape_html(token)
       data << (style ? "<span class=\"#{style}\">#{escaped_token}</span>" : escaped_token)
@@ -181,6 +183,9 @@ module BitClust
         @name_buffer << token
       when @stack.last == :module
         @name_buffer << token
+      when @stack.last == :symbol
+        data << "#{token}</span>"
+        @stack.pop
       else
         on_default(:on_const, token, data)
       end
@@ -216,8 +221,11 @@ module BitClust
 
     def on_op(token, data)
       case
-      when token == "::" && [:class, :module].include?(@stack.last)
+      when token == "::" && [:class, :module].include?(_ = @stack.last)
         @name_buffer << token
+      when token == "<<" && @stack.last == :class
+        @stack.pop
+        on_default(:on_op, token, data)
       else
         @stack.pop if @stack.last == :method_call
         on_default(:on_op, token, data)
@@ -269,6 +277,28 @@ module BitClust
       on_default(:on_nl, token, data)
     end
 
+    def on_semicolon(token, data)
+      case
+      when @name_buffer.empty?
+        return on_default(:on_semicolon, token, data)
+      when @stack.last == :module
+        name = @name_buffer.join
+        data << "<span class=\"nn\">#{name}</span>"
+        @stack.pop
+        @name_buffer.clear
+      when @stack.last == :class
+        namespace = @name_buffer.values_at(0..-3).join
+        operator = @name_buffer[-2]
+        name = @name_buffer.last
+        data << "<span class=\"nn\">#{namespace}</span>"
+        data << "<span class=\"o\">#{operator}</span>"
+        data << "<span class=\"nc\">#{name}</span>"
+        @stack.pop
+        @name_buffer.clear
+      end
+      on_default(:on_semicolon, token, data)
+    end
+
     def on_regexp_beg(token, data)
       style = COLORS[:regexp_beg]
       data << "<span class=\"#{style}\">#{token}"
@@ -316,7 +346,7 @@ module BitClust
       case
       when token == "'"
         data << "#{token}</span>"
-      when [:qwords, :words].include?(@stack.last)
+      when %i[qwords words qsymbols symbols].include?(_ = @stack.last)
         @stack.pop
         data << "#{token}</span>"
       else
@@ -340,6 +370,20 @@ module BitClust
       data
     end
 
+    def on_qsymbols_beg(token, data)
+      @stack.push(:qsymbols)
+      style = COLORS[:qsymbols_beg]
+      data << "<span class=\"#{style}\">#{token}"
+      data
+    end
+
+    def on_symbols_beg(token, data)
+      @stack.push(:symbols)
+      style = COLORS[:symbols_beg]
+      data << "<span class=\"#{style}\">#{token}"
+      data
+    end
+
     def on_heredoc_beg(token, data)
       @stack.push(:heredoc)
       on_default(:on_heredoc_beg, token, data)
@@ -363,7 +407,7 @@ module BitClust
     def on___end__(token, data)
       on_default(:on___end__, token, data)
       style = COLORS[:comment]
-      data << "<span class=\"#{style}\">#{escape_html(@src.lines[lineno..-1].join)}</span>"
+      data << "<span class=\"#{style}\">#{escape_html((@src.lines[lineno..-1] || raise).join)}</span>"
       data
     end
 

data/lib/bitclust/textutils.rb

@@ -18,7 +18,7 @@ module BitClust
     def detab(str, ts = 8)
       add = 0
       str.gsub(/\t/) {
-        len = ts - ($~.begin(0) + add) % ts
+        len = ts - ((($~ || raise).begin(0) || raise) + add) % ts
         add += len - 1
         ' ' * len
       }
@@ -30,11 +30,11 @@ module BitClust
     end
 
     def n_minimum_indent(lines)
-      lines.reject {|line| line.strip.empty? }.map {|line| n_indent(line) }.min
+      lines.reject {|line| line.strip.empty? }.map {|line| n_indent(line) }.min || raise
     end
 
     def n_indent(line)
-      line.slice(/\A\s*/).size
+      (line.slice(/\A\s*/) || raise).size
     end
 
     INDENT_RE = {

data/lib/bitclust/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BitClust
-  VERSION = "1.3.0"
+  VERSION = "1.6.0"
 end