jsonc-merge 1.0.0 → 1.0.1

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 88ff97ca53332565e23301b25b418b912975d5fca7d522cfb52ac57373b8c8bd
4
- data.tar.gz: bf750c31b8748d2ea599d04a9268b1381dbef014420f622fdbaa1805c8da6b53
3
+ metadata.gz: 193321badb6d4d5bf5de157b06e6090b4deac059663997d8d760781ac2d87182
4
+ data.tar.gz: 6303987151c58a62f9c5da904b546d1b73e94efc6266e6921ade07c9081594eb
5
5
  SHA512:
6
- metadata.gz: 1130bd1ef326745fa28b385e5328dfc2392e489623de116039150020075b88cc9e16957925fcaec3eafc8862896657a7a17d28dc3778b66baf09d1a27a775fe0
7
- data.tar.gz: 7d00e86a6fc7d166a44051a6a0a453ae97b517b57579eba5f698bd126b75faef422321f889ad0b009f6a898eb12372b64657f010a8b9b06c8077b04722e388ac
6
+ metadata.gz: 8e0840da5ee115a2195e2bd6bec4f7cc7c9e412273833d5df0562fa2ad1877c4eb274751c5a419a2a4cb2abcae8f0b467b1aec2eae9074e0bb02594a03189261
7
+ data.tar.gz: 60398ba3565cd64668a85b738e59f99175cbdc97d00fa7e07388d8e2d8fffe17b16f2f380af8eecde7a5dfaf6facf4eea842dfd709c39e0a94a71692dcbdd0ef
checksums.yaml.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -30,6 +30,29 @@ Please file a bug if you notice a violation of semantic versioning.
30
30
 
31
31
  ### Security
32
32
 
33
+ ## [1.0.1] - 2026-02-19
34
+
35
+ - TAG: [v1.0.1][1.0.1t]
36
+ - COVERAGE: 93.01% -- 639/687 lines in 11 files
37
+ - BRANCH COVERAGE: 68.75% -- 231/336 branches in 11 files
38
+ - 96.43% documented
39
+
40
+ ### Added
41
+
42
+ - AGENTS.md
43
+
44
+ ### Changed
45
+
46
+ - appraisal2 v3.0.6
47
+ - kettle-test v1.0.10
48
+ - stone_checksums v1.0.3
49
+ - ast-merge v4.0.6
50
+ - tree_haver v5.0.5
51
+ - tree_stump v0.2.0
52
+ - fork no longer required, updates all applied upstream
53
+ - Updated documentation on hostile takeover of RubyGems
54
+ - https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo
55
+
33
56
  ## [1.0.0] - 2026-02-01
34
57
 
35
58
  - TAG: [v1.0.0][1.0.0t]
@@ -43,6 +66,8 @@ Please file a bug if you notice a violation of semantic versioning.
43
66
 
44
67
  ### Security
45
68
 
46
- [Unreleased]: https://github.com/kettle-rb/jsonc-merge/compare/v1.0.0...HEAD
69
+ [Unreleased]: https://github.com/kettle-rb/jsonc-merge/compare/v1.0.1...HEAD
70
+ [1.0.1]: https://github.com/kettle-rb/jsonc-merge/compare/v1.0.0...v1.0.1
71
+ [1.0.1t]: https://github.com/kettle-rb/jsonc-merge/releases/tag/v1.0.1
47
72
  [1.0.0]: https://github.com/kettle-rb/jsonc-merge/compare/f1cc25b1d9b79c598270e3aa203fa56787e6c6fc...v1.0.0
48
73
  [1.0.0t]: https://github.com/kettle-rb/jsonc-merge/tags/v1.0.0
data/README.md CHANGED
@@ -1,36 +1,3 @@
1
- | 📍 NOTE |
2
- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
3
- | RubyGems (the [GitHub org][rubygems-org], not the website) [suffered][draper-security] a [hostile takeover][ellen-takeover] in September 2025. |
4
- | 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. |
5
- | It is a [complicated story][draper-takeover] which is difficult to [parse quickly][draper-lies]. |
6
- | 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]. |
7
- | I'm adding notes like this to gems because I [don't condone theft][draper-theft] of repositories or gems from their rightful owners. |
8
- | If a similar theft happened with my repos/gems, I'd hope some would stand up for me. |
9
- | Disenfranchised former-maintainers have started [gem.coop][gem-coop]. |
10
- | Once available I will publish there exclusively; unless RubyCentral makes amends with the community. |
11
- | The ["Technology for Humans: Joel Draper"][reinteractive-podcast] podcast episode by [reinteractive][reinteractive] is the most cogent summary I'm aware of. |
12
- | See [here][gem-naming], [here][gem-coop] and [here][martin-ann] for more info on what comes next. |
13
- | What I'm doing: A (WIP) proposal for [bundler/gem scopes][gem-scopes], and a (WIP) proposal for a federated [gem server][gem-server]. |
14
-
15
- [rubygems-org]: https://github.com/rubygems/
16
- [draper-security]: https://joel.drapper.me/p/ruby-central-security-measures/
17
- [draper-takeover]: https://joel.drapper.me/p/ruby-central-takeover/
18
- [ellen-takeover]: https://pup-e.com/blog/goodbye-rubygems/
19
- [simi-removed]: https://www.reddit.com/r/ruby/s/gOk42POCaV
20
- [martin-removed]: https://bsky.app/profile/martinemde.com/post/3m3occezxxs2q
21
- [draper-lies]: https://joel.drapper.me/p/ruby-central-fact-check/
22
- [draper-theft]: https://joel.drapper.me/p/ruby-central/
23
- [reinteractive]: https://reinteractive.com/ruby-on-rails
24
- [gem-coop]: https://gem.coop
25
- [gem-naming]: https://github.com/gem-coop/gem.coop/issues/12
26
- [martin-ann]: https://martinemde.com/2025/10/05/announcing-gem-coop.html
27
- [gem-scopes]: https://github.com/galtzo-floss/bundle-namespace
28
- [gem-server]: https://github.com/galtzo-floss/gem-server
29
- [reinteractive-podcast]: https://youtu.be/_H4qbtC5qzU?si=BvuBU90R2wAqD2E6
30
- [bundler-maint-policy]: https://github.com/ruby/rubygems/blob/b1ab33a3d52310a84d16b193991af07f5a6a07c0/doc/bundler/playbooks/TEAM_CHANGES.md
31
- [rubygems-maint-policy]: https://github.com/ruby/rubygems/blob/b1ab33a3d52310a84d16b193991af07f5a6a07c0/doc/rubygems/POLICIES.md?plain=1#L187-L196
32
- [policy-fail]: https://www.reddit.com/r/ruby/comments/1ove9vp/rubycentral_hates_this_one_fact/
33
-
34
1
  [![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]
35
2
 
36
3
  [🖼️galtzo-i]: https://logos.galtzo.com/assets/images/galtzo-floss/avatar-192px.svg
@@ -52,6 +19,13 @@
52
19
 
53
20
  [![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]
54
21
 
22
+ <details>
23
+ <summary>👣 How will this project approach the September 2025 hostile takeover of RubyGems? 🚑️</summary>
24
+
25
+ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo).
26
+
27
+ </details>
28
+
55
29
  ## 🌻 Synopsis
56
30
 
57
31
  Jsonc::Merge is a standalone Ruby module that intelligently merges two versions of a JSONC (JSON with Comments) file using tree-sitter AST analysis. It's like a smart "git merge" specifically designed for JSONC configuration files. Built on top of [ast-merge][ast-merge], it shares the same architecture as [prism-merge][prism-merge] for Ruby source files.
@@ -5,7 +5,7 @@ module Jsonc
5
5
  # Version information for Jsonc::Merge
6
6
  module Version
7
7
  # Current version of the json-merge gem
8
- VERSION = "1.0.0"
8
+ VERSION = "1.0.1"
9
9
  end
10
10
  VERSION = Version::VERSION # traditional location
11
11
  end
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jsonc-merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
46
46
  version: '5.0'
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 5.0.3
49
+ version: 5.0.5
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
56
56
  version: '5.0'
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: 5.0.3
59
+ version: 5.0.5
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: ast-merge
62
62
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  version: '4.0'
67
67
  - - ">="
68
68
  - !ruby/object:Gem::Version
69
- version: 4.0.5
69
+ version: 4.0.6
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '4.0'
77
77
  - - ">="
78
78
  - !ruby/object:Gem::Version
79
- version: 4.0.5
79
+ version: 4.0.6
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: version_gem
82
82
  requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,9 @@ dependencies:
166
166
  - - "~>"
167
167
  - !ruby/object:Gem::Version
168
168
  version: '3.0'
169
+ - - "~>"
170
+ - !ruby/object:Gem::Version
171
+ version: 3.0.6
169
172
  type: :development
170
173
  prerelease: false
171
174
  version_requirements: !ruby/object:Gem::Requirement
@@ -173,6 +176,9 @@ dependencies:
173
176
  - - "~>"
174
177
  - !ruby/object:Gem::Version
175
178
  version: '3.0'
179
+ - - "~>"
180
+ - !ruby/object:Gem::Version
181
+ version: 3.0.6
176
182
  - !ruby/object:Gem::Dependency
177
183
  name: kettle-test
178
184
  requirement: !ruby/object:Gem::Requirement
@@ -182,7 +188,7 @@ dependencies:
182
188
  version: '1.0'
183
189
  - - ">="
184
190
  - !ruby/object:Gem::Version
185
- version: 1.0.7
191
+ version: 1.0.10
186
192
  type: :development
187
193
  prerelease: false
188
194
  version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +198,7 @@ dependencies:
192
198
  version: '1.0'
193
199
  - - ">="
194
200
  - !ruby/object:Gem::Version
195
- version: 1.0.7
201
+ version: 1.0.10
196
202
  - !ruby/object:Gem::Dependency
197
203
  name: ruby-progressbar
198
204
  requirement: !ruby/object:Gem::Requirement
@@ -216,7 +222,7 @@ dependencies:
216
222
  version: '1.0'
217
223
  - - ">="
218
224
  - !ruby/object:Gem::Version
219
- version: 1.0.2
225
+ version: 1.0.3
220
226
  type: :development
221
227
  prerelease: false
222
228
  version_requirements: !ruby/object:Gem::Requirement
@@ -226,7 +232,7 @@ dependencies:
226
232
  version: '1.0'
227
233
  - - ">="
228
234
  - !ruby/object:Gem::Version
229
- version: 1.0.2
235
+ version: 1.0.3
230
236
  - !ruby/object:Gem::Dependency
231
237
  name: gitmoji-regex
232
238
  requirement: !ruby/object:Gem::Requirement
@@ -295,10 +301,10 @@ licenses:
295
301
  - MIT
296
302
  metadata:
297
303
  homepage_uri: https://jsonc-merge.galtzo.com/
298
- source_code_uri: https://github.com/kettle-rb/jsonc-merge/tree/v1.0.0
299
- changelog_uri: https://github.com/kettle-rb/jsonc-merge/blob/v1.0.0/CHANGELOG.md
304
+ source_code_uri: https://github.com/kettle-rb/jsonc-merge/tree/v1.0.1
305
+ changelog_uri: https://github.com/kettle-rb/jsonc-merge/blob/v1.0.1/CHANGELOG.md
300
306
  bug_tracker_uri: https://github.com/kettle-rb/jsonc-merge/issues
301
- documentation_uri: https://www.rubydoc.info/gems/jsonc-merge/1.0.0
307
+ documentation_uri: https://www.rubydoc.info/gems/jsonc-merge/1.0.1
302
308
  funding_uri: https://github.com/sponsors/pboling
303
309
  wiki_uri: https://github.com/kettle-rb/jsonc-merge/wiki
304
310
  news_uri: https://www.railsbling.com/tags/jsonc-merge
metadata.gz.sig CHANGED
Binary file