Skip to content

☯️ Bash::Merge provides smart Bash script merging that preserves comments, understands shell structure, and supports freeze blocks for protecting destination content. Perfect for merging configuration scripts and shell templates with customized destination files.

License

Notifications You must be signed in to change notification settings

kettle-rb/bash-merge

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

16 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
📍 NOTE
RubyGems (the GitHub org, not the website) suffered a hostile takeover in September 2025.
Ultimately 4 maintainers were hard removed and a reason has been given for only 1 of those, while 2 others resigned in protest.
It is a complicated story which is difficult to parse quickly.
Simply put - there was active policy for adding or removing maintainers/owners of rubygems and bundler, and those policies were not followed.
I'm adding notes like this to gems because I don't condone theft of repositories or gems from their rightful owners.
If a similar theft happened with my repos/gems, I'd hope some would stand up for me.
Disenfranchised former-maintainers have started gem.coop.
Once available I will publish there exclusively; unless RubyCentral makes amends with the community.
The "Technology for Humans: Joel Draper" podcast episode by reinteractive is the most cogent summary I'm aware of.
See here, here and here for more info on what comes next.
What I'm doing: A (WIP) proposal for bundler/gem scopes, and a (WIP) proposal for a federated gem server.

Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0 ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5 kettle-rb Logo by Aboling0, CC BY-SA 4.0

☯️ Bash::Merge

Version GitHub tag (latest SemVer) License: MIT Downloads Rank Open Source Helpers CodeCov Test Coverage Coveralls Test Coverage QLTY Test Coverage QLTY Maintainability CI Heads CI Runtime Dependencies @ HEAD CI Current CI Truffle Ruby Deps Locked Deps Unlocked CI Supported CI Test Coverage CI Style CodeQL Apache SkyWalking Eyes License Compatibility Check

if ci_badges.map(&:color).detect { it != "green"} ☝️ let me know, as I may have missed the discord notification.


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.

OpenCollective Backers OpenCollective Sponsors Sponsor Me on Github Liberapay Goal Progress Donate on PayPal Buy me a coffee Donate on Polar Donate at ko-fi.com

🌻 Synopsis

Bash::Merge is a standalone Ruby module that intelligently merges two versions of a Bash script using tree-sitter AST analysis. It's like a smart "git merge" specifically designed for shell scripts. Built on top of ast-merge, it shares the same architecture as prism-merge for Ruby source files.

Key Features

  • Tree-Sitter Powered: Uses tree-sitter-bash for accurate AST parsing
  • Script-Aware: Understands Bash syntax including functions, variables, and commands
  • Intelligent: Matches functions and variable assignments by name
  • Comment-Preserving: Comments are preserved in their context
  • Shebang Handling: Properly handles #!/bin/bash and similar shebangs
  • Freeze Block Support: Respects freeze markers (default: bash-merge:freeze / bash-merge:unfreeze) for merge control - customizable to match your project's conventions
  • Full Provenance: Tracks origin of every node
  • Standalone: Minimal dependencies - just ast-merge and ruby_tree_sitter
  • Customizable:
    • signature_generator - callable custom signature generators
    • preference - setting of :template, :destination, or a Hash for per-node-type preferences
    • node_splitter - Hash mapping node types to callables for per-node-type merge customization (see ast-merge docs)
    • add_template_only_nodes - setting to retain nodes that do not exist in destination
    • freeze_token - customize freeze block markers (default: "bash-merge")

Supported Node Types

Node Type Signature Format Matching Behavior
Function Definition [:function, name] Functions match by name
Variable Assignment [:assignment, name] Variables match by name
Command [:command, name, args...] Commands match by name and arguments
Comment [:comment, text] Comments preserved in context
Pipeline [:pipeline, commands...] Pipelines match by command sequence
If Statement [:if, condition_sig] Conditionals match by condition signature
For Loop [:for, variable] For loops match by loop variable
While Loop [:while, condition_sig] While loops match by condition signature

Example

require "bash/merge"

template = File.read("template.sh")
destination = File.read("destination.sh")

merger = Bash::Merge::SmartMerger.new(template, destination)
result = merger.merge

File.write("merged.sh", result.to_bash)

The *-merge Gem Family

This gem is part of a family of gems that provide intelligent merging for various file formats:

Gem Format Parser Description
ast-merge Text internal Shared infrastructure for all *-merge gems
prism-merge Ruby Prism Smart merge for Ruby source files
psych-merge YAML Psych Smart merge for YAML files
json-merge JSON tree-sitter-json Smart merge for JSON files
jsonc-merge JSONC tree-sitter-jsonc ⚠️ Proof of concept; Smart merge for JSON with Comments
bash-merge Bash tree-sitter-bash Smart merge for Bash scripts
rbs-merge RBS RBS Smart merge for Ruby type signatures
dotenv-merge Dotenv internal (dotenv) Smart merge for .env files
toml-merge TOML tree-sitter-toml Smart merge for TOML files
markdown-merge Markdown base classes Shared foundation for Markdown mergers
markly-merge Markdown Markly Smart merge for Markdown (CommonMark via libcmark-gfm)
commonmarker-merge Markdown Commonmarker Smart merge for Markdown (CommonMark via comrak)

Example implementations for the gem templating use case:

Gem Purpose Description
kettle-dev Gem Development Gem templating tool using *-merge gems
kettle-jem Gem Templating Gem template library with smart merge support

💡 Info you can shake a stick at

Tokens to Remember Gem name Gem namespace
Works with JRuby JRuby 10.0 Compat JRuby HEAD Compat
Works with Truffle Ruby Truffle Ruby 23.1 Compat Truffle Ruby 24.1 Compat
Works with MRI Ruby 3 Ruby 3.2 Compat Ruby 3.3 Compat Ruby 3.4 Compat Ruby HEAD Compat
Support & Community Join Me on Daily.dev's RubyFriends Live Chat on Discord Get help from me on Upwork Get help from me on Codementor
Source Source on GitLab.com Source on CodeBerg.org Source on Github.com The best SHA: dQw4w9WgXcQ!
Documentation Current release on RubyDoc.info YARD on Galtzo.com Maintainer Blog GitLab Wiki GitHub Wiki
Compliance License: MIT Compatible with Apache Software Projects: Verified by SkyWalking Eyes 📄ilo-declaration-img Security Policy Contributor Covenant 2.1 SemVer 2.0.0
Style Enforced Code Style Linter Keep-A-Changelog 1.0.0 Gitmoji Commits Compatibility appraised by: appraisal2
Maintainer 🎖️ Follow Me on LinkedIn Follow Me on Ruby.Social Follow Me on Bluesky Contact Maintainer My technical writing
... 💖 Find Me on WellFound: Find Me on CrunchBase My LinkTree More About Me 🧊 🐙 🛖 🧪

Compatibility

Compatible with MRI Ruby 3.2.0+, and concordant releases of JRuby, and TruffleRuby.

🚚 Amazing test matrix was brought to you by 🔎 appraisal2 🔎 and the color 💚 green 💚
👟 Check it out! github.com/appraisal-rb/appraisal2

Federated DVCS

Find this repo on federated forges (Coming soon!)
Federated DVCS Repository Status Issues PRs Wiki CI Discussions
🧪 kettle-rb/bash-merge on GitLab The Truth 💚 💚 💚 🐭 Tiny Matrix
🧊 kettle-rb/bash-merge on CodeBerg An Ethical Mirror (Donate) 💚 💚 ⭕️ No Matrix
🐙 kettle-rb/bash-merge on GitHub Another Mirror 💚 💚 💚 💯 Full Matrix 💚
🎮️ Discord Server Live Chat on Discord Let's talk about this library!

Enterprise Support Tidelift

Available as part of the Tidelift Subscription.

Need enterprise-level guarantees?

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.

Get help from me on Tidelift

  • 💡Subscribe for support guarantees covering all your FLOSS dependencies
  • 💡Tidelift is part of Sonar
  • 💡Tidelift pays maintainers to maintain the software you depend on!
    📊@Pointy Haired Boss: An enterprise support subscription is "never gonna let you down", and supports open source maintainers

Alternatively:

  • Live Chat on Discord
  • Get help from me on Upwork
  • Get help from me on Codementor

✨ Installation

Install the gem and add to the application's Gemfile by executing:

bundle add bash-merge

If bundler is not being used to manage dependencies, install the gem by executing:

gem install bash-merge

🔒 Secure Installation

For Medium or High Security Installations

This gem is cryptographically signed, and has verifiable SHA-256 and SHA-512 checksums by stone_checksums. Be sure the gem you install hasn’t been tampered with by following the instructions below.

Add my public key (if you haven’t already, expires 2045-04-29) as a trusted certificate:

gem cert --add <(curl -Ls https://raw.github.com/galtzo-floss/certs/main/pboling.pem)

You only need to do that once. Then proceed to install with:

gem install bash-merge -P HighSecurity

The HighSecurity trust profile will verify signed gems, and not allow the installation of unsigned dependencies.

If you want to up your security game full-time:

bundle config set --global trust-policy MediumSecurity

MediumSecurity instead of HighSecurity is necessary if not all the gems you use are signed.

NOTE: Be prepared to track down certs for signed gems and add them the same way you added mine.

🌳 Tree-Sitter Parser Installation

This gem requires the tree-sitter-bash parser library to be installed on your system. The parser is a native shared library (.so on Linux, .dylib on macOS) that provides Bash syntax parsing capabilities.

Option 1: Pre-built Binaries (Recommended)

Download pre-built parsers from Faveod/tree-sitter-parsers:

Linux (x64):

# Download and extract
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
tar -xzf parsers.tar.gz

# Install system-wide (requires sudo)
sudo cp libtree-sitter-bash.so /usr/lib/
sudo ldconfig

# Or install locally and set environment variable
mkdir -p ~/.local/lib/tree-sitter
cp libtree-sitter-bash.so ~/.local/lib/tree-sitter/
export TREE_SITTER_BASH_PATH="$HOME/.local/lib/tree-sitter/libtree-sitter-bash.so"

Debian/Ubuntu (amd64):

curl -Lo parsers.deb https://github.com/Faveod/tree-sitter-parsers/releases/download/v4.10/tree-sitter-parsers-4.10-amd64.deb
sudo dpkg -i parsers.deb

macOS (Apple Silicon):

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
tar -xzf parsers.tar.gz

# Install to a location and set environment variable
mkdir -p ~/.local/lib/tree-sitter
cp libtree-sitter-bash.dylib ~/.local/lib/tree-sitter/
export TREE_SITTER_BASH_PATH="$HOME/.local/lib/tree-sitter/libtree-sitter-bash.dylib"

Option 2: Build from Source

git clone https://github.com/tree-sitter/tree-sitter-bash.git
cd tree-sitter-bash
make
sudo cp libtree-sitter-bash.so /usr/lib/  # Linux
# or
sudo cp libtree-sitter-bash.dylib /usr/local/lib/  # macOS

Option 3: Package Manager

Some package managers provide tree-sitter parsers:

Fedora Atomic (Silverblue, Kinoite, Bazzite, Aurora, etc.):

# Install via rpm-ostree (requires reboot)
rpm-ostree install libtree-sitter-bash

# The library will be installed to /usr/lib64/libtree-sitter-bash.so
# You may need to set the environment variable:
export TREE_SITTER_BASH_PATH="/usr/lib64/libtree-sitter-bash.so"

Fedora (traditional):

sudo dnf install libtree-sitter-bash

Arch Linux:

# Check AUR for tree-sitter-bash
yay -S tree-sitter-bash

Environment Variable

If the parser is not in a standard location (/usr/lib/, /usr/lib64/, /usr/local/lib/), set the TREE_SITTER_BASH_PATH environment variable to point to the parser library:

export TREE_SITTER_BASH_PATH="/path/to/libtree-sitter-bash.so"

Note: Some distributions install the library with a version number suffix (e.g., libtree-sitter-bash.so.14 instead of libtree-sitter-bash.so). If the gem can't find the parser, check for versioned files and either:

  • Set TREE_SITTER_BASH_PATH to the full versioned path, or
  • Create a symlink: sudo ln -s /usr/lib64/libtree-sitter-bash.so.14 /usr/lib64/libtree-sitter-bash.so

Add this to your shell profile (.bashrc, .zshrc, etc.) for persistence.

⚙️ Configuration

merger = Bash::Merge::SmartMerger.new(
  template_content,
  dest_content,
  # Which version to prefer when nodes match
  # :destination (default) - keep destination code
  # :template - use template code
  preference: :destination,

  # Whether to add template-only nodes to the result
  # false (default) - only include nodes that exist in destination
  # true - include all template nodes (functions, variables, etc.)
  add_template_only_nodes: false,

  # Token for freeze block markers
  # Default: "bash-merge"
  # Looks for: # bash-merge:freeze / # bash-merge:unfreeze
  freeze_token: "bash-merge",

  # Custom signature generator (optional)
  # Receives a node, returns a signature array or nil
  signature_generator: ->(node) { [:function, node.name] if node.type == :function_definition },
)

🔧 Basic Usage

Simple Merge

require "bash/merge"

# Template defines the structure
template = <<~BASH
  #!/bin/bash
  
  # Configuration
  APP_NAME="myapp"
  DEBUG=false
  
  # Main function
  main() {
    echo "Starting $APP_NAME"
    setup
    run
  }
  
  setup() {
    echo "Setting up..."
  }
  
  run() {
    echo "Running..."
  }
  
  main "$@"
BASH

# Destination has customizations
destination = <<~BASH
  #!/bin/bash
  
  # Configuration
  APP_NAME="myapp-custom"
  DEBUG=true
  LOG_FILE="/var/log/myapp.log"
  
  # Main function with custom logging
  main() {
    echo "Starting $APP_NAME" | tee -a "$LOG_FILE"
    setup
    run
  }
  
  setup() {
    echo "Custom setup..."
  }
  
  main "$@"
BASH

merger = Bash::Merge::SmartMerger.new(template, destination)
result = merger.merge
puts result.to_bash

Using Freeze Blocks

Freeze blocks protect sections from being overwritten during merge:

#!/bin/bash

# Configuration
APP_NAME="myapp"

# bash-merge:freeze Custom credentials
DB_USER="production_user"
DB_PASS="super_secret_password"
API_KEY="my_production_api_key"
# bash-merge:unfreeze

# Standard functions
main() {
  echo "Starting $APP_NAME"
}

main "$@"

Content between # bash-merge:freeze and # bash-merge:unfreeze markers is preserved from the destination file, regardless of what the template contains.

Adding Template-Only Nodes

merger = Bash::Merge::SmartMerger.new(
  template,
  destination,
  add_template_only_nodes: true,
)
result = merger.merge
# Result includes functions/variables from template that don't exist in destination

🦷 FLOSS Funding

While kettle-rb tools are free software and will always be, the project would benefit immensely from some funding. Raising a monthly budget of... "dollars" would make the project more sustainable.

We welcome both individual and corporate sponsors! We also offer a wide array of funding channels to account for your preferences (although currently Open Collective is our preferred funding platform).

If you're working in a company that's making significant use of kettle-rb tools we'd appreciate it if you suggest to your company to become a kettle-rb sponsor.

You can support the development of kettle-rb tools via GitHub Sponsors, Liberapay, PayPal, Open Collective and Tidelift.

📍 NOTE
If doing a sponsorship in the form of donation is problematic for your company
from an accounting standpoint, we'd recommend the use of Tidelift,
where you can get a support-like subscription instead.

Open Collective for Individuals

Support us with a monthly donation and help us continue our activities. [Become a backer]

NOTE: kettle-readme-backers updates this list every day, automatically.

No backers yet. Be the first!

Open Collective for Organizations

Become a sponsor and get your logo on our README on GitHub with a link to your site. [Become a sponsor]

NOTE: kettle-readme-backers updates this list every day, automatically.

No sponsors yet. Be the first!

Another way to support open-source

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).

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.

I’m developing a new library, floss_funding, 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.

Floss-Funding.dev: 👉️ No network calls. 👉️ No tracking. 👉️ No oversight. 👉️ Minimal crypto hashing. 💡 Easily disabled nags

OpenCollective Backers OpenCollective Sponsors Sponsor Me on Github Liberapay Goal Progress Donate on PayPal Buy me a coffee Donate on Polar Donate to my FLOSS efforts at ko-fi.com Donate to my FLOSS efforts using Patreon

🔐 Security

See SECURITY.md.

🤝 Contributing

If you need some ideas of where to help, you could work on adding more code coverage, or if it is already 💯 (see below) check reek, issues, or PRs, or use the gem and think about how it could be better.

We Keep A Changelog so if you make changes, remember to update it.

See CONTRIBUTING.md for more detailed instructions.

🚀 Release Instructions

See CONTRIBUTING.md.

Code Coverage

Coverage Graph

Coveralls Test Coverage

QLTY Test Coverage

🪇 Code of Conduct

Everyone interacting with this project's codebases, issue trackers, chat rooms and mailing lists agrees to follow the Contributor Covenant 2.1.

🌈 Contributors

Contributors

Made with contributors-img.

Also see GitLab Contributors: https://gitlab.com/kettle-rb/bash-merge/-/graphs/main

⭐️ Star History Star History Chart

📌 Versioning

This Library adheres to Semantic Versioning 2.0.0. Violations of this scheme should be reported as bugs. Specifically, if a minor or patch version is released that breaks backward compatibility, a new version should be immediately released that restores compatibility. Breaking changes to the public API will only be introduced with new major versions.

dropping support for a platform is both obviously and objectively a breaking change
—Jordan Harband (@ljharb, maintainer of SemVer) in SemVer issue 716

I understand that policy doesn't work universally ("exceptions to every rule!"), but it is the policy here. As such, in many cases it is good to specify a dependency on this library using the Pessimistic Version Constraint with two digits of precision.

For example:

spec.add_dependency("bash-merge", "~> 1.0")
📌 Is "Platform Support" part of the public API? More details inside.

SemVer should, IMO, but doesn't explicitly, say that dropping support for specific Platforms is a breaking change to an API, and for that reason the bike shedding is endless.

To get a better understanding of how SemVer is intended to work over a project's lifetime, read this article from the creator of SemVer:

See CHANGELOG.md for a list of releases.

📄 License

The gem is available as open source under the terms of the MIT License License: MIT. See LICENSE.txt for the official Copyright Notice.

© Copyright

  • Copyright (c) 2023, 2025 Peter H. Boling, of Galtzo.com Galtzo.com Logo (Wordless) by Aboling0, CC BY-SA 4.0 , and bash-merge contributors.

🤑 A request for help

Maintainers have teeth and need to pay their dentists. After getting laid off in an RIF in March, and encountering difficulty finding a new one, I began spending most of my time building open source tools. I'm hoping to be able to pay for my kids' health insurance this month, so if you value the work I am doing, I need your support. Please consider sponsoring me or the project.

To join the community or get help 👇️ Join the Discord.

Live Chat on Discord

To say "thanks!" ☝️ Join the Discord or 👇️ send money.

Sponsor kettle-rb/bash-merge on Open Source Collective 💌 Sponsor me on GitHub Sponsors 💌 Sponsor me on Liberapay 💌 Donate on PayPal

Please give the project a star ⭐ ♥.

Thanks for RTFM. ☺️

About

☯️ Bash::Merge provides smart Bash script merging that preserves comments, understands shell structure, and supports freeze blocks for protecting destination content. Perfect for merging configuration scripts and shell templates with customized destination files.

Resources

License

Code of conduct

Contributing

Security policy

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published