prism-merge 1.0.2 → 1.0.3
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 +4 -4
- checksums.yaml.gz.sig +0 -0
- data/CHANGELOG.md +18 -1
- data/README.md +9 -3
- data/lib/prism/merge/version.rb +1 -1
- data.tar.gz.sig +0 -0
- metadata +4 -4
- metadata.gz.sig +3 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e450acf315100305aa2d3b2c0d76989d937c82a85b2b7643afa97ae198ea4b2a
|
|
4
|
+
data.tar.gz: '09e455e508c6d91722e8c73d04c7086dad434f95e8fc6a1447a5c094ecc307ef'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9ee4b24c5967da3e42de67f344aa4abeeb62b7f255bf05a33fb0194c3932628e95755c2dd0cb68d74b2d8ad2a19ba7fc88dd2b6e5614088dcfd5eb93aee64d13
|
|
7
|
+
data.tar.gz: 1c7a7c6e0ba69a2435f153e3f60252b7e65a332b163406bac663f95385680be2d885814f8d7564d3fb3b60dc859f91bbcbba8f1a0108037cc892f7dd189e87cd
|
checksums.yaml.gz.sig
CHANGED
|
Binary file
|
data/CHANGELOG.md
CHANGED
|
@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
|
|
|
30
30
|
|
|
31
31
|
### Security
|
|
32
32
|
|
|
33
|
+
## [1.0.3] - 2025-12-03
|
|
34
|
+
|
|
35
|
+
- TAG: [v1.0.3][1.0.3t]
|
|
36
|
+
- COVERAGE: 95.48% -- 613/642 lines in 7 files
|
|
37
|
+
- BRANCH COVERAGE: 81.39% -- 188/231 branches in 7 files
|
|
38
|
+
- 100.00% documented
|
|
39
|
+
|
|
40
|
+
### Added
|
|
41
|
+
|
|
42
|
+
- Improved synopsis documentation
|
|
43
|
+
|
|
44
|
+
### Fixed
|
|
45
|
+
|
|
46
|
+
- More fixes to Ruby compatibility documentation (down to Ruby 2.7)
|
|
47
|
+
|
|
33
48
|
## [1.0.2] - 2025-12-03
|
|
34
49
|
|
|
35
50
|
- TAG: [v1.0.2][1.0.2t]
|
|
@@ -70,7 +85,9 @@ Please file a bug if you notice a violation of semantic versioning.
|
|
|
70
85
|
|
|
71
86
|
- Initial release
|
|
72
87
|
|
|
73
|
-
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.0.
|
|
88
|
+
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.0.3...HEAD
|
|
89
|
+
[1.0.3]: https://github.com/kettle-rb/prism-merge/compare/v1.0.2...v1.0.3
|
|
90
|
+
[1.0.3t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.0.3
|
|
74
91
|
[1.0.2]: https://github.com/kettle-rb/prism-merge/compare/v1.0.1...v1.0.2
|
|
75
92
|
[1.0.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.0.2
|
|
76
93
|
[1.0.1]: https://github.com/kettle-rb/prism-merge/compare/v1.0.0...v1.0.1
|
data/README.md
CHANGED
|
@@ -63,8 +63,11 @@ Prism::Merge is a standalone Ruby module that intelligently merges two versions
|
|
|
63
63
|
- **Comment-Preserving**: Comments are properly attached to relevant nodes and/or placement
|
|
64
64
|
- **Freeze Block Support**: Respects `kettle-dev:freeze` markers for template merge control
|
|
65
65
|
- **Full Provenance**: Tracks origin of every line
|
|
66
|
-
- **
|
|
67
|
-
- **
|
|
66
|
+
- **Standalone**: No dependencies other than `prism` and `version_gem` (which is a tiny tool all my gems depend on)
|
|
67
|
+
- **Customizable**:
|
|
68
|
+
- `signature_generator` - callable custom signature generators
|
|
69
|
+
- `signature_match_preference` - setting of `:template` or `:destination`
|
|
70
|
+
- `add_template_only_nodes` - setting to retain nodes that do not exist in destination
|
|
68
71
|
|
|
69
72
|
### Example
|
|
70
73
|
|
|
@@ -86,7 +89,7 @@ File.write("merged.rb", result)
|
|
|
86
89
|
|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
87
90
|
| Works with JRuby | [![JRuby 9.4 Compat][💎jruby-9.4i]][🚎10-j-wf] [![JRuby 10.0 Compat][💎jruby-c-i]][🚎11-c-wf] [![JRuby HEAD Compat][💎jruby-headi]][🚎3-hd-wf] |
|
|
88
91
|
| Works with Truffle Ruby | [![Truffle Ruby 23.1 Compat][💎truby-23.1i]][🚎9-t-wf] [![Truffle Ruby 24.1 Compat][💎truby-c-i]][🚎11-c-wf] |
|
|
89
|
-
| Works with MRI Ruby 3 | [![Ruby 3.2 Compat][💎ruby-3.2i]][🚎6-s-wf] [![Ruby 3.3 Compat][💎ruby-3.3i]][🚎6-s-wf] [![Ruby 3.4 Compat][💎ruby-c-i]][🚎11-c-wf] [![Ruby HEAD Compat][💎ruby-headi]][🚎3-hd-wf] |
|
|
92
|
+
| Works with MRI Ruby 3 | [![Ruby 3.0 Compat][💎ruby-3.0i]][🚎4-lg-wf] [![Ruby 3.1 Compat][💎ruby-3.1i]][🚎6-s-wf] [![Ruby 3.2 Compat][💎ruby-3.2i]][🚎6-s-wf] [![Ruby 3.3 Compat][💎ruby-3.3i]][🚎6-s-wf] [![Ruby 3.4 Compat][💎ruby-c-i]][🚎11-c-wf] [![Ruby HEAD Compat][💎ruby-headi]][🚎3-hd-wf] |
|
|
90
93
|
| Works with MRI Ruby 2 | [![Ruby 2.7 Compat][💎ruby-2.7i]][🚎7-us-wf] |
|
|
91
94
|
| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite] [![Get help from me on Upwork][👨🏼🏫expsup-upwork-img]][👨🏼🏫expsup-upwork] [![Get help from me on Codementor][👨🏼🏫expsup-codementor-img]][👨🏼🏫expsup-codementor] |
|
|
92
95
|
| Source | [![Source on GitLab.com][📜src-gl-img]][📜src-gl] [![Source on CodeBerg.org][📜src-cb-img]][📜src-cb] [![Source on Github.com][📜src-gh-img]][📜src-gh] [![The best SHA: dQw4w9WgXcQ!][🧮kloc-img]][🧮kloc] |
|
|
@@ -925,6 +928,9 @@ Thanks for RTFM. ☺️
|
|
|
925
928
|
[🚎14-🔓️-wfi]: https://github.com/kettle-rb/prism-merge/actions/workflows/unlocked_deps.yml/badge.svg
|
|
926
929
|
[🚎15-🪪-wf]: https://github.com/kettle-rb/prism-merge/actions/workflows/license-eye.yml
|
|
927
930
|
[🚎15-🪪-wfi]: https://github.com/kettle-rb/prism-merge/actions/workflows/license-eye.yml/badge.svg
|
|
931
|
+
[💎ruby-2.7i]: https://img.shields.io/badge/Ruby-2.7-DF00CA?style=for-the-badge&logo=ruby&logoColor=white
|
|
932
|
+
[💎ruby-3.0i]: https://img.shields.io/badge/Ruby-3.0-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
933
|
+
[💎ruby-3.1i]: https://img.shields.io/badge/Ruby-3.1-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
928
934
|
[💎ruby-3.2i]: https://img.shields.io/badge/Ruby-3.2-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
929
935
|
[💎ruby-3.3i]: https://img.shields.io/badge/Ruby-3.3-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
930
936
|
[💎ruby-c-i]: https://img.shields.io/badge/Ruby-current-CC342D?style=for-the-badge&logo=ruby&logoColor=green
|
data/lib/prism/merge/version.rb
CHANGED
data.tar.gz.sig
CHANGED
|
Binary file
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: prism-merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter H. Boling
|
|
@@ -263,10 +263,10 @@ licenses:
|
|
|
263
263
|
- MIT
|
|
264
264
|
metadata:
|
|
265
265
|
homepage_uri: https://prism-merge.galtzo.com/
|
|
266
|
-
source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.0.
|
|
267
|
-
changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.0.
|
|
266
|
+
source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.0.3
|
|
267
|
+
changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.0.3/CHANGELOG.md
|
|
268
268
|
bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
|
|
269
|
-
documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.0.
|
|
269
|
+
documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.0.3
|
|
270
270
|
funding_uri: https://github.com/sponsors/pboling
|
|
271
271
|
wiki_uri: https://github.com/kettle-rb/prism-merge/wiki
|
|
272
272
|
news_uri: https://www.railsbling.com/tags/prism-merge
|
metadata.gz.sig
CHANGED
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
iR���L�~��K�w��c����x�Zܔn`sNk@tB ؝������`@ �c��9��+�Tl������6��'~4[W���8g�b�7�%�4�-l��}���&��a;�Cf#���ͨ�} X&�#����!���{5�̕b# �ݷ��$�ˍؔ�)㧠�K������l[
|
|
2
|
+
�e������"rٿ94��V�9���p���7�7j8���i+F
|
|
3
|
+
y� ���
|