https://github.com/am-kantox/kantox-branchester
This app assures that my git branch has no merge conflicts with others in the repo.
https://github.com/am-kantox/kantox-branchester
Last synced: 24 days ago
JSON representation
This app assures that my git branch has no merge conflicts with others in the repo.
- Host: GitHub
- URL: https://github.com/am-kantox/kantox-branchester
- Owner: am-kantox
- License: mit
- Created: 2015-06-19T13:03:17.000Z (almost 10 years ago)
- Default Branch: master
- Last Pushed: 2015-07-24T09:01:04.000Z (almost 10 years ago)
- Last Synced: 2025-02-09T19:53:15.160Z (3 months ago)
- Language: Ruby
- Size: 148 KB
- Stars: 1
- Watchers: 3
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE.txt
- Code of conduct: CODE_OF_CONDUCT.md
Awesome Lists containing this project
README
# Kantox::Branchester
**Pronounces exactly as Mancunians call their city, but with respect to branching.**
Include this gem into your gemfile and stay notified about all the possible
merge conflicts against all the currently active branches.
## Installation
Add this line to your application's Gemfile:
```ruby
gem 'kantox-branchester'
```
And then execute:
$ bundle
Or install it yourself as:
$ gem install kantox-branchester
## Usage
**TL;DR:**
```
$ echo "gem 'kungfuig', git: '[email protected]:am-kantox/kungfuig', branch: 'master'
gem 'kantox-branchester', git: '[email protected]:am-kantox/kantox-branchester', branch: 'master'" >> Gemfile
$ bundle
$ bundle exec branchester
```
Very first run could be long, since the information about all the active
branches is to be gathered. The subsequent run should not take long since
the results are cached.
All logs are stored in `branchester` directory. The configuration is located
in `config/branchester.yml`. The file will appear after first run.
Typical use case would be to include `bundle exec branchester` into local
`post-commit` hook, or to run it manually. Please note, that once blacklisted,
the branch would not be checked against until explicitly removed from
`config/branchester.yml`.
Typical output:
#### For last 30 days / 1000 commits
```bash
Will try to merge 28 branches:
============================
****************************
============================
Some branches failed to merge automatically into feature/check-branchester
feature/CO-32_CM_sha_dir_eme ==>
Recorded preimage for 'Gemfile.lock'
Recorded preimage for 'db/schema.rb'
CONFLICT (content): Merge conflict in db/schema.rb
CONFLICT (content): Merge conflict in Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile
Automatic merge failed; fix conflicts and then commit the result.
hotfix/PT-2246-demo-platform-phone-quotes ==>
CONFLICT (content): Merge conflict in app/mutations/liquidity_provider_router.rb
Automatic merge failed; fix conflicts and then commit the result.
vemv-letter-opener-indication ==>
CONFLICT (content): Merge conflict in config/environments/development.rb
Automatic merge failed; fix conflicts and then commit the result.
```
#### For last 7 days / 1000 commits
```bash
Will try to merge 7 branches:
=======
*******
=======
Everything merged successfully into feature/check-branchester
```
## Configuration
```yaml
--- !ruby/hash:Hashie::Mash
config: !ruby/hash:Hashie::Mash
age: 7
retro: 1000
```
The above means only branches, not older than 7 days and only last 1000 commits
will be taken into account.
### Is it any good?
[Yes](http://news.ycombinator.com/item?id=3067434)
## “Yes, I’m a nerd” (please don’t read this section unless you actually are)
Each launch stores dump of result in `branchester` directory. This dump
might be examined to gather additional information on merge fails (whom to blame etc.)
It’s stored as dump because I have a virtual plan to create a web-service for it.
## To Do
* _urgent_ update a list of active branches once on a startup;
* accept a `--full` parameter in the command line, forcing to ignore whitelist;
* store everything in the `RethinkDB` + make a web interface;
* launch a github-attached service and conquer the world.
## Development
After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
## Contributing
Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/kantox-branchester. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
## License
The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).