ast-merge 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b2cf66d0fbccf11852ffad3a967f7b470473a31e47af2e87fab99e57f54d23
-  data.tar.gz: 8472ce9175eb6fb14e29bcb4f65775d6557d40206ec5c763800012cf70ff7178
+  metadata.gz: e16be7b53f49d2a1a96a2f47cd21963f3c257e316c9af6479355b2e16f502028
+  data.tar.gz: d07924b47b8f20f8cb6a5b73c3616db6bc1bbef6be52e7927e1be580bc22f40e
 SHA512:
-  metadata.gz: 7149ffb09a690608f382f63e9cff91bd85ceb25518b6744cc4617c638fe0acc4bd3a96de17f047c72161a5e4836b615e1721e550e34eee998916ab78b82df380
-  data.tar.gz: 0b5b63b49be561c75027767dd850a692d31a047e000aa2404cc83df27bc4304a6d047e434e2402ddf1ffaed63a5044ea60f515b80959284b6faa52222da8e7fa
+  metadata.gz: 5e1dc52b4951bf79dbbc4e4806e00fd322cf88effd65324939770219c66bf204ad63d932f9be2c6777e693e08881bb93aee9ccda579de21d7f9c01a974115513
+  data.tar.gz: 0622e0110fb955d46a567f23831bd4aa823fc550229c31828514da51c2269730d0bdd59e808fbaa5f80eb134cdd0ebd4d1698da2eeaf7f62eb8b8a38dc8a1986

data/CHANGELOG.md

@@ -30,6 +30,67 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.0.5] - 2025-12-31
+
+- TAG: [v2.0.5][2.0.5t]
+- COVERAGE: 91.68% -- 2379/2595 lines in 44 files
+- BRANCH COVERAGE: 81.37% -- 782/961 branches in 44 files
+- 98.82% documented
+
+### Added
+
+- Comprehensive tests for `Ast::Merge::AstNode` and nested structs (Point, Location)
+- Tests for `Ast::Merge::Comment::Style` class methods and instance methods
+- Tests for `Ast::Merge::Comment::Line` including freeze marker detection
+- Tests for `Ast::Merge::Comment::Block` including raw_content and children modes
+- Tests for `Ast::Merge::Comment::Parser` edge cases (unclosed blocks, mixed content, auto-detection)
+- Tests for `Ast::Merge::NavigableStatement` tree navigation methods
+- Tests for `Ast::Merge::InjectionPoint` (start_line, end_line, inspect)
+- Tests for `Ast::Merge::InjectionPointFinder` boundary options (boundary_type, boundary_text, boundary_matcher, boundary_same_or_shallower)
+- Tests for `Ast::Merge::PartialTemplateMerger::Result` including injection_point and default values
+- Tests for `Ast::Merge::PartialTemplateMerger` text pattern normalization (regex strings, plain strings)
+- Tests for `Ast::Merge::PartialTemplateMerger` anchor normalization with level options
+- Tests for `Ast::Merge::PartialTemplateMerger` unknown when_missing fallback behavior
+- Tests for `Ast::Merge::PartialTemplateMerger` section boundary detection and replace_mode behavior
+- Tests for `Ast::Merge::PartialTemplateMerger` unknown parser error handling
+- Tests for `Ast::Merge::Recipe::Runner::Result` stats and error attributes
+- Tests for `Ast::Merge::Recipe::Runner` actual file writes (non-dry-run mode)
+- Tests for `Ast::Merge::Recipe::Runner` error handling (unreadable files, missing template)
+- Tests for `Ast::Merge::Recipe::Runner` when_missing with append behavior
+- Tests for `Ast::Merge::Recipe::Config` same_or_shallower boundary, replace_mode, level options
+- Tests for `Ast::Merge::Recipe::Config` injection parsing with empty/nil/Regexp patterns
+- Tests for `Ast::Merge::Recipe::Config` expand_targets with absolute patterns
+- Tests for `Ast::Merge::Recipe::Preset` callable add_missing and node_typing
+- Tests for `Ast::Merge::Recipe::Preset` script_loader caching
+- Tests for `Ast::Merge::Recipe::ScriptLoader` syntax error handling
+- Tests for `Ast::Merge::Recipe::ScriptLoader` absolute path resolution
+- Tests for `Ast::Merge::ContentMatchRefiner` extract_node_type with typed nodes
+- Tests for `Ast::Merge::ContentMatchRefiner` filter_nodes with node_types
+
+### Changed
+
+- tree_haver v3.2.1
+- Internal files now use autoload instead of `require_relative` for consistency
+
+## [2.0.4] - 2025-12-31
+
+- TAG: [v2.0.4][2.0.4t]
+- COVERAGE: 88.61% -- 2903/3276 lines in 53 files
+- BRANCH COVERAGE: 67.90% -- 700/1031 branches in 53 files
+- 98.82% documented
+
+### Added
+
+- Many more tests
+
+### Fixed
+
+- RSpec shared examples for `Ast::Merge::DebugLogger` now handle Ruby 4.0+ where benchmark is a bundled gem
+  - The `#time logs start and completion with timing` test now checks `BENCHMARK_AVAILABLE` constant
+  - When benchmark is available: expects full timing output with "Starting:", "Completed:", and `real_ms`
+  - When benchmark is unavailable: expects warning message about benchmark gem not being available
+  - Fixes CI failures on Ruby 4.0.0 for downstream gems (e.g., bash-merge) using the shared examples
+
 ## [2.0.3] - 2025-12-30
 
 - TAG: [v2.0.3][2.0.3t]
@@ -298,7 +359,11 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/ast-merge/compare/v2.0.3...HEAD
+[Unreleased]: https://github.com/kettle-rb/ast-merge/compare/v2.0.5...HEAD
+[2.0.5]: https://github.com/kettle-rb/ast-merge/compare/v2.0.4...v2.0.5
+[2.0.5t]: https://github.com/kettle-rb/ast-merge/releases/tag/v2.0.5
+[2.0.4]: https://github.com/kettle-rb/ast-merge/compare/v2.0.3...v2.0.4
+[2.0.4t]: https://github.com/kettle-rb/ast-merge/releases/tag/v2.0.4
 [2.0.3]: https://github.com/kettle-rb/ast-merge/compare/v2.0.2...v2.0.3
 [2.0.3t]: https://github.com/kettle-rb/ast-merge/releases/tag/v2.0.3
 [2.0.2]: https://github.com/kettle-rb/ast-merge/compare/v2.0.1...v2.0.2

data/README.md

@@ -1032,7 +1032,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.272-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.595-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/ast/merge/comment/block.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../ast_node"
-require_relative "style"
-
 module Ast
   module Merge
     module Comment

data/lib/ast/merge/comment/empty.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../ast_node"
-
 module Ast
   module Merge
     module Comment

data/lib/ast/merge/comment/line.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../ast_node"
-require_relative "style"
-
 module Ast
   module Merge
     module Comment

data/lib/ast/merge/comment/parser.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "style"
-require_relative "line"
-require_relative "empty"
-require_relative "block"
-
 module Ast
   module Merge
     module Comment

data/lib/ast/merge/file_analyzable.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "freezable"
-
 module Ast
   module Merge
     # Mixin module for file analysis classes across all *-merge gems.

data/lib/ast/merge/freeze_node_base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "freezable"
-
 module Ast
   module Merge
     # Base class for freeze block nodes in AST merge libraries.

data/lib/ast/merge/node_typing.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "freezable"
-
 module Ast
   module Merge
     # Provides node type wrapping support for SmartMerger implementations.

data/lib/ast/merge/recipe/config.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "yaml"
-require_relative "preset"
 
 module Ast
   module Merge

data/lib/ast/merge/rspec/shared_examples/debug_logger.rb

@@ -108,9 +108,15 @@ RSpec.shared_examples("Ast::Merge::DebugLogger") do
 
     it "#time logs start and completion with timing" do
       output = capture(:stderr) { described_logger.time("test operation") { 42 } }
-      expect(output).to(include("Starting: test operation"))
-      expect(output).to(include("Completed: test operation"))
-      expect(output).to(match(/real_ms/))
+      if Ast::Merge::DebugLogger::BENCHMARK_AVAILABLE
+        expect(output).to(include("Starting: test operation"))
+        expect(output).to(include("Completed: test operation"))
+        expect(output).to(match(/real_ms/))
+      else
+        expect(output).to(include("WARNING"))
+        expect(output).to(include("Benchmark gem not available"))
+        expect(output).to(include("test operation"))
+      end
     end
 
     it "#time returns the block result" do

data/lib/ast/merge/text/file_analysis.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "line_node"
-require_relative "word_node"
-
 module Ast
   module Merge
     module Text

data/lib/ast/merge/text/line_node.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../ast_node"
-
 module Ast
   module Merge
     module Text

data/lib/ast/merge/text/word_node.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../ast_node"
-
 module Ast
   module Merge
     module Text

data/lib/ast/merge/version.rb

@@ -5,7 +5,7 @@ module Ast
     # Version information for Ast::Merge
     module Version
       # Current version of the ast-merge gem
-      VERSION = "2.0.3"
+      VERSION = "2.0.5"
     end
     VERSION = Version::VERSION # traditional location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Peter H. Boling
@@ -66,7 +66,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -352,10 +352,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://ast-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v2.0.3
-  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v2.0.3/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v2.0.5
+  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v2.0.5/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/ast-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/2.0.3
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/2.0.5
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/ast-merge/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge