RubyGems - bash-merge - Versions diffs - 2.0.3 → 2.0.4 - Mend

bash-merge 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7ede63c1590df94f22fdbffb07c06f1313ae2e09aab64b6b9d1d6174de9077
-  data.tar.gz: 885fb700fab46e68b0c614fa936518c0674cb7c3d50ca4466b943ec84dcd25f9
+  metadata.gz: 537268a1e7226b74f86d72b94a17fd1a5da6c5a995fd6f6d6623949c9436f048
+  data.tar.gz: 0d5d29f36d35e1c4b56597f97f563d8da1345e380d23a9a2a5be350342c1f5b1
 SHA512:
-  metadata.gz: d6d6b14002558067c7234de6e46a027ad47224289f4bc7b93ac64d40e335e4a786d82bda7f78be56381d8fa7ba6b4e2bd9623309ae5a1895247bb4e8151b6a02
-  data.tar.gz: 06a3659679935d65f0f389ed492e92b4f1446c2ebd0d527d6d4a5a3f9c3477757396de637067e0ff4b268c2606ba5c55ea5ea9a9b9ead4d35a6791ba777819b0
+  metadata.gz: 5557dbf95b0dfacbd1fbeb899ea20b7b03eda1453ffd5e16912667e5b033c020291772bfff5d25cceea8bd8733e6b3aed3244d495465c3266d6cce55d1cf86e3
+  data.tar.gz: 0acf658b9e0f0b9754866564fb99133511d6a96fc008bc5e9949a43fe3274baa0b5492af1c7c5df8f70dca4dbbb3166c940552caaf005c9c12870a375a72bd41

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data/CHANGELOG.md CHANGED Viewed

@@ -30,6 +30,18 @@ Please file a bug if you notice a violation of semantic versioning.
 ### Security
+## [2.0.4] - 2026-01-20
+- TAG: [v2.0.4][2.0.4t]
+- COVERAGE: 100.00% -- 25/25 lines in 1 files
+- BRANCH COVERAGE: 100.00% -- 4/4 branches in 1 files
+- 96.33% documented
+### Changed
+- Upgrade to [ast-merge v4.0.3](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.3)
+- Upgrade to [tree_haver v5.0.2](https://github.com/kettle-rb/tree_haver/releases/tag/v5.0.2)
 ## [2.0.3] - 2026-01-11
 - TAG: [v2.0.3][2.0.3t]
@@ -137,7 +149,9 @@ Please file a bug if you notice a violation of semantic versioning.
 ### Security
-[Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v2.0.3...HEAD
+[Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v2.0.4...HEAD
+[2.0.4]: https://github.com/kettle-rb/bash-merge/compare/v2.0.3...v2.0.4
+[2.0.4t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.4
 [2.0.3]: https://github.com/kettle-rb/bash-merge/compare/v2.0.2...v2.0.3
 [2.0.3t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.3
 [2.0.2]: https://github.com/kettle-rb/bash-merge/compare/v2.0.1...v2.0.2

data/README.md CHANGED Viewed

@@ -106,7 +106,7 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
 | Gem                                      | Version                                                        | CI                                                           |          | Language<br>/ Format                                                                                  | Parser Backend(s)                                                                | Description |
 |------------------------------------------|----------------------------------------------------------------|--------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|-------------|
-| [tree_haver][tree_haver]                 | [![Version][tree_haver-gem-i]][tree_haver-gem]                 | [![Version][tree_haver-ci-i]][tree_haver-ci]                 | Multi    | MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus, Parslet                           | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
+| [tree_haver][tree_haver]                 | [![Version][tree_haver-gem-i]][tree_haver-gem]                 | [![Version][tree_haver-ci-i]][tree_haver-ci]                 | Multi    | Supported Backends: MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus, Parslet       | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
 | [ast-merge][ast-merge]                   | [![Version][ast-merge-gem-i]][ast-merge-gem]                   | [![Version][ast-merge-ci-i]][ast-merge-ci]                   | Text     | internal                                                                                              | **Infrastructure**: Shared base classes and merge logic for all `*-merge` gems   |
 | [bash-merge][bash-merge]                 | [![Version][bash-merge-gem-i]][bash-merge-gem]                 | [![Version][bash-merge-ci-i]][bash-merge-ci]                 | Bash     | [tree-sitter-bash][ts-bash] (via tree_haver)                                                          | Smart merge for Bash scripts                                                     |
 | [commonmarker-merge][commonmarker-merge] | [![Version][commonmarker-merge-gem-i]][commonmarker-merge-gem] | [![Version][commonmarker-merge-ci-i]][commonmarker-merge-ci] | Markdown | [Commonmarker][commonmarker] (via tree_haver)                                                         | Smart merge for Markdown (CommonMark via comrak Rust)                            |
@@ -124,18 +124,18 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
 tree_haver supports multiple parsing backends, but not all backends work on all Ruby platforms:
-| Platform 👉️<br> TreeHaver Backend 👇️         | MRI | JRuby | TruffleRuby | Notes                                               |
-|------------------------------------------------|:---:|:-----:|:-----------:|-----------------------------------------------------|
-| **MRI** ([ruby_tree_sitter][ruby_tree_sitter]) |  ✅  |   ❌   |      ❌      | C extension, MRI only                               |
-| **Rust** ([tree_stump][tree_stump])            |  ✅  |   ❌   |      ❌      | Rust extension via magnus/rb-sys, MRI only          |
-| **FFI**                                        |  ✅  |   ✅   |      ❌      | TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE` |
-| **Java** ([jtreesitter][jtreesitter])          |  ❌  |   ✅   |      ❌      | JRuby only, requires grammar JARs                   |
-| **Prism**                                      |  ✅  |   ✅   |      ✅      | Ruby parsing, stdlib in Ruby 3.4+                   |
-| **Psych**                                      |  ✅  |   ✅   |      ✅      | YAML parsing, stdlib                                |
-| **Citrus**                                     |  ✅  |   ✅   |      ✅      | Pure Ruby PEG parser, no native dependencies        |
-| **Parslet**                                    |  ✅  |   ✅   |      ✅      | Pure Ruby PEG parser, no native dependencies        |
-| **Commonmarker**                               |  ✅  |   ❌   |      ❓      | Rust extension for Markdown                         |
-| **Markly**                                     |  ✅  |   ❌   |      ❓      | C extension for Markdown                            |
+| Platform 👉️<br> TreeHaver Backend 👇️          | MRI | JRuby | TruffleRuby | Notes                                                                      |
+|-------------------------------------------------|:---:|:-----:|:-----------:|----------------------------------------------------------------------------|
+| **MRI** ([ruby_tree_sitter][ruby_tree_sitter])  |  ✅  |   ❌   |      ❌      | C extension, MRI only                                                      |
+| **Rust** ([tree_stump][tree_stump])             |  ✅  |   ❌   |      ❌      | Rust extension via magnus/rb-sys, MRI only                                 |
+| **FFI** ([ffi][ffi])                            |  ✅  |   ✅   |      ❌      | TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE`                        |
+| **Java** ([jtreesitter][jtreesitter])           |  ❌  |   ✅   |      ❌      | JRuby only, requires grammar JARs                                          |
+| **Prism** ([prism][prism])                      |  ✅  |   ✅   |      ✅      | Ruby parsing, stdlib in Ruby 3.4+                                          |
+| **Psych** ([psych][psych])                      |  ✅  |   ✅   |      ✅      | YAML parsing, stdlib                                                       |
+| **Citrus** ([citrus][citrus])                   |  ✅  |   ✅   |      ✅      | Pure Ruby PEG parser, no native dependencies                               |
+| **Parslet** ([parslet][parslet])                |  ✅  |   ✅   |      ✅      | Pure Ruby PEG parser, no native dependencies                               |
+| **Commonmarker** ([commonmarker][commonmarker]) |  ✅  |   ❌   |      ❓      | Rust extension for Markdown (via [commonmarker-merge][commonmarker-merge]) |
+| **Markly** ([markly][markly])                   |  ✅  |   ❌   |      ❓      | C extension for Markdown  (via [markly-merge][markly-merge])               |
 **Legend**: ✅ = Works, ❌ = Does not work, ❓ = Untested
@@ -229,6 +229,7 @@ tree_haver supports multiple parsing backends, but not all backends work on all
 [kettle-jem-ci]: https://github.com/kettle-rb/kettle-jem/actions/workflows/current.yml
 [prism]: https://github.com/ruby/prism
 [psych]: https://github.com/ruby/psych
+[ffi]: https://github.com/ffi/ffi
 [ts-json]: https://github.com/tree-sitter/tree-sitter-json
 [ts-jsonc]: https://gitlab.com/WhyNotHugo/tree-sitter-jsonc
 [ts-bash]: https://github.com/tree-sitter/tree-sitter-bash
@@ -243,6 +244,8 @@ tree_haver supports multiple parsing backends, but not all backends work on all
 [ruby_tree_sitter]: https://github.com/Faveod/ruby-tree-sitter
 [tree_stump]: https://github.com/joker1007/tree_stump
 [jtreesitter]: https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter
+[citrus]: https://github.com/mjackson/citrus
+[parslet]: https://github.com/kschiess/parslet
 ## 💡 Info you can shake a stick at
@@ -657,9 +660,7 @@ Support us with a monthly donation and help us continue our activities. \[[Becom
 NOTE: [kettle-readme-backers][kettle-readme-backers] updates this list every day, automatically.
 <!-- OPENCOLLECTIVE-INDIVIDUALS:START -->
 No backers yet. Be the first!
 <!-- OPENCOLLECTIVE-INDIVIDUALS:END -->
 ### Open Collective for Organizations
@@ -669,9 +670,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
 NOTE: [kettle-readme-backers][kettle-readme-backers] updates this list every day, automatically.
 <!-- OPENCOLLECTIVE-ORGANIZATIONS:START -->
 No sponsors yet. Be the first!
 <!-- OPENCOLLECTIVE-ORGANIZATIONS:END -->
 [kettle-readme-backers]: https://github.com/kettle-rb/bash-merge/blob/main/exe/kettle-readme-backers
@@ -977,7 +976,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-0.521-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.025-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/bash/merge/version.rb CHANGED Viewed

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

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
         version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: ast-merge
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
         version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.3
 - !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/v2.0.3
-  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v2.0.3/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v2.0.4
+  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v2.0.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/bash-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/bash-merge/2.0.3
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/2.0.4
   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

metadata.gz.sig CHANGED Viewed

Binary file