bash-merge 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '082e2a501629dd515735c6646806e83b26d4c7a549f74b4061233b3666a0aac1'
-  data.tar.gz: ab004d8813d572afdfee29a9b91a5e7ec7c46955ffb1ff995a321cc648e3a555
+  metadata.gz: bf2cbd8a4823b24975b63a2366d700f7cbc61a72584bf08d4c90e998713df3bf
+  data.tar.gz: 172b697453ad5c0b647914036906f3068b49a4d18475c183471f2dd649081f21
 SHA512:
-  metadata.gz: f2ce2ce4d992613708468896d13382434e6331703df6e11b4affb9da9f7c056403f28be182954ad696665fa473c354c9c52065aaa659b4a0eebf2a3ea217db82
-  data.tar.gz: f5c0b4d01200b16e73d4318fe30c4107f7525db12663534735336bbe81616e84fc5cdb36d36a292bd6b53343a2f948036d2919f4d2f4c2883803ad65530c69da
+  metadata.gz: 4bd8c9ff57b18df22ca30d2a7fd55868fbf101d1159f76b987bb39b92c592e044ab96856bbaf73dea137af9da4089f4eae9a43fd240694488e45f20608a79dfc
+  data.tar.gz: 87b6db769a1a8680a77380f6e1b0d0b6f842430687b314fbd5fa36c4097c87e984b7b974d2aea0d85fd2e2f9c10292d034a997257e601cbe92e1f65406f8aa20

data/CHANGELOG.md

@@ -30,6 +30,37 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.0.2] - 2026-01-02
+
+- TAG: [v1.0.2][1.0.2t]
+- COVERAGE: 100.00% -- 109/109 lines in 2 files
+- BRANCH COVERAGE: 100.00% -- 28/28 branches in 2 files
+- 96.46% documented
+
+### Removed
+
+- **Load-time grammar registration** - TreeHaver's `parser_for` now handles grammar discovery
+  and registration automatically. Removed manual `GrammarFinder` calls and warnings from
+  `lib/bash/merge.rb`.
+
+## [1.0.1] - 2026-01-01
+
+- TAG: [v1.0.1][1.0.1t]
+- COVERAGE: 100.00% -- 109/109 lines in 2 files
+- BRANCH COVERAGE: 100.00% -- 28/28 branches in 2 files
+- 96.46% documented
+
+### Changed
+
+- **NodeWrapper**: Now inherits from `Ast::Merge::NodeWrapperBase`
+  - Removes ~100 lines of duplicated code (initialization, line extraction, basic methods)
+  - Keeps only Bash-specific type predicates and signature computation
+  - Adds `#node_wrapper?` method for distinguishing from `NodeTyping::Wrapper`
+- **FileAnalysis error handling**: Now rescues `TreeHaver::Error` instead of `TreeHaver::NotAvailable`
+  - `TreeHaver::Error` inherits from `Exception`, not `StandardError`
+  - `TreeHaver::NotAvailable` is a subclass of `TreeHaver::Error`, so it's also caught
+  - Fixes parse error handling on alternative Ruby engines
+
 ## [1.0.0] - 2026-01-01
 
 - TAG: [v1.0.0][1.0.0t]
@@ -43,6 +74,10 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
-[Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v1.0.2...HEAD
+[1.0.2]: https://github.com/kettle-rb/bash-merge/compare/v1.0.1...v1.0.2
+[1.0.2t]: https://github.com/kettle-rb/bash-merge/releases/tag/v1.0.2
+[1.0.1]: https://github.com/kettle-rb/bash-merge/compare/v1.0.0...v1.0.1
+[1.0.1t]: https://github.com/kettle-rb/bash-merge/releases/tag/v1.0.1
 [1.0.0]: https://github.com/kettle-rb/bash-merge/compare/db525d5aedd0c895422a067629118f3fa9c3c22d...v1.0.0
 [1.0.0t]: https://github.com/kettle-rb/bash-merge/tags/v1.0.0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2025 Peter H. Boling
+Copyright (c) 2025-2026 Peter H. Boling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -685,7 +685,7 @@ See [LICENSE.txt](LICENSE.txt) for the official [Copyright Notice](https://opens
 
 <ul>
     <li>
-        Copyright (c) 2025 Peter H. Boling, of
+        Copyright (c) 2025-2026 Peter H. Boling, of
         <a href="https://discord.gg/3qme4XHNKN">
             Galtzo.com
             <picture>

data/lib/bash/merge/file_analysis.rb

@@ -144,7 +144,9 @@ module Bash
         if @ast&.root_node&.has_error?
           collect_parse_errors(@ast.root_node)
         end
-      rescue TreeHaver::NotAvailable => e
+      rescue TreeHaver::Error => e
+        # TreeHaver::Error inherits from Exception, not StandardError.
+        # This also catches TreeHaver::NotAvailable (subclass of Error).
         @errors << e.message
         @ast = nil
       rescue StandardError => e

data/lib/bash/merge/node_wrapper.rb

@@ -5,87 +5,20 @@ module Bash
     # Wraps TreeHaver nodes with comment associations, line information, and signatures.
     # This provides a unified interface for working with Bash AST nodes during merging.
     #
+    # Inherits common functionality from Ast::Merge::NodeWrapperBase:
+    # - Source context (lines, source, comments)
+    # - Line info extraction
+    # - Basic methods: #type, #type?, #text, #content, #signature
+    #
     # @example Basic usage
     #   parser = TreeHaver::Parser.new
     #   parser.language = TreeHaver::Language.bash
     #   tree = parser.parse(source)
     #   wrapper = NodeWrapper.new(tree.root_node, lines: source.lines, source: source)
     #   wrapper.signature # => [:program, ...]
-    class NodeWrapper
-      # @return [TreeHaver::Node] The wrapped tree-haver node
-      attr_reader :node
-
-      # @return [Array<Hash>] Leading comments associated with this node
-      attr_reader :leading_comments
-
-      # @return [Hash, nil] Inline/trailing comment on the same line
-      attr_reader :inline_comment
-
-      # @return [Integer] Start line (1-based)
-      attr_reader :start_line
-
-      # @return [Integer] End line (1-based)
-      attr_reader :end_line
-
-      # @return [Array<String>] Source lines
-      attr_reader :lines
-
-      # @return [String] The original source string
-      attr_reader :source
-
-      # @param node [TreeHaver::Node] tree-haver node to wrap
-      # @param lines [Array<String>] Source lines for content extraction
-      # @param source [String] Original source string for byte-based text extraction
-      # @param leading_comments [Array<Hash>] Comments before this node
-      # @param inline_comment [Hash, nil] Inline comment on the node's line
-      def initialize(node, lines:, source: nil, leading_comments: [], inline_comment: nil)
-        @node = node
-        @lines = lines
-        @source = source || lines.join("\n")
-        @leading_comments = leading_comments
-        @inline_comment = inline_comment
-
-        # Extract line information from the tree-haver node (0-indexed to 1-indexed)
-        if node.respond_to?(:start_point)
-          point = node.start_point
-          @start_line = (point.respond_to?(:row) ? point.row : point[:row]) + 1
-        end
-        if node.respond_to?(:end_point)
-          point = node.end_point
-          @end_line = (point.respond_to?(:row) ? point.row : point[:row]) + 1
-        end
-
-        # Handle edge case where end_line might be before start_line
-        @end_line = @start_line if @start_line && @end_line && @end_line < @start_line
-      end
-
-      # Generate a signature for this node for matching purposes.
-      # Signatures are used to identify corresponding nodes between template and destination.
-      #
-      # @return [Array, nil] Signature array or nil if not signaturable
-      def signature
-        compute_signature(@node)
-      end
-
-      # Check if this is a freeze node
-      # @return [Boolean]
-      def freeze_node?
-        false
-      end
-
-      # Get the node type as a symbol
-      # @return [Symbol]
-      def type
-        @node.type.to_sym
-      end
-
-      # Check if this node has a specific type
-      # @param type_name [Symbol, String] Type to check
-      # @return [Boolean]
-      def type?(type_name)
-        @node.type.to_s == type_name.to_s
-      end
-
+    #
+    # @see Ast::Merge::NodeWrapperBase
+    class NodeWrapper < Ast::Merge::NodeWrapperBase
       # Check if this is a function definition
       # @return [Boolean]
       def function_definition?
@@ -174,18 +107,6 @@ module Bash
         nil
       end
 
-      # Get children wrapped as NodeWrappers
-      # @return [Array<NodeWrapper>]
-      def children
-        return [] unless @node.respond_to?(:each)
-
-        result = []
-        @node.each do |child|
-          result << NodeWrapper.new(child, lines: @lines, source: @source)
-        end
-        result
-      end
-
       # Find a child by field name
       # @param field_name [String] Field name to look for
       # @return [TreeSitter::Node, nil]
@@ -207,37 +128,13 @@ module Bash
         nil
       end
 
-      # Get the text content for this node by extracting from source using byte positions
-      # @return [String]
-      def text
-        node_text(@node)
-      end
-
-      # Extract text from a tree-sitter node using byte positions
-      # @param ts_node [TreeSitter::Node] The tree-sitter node
-      # @return [String]
-      def node_text(ts_node)
-        return "" unless ts_node.respond_to?(:start_byte) && ts_node.respond_to?(:end_byte)
-
-        @source[ts_node.start_byte...ts_node.end_byte] || ""
-      end
-
-      # Get the content for this node from source lines
-      # @return [String]
-      def content
-        return "" unless @start_line && @end_line
-
-        (@start_line..@end_line).map { |ln| @lines[ln - 1] }.compact.join("\n")
-      end
+      protected
 
-      # String representation for debugging
-      # @return [String]
-      def inspect
-        "#<#{self.class.name} type=#{@node.type} lines=#{@start_line}..#{@end_line}>"
+      # Override wrap_child to use Bash::Merge::NodeWrapper
+      def wrap_child(child)
+        NodeWrapper.new(child, lines: @lines, source: @source)
       end
 
-      private
-
       def compute_signature(node)
         node_type = node.type.to_s
 
@@ -289,6 +186,8 @@ module Bash
         end
       end
 
+      private
+
       def extract_command_signature_context(node)
         # Extract additional context like redirections
         redirections = []

data/lib/bash/merge/version.rb

@@ -5,7 +5,7 @@ module Bash
     # Version information for Bash::Merge
     module Version
       # Current version of the bash-merge gem
-      VERSION = "1.0.0"
+      VERSION = "1.0.2"
     end
     VERSION = Version::VERSION # traditional location
   end

data/lib/bash/merge.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
-# External gems
-# TreeHaver provides a unified cross-Ruby interface to tree-sitter
-require "tree_haver"
+# std libs
+require "set"
 
+# External gems
+# TreeHaver provides a unified cross-Ruby interface to tree-sitter.
+# It handles grammar discovery and backend selection automatically
+# via parser_for(:bash). No manual registration needed.
+#
 # BACKEND COMPATIBILITY for Bash:
 # - FFI: Most portable and reliable with bash grammar (recommended)
 # - MRI: Has ABI incompatibility with bash grammar
@@ -12,24 +16,9 @@ require "tree_haver"
 # Set TREE_HAVER_BACKEND=ffi (or mri/rust) to control backend selection.
 # When MRI loads a grammar first, FFI gets incompatible pointers (symbol conflict).
 # MRI statically links tree-sitter, FFI dynamically links libtree-sitter.so.
-
-# Register tree-sitter bash grammar
-bash_finder = TreeHaver::GrammarFinder.new(:bash)
-bash_available = bash_finder.available?
-bash_finder.register! if bash_available
-
-# Only warn if the grammar file is actually missing (not just runtime unavailable)
-# When the runtime isn't available, tree-sitter backends just won't be used,
-# which is expected behavior - no need to warn the user.
-unless bash_available
-  grammar_path = bash_finder.find_library_path
-  unless grammar_path
-    warn "WARNING: Bash grammar not available. #{bash_finder.not_found_message}"
-  end
-end
+require "tree_haver"
 
 require "version_gem"
-require "set"
 
 # Shared merge infrastructure
 require "ast/merge"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: ast-merge
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -315,10 +315,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://bash-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v1.0.0
-  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v1.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v1.0.2
+  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v1.0.2/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/bash-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/bash-merge/1.0.0
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/1.0.2
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/bash-merge/wiki
   news_uri: https://www.railsbling.com/tags/bash-merge