tocer 12.1.0 → 13.0.2

data/lib/tocer/cli/parsers/core.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 require "tocer/identity"
+require "refinements/structs"
 
 module Tocer
   module CLI
     module Parsers
       # Handles parsing of Command Line Interface (CLI) core options.
       class Core
-        def self.call(options: {}, client: CLIENT) = new(options: options, client: client).call
+        using Refinements::Structs
 
-        def initialize options: {}, client: CLIENT
-          @options = options
+        def self.call(...) = new(...).call
+
+        def initialize configuration = Configuration::Loader.call, client: Parser::CLIENT
+          @configuration = configuration
           @client = client
         end
 
@@ -18,12 +21,13 @@ module Tocer
           client.banner = "#{Identity::LABEL} - #{Identity::SUMMARY}"
           client.separator "\nUSAGE:\n"
           collate
-          arguments.empty? ? arguments : client.parse!(arguments)
+          client.parse arguments
+          configuration
         end
 
         private
 
-        attr_reader :options, :client
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -34,25 +38,31 @@ module Tocer
             %i[edit view],
             "Manage gem configuration: edit or view."
           ) do |action|
-            options[:config] = action
+            configuration.merge! action_config: action
           end
         end
 
-        def add_build
-          client.on "-b", "--build [PATH]", %(Build table of contents. Default path: ".") do |value|
-            options[:build] = value || "."
+        def add_insert
+          root_dir = configuration.root_dir
+
+          client.on(
+            "-i",
+            "--insert [PATH]",
+            %(Insert/update table of contents. Default: "#{root_dir}".)
+          ) do |path|
+            configuration.merge! action_insert: true, root_dir: path || root_dir
           end
         end
 
         def add_version
           client.on "-v", "--version", "Show gem version." do
-            options[:version] = Identity::VERSION_LABEL
+            configuration.merge! action_version: true
           end
         end
 
         def add_help
           client.on "-h", "--help", "Show this message." do
-            options[:help] = true
+            configuration.merge! action_help: true
           end
         end
       end

data/lib/tocer/cli/parsers/flag.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "refinements/structs"
+
+module Tocer
+  module CLI
+    module Parsers
+      # Handles parsing of Command Line Interface (CLI) flags.
+      class Flag
+        using Refinements::Structs
+
+        def self.call(...) = new(...).call
+
+        def initialize configuration = Configuration::Loader.call, client: Parser::CLIENT
+          @configuration = configuration
+          @client = client
+        end
+
+        def call arguments = []
+          client.separator "\nOPTIONS:\n"
+          private_methods.sort.grep(/add_/).each { |method| __send__ method }
+          client.parse arguments
+          configuration
+        end
+
+        private
+
+        attr_reader :configuration, :client
+
+        def add_label
+          client.on(
+            "--label [LABEL]",
+            %(Add label. Default: "#{configuration.label}".)
+          ) do |value|
+            configuration.merge! label: value if value
+          end
+        end
+
+        def add_include
+          client.on(
+            "--includes [a,b,c]",
+            Array,
+            %(Add include patterns. Default: #{configuration.includes}.)
+          ) do |items|
+            configuration.merge! includes: items if items
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tocer/cli/shell.rb

@@ -4,39 +4,35 @@ module Tocer
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      PROCESSORS = {config: Processors::Config.new, build: Processors::Build.new}.freeze
+      ACTIONS = {config: Actions::Config.new, insert: Actions::Insert.new}.freeze
 
-      def initialize parser: Parsers::Assembler.new, processors: PROCESSORS
+      def initialize parser: Parser.new, actions: ACTIONS
         @parser = parser
-        @processors = processors
+        @actions = actions
       end
 
       def call arguments = []
-        parse arguments
-
-        case options
-          in config: action then process_config action
-          in build: path then process_build path
-          in version: then puts version
-          else usage
-        end
+        perform parser.call(arguments)
+      rescue OptionParser::ParseError => error
+        puts error.message
       end
 
       private
 
-      attr_reader :parser, :processors
+      attr_reader :parser, :actions
 
-      def parse arguments = []
-        parser.call arguments
-      rescue StandardError => error
-        puts error.message
+      def perform configuration
+        case configuration
+          in action_config: Symbol => action then process_config action
+          in action_insert: true then process_insert configuration
+          in action_version: true then puts Identity::VERSION_LABEL
+          else usage
+        end
       end
 
-      def process_config(action) = processors.fetch(:config).call(action)
-
-      def process_build(path) = processors.fetch(:build).call(path, options)
+      def process_config(action) = actions.fetch(:config).call(action)
 
-      def options = parser.to_h
+      def process_insert(configuration) = actions.fetch(:insert).call(configuration)
 
       def usage = puts(parser.to_s)
     end

data/lib/tocer/configuration/content.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Tocer
+  module Configuration
+    # Defines the content of the configuration for use throughout the gem.
+    Content = Struct.new(
+      :action_config,
+      :action_help,
+      :action_insert,
+      :action_version,
+      :includes,
+      :label,
+      :root_dir,
+      keyword_init: true
+    ) do
+      def initialize *arguments
+        super
+        freeze
+      end
+    end
+  end
+end

data/lib/tocer/{cli/configuration → configuration}/defaults.yml

@@ -1,3 +1,4 @@
 :label: "## Table of Contents"
 :includes:
   - "README.md"
+:root_dir: "."

data/lib/tocer/configuration/loader.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "refinements/structs"
+require "runcom"
+require "yaml"
+
+module Tocer
+  module Configuration
+    # Represents the fully assembled Command Line Interface (CLI) configuration.
+    class Loader
+      using Refinements::Structs
+
+      DEFAULTS = YAML.load_file(Pathname(__dir__).join("defaults.yml")).freeze
+      CLIENT = Runcom::Config.new "#{Identity::NAME}/configuration.yml", defaults: DEFAULTS
+
+      def self.call = new.call
+
+      def self.with_defaults = new(client: DEFAULTS)
+
+      def initialize content: Content.new, client: CLIENT
+        @content = content
+        @client = client
+      end
+
+      def call = content.merge(**client.to_h)
+
+      private
+
+      attr_reader :content, :client
+    end
+  end
+end

data/lib/tocer/elements/comment_block.rb

@@ -17,6 +17,8 @@ module Tocer
         @message = message
       end
 
+      def comments = "#{start_tag}\n#{finish_tag}\n"
+
       def start_index(lines) = self.class.index(lines, start_id)
 
       def start_tag = comment(start_id, message)
@@ -25,6 +27,8 @@ module Tocer
 
       def finish_tag = comment(finish_id, message)
 
+      def empty?(lines) = (finish_index(lines) - start_index(lines)) == 1
+
       def prependable?(lines) = start_index(lines).zero? && finish_index(lines).zero?
 
       private

data/lib/tocer/identity.rb

@@ -5,7 +5,7 @@ module Tocer
   module Identity
     NAME = "tocer"
     LABEL = "Tocer"
-    VERSION = "12.1.0"
+    VERSION = "13.0.2"
     VERSION_LABEL = "#{LABEL} #{VERSION}".freeze
     SUMMARY = "A command line interface for generating table of contents for Markdown files."
   end

data/lib/tocer/rake/tasks.rb

@@ -13,7 +13,7 @@ module Tocer
 
       def self.setup = new.install
 
-      def initialize configuration: CLI::Configuration::Loader.new.call, runner: Runner.new
+      def initialize configuration = Configuration::Loader.call, runner: Runner.new
         @configuration = configuration
         @runner = runner
       end
@@ -21,7 +21,7 @@ module Tocer
       def install
         desc "Add/Update Table of Contents (README)"
         task :toc, %i[label includes] do |_task, arguments|
-          runner.call(**configuration.merge(**arguments.to_h).to_h)
+          runner.call configuration.merge(**arguments.to_h)
         end
       end
 

data/lib/tocer/runner.rb

@@ -7,21 +7,20 @@ module Tocer
   class Runner
     using Refinements::Pathnames
 
-    def initialize configuration: CLI::Configuration::Loader.call, writer: Writer.new
-      @configuration = configuration
+    def initialize writer: Writer.new
       @writer = writer
     end
 
-    def call root_dir: ".", label: configuration.label, includes: configuration.includes
-      Pathname(root_dir).files(%({#{includes.join ","}}))
-                        .each do |path|
-                          yield path if block_given?
-                          writer.call path, label: label
-                        end
+    def call configuration = Configuration::Loader.call
+      Pathname(configuration.root_dir).files(%({#{configuration.includes.join ","}}))
+                                      .each do |path|
+                                        yield path if block_given?
+                                        writer.call path, label: configuration.label
+                                      end
     end
 
     private
 
-    attr_reader :configuration, :writer
+    attr_reader :writer
   end
 end

data/lib/tocer/transformers/finder.rb

@@ -11,8 +11,9 @@ module Tocer
       end
 
       def call markdown
-        transformers.find { |pattern, transformer| break transformer if pattern.match? markdown }
-                    .then { |transformer| transformer.new markdown }
+        transformers.find do |pattern, transformer|
+          break transformer.new(markdown) if pattern.match? markdown
+        end
       end
 
       private

data/lib/tocer/writer.rb

@@ -24,7 +24,7 @@ module Tocer
       @builder = builder
     end
 
-    def call path, label: CLI::Configuration::Loader.call.label
+    def call path, label: Configuration::Loader.call.label
       path.rewrite do |body|
         lines = body.each_line.to_a
         builder.prependable?(lines) ? prepend(lines, label) : replace(lines, label)
@@ -41,14 +41,22 @@ module Tocer
       klass = self.class
 
       klass.add(
-        start_index: start_index,
+        start_index:,
         old_lines: klass.remove(start_index, finish_index, lines),
-        new_lines: content(lines[finish_index, lines.length], label)
+        new_lines: new_lines(lines, label, finish_index)
       ).join
     end
 
+    def new_lines lines, label, finish_index
+      if builder.unbuildable?(lines)
+        builder.comments
+      else
+        content(lines[finish_index, lines.length], label)
+      end
+    end
+
     def prepend(lines, label) = [content(lines, label), lines.join].compress.join("\n")
 
-    def content(lines, label) = builder.call(lines, label: label)
+    def content(lines, label) = builder.call(lines, label:)
   end
 end

data/lib/tocer.rb

@@ -1,20 +1,13 @@
 # frozen_string_literal: true
 
-require "tocer/identity"
-require "tocer/elements/comment_block"
-require "tocer/parsers/header"
-require "tocer/transformers/link"
-require "tocer/transformers/text"
-require "tocer/transformers/finder"
-require "tocer/builder"
-require "tocer/writer"
-require "tocer/runner"
-require "tocer/cli/configuration/content"
-require "tocer/cli/configuration/loader"
-require "tocer/cli/parsers"
-require "tocer/cli/parsers/build"
-require "tocer/cli/parsers/core"
-require "tocer/cli/parsers/assembler"
-require "tocer/cli/processors/build"
-require "tocer/cli/processors/config"
-require "tocer/cli/shell"
+require "zeitwerk"
+
+Zeitwerk::Loader.for_gem.then do |loader|
+  loader.inflector.inflect "cli" => "CLI"
+  loader.ignore "#{__dir__}/tocer/rake"
+  loader.setup
+end
+
+# Main namespace.
+module Tocer
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: tocer
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 13.0.2
 platform: ruby
 authors:
 - Brooke Kuhlmann
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -28,7 +28,7 @@ cert_chain:
   lkHilIrX69jq8wMPpBhlaw2mRmeSL50Wv5u6xVBvOHhXFSP1crXM95vfLhLyRYod
   W2A=
   -----END CERTIFICATE-----
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinements
@@ -36,28 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.4'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.4'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description:
 email:
 - brooke@alchemists.io
@@ -70,19 +84,18 @@ extra_rdoc_files:
 files:
 - LICENSE.adoc
 - README.adoc
-- bin/tocer
+- exe/tocer
 - lib/tocer.rb
 - lib/tocer/builder.rb
-- lib/tocer/cli/configuration/content.rb
-- lib/tocer/cli/configuration/defaults.yml
-- lib/tocer/cli/configuration/loader.rb
-- lib/tocer/cli/parsers.rb
-- lib/tocer/cli/parsers/assembler.rb
-- lib/tocer/cli/parsers/build.rb
+- lib/tocer/cli/actions/config.rb
+- lib/tocer/cli/actions/insert.rb
+- lib/tocer/cli/parser.rb
 - lib/tocer/cli/parsers/core.rb
-- lib/tocer/cli/processors/build.rb
-- lib/tocer/cli/processors/config.rb
+- lib/tocer/cli/parsers/flag.rb
 - lib/tocer/cli/shell.rb
+- lib/tocer/configuration/content.rb
+- lib/tocer/configuration/defaults.yml
+- lib/tocer/configuration/loader.rb
 - lib/tocer/elements/comment_block.rb
 - lib/tocer/identity.rb
 - lib/tocer/parsers/header.rb
@@ -95,11 +108,12 @@ files:
 - lib/tocer/writer.rb
 homepage: https://www.alchemists.io/projects/tocer
 licenses:
-- Apache-2.0
+- Hippocratic-3.0
 metadata:
   bug_tracker_uri: https://github.com/bkuhlmann/tocer/issues
-  changelog_uri: https://www.alchemists.io/projects/tocer/changes.html
+  changelog_uri: https://www.alchemists.io/projects/tocer/versions
   documentation_uri: https://www.alchemists.io/projects/tocer
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/bkuhlmann/tocer
 post_install_message:
 rdoc_options: []
@@ -109,14 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: A command line interface for generating table of contents for Markdown files.

data/lib/tocer/cli/configuration/content.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Tocer
-  module CLI
-    module Configuration
-      # Defines the content of the configuration for use throughout the gem.
-      Content = Struct.new :label, :includes, keyword_init: true
-    end
-  end
-end

data/lib/tocer/cli/configuration/loader.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "refinements/structs"
-require "runcom"
-require "yaml"
-
-module Tocer
-  module CLI
-    module Configuration
-      # Represents the fully assembled Command Line Interface (CLI) configuration.
-      class Loader
-        using Refinements::Structs
-
-        DEFAULTS = YAML.load_file(Pathname(__dir__).join("defaults.yml")).freeze
-        CLIENT = Runcom::Config.new "#{Identity::NAME}/configuration.yml", defaults: DEFAULTS
-
-        def self.call = new.call
-
-        def initialize content: Content.new, client: CLIENT
-          @content = content
-          @client = client
-        end
-
-        def call = content.merge(**client.to_h)
-
-        private
-
-        attr_reader :content, :client
-      end
-    end
-  end
-end

data/lib/tocer/cli/parsers/assembler.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Tocer
-  module CLI
-    module Parsers
-      # Assembles and parses all Command Line Interface (CLI) options.
-      class Assembler
-        SECTIONS = [Core, Build].freeze # Order is important.
-
-        def initialize configuration: CLI::Configuration::Loader.call,
-                       sections: SECTIONS,
-                       client: CLIENT
-          @options = configuration.to_h
-          @sections = sections
-          @client = client
-        end
-
-        def call arguments = []
-          sections.each { |parser| parser.call client: client, options: options }
-          client.parse! arguments
-          options
-        end
-
-        def to_h = options
-
-        def to_s = client.to_s
-
-        private
-
-        attr_reader :options, :sections, :client
-      end
-    end
-  end
-end

data/lib/tocer/cli/parsers/build.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Tocer
-  module CLI
-    module Parsers
-      # Handles parsing of Command Line Interface (CLI) build options.
-      class Build
-        def self.call options: {}, configuration: Configuration::Loader.call, client: CLIENT
-          new(options: options, configuration: configuration, client: client).call
-        end
-
-        def initialize options: {}, configuration: Configuration::Loader.call, client: CLIENT
-          @options = options
-          @configuration = configuration
-          @client = client
-        end
-
-        def call arguments = []
-          client.separator "\nBUILD OPTIONS:\n"
-          private_methods.sort.grep(/add_/).each { |method| __send__ method }
-          arguments.empty? ? arguments : client.parse!(arguments)
-        end
-
-        private
-
-        attr_reader :options, :configuration, :client
-
-        def add_label
-          client.on(
-            "-l",
-            "--label [LABEL]",
-            %(Label. Default: "#{CLI::Configuration::Loader.call.label}".)
-          ) do |value|
-            options[:label] = value || configuration.to_h.fetch(:label)
-          end
-        end
-
-        def add_include
-          client.on(
-            "-i",
-            "--includes [a,b,c]",
-            Array,
-            %(Include pattern list. Default: #{CLI::Configuration::Loader.call.includes}.)
-          ) do |value|
-            list = Array value
-            options[:includes] = list.empty? ? configuration.to_h.fetch(:includes) : list
-          end
-        end
-      end
-    end
-  end
-end