bash-merge 2.0.5 → 7.1.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 +4 -4
- checksums.yaml.gz.sig +0 -0
- data/LICENSE.md +13 -0
- data/README.md +105 -670
- data/lib/bash/merge/comment_tracker.rb +36 -100
- data/lib/bash/merge/debug_logger.rb +10 -10
- data/lib/bash/merge/emitter.rb +45 -33
- data/lib/bash/merge/file_analysis.rb +133 -33
- data/lib/bash/merge/freeze_node.rb +9 -9
- data/lib/bash/merge/merge_result.rb +11 -5
- data/lib/bash/merge/node_wrapper.rb +62 -36
- data/lib/bash/merge/smart_merger.rb +641 -32
- data/lib/bash/merge/version.rb +5 -4
- data/lib/bash/merge.rb +116 -25
- data/lib/bash-merge.rb +7 -1
- data/sig/bash/merge.rbs +3 -255
- data.tar.gz.sig +0 -0
- metadata +85 -84
- metadata.gz.sig +0 -0
- data/CHANGELOG.md +0 -186
- data/CITATION.cff +0 -20
- data/CODE_OF_CONDUCT.md +0 -134
- data/CONTRIBUTING.md +0 -227
- data/FUNDING.md +0 -74
- data/LICENSE.txt +0 -21
- data/REEK +0 -0
- data/RUBOCOP.md +0 -71
- data/SECURITY.md +0 -21
- data/lib/bash/merge/conflict_resolver.rb +0 -199
data/README.md
CHANGED
|
@@ -1,60 +1,27 @@
|
|
|
1
|
-
|
|
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
|
-
[![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
|
-
|
|
36
|
-
[🖼️galtzo-i]: https://logos.galtzo.com/assets/images/galtzo-floss/avatar-192px.svg
|
|
37
|
-
[🖼️galtzo-discord]: https://discord.gg/3qme4XHNKN
|
|
38
|
-
[🖼️ruby-lang-i]: https://logos.galtzo.com/assets/images/ruby-lang/avatar-192px.svg
|
|
39
|
-
[🖼️ruby-lang]: https://www.ruby-lang.org/
|
|
40
|
-
[🖼️kettle-rb-i]: https://logos.galtzo.com/assets/images/kettle-rb/avatar-192px.svg
|
|
41
|
-
[🖼️kettle-rb]: https://github.com/kettle-rb
|
|
1
|
+
<a href="https://github.com/structuredmerge"><img alt="structuredmerge Logo by GitHub" src="https://github.com/structuredmerge.png?size=192" width="14%" align="right"/></a>
|
|
42
2
|
|
|
43
3
|
# ☯️ Bash::Merge
|
|
44
4
|
|
|
45
|
-
[![Version][👽versioni]][
|
|
5
|
+
[![Version][👽versioni]][👽version] [![Ruby Users Forum][✉️ruby-forum-top-img]][✉️ruby-forum] [![GitHub tag (latest SemVer)][⛳️tag-img]][⛳️tag] [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Total downloads][👽dl-ranki]][👽dl-rank] [![CI Current][🚎11-c-wfi]][🚎11-c-wf]
|
|
46
6
|
|
|
47
|
-
`if ci_badges.map(&:color).detect { it != "green"}` ☝️ [let me know][
|
|
7
|
+
`if ci_badges.map(&:color).detect { it != "green"}` ☝️ [let me know on Discord][✉️discord-invite] or [RubyForum][✉️ruby-forum], as I may have missed the notification.
|
|
48
8
|
|
|
49
|
-
|
|
9
|
+
---
|
|
50
10
|
|
|
51
11
|
`if ci_badges.map(&:color).all? { it == "green"}` 👇️ send money so I can do more of this. FLOSS maintenance is now my full-time job.
|
|
52
12
|
|
|
53
|
-
[![
|
|
13
|
+
[![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 at ko-fi.com][🖇kofi-img]][🖇kofi]
|
|
54
14
|
|
|
55
|
-
|
|
15
|
+
<details markdown="1">
|
|
16
|
+
<summary>👣 How will this project approach the September 2025 hostile takeover of RubyGems? 🚑️</summary>
|
|
17
|
+
|
|
18
|
+
I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo).
|
|
19
|
+
|
|
20
|
+
</details>
|
|
21
|
+
|
|
22
|
+
## 🌻 Synopsis <a href="https://discord.gg/3qme4XHNKN"><img alt="Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/galtzo-floss/avatar-128px.svg" width="8%" align="right"/></a> <a href="https://ruby-toolbox.com"><img alt="ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5" src="https://logos.galtzo.com/assets/images/ruby-lang/avatar-128px.svg" width="8%" align="right"/></a>
|
|
56
23
|
|
|
57
|
-
Bash::Merge
|
|
24
|
+
Bash::Merge intelligently merges two versions of a Bash script using the StructuredMerge Ruby stack. It is built on [ast-merge][ast-merge] and [tree_haver][tree_haver], with Bash parsing supplied through the current tree-sitter language-pack backend.
|
|
58
25
|
|
|
59
26
|
### Key Features
|
|
60
27
|
|
|
@@ -65,7 +32,7 @@ Bash::Merge is a standalone Ruby module that intelligently merges two versions o
|
|
|
65
32
|
- **Shebang Handling**: Properly handles `#!/bin/bash` and similar shebangs
|
|
66
33
|
- **Freeze Block Support**: Respects freeze markers (default: `bash-merge:freeze` / `bash-merge:unfreeze`) for merge control - customizable to match your project's conventions
|
|
67
34
|
- **Full Provenance**: Tracks origin of every node
|
|
68
|
-
- **
|
|
35
|
+
- **StructuredMerge Native**: Depends on `ast-merge` and `tree_haver`; parser availability comes from the registered backend providers
|
|
69
36
|
- **Customizable**:
|
|
70
37
|
- `signature_generator` - callable custom signature generators
|
|
71
38
|
- `preference` - setting of `:template`, `:destination`, or a Hash for per-node-type preferences
|
|
@@ -75,16 +42,16 @@ Bash::Merge is a standalone Ruby module that intelligently merges two versions o
|
|
|
75
42
|
|
|
76
43
|
### Supported Node Types
|
|
77
44
|
|
|
78
|
-
| Node Type
|
|
79
|
-
|
|
80
|
-
| Function Definition | `[:function, name]`
|
|
81
|
-
| Variable Assignment | `[:assignment, name]`
|
|
82
|
-
| Command
|
|
83
|
-
| Comment
|
|
84
|
-
| Pipeline
|
|
85
|
-
| If Statement
|
|
86
|
-
| For Loop
|
|
87
|
-
| While Loop
|
|
45
|
+
| Node Type | Signature Format | Matching Behavior |
|
|
46
|
+
|---------------------|-----------------------------|-------------------------------------------|
|
|
47
|
+
| Function Definition | `[:function, name]` | Functions match by name |
|
|
48
|
+
| Variable Assignment | `[:assignment, name]` | Variables match by name |
|
|
49
|
+
| Command | `[:command, name, args...]` | Commands match by name and arguments |
|
|
50
|
+
| Comment | `[:comment, text]` | Comments preserved in context |
|
|
51
|
+
| Pipeline | `[:pipeline, commands...]` | Pipelines match by command sequence |
|
|
52
|
+
| If Statement | `[:if, condition_sig]` | Conditionals match by condition signature |
|
|
53
|
+
| For Loop | `[:for, variable]` | For loops match by loop variable |
|
|
54
|
+
| While Loop | `[:while, condition_sig]` | While loops match by condition signature |
|
|
88
55
|
|
|
89
56
|
### Example
|
|
90
57
|
|
|
@@ -100,211 +67,47 @@ result = merger.merge
|
|
|
100
67
|
File.write("merged.sh", result.to_bash)
|
|
101
68
|
```
|
|
102
69
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
The `*-merge` gem family provides intelligent, AST-based merging for various file formats. At the foundation is [tree_haver][tree_haver], which provides a unified cross-Ruby parsing API that works seamlessly across MRI, JRuby, and TruffleRuby.
|
|
106
|
-
|
|
107
|
-
| Gem | Version / CI | Language<br>/ Format | Parser Backend(s) | Description |
|
|
108
|
-
|------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------:|----------------------|-------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
|
|
109
|
-
| [tree_haver][tree_haver] | [![Version][tree_haver-gem-i]][tree_haver-gem] <br/> [![CI][tree_haver-ci-i]][tree_haver-ci] | Multi | Supported Backends: MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus, Parslet | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
|
|
110
|
-
| [ast-merge][ast-merge] | [![Version][ast-merge-gem-i]][ast-merge-gem] <br/> [![CI][ast-merge-ci-i]][ast-merge-ci] | Text | internal | **Infrastructure**: Shared base classes and merge logic for all `*-merge` gems |
|
|
111
|
-
| [bash-merge][bash-merge] | [![Version][bash-merge-gem-i]][bash-merge-gem] <br/> [![CI][bash-merge-ci-i]][bash-merge-ci] | Bash | [tree-sitter-bash][ts-bash] (via tree_haver) | Smart merge for Bash scripts |
|
|
112
|
-
| [commonmarker-merge][commonmarker-merge] | [![Version][commonmarker-merge-gem-i]][commonmarker-merge-gem] <br/> [![CI][commonmarker-merge-ci-i]][commonmarker-merge-ci] | Markdown | [Commonmarker][commonmarker] (via tree_haver) | Smart merge for Markdown (CommonMark via comrak Rust) |
|
|
113
|
-
| [dotenv-merge][dotenv-merge] | [![Version][dotenv-merge-gem-i]][dotenv-merge-gem] <br/> [![CI][dotenv-merge-ci-i]][dotenv-merge-ci] | Dotenv | internal | Smart merge for `.env` files |
|
|
114
|
-
| [json-merge][json-merge] | [![Version][json-merge-gem-i]][json-merge-gem] <br/> [![CI][json-merge-ci-i]][json-merge-ci] | JSON | [tree-sitter-json][ts-json] (via tree_haver) | Smart merge for JSON files |
|
|
115
|
-
| [jsonc-merge][jsonc-merge] | [![Version][jsonc-merge-gem-i]][jsonc-merge-gem] <br/> [![CI][jsonc-merge-ci-i]][jsonc-merge-ci] | JSONC | [tree-sitter-jsonc][ts-jsonc] (via tree_haver) | ⚠️ Proof of concept; Smart merge for JSON with Comments |
|
|
116
|
-
| [markdown-merge][markdown-merge] | [![Version][markdown-merge-gem-i]][markdown-merge-gem] <br/> [![CI][markdown-merge-ci-i]][markdown-merge-ci] | Markdown | [Commonmarker][commonmarker] / [Markly][markly] (via tree_haver), [Parslet][parslet] | **Foundation**: Shared base for Markdown mergers with inner code block merging |
|
|
117
|
-
| [markly-merge][markly-merge] | [![Version][markly-merge-gem-i]][markly-merge-gem] <br/> [![CI][markly-merge-ci-i]][markly-merge-ci] | Markdown | [Markly][markly] (via tree_haver) | Smart merge for Markdown (CommonMark via cmark-gfm C) |
|
|
118
|
-
| [prism-merge][prism-merge] | [![Version][prism-merge-gem-i]][prism-merge-gem] <br/> [![CI][prism-merge-ci-i]][prism-merge-ci] | Ruby | [Prism][prism] (`prism` std lib gem) | Smart merge for Ruby source files |
|
|
119
|
-
| [psych-merge][psych-merge] | [![Version][psych-merge-gem-i]][psych-merge-gem] <br/> [![CI][psych-merge-ci-i]][psych-merge-ci] | YAML | [Psych][psych] (`psych` std lib gem) | Smart merge for YAML files |
|
|
120
|
-
| [rbs-merge][rbs-merge] | [![Version][rbs-merge-gem-i]][rbs-merge-gem] <br/> [![CI][rbs-merge-ci-i]][rbs-merge-ci] | RBS | [tree-sitter-bash][ts-rbs] (via tree_haver), [RBS][rbs] (`rbs` std lib gem) | Smart merge for Ruby type signatures |
|
|
121
|
-
| [toml-merge][toml-merge] | [![Version][toml-merge-gem-i]][toml-merge-gem] <br/> [![CI][toml-merge-ci-i]][toml-merge-ci] | TOML | [Parslet + toml][toml], [Citrus + toml-rb][toml-rb], [tree-sitter-toml][ts-toml] (all via tree_haver) | Smart merge for TOML files |
|
|
122
|
-
|
|
123
|
-
#### Backend Platform Compatibility
|
|
124
|
-
|
|
125
|
-
tree_haver supports multiple parsing backends, but not all backends work on all Ruby platforms:
|
|
126
|
-
|
|
127
|
-
| Platform 👉️<br> TreeHaver Backend 👇️ | MRI | JRuby | TruffleRuby | Notes |
|
|
128
|
-
|-------------------------------------------------|:---:|:-----:|:-----------:|----------------------------------------------------------------------------|
|
|
129
|
-
| **MRI** ([ruby_tree_sitter][ruby_tree_sitter]) | ✅ | ❌ | ❌ | C extension, MRI only |
|
|
130
|
-
| **Rust** ([tree_stump][tree_stump]) | ✅ | ❌ | ❌ | Rust extension via magnus/rb-sys, MRI only |
|
|
131
|
-
| **FFI** ([ffi][ffi]) | ✅ | ✅ | ❌ | TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE` |
|
|
132
|
-
| **Java** ([jtreesitter][jtreesitter]) | ❌ | ✅ | ❌ | JRuby only, requires grammar JARs |
|
|
133
|
-
| **Prism** ([prism][prism]) | ✅ | ✅ | ✅ | Ruby parsing, stdlib in Ruby 3.4+ |
|
|
134
|
-
| **Psych** ([psych][psych]) | ✅ | ✅ | ✅ | YAML parsing, stdlib |
|
|
135
|
-
| **Citrus** ([citrus][citrus]) | ✅ | ✅ | ✅ | Pure Ruby PEG parser, no native dependencies |
|
|
136
|
-
| **Parslet** ([parslet][parslet]) | ✅ | ✅ | ✅ | Pure Ruby PEG parser, no native dependencies |
|
|
137
|
-
| **Commonmarker** ([commonmarker][commonmarker]) | ✅ | ❌ | ❓ | Rust extension for Markdown (via [commonmarker-merge][commonmarker-merge]) |
|
|
138
|
-
| **Markly** ([markly][markly]) | ✅ | ❌ | ❓ | C extension for Markdown (via [markly-merge][markly-merge]) |
|
|
139
|
-
|
|
140
|
-
**Legend**: ✅ = Works, ❌ = Does not work, ❓ = Untested
|
|
141
|
-
|
|
142
|
-
**Why some backends don't work on certain platforms**:
|
|
143
|
-
|
|
144
|
-
- **JRuby**: Runs on the JVM; cannot load native C/Rust extensions (`.so` files)
|
|
145
|
-
- **TruffleRuby**: Has C API emulation via Sulong/LLVM, but it doesn't expose all MRI internals that native extensions require (e.g., `RBasic.flags`, `rb_gc_writebarrier`)
|
|
146
|
-
- **FFI on TruffleRuby**: TruffleRuby's FFI implementation doesn't support returning structs by value, which tree-sitter's C API requires
|
|
147
|
-
|
|
148
|
-
**Example implementations** for the gem templating use case:
|
|
149
|
-
|
|
150
|
-
| Gem | Purpose | Description |
|
|
151
|
-
|--------------------------|-----------------|-----------------------------------------------|
|
|
152
|
-
| [kettle-dev][kettle-dev] | Gem Development | Gem templating tool using `*-merge` gems |
|
|
153
|
-
| [kettle-jem][kettle-jem] | Gem Templating | Gem template library with smart merge support |
|
|
154
|
-
|
|
155
|
-
[tree_haver]: https://github.com/kettle-rb/tree_haver
|
|
156
|
-
[ast-merge]: https://github.com/kettle-rb/ast-merge
|
|
157
|
-
[prism-merge]: https://github.com/kettle-rb/prism-merge
|
|
158
|
-
[psych-merge]: https://github.com/kettle-rb/psych-merge
|
|
159
|
-
[json-merge]: https://github.com/kettle-rb/json-merge
|
|
160
|
-
[jsonc-merge]: https://github.com/kettle-rb/jsonc-merge
|
|
161
|
-
[bash-merge]: https://github.com/kettle-rb/bash-merge
|
|
162
|
-
[rbs-merge]: https://github.com/kettle-rb/rbs-merge
|
|
163
|
-
[dotenv-merge]: https://github.com/kettle-rb/dotenv-merge
|
|
164
|
-
[toml-merge]: https://github.com/kettle-rb/toml-merge
|
|
165
|
-
[markdown-merge]: https://github.com/kettle-rb/markdown-merge
|
|
166
|
-
[markly-merge]: https://github.com/kettle-rb/markly-merge
|
|
167
|
-
[commonmarker-merge]: https://github.com/kettle-rb/commonmarker-merge
|
|
168
|
-
[kettle-dev]: https://github.com/kettle-rb/kettle-dev
|
|
169
|
-
[kettle-jem]: https://github.com/kettle-rb/kettle-jem
|
|
170
|
-
[tree_haver-gem]: https://bestgems.org/gems/tree_haver
|
|
171
|
-
[ast-merge-gem]: https://bestgems.org/gems/ast-merge
|
|
172
|
-
[prism-merge-gem]: https://bestgems.org/gems/prism-merge
|
|
173
|
-
[psych-merge-gem]: https://bestgems.org/gems/psych-merge
|
|
174
|
-
[json-merge-gem]: https://bestgems.org/gems/json-merge
|
|
175
|
-
[jsonc-merge-gem]: https://bestgems.org/gems/jsonc-merge
|
|
176
|
-
[bash-merge-gem]: https://bestgems.org/gems/bash-merge
|
|
177
|
-
[rbs-merge-gem]: https://bestgems.org/gems/rbs-merge
|
|
178
|
-
[dotenv-merge-gem]: https://bestgems.org/gems/dotenv-merge
|
|
179
|
-
[toml-merge-gem]: https://bestgems.org/gems/toml-merge
|
|
180
|
-
[markdown-merge-gem]: https://bestgems.org/gems/markdown-merge
|
|
181
|
-
[markly-merge-gem]: https://bestgems.org/gems/markly-merge
|
|
182
|
-
[commonmarker-merge-gem]: https://bestgems.org/gems/commonmarker-merge
|
|
183
|
-
[kettle-dev-gem]: https://bestgems.org/gems/kettle-dev
|
|
184
|
-
[kettle-jem-gem]: https://bestgems.org/gems/kettle-jem
|
|
185
|
-
[tree_haver-gem-i]: https://img.shields.io/gem/v/tree_haver.svg
|
|
186
|
-
[ast-merge-gem-i]: https://img.shields.io/gem/v/ast-merge.svg
|
|
187
|
-
[prism-merge-gem-i]: https://img.shields.io/gem/v/prism-merge.svg
|
|
188
|
-
[psych-merge-gem-i]: https://img.shields.io/gem/v/psych-merge.svg
|
|
189
|
-
[json-merge-gem-i]: https://img.shields.io/gem/v/json-merge.svg
|
|
190
|
-
[jsonc-merge-gem-i]: https://img.shields.io/gem/v/jsonc-merge.svg
|
|
191
|
-
[bash-merge-gem-i]: https://img.shields.io/gem/v/bash-merge.svg
|
|
192
|
-
[rbs-merge-gem-i]: https://img.shields.io/gem/v/rbs-merge.svg
|
|
193
|
-
[dotenv-merge-gem-i]: https://img.shields.io/gem/v/dotenv-merge.svg
|
|
194
|
-
[toml-merge-gem-i]: https://img.shields.io/gem/v/toml-merge.svg
|
|
195
|
-
[markdown-merge-gem-i]: https://img.shields.io/gem/v/markdown-merge.svg
|
|
196
|
-
[markly-merge-gem-i]: https://img.shields.io/gem/v/markly-merge.svg
|
|
197
|
-
[commonmarker-merge-gem-i]: https://img.shields.io/gem/v/commonmarker-merge.svg
|
|
198
|
-
[kettle-dev-gem-i]: https://img.shields.io/gem/v/kettle-dev.svg
|
|
199
|
-
[kettle-jem-gem-i]: https://img.shields.io/gem/v/kettle-jem.svg
|
|
200
|
-
[tree_haver-ci-i]: https://github.com/kettle-rb/tree_haver/actions/workflows/current.yml/badge.svg
|
|
201
|
-
[ast-merge-ci-i]: https://github.com/kettle-rb/ast-merge/actions/workflows/current.yml/badge.svg
|
|
202
|
-
[prism-merge-ci-i]: https://github.com/kettle-rb/prism-merge/actions/workflows/current.yml/badge.svg
|
|
203
|
-
[psych-merge-ci-i]: https://github.com/kettle-rb/psych-merge/actions/workflows/current.yml/badge.svg
|
|
204
|
-
[json-merge-ci-i]: https://github.com/kettle-rb/json-merge/actions/workflows/current.yml/badge.svg
|
|
205
|
-
[jsonc-merge-ci-i]: https://github.com/kettle-rb/jsonc-merge/actions/workflows/current.yml/badge.svg
|
|
206
|
-
[bash-merge-ci-i]: https://github.com/kettle-rb/bash-merge/actions/workflows/current.yml/badge.svg
|
|
207
|
-
[rbs-merge-ci-i]: https://github.com/kettle-rb/rbs-merge/actions/workflows/current.yml/badge.svg
|
|
208
|
-
[dotenv-merge-ci-i]: https://github.com/kettle-rb/dotenv-merge/actions/workflows/current.yml/badge.svg
|
|
209
|
-
[toml-merge-ci-i]: https://github.com/kettle-rb/toml-merge/actions/workflows/current.yml/badge.svg
|
|
210
|
-
[markdown-merge-ci-i]: https://github.com/kettle-rb/markdown-merge/actions/workflows/current.yml/badge.svg
|
|
211
|
-
[markly-merge-ci-i]: https://github.com/kettle-rb/markly-merge/actions/workflows/current.yml/badge.svg
|
|
212
|
-
[commonmarker-merge-ci-i]: https://github.com/kettle-rb/commonmarker-merge/actions/workflows/current.yml/badge.svg
|
|
213
|
-
[kettle-dev-ci-i]: https://github.com/kettle-rb/kettle-dev/actions/workflows/current.yml/badge.svg
|
|
214
|
-
[kettle-jem-ci-i]: https://github.com/kettle-rb/kettle-jem/actions/workflows/current.yml/badge.svg
|
|
215
|
-
[tree_haver-ci]: https://github.com/kettle-rb/tree_haver/actions/workflows/current.yml
|
|
216
|
-
[ast-merge-ci]: https://github.com/kettle-rb/ast-merge/actions/workflows/current.yml
|
|
217
|
-
[prism-merge-ci]: https://github.com/kettle-rb/prism-merge/actions/workflows/current.yml
|
|
218
|
-
[psych-merge-ci]: https://github.com/kettle-rb/psych-merge/actions/workflows/current.yml
|
|
219
|
-
[json-merge-ci]: https://github.com/kettle-rb/json-merge/actions/workflows/current.yml
|
|
220
|
-
[jsonc-merge-ci]: https://github.com/kettle-rb/jsonc-merge/actions/workflows/current.yml
|
|
221
|
-
[bash-merge-ci]: https://github.com/kettle-rb/bash-merge/actions/workflows/current.yml
|
|
222
|
-
[rbs-merge-ci]: https://github.com/kettle-rb/rbs-merge/actions/workflows/current.yml
|
|
223
|
-
[dotenv-merge-ci]: https://github.com/kettle-rb/dotenv-merge/actions/workflows/current.yml
|
|
224
|
-
[toml-merge-ci]: https://github.com/kettle-rb/toml-merge/actions/workflows/current.yml
|
|
225
|
-
[markdown-merge-ci]: https://github.com/kettle-rb/markdown-merge/actions/workflows/current.yml
|
|
226
|
-
[markly-merge-ci]: https://github.com/kettle-rb/markly-merge/actions/workflows/current.yml
|
|
227
|
-
[commonmarker-merge-ci]: https://github.com/kettle-rb/commonmarker-merge/actions/workflows/current.yml
|
|
228
|
-
[kettle-dev-ci]: https://github.com/kettle-rb/kettle-dev/actions/workflows/current.yml
|
|
229
|
-
[kettle-jem-ci]: https://github.com/kettle-rb/kettle-jem/actions/workflows/current.yml
|
|
230
|
-
[prism]: https://github.com/ruby/prism
|
|
231
|
-
[psych]: https://github.com/ruby/psych
|
|
232
|
-
[ffi]: https://github.com/ffi/ffi
|
|
233
|
-
[ts-json]: https://github.com/tree-sitter/tree-sitter-json
|
|
234
|
-
[ts-jsonc]: https://gitlab.com/WhyNotHugo/tree-sitter-jsonc
|
|
235
|
-
[ts-bash]: https://github.com/tree-sitter/tree-sitter-bash
|
|
236
|
-
[ts-rbs]: https://github.com/joker1007/tree-sitter-rbs
|
|
237
|
-
[ts-toml]: https://github.com/tree-sitter-grammars/tree-sitter-toml
|
|
238
|
-
[dotenv]: https://github.com/bkeepers/dotenv
|
|
239
|
-
[rbs]: https://github.com/ruby/rbs
|
|
240
|
-
[toml-rb]: https://github.com/emancu/toml-rb
|
|
241
|
-
[toml]: https://github.com/jm/toml
|
|
242
|
-
[markly]: https://github.com/ioquatix/markly
|
|
243
|
-
[commonmarker]: https://github.com/gjtorikian/commonmarker
|
|
244
|
-
[ruby_tree_sitter]: https://github.com/Faveod/ruby-tree-sitter
|
|
245
|
-
[tree_stump]: https://github.com/joker1007/tree_stump
|
|
246
|
-
[jtreesitter]: https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter
|
|
247
|
-
[citrus]: https://github.com/mjackson/citrus
|
|
248
|
-
[parslet]: https://github.com/kschiess/parslet
|
|
70
|
+
[ast-merge]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/ast-merge
|
|
71
|
+
[tree_haver]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/tree_haver
|
|
249
72
|
|
|
250
73
|
## 💡 Info you can shake a stick at
|
|
251
74
|
|
|
252
|
-
| Tokens to Remember | [![Gem name][⛳️name-img]][
|
|
253
|
-
|
|
254
|
-
| Works with
|
|
255
|
-
|
|
|
256
|
-
|
|
|
257
|
-
| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Live Chat on Discord][✉️discord-invite-img-ftb]][🖼️galtzo-discord] [![Get help from me on Upwork][👨🏼🏫expsup-upwork-img]][👨🏼🏫expsup-upwork] [![Get help from me on Codementor][👨🏼🏫expsup-codementor-img]][👨🏼🏫expsup-codementor] |
|
|
258
|
-
| 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]][bash-merge] [][🧮kloc] |
|
|
75
|
+
| Tokens to Remember | [![Gem name][⛳️name-img]][⛳️gem-name] [![Gem namespace][⛳️namespace-img]][⛳️gem-namespace] |
|
|
76
|
+
|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
77
|
+
| Works with MRI Ruby 4 | [![Ruby current Compat][💎ruby-c-i]][🚎11-c-wf]|
|
|
78
|
+
| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Get help from RubyForum][✉️ruby-forum-img]][✉️ruby-forum] [![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] |
|
|
79
|
+
| 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] |
|
|
259
80
|
| Documentation | [![Current release on RubyDoc.info][📜docs-cr-rd-img]][🚎yard-current] [![YARD on Galtzo.com][📜docs-head-rd-img]][🚎yard-head] [![Maintainer Blog][🚂maint-blog-img]][🚂maint-blog] [![GitLab Wiki][📜gl-wiki-img]][📜gl-wiki] [![GitHub Wiki][📜gh-wiki-img]][📜gh-wiki] |
|
|
260
|
-
| Compliance | [![License:
|
|
81
|
+
| Compliance | [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Apache license compatibility: Category X][📄license-compat-img]][📄license-compat] [![📄ilo-declaration-img]][📄ilo-declaration] [![Security Policy][🔐security-img]][🔐security] [![Contributor Covenant 2.1][🪇conduct-img]][🪇conduct] [![SemVer 2.0.0][📌semver-img]][📌semver] |
|
|
261
82
|
| Style | [![Enforced Code Style Linter][💎rlts-img]][💎rlts] [![Keep-A-Changelog 1.0.0][📗keep-changelog-img]][📗keep-changelog] [![Gitmoji Commits][📌gitmoji-img]][📌gitmoji] [![Compatibility appraised by: appraisal2][💎appraisal2-img]][💎appraisal2] |
|
|
262
83
|
| Maintainer 🎖️ | [![Follow Me on LinkedIn][💖🖇linkedin-img]][💖🖇linkedin] [![Follow Me on Ruby.Social][💖🐘ruby-mast-img]][💖🐘ruby-mast] [![Follow Me on Bluesky][💖🦋bluesky-img]][💖🦋bluesky] [![Contact Maintainer][🚂maint-contact-img]][🚂maint-contact] [![My technical writing][💖💁🏼♂️devto-img]][💖💁🏼♂️devto] |
|
|
263
|
-
| `...` 💖 | [![Find Me on WellFound:][💖✌️wellfound-img]][💖✌️wellfound] [![Find Me on CrunchBase][💖💲crunchbase-img]][💖💲crunchbase] [![My LinkTree][💖🌳linktree-img]][💖🌳linktree] [![More About Me][💖💁🏼♂️aboutme-img]][💖💁🏼♂️aboutme] [🧊][💖🧊berg] [🐙][💖🐙hub]
|
|
84
|
+
| `...` 💖 | [![Find Me on WellFound:][💖✌️wellfound-img]][💖✌️wellfound] [![Find Me on CrunchBase][💖💲crunchbase-img]][💖💲crunchbase] [![My LinkTree][💖🌳linktree-img]][💖🌳linktree] [![More About Me][💖💁🏼♂️aboutme-img]][💖💁🏼♂️aboutme] [🧊][💖🧊berg] [🐙][💖🐙hub] [🛖][💖🛖hut] [🧪][💖🧪lab] |
|
|
264
85
|
|
|
265
86
|
### Compatibility
|
|
266
87
|
|
|
267
|
-
Compatible with MRI Ruby
|
|
88
|
+
Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
|
|
89
|
+
CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
|
|
90
|
+
This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
|
|
91
|
+
may be higher than the gem's runtime compatibility floor when legacy Rubies are
|
|
92
|
+
not practical for the current toolchain.
|
|
268
93
|
|
|
269
|
-
|
|
270
|
-
| --- | --- |
|
|
271
|
-
| 👟 Check it out\! | ✨ [github.com/appraisal-rb/appraisal2][💎appraisal2] ✨ |
|
|
94
|
+
<a href="https://github.com/kettle-dev"><img alt="kettle-dev Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/kettle-dev/avatar-128px.svg" width="14%" align="right"/></a>
|
|
272
95
|
|
|
273
|
-
|
|
96
|
+
The _amazing_ test matrix is powered by the kettle-dev stack.
|
|
274
97
|
|
|
275
98
|
<details markdown="1">
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
|
279
|
-
|
|
280
|
-
|
|
|
281
|
-
|
|
|
282
|
-
|
|
|
283
|
-
|
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
[
|
|
288
|
-
|
|
289
|
-
### Enterprise Support [][🏙️entsup-tidelift]
|
|
290
|
-
|
|
291
|
-
Available as part of the Tidelift Subscription.
|
|
292
|
-
|
|
293
|
-
<details markdown="1">
|
|
294
|
-
<summary>Need enterprise-level guarantees?</summary>
|
|
295
|
-
|
|
296
|
-
The maintainers of this and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use.
|
|
297
|
-
|
|
298
|
-
[![Get help from me on Tidelift][🏙️entsup-tidelift-img]][🏙️entsup-tidelift]
|
|
299
|
-
|
|
300
|
-
- 💡Subscribe for support guarantees covering *all* your FLOSS dependencies
|
|
301
|
-
- 💡Tidelift is part of [Sonar][🏙️entsup-tidelift-sonar]
|
|
302
|
-
- 💡Tidelift pays maintainers to maintain the software you depend on\!<br/>📊`@`Pointy Haired Boss: An [enterprise support][🏙️entsup-tidelift] subscription is "[never gonna let you down][🧮kloc]", and *supports* open source maintainers
|
|
303
|
-
Alternatively:
|
|
304
|
-
|
|
305
|
-
- [![Live Chat on Discord][✉️discord-invite-img-ftb]][🖼️galtzo-discord]
|
|
306
|
-
- [![Get help from me on Upwork][👨🏼🏫expsup-upwork-img]][👨🏼🏫expsup-upwork]
|
|
307
|
-
- [![Get help from me on Codementor][👨🏼🏫expsup-codementor-img]][👨🏼🏫expsup-codementor]
|
|
99
|
+
<summary>How kettle-dev manages complexity in tests</summary>
|
|
100
|
+
|
|
101
|
+
| Gem | Source | Role | Total downloads |
|
|
102
|
+
|-----|--------|------|---------------------|
|
|
103
|
+
| [appraisal2](https://clickgems.clickhouse.com/dashboard/appraisal2) | [GitHub](https://github.com/appraisal-rb/appraisal2) | multi-dependency Appraisal matrix generation | [](https://clickgems.clickhouse.com/dashboard/appraisal2) |
|
|
104
|
+
| [appraisal2-rubocop](https://clickgems.clickhouse.com/dashboard/appraisal2-rubocop) | [GitHub](https://github.com/appraisal-rb/appraisal2-rubocop) | RuboCop Appraisal generator integration | [](https://clickgems.clickhouse.com/dashboard/appraisal2-rubocop) |
|
|
105
|
+
| [kettle-dev](https://clickgems.clickhouse.com/dashboard/kettle-dev) | [GitHub](https://github.com/kettle-dev/kettle-dev) | development, release, and CI workflow tooling | [](https://clickgems.clickhouse.com/dashboard/kettle-dev) |
|
|
106
|
+
| [kettle-jem](https://clickgems.clickhouse.com/dashboard/kettle-jem) | [GitHub](https://github.com/kettle-dev/kettle-jem) | Appraisals & CI workflow templates | [](https://clickgems.clickhouse.com/dashboard/kettle-jem) |
|
|
107
|
+
| [kettle-soup-cover](https://clickgems.clickhouse.com/dashboard/kettle-soup-cover) | [GitHub](https://github.com/kettle-dev/kettle-soup-cover) | SimpleCov coverage policy and reporting | [](https://clickgems.clickhouse.com/dashboard/kettle-soup-cover) |
|
|
108
|
+
| [kettle-test](https://clickgems.clickhouse.com/dashboard/kettle-test) | [GitHub](https://github.com/kettle-dev/kettle-test) | standard test runner and coverage harness | [](https://clickgems.clickhouse.com/dashboard/kettle-test) |
|
|
109
|
+
| [rubocop-lts](https://clickgems.clickhouse.com/dashboard/rubocop-lts) | [GitHub](https://github.com/rubocop-lts/rubocop-lts) | Ruby-version-aware linting | [](https://clickgems.clickhouse.com/dashboard/rubocop-lts) |
|
|
110
|
+
| [turbo_tests2](https://clickgems.clickhouse.com/dashboard/turbo_tests2) | [GitHub](https://github.com/galtzo-floss/turbo_tests2) | parallel test execution | [](https://clickgems.clickhouse.com/dashboard/turbo_tests2) |
|
|
308
111
|
|
|
309
112
|
</details>
|
|
310
113
|
|
|
@@ -322,188 +125,6 @@ If bundler is not being used to manage dependencies, install the gem by executin
|
|
|
322
125
|
gem install bash-merge
|
|
323
126
|
```
|
|
324
127
|
|
|
325
|
-
### 🔒 Secure Installation
|
|
326
|
-
|
|
327
|
-
<details markdown="1">
|
|
328
|
-
<summary>For Medium or High Security Installations</summary>
|
|
329
|
-
|
|
330
|
-
This gem is cryptographically signed, and has verifiable [SHA-256 and SHA-512][💎SHA_checksums] checksums by
|
|
331
|
-
[stone\_checksums][💎stone_checksums]. Be sure the gem you install hasn’t been tampered with
|
|
332
|
-
by following the instructions below.
|
|
333
|
-
|
|
334
|
-
Add my public key (if you haven’t already, expires 2045-04-29) as a trusted certificate:
|
|
335
|
-
|
|
336
|
-
```console
|
|
337
|
-
gem cert --add <(curl -Ls https://raw.github.com/galtzo-floss/certs/main/pboling.pem)
|
|
338
|
-
```
|
|
339
|
-
|
|
340
|
-
You only need to do that once. Then proceed to install with:
|
|
341
|
-
|
|
342
|
-
```console
|
|
343
|
-
gem install bash-merge -P HighSecurity
|
|
344
|
-
```
|
|
345
|
-
|
|
346
|
-
The `HighSecurity` trust profile will verify signed gems, and not allow the installation of unsigned dependencies.
|
|
347
|
-
|
|
348
|
-
If you want to up your security game full-time:
|
|
349
|
-
|
|
350
|
-
```console
|
|
351
|
-
bundle config set --global trust-policy MediumSecurity
|
|
352
|
-
```
|
|
353
|
-
|
|
354
|
-
`MediumSecurity` instead of `HighSecurity` is necessary if not all the gems you use are signed.
|
|
355
|
-
|
|
356
|
-
NOTE: Be prepared to track down certs for signed gems and add them the same way you added mine.
|
|
357
|
-
|
|
358
|
-
</details>
|
|
359
|
-
|
|
360
|
-
### 🌳 Tree-Sitter Parser Installation
|
|
361
|
-
|
|
362
|
-
This gem requires the `tree-sitter-bash` parser library to be installed on your system.
|
|
363
|
-
The parser is a native shared library (`.so` on Linux, `.dylib` on macOS) that provides
|
|
364
|
-
Bash syntax parsing capabilities.
|
|
365
|
-
|
|
366
|
-
#### Option 1: Pre-built Binaries (Recommended)
|
|
367
|
-
|
|
368
|
-
Download pre-built parsers from [Faveod/tree-sitter-parsers](https://github.com/Faveod/tree-sitter-parsers/releases):
|
|
369
|
-
|
|
370
|
-
**Linux (x64):**
|
|
371
|
-
|
|
372
|
-
```console
|
|
373
|
-
# Download and extract
|
|
374
|
-
curl -Lo parsers.tar.gz https://github.com/Faveod/tree-sitter-parsers/releases/download/v4.10/tree-sitter-parsers-4.10-linux-x64.tar.gz
|
|
375
|
-
tar -xzf parsers.tar.gz
|
|
376
|
-
|
|
377
|
-
# Install system-wide (requires sudo)
|
|
378
|
-
sudo cp libtree-sitter-bash.so /usr/lib/
|
|
379
|
-
sudo ldconfig
|
|
380
|
-
|
|
381
|
-
# Or install locally and set environment variable
|
|
382
|
-
mkdir -p ~/.local/lib/tree-sitter
|
|
383
|
-
cp libtree-sitter-bash.so ~/.local/lib/tree-sitter/
|
|
384
|
-
export TREE_SITTER_BASH_PATH="$HOME/.local/lib/tree-sitter/libtree-sitter-bash.so"
|
|
385
|
-
```
|
|
386
|
-
|
|
387
|
-
**Debian/Ubuntu (amd64):**
|
|
388
|
-
|
|
389
|
-
```console
|
|
390
|
-
curl -Lo parsers.deb https://github.com/Faveod/tree-sitter-parsers/releases/download/v4.10/tree-sitter-parsers-4.10-amd64.deb
|
|
391
|
-
sudo dpkg -i parsers.deb
|
|
392
|
-
```
|
|
393
|
-
|
|
394
|
-
**macOS (Apple Silicon):**
|
|
395
|
-
|
|
396
|
-
```console
|
|
397
|
-
curl -Lo parsers.tar.gz https://github.com/Faveod/tree-sitter-parsers/releases/download/v4.10/tree-sitter-parsers-4.10-macos-arm64.tar.gz
|
|
398
|
-
tar -xzf parsers.tar.gz
|
|
399
|
-
|
|
400
|
-
# Install to a location and set environment variable
|
|
401
|
-
mkdir -p ~/.local/lib/tree-sitter
|
|
402
|
-
cp libtree-sitter-bash.dylib ~/.local/lib/tree-sitter/
|
|
403
|
-
export TREE_SITTER_BASH_PATH="$HOME/.local/lib/tree-sitter/libtree-sitter-bash.dylib"
|
|
404
|
-
```
|
|
405
|
-
|
|
406
|
-
#### Option 2: Build from Source
|
|
407
|
-
|
|
408
|
-
```console
|
|
409
|
-
git clone https://github.com/tree-sitter/tree-sitter-bash.git
|
|
410
|
-
cd tree-sitter-bash
|
|
411
|
-
make
|
|
412
|
-
sudo cp libtree-sitter-bash.so /usr/lib/ # Linux
|
|
413
|
-
# or
|
|
414
|
-
sudo cp libtree-sitter-bash.dylib /usr/local/lib/ # macOS
|
|
415
|
-
```
|
|
416
|
-
|
|
417
|
-
#### Option 3: Package Manager
|
|
418
|
-
|
|
419
|
-
Some package managers provide tree-sitter parsers:
|
|
420
|
-
|
|
421
|
-
**Fedora Atomic (Silverblue, Kinoite, Bazzite, Aurora, etc.):**
|
|
422
|
-
|
|
423
|
-
```console
|
|
424
|
-
# Install via rpm-ostree (requires reboot)
|
|
425
|
-
rpm-ostree install libtree-sitter-bash
|
|
426
|
-
|
|
427
|
-
# The library will be installed to /usr/lib64/libtree-sitter-bash.so
|
|
428
|
-
# You may need to set the environment variable:
|
|
429
|
-
export TREE_SITTER_BASH_PATH="/usr/lib64/libtree-sitter-bash.so"
|
|
430
|
-
```
|
|
431
|
-
|
|
432
|
-
**Fedora (traditional):**
|
|
433
|
-
|
|
434
|
-
```console
|
|
435
|
-
sudo dnf install libtree-sitter-bash
|
|
436
|
-
```
|
|
437
|
-
|
|
438
|
-
**Arch Linux:**
|
|
439
|
-
|
|
440
|
-
```console
|
|
441
|
-
# Check AUR for tree-sitter-bash
|
|
442
|
-
yay -S tree-sitter-bash
|
|
443
|
-
```
|
|
444
|
-
|
|
445
|
-
#### Environment Variable
|
|
446
|
-
|
|
447
|
-
If the parser is not in a standard location (`/usr/lib/`, `/usr/lib64/`, `/usr/local/lib/`),
|
|
448
|
-
set the `TREE_SITTER_BASH_PATH` environment variable to point to the parser library:
|
|
449
|
-
|
|
450
|
-
```console
|
|
451
|
-
export TREE_SITTER_BASH_PATH="/path/to/libtree-sitter-bash.so"
|
|
452
|
-
```
|
|
453
|
-
|
|
454
|
-
**Note:** Some distributions install the library with a version number suffix
|
|
455
|
-
(e.g., `libtree-sitter-bash.so.14` instead of `libtree-sitter-bash.so`).
|
|
456
|
-
If the gem can't find the parser, check for versioned files and either:
|
|
457
|
-
|
|
458
|
-
- Set `TREE_SITTER_BASH_PATH` to the full versioned path, or
|
|
459
|
-
- Create a symlink: `sudo ln -s /usr/lib64/libtree-sitter-bash.so.14 /usr/lib64/libtree-sitter-bash.so`
|
|
460
|
-
Add this to your shell profile (`.bashrc`, `.zshrc`, etc.) for persistence.
|
|
461
|
-
|
|
462
|
-
### 💎 Ruby Interface Gems
|
|
463
|
-
|
|
464
|
-
In addition to the tree-sitter parser library, you need a Ruby gem that provides
|
|
465
|
-
bindings to tree-sitter. Choose **one** of the following based on your Ruby implementation:
|
|
466
|
-
|
|
467
|
-
| Gem | Ruby Support | Description |
|
|
468
|
-
| --- | --- | --- |
|
|
469
|
-
| [ruby\_tree\_sitter][ruby_tree_sitter] | MRI only | C extension bindings (recommended for MRI) |
|
|
470
|
-
| [tree\_stump][tree_stump] | MRI (maybe JRuby) | Rust-based bindings via Rutie |
|
|
471
|
-
| [ffi][ffi] | MRI, JRuby, TruffleRuby | Generic FFI bindings (used by tree\_haver's FFI backend) |
|
|
472
|
-
|
|
473
|
-
[ruby_tree_sitter]: https://github.com/Faveod/ruby_tree_sitter
|
|
474
|
-
[tree_stump]: https://github.com/nickstenning/tree_stump
|
|
475
|
-
[ffi]: https://github.com/ffi/ffi
|
|
476
|
-
|
|
477
|
-
#### For MRI Ruby (Recommended)
|
|
478
|
-
|
|
479
|
-
```console
|
|
480
|
-
gem install ruby_tree_sitter
|
|
481
|
-
```
|
|
482
|
-
|
|
483
|
-
Or add to your Gemfile:
|
|
484
|
-
|
|
485
|
-
```ruby
|
|
486
|
-
gem "ruby_tree_sitter", "~> 2.0"
|
|
487
|
-
```
|
|
488
|
-
|
|
489
|
-
#### For JRuby or TruffleRuby
|
|
490
|
-
|
|
491
|
-
```console
|
|
492
|
-
gem install ffi
|
|
493
|
-
```
|
|
494
|
-
|
|
495
|
-
Or add to your Gemfile:
|
|
496
|
-
|
|
497
|
-
```ruby
|
|
498
|
-
gem "ffi"
|
|
499
|
-
```
|
|
500
|
-
|
|
501
|
-
The `tree_haver` gem (a dependency of bash-merge) will automatically detect and use
|
|
502
|
-
the appropriate backend based on which gems are available.
|
|
503
|
-
|
|
504
|
-
**Note:** The `ruby_tree_sitter` gem only compiles on MRI Ruby. For JRuby or TruffleRuby,
|
|
505
|
-
you must use the FFI backend.
|
|
506
|
-
|
|
507
128
|
## ⚙️ Configuration
|
|
508
129
|
|
|
509
130
|
```ruby
|
|
@@ -630,64 +251,6 @@ result = merger.merge
|
|
|
630
251
|
# Result includes functions/variables from template that don't exist in destination
|
|
631
252
|
```
|
|
632
253
|
|
|
633
|
-
## 🦷 FLOSS Funding
|
|
634
|
-
|
|
635
|
-
While kettle-rb tools are free software and will always be, the project would benefit immensely from some funding.
|
|
636
|
-
Raising a monthly budget of... "dollars" would make the project more sustainable.
|
|
637
|
-
|
|
638
|
-
We welcome both individual and corporate sponsors\! We also offer a
|
|
639
|
-
wide array of funding channels to account for your preferences
|
|
640
|
-
(although currently [Open Collective][🖇osc] is our preferred funding platform).
|
|
641
|
-
|
|
642
|
-
**If you're working in a company that's making significant use of kettle-rb tools we'd
|
|
643
|
-
appreciate it if you suggest to your company to become a kettle-rb sponsor.**
|
|
644
|
-
|
|
645
|
-
You can support the development of kettle-rb tools via
|
|
646
|
-
[GitHub Sponsors][🖇sponsor],
|
|
647
|
-
[Liberapay][⛳liberapay],
|
|
648
|
-
[PayPal][🖇paypal],
|
|
649
|
-
[Open Collective][🖇osc]
|
|
650
|
-
and [Tidelift][🏙️entsup-tidelift].
|
|
651
|
-
|
|
652
|
-
| 📍 NOTE |
|
|
653
|
-
| --- |
|
|
654
|
-
| If doing a sponsorship in the form of donation is problematic for your company <br/> from an accounting standpoint, we'd recommend the use of Tidelift, <br/> where you can get a support-like subscription instead. |
|
|
655
|
-
|
|
656
|
-
### Open Collective for Individuals
|
|
657
|
-
|
|
658
|
-
Support us with a monthly donation and help us continue our activities. \[[Become a backer][🖇osc-backers]\]
|
|
659
|
-
|
|
660
|
-
NOTE: [kettle-readme-backers][kettle-readme-backers] updates this list every day, automatically.
|
|
661
|
-
|
|
662
|
-
<!-- OPENCOLLECTIVE-INDIVIDUALS:START -->
|
|
663
|
-
No backers yet. Be the first!
|
|
664
|
-
<!-- OPENCOLLECTIVE-INDIVIDUALS:END -->
|
|
665
|
-
|
|
666
|
-
### Open Collective for Organizations
|
|
667
|
-
|
|
668
|
-
Become a sponsor and get your logo on our README on GitHub with a link to your site. \[[Become a sponsor][🖇osc-sponsors]\]
|
|
669
|
-
|
|
670
|
-
NOTE: [kettle-readme-backers][kettle-readme-backers] updates this list every day, automatically.
|
|
671
|
-
|
|
672
|
-
<!-- OPENCOLLECTIVE-ORGANIZATIONS:START -->
|
|
673
|
-
No sponsors yet. Be the first!
|
|
674
|
-
<!-- OPENCOLLECTIVE-ORGANIZATIONS:END -->
|
|
675
|
-
|
|
676
|
-
[kettle-readme-backers]: https://github.com/kettle-rb/bash-merge/blob/main/exe/kettle-readme-backers
|
|
677
|
-
|
|
678
|
-
### Another way to support open-source
|
|
679
|
-
|
|
680
|
-
I’m driven by a passion to foster a thriving open-source community – a space where people can tackle complex problems, no matter how small. Revitalizing libraries that have fallen into disrepair, and building new libraries focused on solving real-world challenges, are my passions. I was recently affected by layoffs, and the tech jobs market is unwelcoming. I’m reaching out here because your support would significantly aid my efforts to provide for my family, and my farm (11 🐔 chickens, 2 🐶 dogs, 3 🐰 rabbits, 8 🐈 cats).
|
|
681
|
-
|
|
682
|
-
If you work at a company that uses my work, please encourage them to support me as a corporate sponsor. My work on gems you use might show up in `bundle fund`.
|
|
683
|
-
|
|
684
|
-
I’m developing a new library, [floss\_funding][🖇floss-funding-gem], designed to empower open-source developers like myself to get paid for the work we do, in a sustainable way. Please give it a look.
|
|
685
|
-
|
|
686
|
-
**[Floss-Funding.dev]
|
|
687
|
-
[🖇floss-funding.dev]: 👉️ No network calls. 👉️ No tracking. 👉️ No oversight. 👉️ Minimal crypto hashing. 💡 Easily disabled nags**
|
|
688
|
-
|
|
689
|
-
[![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 to my FLOSS efforts at ko-fi.com][🖇kofi-img]][🖇kofi] [![Donate to my FLOSS efforts using Patreon][🖇patreon-img]][🖇patreon]
|
|
690
|
-
|
|
691
254
|
## 🔐 Security
|
|
692
255
|
|
|
693
256
|
See [SECURITY.md][🔐security].
|
|
@@ -695,78 +258,36 @@ See [SECURITY.md][🔐security].
|
|
|
695
258
|
## 🤝 Contributing
|
|
696
259
|
|
|
697
260
|
If you need some ideas of where to help, you could work on adding more code coverage,
|
|
698
|
-
or if it is already 💯 (see [below](#code-coverage)) check [
|
|
261
|
+
or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
|
|
699
262
|
or use the gem and think about how it could be better.
|
|
700
263
|
|
|
701
264
|
We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
|
|
702
265
|
|
|
703
266
|
See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
|
|
704
267
|
|
|
705
|
-
### 🚀 Release Instructions
|
|
706
|
-
|
|
707
|
-
See [CONTRIBUTING.md][🤝contributing].
|
|
708
|
-
|
|
709
268
|
### Code Coverage
|
|
710
269
|
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
[![Coveralls Test Coverage][🏀coveralls-img]][🏀coveralls]
|
|
714
|
-
|
|
715
|
-
[![QLTY Test Coverage][🏀qlty-covi]][🏀qlty-cov]
|
|
716
|
-
|
|
717
|
-
### 🪇 Code of Conduct
|
|
718
|
-
|
|
719
|
-
Everyone interacting with this project's codebases, issue trackers,
|
|
720
|
-
chat rooms and mailing lists agrees to follow the [![Contributor Covenant 2.1][🪇conduct-img]][🪇conduct].
|
|
721
|
-
|
|
722
|
-
## 🌈 Contributors
|
|
723
|
-
|
|
724
|
-
[![Contributors][🖐contributors-img]][🖐contributors]
|
|
725
|
-
|
|
726
|
-
Made with [contributors-img][🖐contrib-rocks].
|
|
727
|
-
|
|
728
|
-
Also see GitLab Contributors: <https://gitlab.com/kettle-rb/bash-merge/-/graphs/main>
|
|
729
|
-
|
|
730
|
-
<details>
|
|
731
|
-
<summary>⭐️ Star History</summary>
|
|
732
|
-
|
|
733
|
-
<a href="https://star-history.com/#kettle-rb/bash-merge&Date">
|
|
734
|
-
<picture>
|
|
735
|
-
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=kettle-rb/bash-merge&type=Date&theme=dark" />
|
|
736
|
-
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=kettle-rb/bash-merge&type=Date" />
|
|
737
|
-
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=kettle-rb/bash-merge&type=Date" />
|
|
738
|
-
</picture>
|
|
739
|
-
</a>
|
|
270
|
+
<details markdown="1">
|
|
271
|
+
<summary>Coverage service badges</summary>
|
|
740
272
|
|
|
741
273
|
</details>
|
|
742
274
|
|
|
743
275
|
## 📌 Versioning
|
|
744
276
|
|
|
745
|
-
This
|
|
746
|
-
|
|
747
|
-
Specifically, if a minor or patch version is released that breaks backward compatibility,
|
|
748
|
-
a new version should be immediately released that restores compatibility.
|
|
749
|
-
Breaking changes to the public API will only be introduced with new major versions.
|
|
750
|
-
|
|
751
|
-
> dropping support for a platform is both obviously and objectively a breaking change <br/>
|
|
752
|
-
> —Jordan Harband ([@ljharb](https://github.com/ljharb), maintainer of SemVer) [in SemVer issue 716][📌semver-breaking]
|
|
753
|
-
|
|
754
|
-
I understand that policy doesn't work universally ("exceptions to every rule\!"),
|
|
755
|
-
but it is the policy here.
|
|
756
|
-
As such, in many cases it is good to specify a dependency on this library using
|
|
757
|
-
the [Pessimistic Version Constraint][📌pvc] with two digits of precision.
|
|
277
|
+
This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
|
|
278
|
+
For most applications, prefer the [Pessimistic Version Constraint][📌pvc] with two digits of precision.
|
|
758
279
|
|
|
759
280
|
For example:
|
|
760
281
|
|
|
761
282
|
```ruby
|
|
762
|
-
spec.add_dependency("bash-merge", "~>
|
|
283
|
+
spec.add_dependency("bash-merge", "~> 7.0")
|
|
763
284
|
```
|
|
764
285
|
|
|
765
286
|
<details markdown="1">
|
|
766
287
|
<summary>📌 Is "Platform Support" part of the public API? More details inside.</summary>
|
|
767
288
|
|
|
768
|
-
|
|
769
|
-
|
|
289
|
+
Dropping support for a platform can be a breaking change for affected users.
|
|
290
|
+
If a release changes supported platforms, it should be called out clearly in the changelog and versioned with that impact in mind.
|
|
770
291
|
|
|
771
292
|
To get a better understanding of how SemVer is intended to work over a project's lifetime,
|
|
772
293
|
read this article from the creator of SemVer:
|
|
@@ -779,68 +300,19 @@ See [CHANGELOG.md][📌changelog] for a list of releases.
|
|
|
779
300
|
|
|
780
301
|
## 📄 License
|
|
781
302
|
|
|
782
|
-
The gem is available
|
|
783
|
-
|
|
784
|
-
See [LICENSE.txt][📄license] for the official [Copyright Notice][📄copyright-notice-explainer].
|
|
785
|
-
|
|
786
|
-
### © Copyright
|
|
787
|
-
|
|
788
|
-
<ul>
|
|
789
|
-
<li>
|
|
790
|
-
Copyright (c) 2025-2026 Peter H. Boling, of
|
|
791
|
-
<a href="https://discord.gg/3qme4XHNKN">
|
|
792
|
-
Galtzo.com
|
|
793
|
-
<picture>
|
|
794
|
-
<img src="https://logos.galtzo.com/assets/images/galtzo-floss/avatar-128px-blank.svg" alt="Galtzo.com Logo (Wordless) by Aboling0, CC BY-SA 4.0" width="24">
|
|
795
|
-
</picture>
|
|
796
|
-
</a>, and bash-merge contributors.
|
|
797
|
-
</li>
|
|
798
|
-
</ul>
|
|
799
|
-
|
|
800
|
-
## 🤑 A request for help
|
|
801
|
-
|
|
802
|
-
Maintainers have teeth and need to pay their dentists.
|
|
803
|
-
After getting laid off in an RIF in March, and encountering difficulty finding a new one,
|
|
804
|
-
I began spending most of my time building open source tools.
|
|
805
|
-
I'm hoping to be able to pay for my kids' health insurance this month,
|
|
806
|
-
so if you value the work I am doing, I need your support.
|
|
807
|
-
Please consider sponsoring me or the project.
|
|
808
|
-
|
|
809
|
-
To join the community or get help 👇️ Join the Discord.
|
|
810
|
-
|
|
811
|
-
[![Live Chat on Discord][✉️discord-invite-img-ftb]][🖼️galtzo-discord]
|
|
812
|
-
|
|
813
|
-
To say "thanks\!" ☝️ Join the Discord or 👇️ send money.
|
|
814
|
-
|
|
815
|
-
[![Sponsor kettle-rb/bash-merge on Open Source Collective][🖇osc-all-bottom-img]][🖇osc] 💌 [![Sponsor me on GitHub Sponsors][🖇sponsor-bottom-img]][🖇sponsor] 💌 [![Sponsor me on Liberapay][⛳liberapay-bottom-img]][⛳liberapay] 💌 [![Donate on PayPal][🖇paypal-bottom-img]][🖇paypal]
|
|
816
|
-
|
|
817
|
-
### Please give the project a star ⭐ ♥.
|
|
303
|
+
The gem is available under the following licenses: [AGPL-3.0-only](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/AGPL-3.0-only.md), [PolyForm-Small-Business-1.0.0](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/PolyForm-Small-Business-1.0.0.md).
|
|
304
|
+
See [LICENSE.md][📄license] for details.
|
|
818
305
|
|
|
819
|
-
|
|
306
|
+
If none of the available licenses suit your use case, please [contact us](mailto:floss@galtzo.com) to discuss a custom commercial license.
|
|
820
307
|
|
|
821
308
|
[⛳liberapay-img]: https://img.shields.io/liberapay/goal/pboling.svg?logo=liberapay&color=a51611&style=flat
|
|
822
309
|
[⛳liberapay-bottom-img]: https://img.shields.io/liberapay/goal/pboling.svg?style=for-the-badge&logo=liberapay&color=a51611
|
|
823
310
|
[⛳liberapay]: https://liberapay.com/pboling/donate
|
|
824
|
-
[🖇osc-all-img]: https://img.shields.io/opencollective/all/kettle-rb
|
|
825
|
-
[🖇osc-sponsors-img]: https://img.shields.io/opencollective/sponsors/kettle-rb
|
|
826
|
-
[🖇osc-backers-img]: https://img.shields.io/opencollective/backers/kettle-rb
|
|
827
|
-
[🖇osc-backers]: https://opencollective.com/kettle-rb#backer
|
|
828
|
-
[🖇osc-backers-i]: https://opencollective.com/kettle-rb/backers/badge.svg?style=flat
|
|
829
|
-
[🖇osc-sponsors]: https://opencollective.com/kettle-rb#sponsor
|
|
830
|
-
[🖇osc-sponsors-i]: https://opencollective.com/kettle-rb/sponsors/badge.svg?style=flat
|
|
831
|
-
[🖇osc-all-bottom-img]: https://img.shields.io/opencollective/all/kettle-rb?style=for-the-badge
|
|
832
|
-
[🖇osc-sponsors-bottom-img]: https://img.shields.io/opencollective/sponsors/kettle-rb?style=for-the-badge
|
|
833
|
-
[🖇osc-backers-bottom-img]: https://img.shields.io/opencollective/backers/kettle-rb?style=for-the-badge
|
|
834
|
-
[🖇osc]: https://opencollective.com/kettle-rb
|
|
835
311
|
[🖇sponsor-img]: https://img.shields.io/badge/Sponsor_Me!-pboling.svg?style=social&logo=github
|
|
836
312
|
[🖇sponsor-bottom-img]: https://img.shields.io/badge/Sponsor_Me!-pboling-blue?style=for-the-badge&logo=github
|
|
837
313
|
[🖇sponsor]: https://github.com/sponsors/pboling
|
|
838
|
-
[🖇polar-img]: https://img.shields.io/badge/polar-donate-a51611.svg?style=flat
|
|
839
|
-
[🖇polar]: https://polar.sh/pboling
|
|
840
314
|
[🖇kofi-img]: https://img.shields.io/badge/ko--fi-%E2%9C%93-a51611.svg?style=flat
|
|
841
|
-
[🖇kofi]: https://ko-fi.com/
|
|
842
|
-
[🖇patreon-img]: https://img.shields.io/badge/patreon-donate-a51611.svg?style=flat
|
|
843
|
-
[🖇patreon]: https://patreon.com/galtzo
|
|
315
|
+
[🖇kofi]: https://ko-fi.com/pboling
|
|
844
316
|
[🖇buyme-small-img]: https://img.shields.io/badge/buy_me_a_coffee-%E2%9C%93-a51611.svg?style=flat
|
|
845
317
|
[🖇buyme-img]: https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20latte&emoji=&slug=pboling&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff
|
|
846
318
|
[🖇buyme]: https://www.buymeacoffee.com/pboling
|
|
@@ -853,19 +325,22 @@ Thanks for RTFM. ☺️
|
|
|
853
325
|
[✉️discord-invite-img-ftb]: https://img.shields.io/discord/1373797679469170758?style=for-the-badge&logo=discord
|
|
854
326
|
[✉️ruby-friends-img]: https://img.shields.io/badge/daily.dev-%F0%9F%92%8E_Ruby_Friends-0A0A0A?style=for-the-badge&logo=dailydotdev&logoColor=white
|
|
855
327
|
[✉️ruby-friends]: https://app.daily.dev/squads/rubyfriends
|
|
328
|
+
[✉️ruby-forum-top-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=flat&logo=discourse&label=Ruby%20Users%20Forum
|
|
329
|
+
[✉️ruby-forum-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=for-the-badge&logo=discourse&label=Ruby%20Users%20Forum
|
|
330
|
+
[✉️ruby-forum]: https://www.rubyforum.org/tag/structuredmerge
|
|
856
331
|
[✇bundle-group-pattern]: https://gist.github.com/pboling/4564780
|
|
857
|
-
[⛳️gem-namespace]: https://github.com/
|
|
332
|
+
[⛳️gem-namespace]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/bash-merge
|
|
858
333
|
[⛳️namespace-img]: https://img.shields.io/badge/namespace-Bash::Merge-3C2D2D.svg?style=square&logo=ruby&logoColor=white
|
|
859
|
-
[⛳️gem-name]: https://
|
|
334
|
+
[⛳️gem-name]: https://clickgems.clickhouse.com/dashboard/bash-merge
|
|
860
335
|
[⛳️name-img]: https://img.shields.io/badge/name-bash--merge-3C2D2D.svg?style=square&logo=rubygems&logoColor=red
|
|
861
|
-
[⛳️tag-img]: https://img.shields.io/github/tag/
|
|
862
|
-
[⛳️tag]:
|
|
336
|
+
[⛳️tag-img]: https://img.shields.io/github/tag/structuredmerge/structuredmerge-ruby.svg
|
|
337
|
+
[⛳️tag]: https://github.com/structuredmerge/structuredmerge-ruby/releases
|
|
863
338
|
[🚂maint-blog]: http://www.railsbling.com/tags/bash-merge
|
|
864
339
|
[🚂maint-blog-img]: https://img.shields.io/badge/blog-railsbling-0093D0.svg?style=for-the-badge&logo=rubyonrails&logoColor=orange
|
|
865
340
|
[🚂maint-contact]: http://www.railsbling.com/contact
|
|
866
341
|
[🚂maint-contact-img]: https://img.shields.io/badge/Contact-Maintainer-0093D0.svg?style=flat&logo=rubyonrails&logoColor=red
|
|
867
342
|
[💖🖇linkedin]: http://www.linkedin.com/in/peterboling
|
|
868
|
-
[💖🖇linkedin-img]: https://img.shields.io/badge/
|
|
343
|
+
[💖🖇linkedin-img]: https://img.shields.io/badge/LinkedIn-Profile-0B66C2?style=flat&logo=newjapanprowrestling
|
|
869
344
|
[💖✌️wellfound]: https://wellfound.com/u/peter-boling
|
|
870
345
|
[💖✌️wellfound-img]: https://img.shields.io/badge/peter--boling-orange?style=flat&logo=wellfound
|
|
871
346
|
[💖💲crunchbase]: https://www.crunchbase.com/person/peter-boling
|
|
@@ -894,103 +369,63 @@ Thanks for RTFM. ☺️
|
|
|
894
369
|
[💁🏼♂️peterboling]: http://www.peterboling.com
|
|
895
370
|
[🚂railsbling]: http://www.railsbling.com
|
|
896
371
|
[📜src-gl-img]: https://img.shields.io/badge/GitLab-FBA326?style=for-the-badge&logo=Gitlab&logoColor=orange
|
|
897
|
-
[📜src-gl]: https://gitlab.com/
|
|
372
|
+
[📜src-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/tree/main/gems/bash-merge
|
|
898
373
|
[📜src-cb-img]: https://img.shields.io/badge/CodeBerg-4893CC?style=for-the-badge&logo=CodeBerg&logoColor=blue
|
|
899
|
-
[📜src-cb]: https://codeberg.org/
|
|
900
|
-
[📜src-gh-img]: https://img.shields.io/badge/GitHub-238636?style=for-the-badge&logo=
|
|
901
|
-
[📜src-gh]: https://github.com/
|
|
374
|
+
[📜src-cb]: https://codeberg.org/structuredmerge/structuredmerge-ruby/src/branch/main/gems/bash-merge
|
|
375
|
+
[📜src-gh-img]: https://img.shields.io/badge/GitHub-238636?style=for-the-badge&logo=GitHub&logoColor=green
|
|
376
|
+
[📜src-gh]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/bash-merge
|
|
902
377
|
[📜docs-cr-rd-img]: https://img.shields.io/badge/RubyDoc-Current_Release-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
|
|
903
378
|
[📜docs-head-rd-img]: https://img.shields.io/badge/YARD_on_Galtzo.com-HEAD-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
|
|
904
|
-
[📜gl-wiki]: https://gitlab.com/
|
|
905
|
-
[📜gh-wiki]: https://github.com/
|
|
906
|
-
[📜gl-wiki-img]: https://img.shields.io/badge/wiki-
|
|
907
|
-
[📜gh-wiki-img]: https://img.shields.io/badge/wiki-
|
|
908
|
-
[👽dl-rank]: https://
|
|
909
|
-
[👽dl-ranki]: https://img.shields.io/gem/
|
|
910
|
-
[👽
|
|
911
|
-
[👽oss-helpi]: https://www.codetriage.com/kettle-rb/bash-merge/badges/users.svg
|
|
912
|
-
[👽version]: https://bestgems.org/gems/bash-merge
|
|
379
|
+
[📜gl-wiki]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/wikis/home
|
|
380
|
+
[📜gh-wiki]: https://github.com/structuredmerge/structuredmerge-ruby/wiki
|
|
381
|
+
[📜gl-wiki-img]: https://img.shields.io/badge/wiki-gitlab-943CD2.svg?style=for-the-badge&logo=gitlab&logoColor=white
|
|
382
|
+
[📜gh-wiki-img]: https://img.shields.io/badge/wiki-github-943CD2.svg?style=for-the-badge&logo=github&logoColor=white
|
|
383
|
+
[👽dl-rank]: https://clickgems.clickhouse.com/dashboard/bash-merge
|
|
384
|
+
[👽dl-ranki]: https://img.shields.io/gem/dt/bash-merge.svg
|
|
385
|
+
[👽version]: https://clickgems.clickhouse.com/dashboard/bash-merge
|
|
913
386
|
[👽versioni]: https://img.shields.io/gem/v/bash-merge.svg
|
|
914
|
-
[
|
|
915
|
-
[
|
|
916
|
-
[🏀qlty-cov]: https://qlty.sh/gh/kettle-rb/projects/bash-merge/metrics/code?sort=coverageRating
|
|
917
|
-
[🏀qlty-covi]: https://qlty.sh/gh/kettle-rb/projects/bash-merge/coverage.svg
|
|
918
|
-
[🏀codecov]: https://codecov.io/gh/kettle-rb/bash-merge
|
|
919
|
-
[🏀codecovi]: https://codecov.io/gh/kettle-rb/bash-merge/graph/badge.svg
|
|
920
|
-
[🏀coveralls]: https://coveralls.io/github/kettle-rb/bash-merge?branch=main
|
|
921
|
-
[🏀coveralls-img]: https://coveralls.io/repos/github/kettle-rb/bash-merge/badge.svg?branch=main
|
|
922
|
-
[🖐codeQL]: https://github.com/kettle-rb/bash-merge/security/code-scanning
|
|
923
|
-
[🖐codeQL-img]: https://github.com/kettle-rb/bash-merge/actions/workflows/codeql-analysis.yml/badge.svg
|
|
924
|
-
[🚎2-cov-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/coverage.yml
|
|
925
|
-
[🚎2-cov-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/coverage.yml/badge.svg
|
|
926
|
-
[🚎3-hd-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/heads.yml
|
|
927
|
-
[🚎3-hd-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/heads.yml/badge.svg
|
|
928
|
-
[🚎5-st-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/style.yml
|
|
929
|
-
[🚎5-st-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/style.yml/badge.svg
|
|
930
|
-
[🚎6-s-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/supported.yml
|
|
931
|
-
[🚎6-s-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/supported.yml/badge.svg
|
|
932
|
-
[🚎9-t-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/truffle.yml
|
|
933
|
-
[🚎9-t-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/truffle.yml/badge.svg
|
|
934
|
-
[🚎11-c-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/current.yml
|
|
935
|
-
[🚎11-c-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/current.yml/badge.svg
|
|
936
|
-
[🚎12-crh-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/dep-heads.yml
|
|
937
|
-
[🚎12-crh-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/dep-heads.yml/badge.svg
|
|
938
|
-
[🚎13-🔒️-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/locked_deps.yml
|
|
939
|
-
[🚎13-🔒️-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/locked_deps.yml/badge.svg
|
|
940
|
-
[🚎14-🔓️-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/unlocked_deps.yml
|
|
941
|
-
[🚎14-🔓️-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/unlocked_deps.yml/badge.svg
|
|
942
|
-
[🚎15-🪪-wf]: https://github.com/kettle-rb/bash-merge/actions/workflows/license-eye.yml
|
|
943
|
-
[🚎15-🪪-wfi]: https://github.com/kettle-rb/bash-merge/actions/workflows/license-eye.yml/badge.svg
|
|
944
|
-
[💎ruby-3.2i]: https://img.shields.io/badge/Ruby-3.2-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
945
|
-
[💎ruby-3.3i]: https://img.shields.io/badge/Ruby-3.3-CC342D?style=for-the-badge&logo=ruby&logoColor=white
|
|
387
|
+
[🚎11-c-wf]: https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml
|
|
388
|
+
[🚎11-c-wfi]: https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml/badge.svg
|
|
946
389
|
[💎ruby-c-i]: https://img.shields.io/badge/Ruby-current-CC342D?style=for-the-badge&logo=ruby&logoColor=green
|
|
947
|
-
[
|
|
948
|
-
[
|
|
949
|
-
[
|
|
950
|
-
[
|
|
951
|
-
[
|
|
952
|
-
[
|
|
953
|
-
[🤝gh-issues]: https://github.com/kettle-rb/bash-merge/issues
|
|
954
|
-
[🤝gh-pulls]: https://github.com/kettle-rb/bash-merge/pulls
|
|
955
|
-
[🤝gl-issues]: https://gitlab.com/kettle-rb/bash-merge/-/issues
|
|
956
|
-
[🤝gl-pulls]: https://gitlab.com/kettle-rb/bash-merge/-/merge_requests
|
|
957
|
-
[🤝cb-issues]: https://codeberg.org/kettle-rb/bash-merge/issues
|
|
958
|
-
[🤝cb-pulls]: https://codeberg.org/kettle-rb/bash-merge/pulls
|
|
390
|
+
[🤝gh-issues]: https://github.com/structuredmerge/structuredmerge-ruby/issues
|
|
391
|
+
[🤝gh-pulls]: https://github.com/structuredmerge/structuredmerge-ruby/pulls
|
|
392
|
+
[🤝gl-issues]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/issues
|
|
393
|
+
[🤝gl-pulls]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/merge_requests
|
|
394
|
+
[🤝cb-issues]: https://codeberg.org/structuredmerge/structuredmerge-ruby/issues
|
|
395
|
+
[🤝cb-pulls]: https://codeberg.org/structuredmerge/structuredmerge-ruby/pulls
|
|
959
396
|
[🤝cb-donate]: https://donate.codeberg.org/
|
|
960
|
-
[🤝contributing]: CONTRIBUTING.md
|
|
961
|
-
[🏀codecov-g]: https://codecov.io/gh/kettle-rb/bash-merge/graphs/tree.svg
|
|
397
|
+
[🤝contributing]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CONTRIBUTING.md
|
|
962
398
|
[🖐contrib-rocks]: https://contrib.rocks
|
|
963
|
-
[🖐contributors]: https://github.com/
|
|
964
|
-
[🖐contributors-img]: https://contrib.rocks/image?repo=
|
|
965
|
-
[
|
|
966
|
-
[🪇conduct]: CODE_OF_CONDUCT.md
|
|
399
|
+
[🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors
|
|
400
|
+
[🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby
|
|
401
|
+
[🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md
|
|
967
402
|
[🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg
|
|
968
403
|
[📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
|
|
969
404
|
[📌semver]: https://semver.org/spec/v2.0.0.html
|
|
970
405
|
[📌semver-img]: https://img.shields.io/badge/semver-2.0.0-259D6C.svg?style=flat
|
|
971
406
|
[📌semver-breaking]: https://github.com/semver/semver/issues/716#issuecomment-869336139
|
|
972
407
|
[📌major-versions-not-sacred]: https://tom.preston-werner.com/2022/05/23/major-version-numbers-are-not-sacred.html
|
|
973
|
-
[📌changelog]: CHANGELOG.md
|
|
408
|
+
[📌changelog]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CHANGELOG.md
|
|
974
409
|
[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
|
|
975
410
|
[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-34495e.svg?style=flat
|
|
976
411
|
[📌gitmoji]: https://gitmoji.dev
|
|
977
412
|
[📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
|
|
978
413
|
[🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
|
|
979
|
-
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.
|
|
980
|
-
[🔐security]: SECURITY.md
|
|
414
|
+
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.810-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
|
|
415
|
+
[🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
|
|
981
416
|
[🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
|
|
982
417
|
[📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year
|
|
983
|
-
[📄license]: LICENSE.
|
|
984
|
-
[📄license-ref]:
|
|
985
|
-
[📄license-img]: https://img.shields.io/badge/License-
|
|
986
|
-
[📄license-compat]: https://
|
|
987
|
-
[📄license-compat-img]: https://img.shields.io/badge/
|
|
418
|
+
[📄license]: LICENSE.md
|
|
419
|
+
[📄license-ref]: LICENSE.md
|
|
420
|
+
[📄license-img]: https://img.shields.io/badge/License-AGPL--3.0--only_OR_PolyForm--Small--Business--1.0.0-259D6C.svg
|
|
421
|
+
[📄license-compat]: https://www.apache.org/legal/resolved.html#category-x
|
|
422
|
+
[📄license-compat-img]: https://img.shields.io/badge/Apache_Incompatible:_Category_X-%E2%9C%97-C0392B.svg?style=flat&logo=Apache
|
|
988
423
|
[📄ilo-declaration]: https://www.ilo.org/declaration/lang--en/index.htm
|
|
989
424
|
[📄ilo-declaration-img]: https://img.shields.io/badge/ILO_Fundamental_Principles-✓-259D6C.svg?style=flat
|
|
990
425
|
[🚎yard-current]: http://rubydoc.info/gems/bash-merge
|
|
991
426
|
[🚎yard-head]: https://bash-merge.galtzo.com
|
|
992
427
|
[💎stone_checksums]: https://github.com/galtzo-floss/stone_checksums
|
|
993
|
-
[💎SHA_checksums]: https://gitlab.com/
|
|
428
|
+
[💎SHA_checksums]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/tree/main/checksums
|
|
994
429
|
[💎rlts]: https://github.com/rubocop-lts/rubocop-lts
|
|
995
430
|
[💎rlts-img]: https://img.shields.io/badge/code_style_&_linting-rubocop--lts-34495e.svg?plastic&logo=ruby&logoColor=white
|
|
996
431
|
[💎appraisal2]: https://github.com/appraisal-rb/appraisal2
|