Skip to content
This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Commit f18c482

Browse files
pbolingpboling
committed
🔖 Prepare release v2.0.0
⚡️ A message from a fellow meat-based-AI ⚡️ - [❤️] Finely-crafted open-source tools like toml-merge (& many more) require time and effort. - [❤️] Though I adore my work, it lacks financial sustainability. - [❤️] Please, help me continue enhancing your tools by becoming a sponsor: - [💲] https://liberapay.com/pboling/donate - [💲] https://github.com/sponsors/pboling
1 parent b1b8a6c commit f18c482

40 files changed

Lines changed: 531 additions & 472 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ Thanks for RTFM. ☺️
802802
[📌gitmoji]: https://gitmoji.dev
803803
[📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
804804
[🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
805-
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.078-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
805+
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.637-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
806806
[🔐security]: SECURITY.md
807807
[🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
808808
[📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

‎docs/Toml.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ <h5 class="example_title"><div class='inline'><p>With debug information</p>
142142
</div>
143143

144144
<div id="footer">
145-
Generated on Fri Jan 9 00:39:54 2026 by
145+
Generated on Fri Jan 9 01:13:02 2026 by
146146
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
147147
0.9.38 (ruby-4.0.0).
148148
</div>

‎docs/Toml/Merge.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ <h2>
173173
</div>
174174

175175
<div id="footer">
176-
Generated on Fri Jan 9 00:39:54 2026 by
176+
Generated on Fri Jan 9 01:13:02 2026 by
177177
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
178178
0.9.38 (ruby-4.0.0).
179179
</div>

‎docs/Toml/Merge/ConflictResolver.html‎

Lines changed: 0 additions & 350 deletions
Original file line numberDiff line numberDiff line change
@@ -1,350 +0,0 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title>
7-
Class: Toml::Merge::ConflictResolver
8-
9-
&mdash; Documentation by YARD 0.9.38
10-
11-
</title>
12-
13-
<link rel="stylesheet" href="../../css/style.css" type="text/css" />
14-
15-
<link rel="stylesheet" href="../../css/common.css" type="text/css" />
16-
17-
<script type="text/javascript">
18-
pathId = "Toml::Merge::ConflictResolver";
19-
relpath = '../../';
20-
</script>
21-
22-
23-
<script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
24-
25-
<script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
26-
27-
28-
</head>
29-
<body>
30-
<div class="nav_wrap">
31-
<iframe id="nav" src="../../class_list.html?1"></iframe>
32-
<div id="resizer"></div>
33-
</div>
34-
35-
<div id="main" tabindex="-1">
36-
<div id="header">
37-
<div id="menu">
38-
39-
<a href="../../_index.html">Index (C)</a> &raquo;
40-
<span class='title'><span class='object_link'><a href="../../Toml.html" title="Toml (module)">Toml</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Merge.html" title="Toml::Merge (module)">Merge</a></span></span>
41-
&raquo;
42-
<span class="title">ConflictResolver</span>
43-
44-
</div>
45-
46-
<div id="search">
47-
48-
<a class="full_list_link" id="class_list_link"
49-
href="../../class_list.html">
50-
51-
<svg width="24" height="24">
52-
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
53-
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
54-
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
55-
</svg>
56-
</a>
57-
58-
</div>
59-
<div class="clear"></div>
60-
</div>
61-
62-
<div id="content"><h1>Class: Toml::Merge::ConflictResolver
63-
64-
65-
66-
</h1>
67-
<div class="box_info">
68-
69-
<dl>
70-
<dt>Inherits:</dt>
71-
<dd>
72-
<span class="inheritName">Ast::Merge::ConflictResolverBase</span>
73-
74-
<ul class="fullTree">
75-
<li>Object</li>
76-
77-
<li class="next">Ast::Merge::ConflictResolverBase</li>
78-
79-
<li class="next">Toml::Merge::ConflictResolver</li>
80-
81-
</ul>
82-
<a href="#" class="inheritanceTree">show all</a>
83-
84-
</dd>
85-
</dl>
86-
87-
88-
89-
90-
91-
92-
93-
94-
95-
96-
97-
<dl>
98-
<dt>Defined in:</dt>
99-
<dd>lib/toml/merge/conflict_resolver.rb</dd>
100-
</dl>
101-
102-
</div>
103-
104-
<h2>Overview</h2><div class="docstring">
105-
<div class="discussion">
106-
<p>Resolves conflicts between template and destination TOML content<br />
107-
using structural signatures and configurable preferences.</p>
108-
109-
110-
</div>
111-
</div>
112-
<div class="tags">
113-
114-
<div class="examples">
115-
<h4 class="tag_title">Examples:</h4>
116-
117-
118-
<h5 class="example_title"><div class='inline'><p>Basic usage</p>
119-
</div></h5>
120-
121-
<pre class="example code"><code><span class='id identifier rubyid_resolver'>resolver</span> <span class='op'>=</span> <span class='const'>ConflictResolver</span><span class='period'>.</span><span class='id identifier rubyid_new'><span class='object_link'><a href="#initialize-instance_method" title="Toml::Merge::ConflictResolver#initialize (method)">new</a></span></span><span class='lparen'>(</span><span class='id identifier rubyid_template_analysis'>template_analysis</span><span class='comma'>,</span> <span class='id identifier rubyid_dest_analysis'>dest_analysis</span><span class='rparen'>)</span>
122-
<span class='id identifier rubyid_resolver'>resolver</span><span class='period'>.</span><span class='id identifier rubyid_resolve'>resolve</span><span class='lparen'>(</span><span class='id identifier rubyid_result'>result</span><span class='rparen'>)</span></code></pre>
123-
124-
</div>
125-
126-
127-
</div>
128-
129-
130-
131-
132-
133-
134-
135-
<h2>
136-
Instance Method Summary
137-
<small><a href="#" class="summary_toggle">collapse</a></small>
138-
</h2>
139-
140-
<ul class="summary">
141-
142-
<li class="public ">
143-
<span class="summary_signature">
144-
145-
<a href="#initialize-instance_method" title="#initialize (instance method)">#<strong>initialize</strong>(template_analysis, dest_analysis, preference: :destination, add_template_only_nodes: false, match_refiner: nil, **options) &#x21d2; ConflictResolver </a>
146-
147-
148-
149-
</span>
150-
151-
152-
<span class="note title constructor">constructor</span>
153-
154-
155-
156-
157-
158-
159-
160-
161-
<span class="summary_desc"><div class='inline'><p>Creates a new ConflictResolver.</p>
162-
</div></span>
163-
164-
</li>
165-
166-
167-
</ul>
168-
169-
170-
171-
<div id="constructor_details" class="method_details_list">
172-
<h2>Constructor Details</h2>
173-
174-
<div class="method_details first">
175-
<h3 class="signature first" id="initialize-instance_method">
176-
177-
#<strong>initialize</strong>(template_analysis, dest_analysis, preference: :destination, add_template_only_nodes: false, match_refiner: nil, **options) &#x21d2; <tt><span class='object_link'><a href="" title="Toml::Merge::ConflictResolver (class)">ConflictResolver</a></span></tt>
178-
179-
180-
181-
182-
183-
</h3><div class="docstring">
184-
<div class="discussion">
185-
<p>Creates a new ConflictResolver</p>
186-
187-
188-
</div>
189-
</div>
190-
<div class="tags">
191-
<p class="tag_title">Parameters:</p>
192-
<ul class="param">
193-
194-
<li>
195-
196-
<span class='name'>template_analysis</span>
197-
198-
199-
<span class='type'>(<tt><span class='object_link'><a href="FileAnalysis.html" title="Toml::Merge::FileAnalysis (class)">FileAnalysis</a></span></tt>)</span>
200-
201-
202-
203-
&mdash;
204-
<div class='inline'><p>Analyzed template file</p>
205-
</div>
206-
207-
</li>
208-
209-
<li>
210-
211-
<span class='name'>dest_analysis</span>
212-
213-
214-
<span class='type'>(<tt><span class='object_link'><a href="FileAnalysis.html" title="Toml::Merge::FileAnalysis (class)">FileAnalysis</a></span></tt>)</span>
215-
216-
217-
218-
&mdash;
219-
<div class='inline'><p>Analyzed destination file</p>
220-
</div>
221-
222-
</li>
223-
224-
<li>
225-
226-
<span class='name'>preference</span>
227-
228-
229-
<span class='type'>(<tt>Symbol</tt>)</span>
230-
231-
232-
<em class="default">(defaults to: <tt>:destination</tt>)</em>
233-
234-
235-
&mdash;
236-
<div class='inline'><p>Which version to prefer when<br />
237-
nodes have matching signatures:</p>
238-
<ul>
239-
<li>:destination (default) - Keep destination version (customizations)</li>
240-
<li>:template - Use template version (updates)</li>
241-
</ul>
242-
</div>
243-
244-
</li>
245-
246-
<li>
247-
248-
<span class='name'>add_template_only_nodes</span>
249-
250-
251-
<span class='type'>(<tt>Boolean</tt>)</span>
252-
253-
254-
<em class="default">(defaults to: <tt>false</tt>)</em>
255-
256-
257-
&mdash;
258-
<div class='inline'><p>Whether to add nodes only in template</p>
259-
</div>
260-
261-
</li>
262-
263-
<li>
264-
265-
<span class='name'>match_refiner</span>
266-
267-
268-
<span class='type'>(<tt>#call</tt>, <tt>nil</tt>)</span>
269-
270-
271-
<em class="default">(defaults to: <tt>nil</tt>)</em>
272-
273-
274-
&mdash;
275-
<div class='inline'><p>Optional match refiner for fuzzy matching</p>
276-
</div>
277-
278-
</li>
279-
280-
<li>
281-
282-
<span class='name'>options</span>
283-
284-
285-
<span class='type'>(<tt>Hash</tt>)</span>
286-
287-
288-
289-
&mdash;
290-
<div class='inline'><p>Additional options for forward compatibility</p>
291-
</div>
292-
293-
</li>
294-
295-
</ul>
296-
297-
298-
</div><table class="source_code">
299-
<tr>
300-
<td>
301-
<pre class="lines">
302-
303-
304-
23
305-
24
306-
25
307-
26
308-
27
309-
28
310-
29
311-
30
312-
31
313-
32
314-
33
315-
34</pre>
316-
</td>
317-
<td>
318-
<pre class="code"><span class="info file"># File 'lib/toml/merge/conflict_resolver.rb', line 23</span>
319-
320-
<span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_template_analysis'>template_analysis</span><span class='comma'>,</span> <span class='id identifier rubyid_dest_analysis'>dest_analysis</span><span class='comma'>,</span> <span class='label'>preference:</span> <span class='symbol'>:destination</span><span class='comma'>,</span> <span class='label'>add_template_only_nodes:</span> <span class='kw'>false</span><span class='comma'>,</span> <span class='label'>match_refiner:</span> <span class='kw'>nil</span><span class='comma'>,</span> <span class='op'>**</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
321-
<span class='kw'>super</span><span class='lparen'>(</span>
322-
<span class='label'>strategy:</span> <span class='symbol'>:batch</span><span class='comma'>,</span>
323-
<span class='label'>preference:</span> <span class='id identifier rubyid_preference'>preference</span><span class='comma'>,</span>
324-
<span class='label'>template_analysis:</span> <span class='id identifier rubyid_template_analysis'>template_analysis</span><span class='comma'>,</span>
325-
<span class='label'>dest_analysis:</span> <span class='id identifier rubyid_dest_analysis'>dest_analysis</span><span class='comma'>,</span>
326-
<span class='label'>add_template_only_nodes:</span> <span class='id identifier rubyid_add_template_only_nodes'>add_template_only_nodes</span><span class='comma'>,</span>
327-
<span class='label'>match_refiner:</span> <span class='id identifier rubyid_match_refiner'>match_refiner</span><span class='comma'>,</span>
328-
<span class='op'>**</span><span class='id identifier rubyid_options'>options</span>
329-
<span class='rparen'>)</span>
330-
<span class='ivar'>@emitter</span> <span class='op'>=</span> <span class='const'><span class='object_link'><a href="Emitter.html" title="Toml::Merge::Emitter (class)">Emitter</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
331-
<span class='kw'>end</span></pre>
332-
</td>
333-
</tr>
334-
</table>
335-
</div>
336-
337-
</div>
338-
339-
340-
</div>
341-
342-
<div id="footer">
343-
Generated on Fri Jan 9 00:39:54 2026 by
344-
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
345-
0.9.38 (ruby-4.0.0).
346-
</div>
347-
348-
</div>
349-
</body>
350-
</html>

‎docs/Toml/Merge/DebugLogger.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ <h3 class="signature first" id="log_node-class_method">
264264
</div>
265265

266266
<div id="footer">
267-
Generated on Fri Jan 9 00:39:54 2026 by
267+
Generated on Fri Jan 9 01:13:02 2026 by
268268
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
269269
0.9.38 (ruby-4.0.0).
270270
</div>

‎docs/Toml/Merge/DestinationParseError.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ <h2>Constructor Details</h2>
162162
</div>
163163

164164
<div id="footer">
165-
Generated on Fri Jan 9 00:39:54 2026 by
165+
Generated on Fri Jan 9 01:13:02 2026 by
166166
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
167167
0.9.38 (ruby-4.0.0).
168168
</div>

0 commit comments

Comments
 (0)