ast-merge 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de91847b37300f7564eae028784a690a9b6b45cecf05f00bd4bece6fac30aa9
-  data.tar.gz: a3360868514b6f0a448380627d7ab83bf3a9a8684dd07073420b0a79c9396fea
+  metadata.gz: 2472ef456d1aa146dc31692f6b3c30aa02d9d2276d3b1be1a170056fe764d58c
+  data.tar.gz: 914a71d9f70a4edf27d91525c4c23166e715ac75009f0ee191eccfd1099d905a
 SHA512:
-  metadata.gz: 4c856bac67aefb340a5c69784bcd2869a5fb1bd4b566b212047120f1214ba0f7d0d2e112d2d6bf76a845eb9acfa941c5e0e6648d49f26bbbbb1a5ba0144b2485
-  data.tar.gz: 01fa4378ec6b0b6eaf4fb32e6af26a5ea5878cf55c59dbc36d098632f11c83d5531406114ca58d02b396c05f01bee1cf9d6f65ca41cfadae7fde6cd6cf7a5815
+  metadata.gz: 31a80cd7655eb4d6717009b201f5765e8ef699e58d9199355d84e09143df052f201ab906043f62d2606ea227c9ba6703a3bef3c129e2a045402b1aceabe21f56
+  data.tar.gz: f2245d51fc9d0209159886d1b8f1917b2d86a185dff2ddd07ba3835f0a4bf2085ca773c3dc4e8396fa9e796139e1c0a37c8ba593cabe78ee76d41b221daa669b

data/CHANGELOG.md

@@ -30,6 +30,39 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 88.45% -- 2894/3272 lines in 53 files
+- BRANCH COVERAGE: 67.83% -- 698/1029 branches in 53 files
+- 98.82% documented
+
+### Fixed
+
+- `Ast::Merge::DebugLogger::BENCHMARK_AVAILABLE` now correctly detects when benchmark gem is unavailable
+  - Previous implementation used `autoload` which never raises `LoadError` (it only registers for lazy loading)
+  - Now uses `require "benchmark"` which properly catches `LoadError` on Ruby 4.0+ where benchmark is a bundled gem
+  - The `#time` method now correctly falls back to non-timed execution when benchmark is unavailable
+
 ## [2.0.2] - 2025-12-30
 
 - TAG: [v2.0.2][2.0.2t]
@@ -284,7 +317,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.2...HEAD
+[Unreleased]: https://github.com/kettle-rb/ast-merge/compare/v2.0.4...HEAD
+[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
 [2.0.2t]: https://github.com/kettle-rb/ast-merge/releases/tag/v2.0.2
 [2.0.1]: https://github.com/kettle-rb/ast-merge/compare/v2.0.0...v2.0.1

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.271-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.276-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/debug_logger.rb

@@ -70,16 +70,15 @@ module Ast
     #
     # @note Shared examples require +silent_stream+ and +rspec-stubbed_env+ gems.
     module DebugLogger
-      # Benchmark is optional - gracefully degrade if not available
-      # Use autoload to defer loading until actually needed
+      # Benchmark is optional - gracefully degrade if not available.
+      # As of Ruby 4.0, benchmark is a bundled gem (not default), so it may not be available.
+      # We attempt to require it at load time and set a flag for later use.
       BENCHMARK_AVAILABLE = begin
-        autoload(:Benchmark, "benchmark")
+        require "benchmark"
         true
       rescue LoadError
-        # :nocov:
-        # Platform-specific: benchmark is part of Ruby stdlib, LoadError only on unusual Ruby builds
+        # benchmark gem not available (Ruby 4.0+ without explicit dependency, or unusual Ruby builds)
         false
-        # :nocov:
       end
 
       class << self

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/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.2"
+      VERSION = "2.0.4"
     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.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.2
-  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v2.0.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v2.0.4
+  changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v2.0.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/ast-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/2.0.2
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/2.0.4
   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