bash-merge 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143070616b47ff572ec71a20ce9e8be2549fbdaac8e00fb703de16598b143770
-  data.tar.gz: e11406b8fc7e8adf42b5f473c22fa5761e46ed13a300715b3012765753e1b472
+  metadata.gz: 6c986cd0c94a1ce089bbd91e4dfaf8231fce4f1c7be371d2360fe9d554629c66
+  data.tar.gz: a015c172a3927379ccdc99306aeead042f79f33b7b75f4d6634039fa43383419
 SHA512:
-  metadata.gz: fb3bd78f3e13caddb7eee63fd32fa62d180ee99ede3d2a138ceb125e23df5ceb3e93dc2393413efc3fb5d3c38faa7136aca9584357ef1e85f435f315d99574ba
-  data.tar.gz: a1c7c1cf94ae0c103993356d525418384a6d2f13d5c878800487cd1839a3ce3e52206e9abb2b6b3ff8ba603dbe50af6c6eca75decc0e8b1ce3b06519ba1448e6
+  metadata.gz: b4d132dc07bfc018c0d4624d4db9d054959fff75c886fd63b2c8e7864586c19f865f9f0c13230dbcf0d7709ef8819afde7f821650a1724a13a173c1e3f37d6a9
+  data.tar.gz: 8000de3038c098bcfafc24db674313fef4e1c3e2e51ad55e6b696f0135482d740afc0e722e017d259b52166724d675eb680b74f4530eae3423040826993c441b

data/CHANGELOG.md

@@ -30,6 +30,29 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### 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]
@@ -43,8 +66,8 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Changed
 
-- tree_haver v5.0.3
-- ast-merge v4.0.5
+- 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
 
@@ -165,7 +188,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.5...HEAD
+[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

data/README.md

@@ -1,36 +1,3 @@
-| 📍 NOTE |
-| --- |
-| RubyGems (the [GitHub org][rubygems-org], not the website) [suffered][draper-security] a [hostile takeover][ellen-takeover] in September 2025. |
-| Ultimately [4 maintainers][simi-removed] were [hard removed][martin-removed] and a reason has been given for only 1 of those, while 2 others resigned in protest. |
-| It is a [complicated story][draper-takeover] which is difficult to [parse quickly][draper-lies]. |
-| Simply put - there was active policy for adding or removing maintainers/owners of [rubygems][rubygems-maint-policy] and [bundler][bundler-maint-policy], and those [policies were not followed][policy-fail]. |
-| I'm adding notes like this to gems because I [don't condone theft][draper-theft] of repositories or gems from their rightful owners. |
-| If a similar theft happened with my repos/gems, I'd hope some would stand up for me. |
-| Disenfranchised former-maintainers have started [gem.coop][gem-coop]. |
-| Once available I will publish there exclusively; unless RubyCentral makes amends with the community. |
-| The ["Technology for Humans: Joel Draper"][reinteractive-podcast] podcast episode by [reinteractive][reinteractive] is the most cogent summary I'm aware of. |
-| See [here][gem-naming], [here][gem-coop] and [here][martin-ann] for more info on what comes next. |
-| What I'm doing: A (WIP) proposal for [bundler/gem scopes][gem-scopes], and a (WIP) proposal for a federated [gem server][gem-server]. |
-
-[rubygems-org]: https://github.com/rubygems/
-[draper-security]: https://joel.drapper.me/p/ruby-central-security-measures/
-[draper-takeover]: https://joel.drapper.me/p/ruby-central-takeover/
-[ellen-takeover]: https://pup-e.com/blog/goodbye-rubygems/
-[simi-removed]: https://www.reddit.com/r/ruby/s/gOk42POCaV
-[martin-removed]: https://bsky.app/profile/martinemde.com/post/3m3occezxxs2q
-[draper-lies]: https://joel.drapper.me/p/ruby-central-fact-check/
-[draper-theft]: https://joel.drapper.me/p/ruby-central/
-[reinteractive]: https://reinteractive.com/ruby-on-rails
-[gem-coop]: https://gem.coop
-[gem-naming]: https://github.com/gem-coop/gem.coop/issues/12
-[martin-ann]: https://martinemde.com/2025/10/05/announcing-gem-coop.html
-[gem-scopes]: https://github.com/galtzo-floss/bundle-namespace
-[gem-server]: https://github.com/galtzo-floss/gem-server
-[reinteractive-podcast]: https://youtu.be/_H4qbtC5qzU?si=BvuBU90R2wAqD2E6
-[bundler-maint-policy]: https://github.com/ruby/rubygems/blob/b1ab33a3d52310a84d16b193991af07f5a6a07c0/doc/bundler/playbooks/TEAM_CHANGES.md
-[rubygems-maint-policy]: https://github.com/ruby/rubygems/blob/b1ab33a3d52310a84d16b193991af07f5a6a07c0/doc/rubygems/POLICIES.md?plain=1#L187-L196
-[policy-fail]: https://www.reddit.com/r/ruby/comments/1ove9vp/rubycentral_hates_this_one_fact/
-
 [![Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0][🖼️galtzo-i]][🖼️galtzo-discord] [![ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5][🖼️ruby-lang-i]][🖼️ruby-lang] [![kettle-rb Logo by Aboling0, CC BY-SA 4.0][🖼️kettle-rb-i]][🖼️kettle-rb]
 
 [🖼️galtzo-i]: https://logos.galtzo.com/assets/images/galtzo-floss/avatar-192px.svg
@@ -52,6 +19,13 @@
 
 [![OpenCollective Backers][🖇osc-backers-i]][🖇osc-backers] [![OpenCollective Sponsors][🖇osc-sponsors-i]][🖇osc-sponsors] [![Sponsor Me on Github][🖇sponsor-img]][🖇sponsor] [![Liberapay Goal Progress][⛳liberapay-img]][⛳liberapay] [![Donate on PayPal][🖇paypal-img]][🖇paypal] [![Buy me a coffee][🖇buyme-small-img]][🖇buyme] [![Donate on Polar][🖇polar-img]][🖇polar] [![Donate at ko-fi.com][🖇kofi-img]][🖇kofi]
 
+<details>
+    <summary>👣 How will this project approach the September 2025 hostile takeover of RubyGems? 🚑️</summary>
+
+I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo).
+
+</details>
+
 ## 🌻 Synopsis
 
 Bash::Merge is a standalone Ruby module that intelligently merges two versions of a Bash script using tree-sitter AST analysis. It's like a smart "git merge" specifically designed for shell scripts. Built on top of [ast-merge][ast-merge], it shares the same architecture as [prism-merge][prism-merge] for Ruby source files.

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 = "2.0.5"
+      VERSION = "2.0.6"
     end
     VERSION = Version::VERSION # traditional location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
         version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.5
   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.3
+        version: 5.0.5
 - !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.5
+        version: 4.0.6
   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.5
+        version: 4.0.6
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,6 +176,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: kettle-soup-cover
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +208,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +218,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +242,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -246,7 +252,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -315,10 +321,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://bash-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v2.0.5
-  changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v2.0.5/CHANGELOG.md
+  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.5
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/2.0.6
   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