bash-merge 2.0.6 → 7.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 7.1.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -38,45 +38,33 @@ cert_chain:
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tree_haver
+  name: ast-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
-  name: ast-merge
+  name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +74,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,35 +84,41 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.1.15
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,65 +154,85 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: appraisal2
+  name: anonymous_loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: kettle-soup-cover
+  name: appraisal2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.19
+- !ruby/object:Gem::Dependency
+  name: turbo_tests2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +256,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -252,87 +266,69 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
-description: "☯️ Bash::Merge provides smart Bash script merging that preserves comments,
-  understands shell structure, and supports freeze blocks for protecting destination
-  content. Perfect for merging configuration scripts and shell templates with customized
-  destination files."
+        version: 2.0.11
+description: "☯️ Bash statement, comment, freeze-block, and template merge behavior
+  for Structured Merge."
 email:
 - floss@galtzo.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
-- README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
+extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
 - lib/bash-merge.rb
 - lib/bash/merge.rb
 - lib/bash/merge/comment_tracker.rb
-- lib/bash/merge/conflict_resolver.rb
 - lib/bash/merge/debug_logger.rb
 - lib/bash/merge/emitter.rb
 - lib/bash/merge/file_analysis.rb
 - lib/bash/merge/freeze_node.rb
 - lib/bash/merge/merge_result.rb
 - lib/bash/merge/node_wrapper.rb
+- lib/bash/merge/provider.rb
 - lib/bash/merge/smart_merger.rb
 - lib/bash/merge/version.rb
 - sig/bash/merge.rbs
-homepage: https://github.com/kettle-rb/bash-merge
+homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
-- MIT
+- AGPL-3.0-only
+- PolyForm-Small-Business-1.0.0
 metadata:
-  homepage_uri: https://bash-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v2.0.6
-  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v2.0.6/CHANGELOG.md
-  bug_tracker_uri: https://github.com/kettle-rb/bash-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/bash-merge/2.0.6
+  homepage_uri: https://structuredmerge.org
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.3
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
+  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/7.1.3
   funding_uri: https://github.com/sponsors/pboling
-  wiki_uri: https://github.com/kettle-rb/bash-merge/wiki
+  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/bash-merge
   discord_uri: https://discord.gg/3qme4XHNKN
+  mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--title"
-- bash-merge - ☯️ Intelligent Bash script merging using tree-sitter AST analysis
+- bash-merge - ☯️ Structured Merge Bash analysis and merge for Ruby
 - "--main"
 - README.md
 - "--exclude"
@@ -346,14 +342,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.17
 specification_version: 4
-summary: "☯️ Intelligent Bash script merging using tree-sitter AST analysis"
+summary: "☯️ Structured Merge Bash analysis and merge for Ruby"
 test_files: []

data/CHANGELOG.md

@@ -1,211 +0,0 @@
-# Changelog
-
-[![SemVer 2.0.0][📌semver-img]][📌semver] [![Keep-A-Changelog 1.0.0][📗keep-changelog-img]][📗keep-changelog]
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog][📗keep-changelog],
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
-and [yes][📌major-versions-not-sacred], platform and engine support are part of the [public API][📌semver-breaking].
-Please file a bug if you notice a violation of semantic versioning.
-
-[📌semver]: https://semver.org/spec/v2.0.0.html
-[📌semver-img]: https://img.shields.io/badge/semver-2.0.0-FFDD67.svg?style=flat
-[📌semver-breaking]: https://github.com/semver/semver/issues/716#issuecomment-869336139
-[📌major-versions-not-sacred]: https://tom.preston-werner.com/2022/05/23/major-version-numbers-are-not-sacred.html
-[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
-[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-FFDD67.svg?style=flat
-
-## [Unreleased]
-
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
-
-## [2.0.6] - 2026-02-19
-
-- TAG: [v2.0.6][2.0.6t]
-- COVERAGE: 96.10% -- 518/539 lines in 11 files
-- BRANCH COVERAGE: 74.72% -- 133/178 branches in 11 files
-- 96.33% documented
-
-### Added
-
-- AGENTS.md
-
-### Changed
-
-- appraisal2 v3.0.6
-- kettle-test v1.0.10
-- stone_checksums v1.0.3
-- ast-merge v4.0.6
-- tree_haver v5.0.5
-- tree_stump v0.2.0
-  - fork no longer required, updates all applied upstream
-- Updated documentation on hostile takeover of RubyGems
-  - https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo
-
-## [2.0.5] - 2026-02-01
-
-- TAG: [v2.0.5][2.0.5t]
-- COVERAGE: 96.10% -- 518/539 lines in 11 files
-- BRANCH COVERAGE: 74.72% -- 133/178 branches in 11 files
-- 96.33% documented
-
-### Added
-
-- ConflictResolver now applies per-node-type preferences via `node_typing`.
-
-### Changed
-
-- Upgrade to [ast-merge v4.0.5](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.5)
-- Upgrade to [tree_haver v5.0.3](https://github.com/kettle-rb/tree_haver/releases/tag/v5.0.3)
-
-## [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]
-- COVERAGE: 96.16% -- 501/521 lines in 11 files
-- BRANCH COVERAGE: 76.22% -- 125/164 branches in 11 files
-- 96.33% documented
-
-### Changed
-
-- ast-merge v4.0.2
-- tree_haver v5.0.1
-
-## [2.0.2] - 2026-01-09
-
-- TAG: [v2.0.2][2.0.2t]
-- COVERAGE: 96.34% -- 500/519 lines in 11 files
-- BRANCH COVERAGE: 76.54% -- 124/162 branches in 11 files
-- 96.33% documented
-
-### Changed
-
-- tree_haver v4.0.5
-  - FFI Backend improvements
-  - Error handling improvements
-- Improved GHA workflows & rake tasks
-- **Simplified dependency_tags.rb**: Removed redundant debug code
-  - Removed `BASH_MERGE_DEBUG` env var handling (use `TREE_HAVER_DEBUG` instead)
-  - tree_haver's debug output now respects blocked backends via `compute_blocked_backends`
-  - Avoids accidentally loading MRI backend during FFI-only test runs
-
-## [2.0.1] - 2026-01-09
-
-- TAG: [v2.0.1][2.0.1t]
-- COVERAGE: 96.34% -- 500/519 lines in 11 files
-- BRANCH COVERAGE: 76.54% -- 124/162 branches in 11 files
-- 96.33% documented
-
-### Added
-
-- FFI backend isolation for test suite
-  - Added `bin/rspec-ffi` script to run FFI specs in isolation (before MRI backend loads)
-  - Added `spec/spec_ffi_helper.rb` for FFI-specific test configuration
-  - Updated Rakefile with `ffi_specs` and `remaining_specs` tasks
-  - The `:test` task now runs FFI specs first, then remaining specs
-- Emitter-based output
-
-### Changed
-
-- ast-merge v3.1.0, adds Ast::Merge::EmitterBase
-- tree_haver v4.0.4, adds error handling for FFI backend
-- major spec refactor
-
-## [2.0.0] - 2026-01-06
-
-- TAG: [v2.0.0][2.0.0t]
-- COVERAGE: 100.00% -- 109/109 lines in 2 files
-- BRANCH COVERAGE: 100.00% -- 28/28 branches in 2 files
-- 96.46% documented
-
-### Changed
-
-- ast-merge v3.0.0 compatibility (breaking changes)
-
-## [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]
-- COVERAGE: 100.00% -- 109/109 lines in 2 files
-- BRANCH COVERAGE: 100.00% -- 28/28 branches in 2 files
-- 96.90% documented
-
-### Added
-
-- Initial release
-
-### Security
-
-[Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v2.0.6...HEAD
-[2.0.6]: https://github.com/kettle-rb/bash-merge/compare/v2.0.5...v2.0.6
-[2.0.6t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.6
-[2.0.5]: https://github.com/kettle-rb/bash-merge/compare/v2.0.4...v2.0.5
-[2.0.5t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.5
-[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
-[2.0.2t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.2
-[2.0.1]: https://github.com/kettle-rb/bash-merge/compare/v2.0.0...v2.0.1
-[2.0.1t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.1
-[2.0.0]: https://github.com/kettle-rb/bash-merge/compare/v1.0.2...v2.0.0
-[2.0.0t]: https://github.com/kettle-rb/bash-merge/releases/tag/v2.0.0
-[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/CITATION.cff

@@ -1,20 +0,0 @@
-cff-version: 1.2.0
-title: bash-merge
-message: >-
-  If you use this work and you want to cite it,
-  then you can use the metadata from this file.
-type: software
-authors:
-  - given-names: Peter Hurn
-    family-names: Boling
-    email: peter@railsbling.com
-    affiliation: railsbling.com
-    orcid: 'https://orcid.org/0009-0008-8519-441X'
-identifiers:
-  - type: url
-    value: 'https://github.com/kettle-rb/bash-merge'
-    description: bash-merge
-repository-code: 'https://github.com/kettle-rb/bash-merge'
-abstract: >-
-  bash-merge
-license: See license file