json-merge 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b80810376606cc51dc2bb9b44a4cd40c59fc1f7c8d56f12fb2840d0860a5f0
-  data.tar.gz: dcae0b630a056f5fcc2a59d6ace275b2b649b62df5af62c287e12d80468fa78d
+  metadata.gz: 38f954bb103511024a69c2d85caa277ff1de782b88cd1c9b77ff0ae4809b6568
+  data.tar.gz: 5beaadc8745638f82acac95e7d62be37dbfce579a250cde95cc9efafa329463c
 SHA512:
-  metadata.gz: 0002d281c55f8f0dfd5d0000d22237f5bf68495eaa724008a57efd049fe1845d32cb4318fcc00266948cc5b93855bd4315eea87bfd65bdce57386747c10d118b
-  data.tar.gz: 48360b4e51149e4c83111ec167ffb1279e84147db5d67e9701dab41f247c9862970df48681fedbfca6460791ef8f39918bb49b1d2ee59f9d9a74cb818ba16fc8
+  metadata.gz: 3b6b6dc2287465a4789a78bdc32cbbb317924ead1bf24305642946b21a5b1dece510e829cde881f2c23d1f3a31d31a789812bfe23fc7dc38e6f7729ce9953837
+  data.tar.gz: 210cfe2fa6b47a09f0949feddf641e57a499c939df837de420df8f0e7f0c4401b778922f6f1aa7a41ef9e645c2fe1a5be2330617deeaa7abb4ee15e1922e94db

data/CHANGELOG.md

@@ -30,6 +30,29 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.1.2] - 2026-02-19
+
+- TAG: [v1.1.2][1.1.2t]
+- COVERAGE: 95.72% -- 604/631 lines in 10 files
+- BRANCH COVERAGE: 77.81% -- 235/302 branches in 10 files
+- 96.63% documented
+
+### Added
+
+- AGENTS.md
+
+### Changed
+
+- appraisal2 v3.0.6
+- kettle-test v1.0.10
+- stone_checksums v1.0.3
+- [ast-merge v4.0.6](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.6)
+- [tree_haver v5.0.5](https://github.com/kettle-rb/tree_haver/releases/tag/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
+
 ## [1.1.1] - 2026-01-26
 
 - TAG: [v1.1.1][1.1.1t]
@@ -43,8 +66,8 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Changed
 
-- ast-merge v4.0.4
-- tree_haver v5.0.2
+- Upgrade to [ast-merge v4.0.4](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.4)
+- Upgrade to [tree_haver v5.0.2](https://github.com/kettle-rb/tree_haver/releases/tag/v5.0.2)
 
 ## [1.1.0] - 2026-01-12
 
@@ -65,9 +88,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Changed
 
-- ast-merge v4.0.2
+- Upgrade to [ast-merge v4.0.2](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.2)
   - Includes Ast::Merge::EmitterBase
-- tree_haver v5.0.1
+- Upgrade to [tree_haver v5.0.1](https://github.com/kettle-rb/tree_haver/releases/tag/v5.0.1)
   - Many Backend improvements
   - Many error handling improvements
 - **Simplified dependency_tags.rb**: Removed redundant debug code
@@ -113,7 +136,11 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
-[Unreleased]: https://github.com/kettle-rb/json-merge/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/kettle-rb/json-merge/compare/v1.1.2...HEAD
+[1.1.3]: https://github.com/kettle-rb/json-merge/compare/v1.1.2...v1.1.3
+[1.1.3t]: https://github.com/kettle-rb/json-merge/releases/tag/v1.1.3
+[1.1.2]: https://github.com/kettle-rb/json-merge/compare/v1.1.1...v1.1.2
+[1.1.2t]: https://github.com/kettle-rb/json-merge/releases/tag/v1.1.2
 [1.1.1]: https://github.com/kettle-rb/json-merge/compare/v1.1.0...v1.1.1
 [1.1.1t]: https://github.com/kettle-rb/json-merge/releases/tag/v1.1.1
 [1.1.0]: https://github.com/kettle-rb/json-merge/compare/v1.0.0...v1.1.0

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
 
 Json::Merge is a standalone Ruby module that intelligently merges two versions of a JSON file using tree-sitter AST analysis. It's like a smart "git merge" specifically designed for JSON configuration files. Built on top of [ast-merge][ast-merge], it shares the same architecture as [prism-merge][prism-merge] for Ruby source files.

data/lib/json/merge/version.rb

@@ -5,7 +5,7 @@ module Json
     # Version information for Json::Merge
     module Version
       # Current version of the json-merge gem
-      VERSION = "1.1.1"
+      VERSION = "1.1.2"
     end
     VERSION = Version::VERSION # traditional location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-merge
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
         version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        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.2
+        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.4
+        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.4
+        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-test
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +188,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +198,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +222,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
@@ -226,7 +232,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
@@ -294,10 +300,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://json-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/json-merge/tree/v1.1.1
-  changelog_uri: https://github.com/kettle-rb/json-merge/blob/v1.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/json-merge/tree/v1.1.2
+  changelog_uri: https://github.com/kettle-rb/json-merge/blob/v1.1.2/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/json-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/json-merge/1.1.1
+  documentation_uri: https://www.rubydoc.info/gems/json-merge/1.1.2
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/json-merge/wiki
   news_uri: https://www.railsbling.com/tags/json-merge
@@ -326,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.5
 specification_version: 4
 summary: "☯️ Intelligent JSON file merging using tree-sitter AST analysis"
 test_files: []