git-fancy 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d92ba033793ea978318c6ca53b07088bbd769bb2255e54788cd76289368af265
+  data.tar.gz: c7dc19e5a4a1d378f32012cbe84516cb623c8530f3f1656d4a25da91422828b4
+SHA512:
+  metadata.gz: 9b9149fa76d4256400ee1b8f9569bbc01cb8c5f14d42a174cc9a5f574b4685fefc0aa81346a044a256b2d09befa2e811b9c3df560d2ee0400cd199742b17e837
+  data.tar.gz: 75592f89347bcd62bbb8aa79251c4316639ecdd839e5974b9f486b365eeda80c457b2fcbedff0caa47ffb9deded0c96401255fb0be4a2d6709b1f9fd78663171

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,8 @@
+AllCops:
+  TargetRubyVersion: 3.1
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - 2025-05-05
+
+- Initial release

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2025 Sean McCleary
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,43 @@
+# Git::Fancy
+
+TODO: Delete this and the text below, and describe your gem
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/git/fancy`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+## Installation
+
+TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+
+Install the gem and add to the application's Gemfile by executing:
+
+```bash
+bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
+
+If bundler is not being used to manage dependencies, install the gem by executing:
+
+```bash
+gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` 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 the created tag, 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]/git-fancy. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/git-fancy/blob/master/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Git::Fancy project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/git-fancy/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: %i[spec rubocop]

data/exe/switch-branch

@@ -0,0 +1,145 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Switch to git branch by matching part of a name
+
+require 'optparse'
+require 'tty-prompt'
+require 'tty-logger'
+require 'sqlite3'
+require 'git/fancy'
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = 'Usage: sb [options]'
+  opts.on('--delete', 'Deletes history') do
+    options[:delete_history] = true
+  end
+  opts.on('--inspect-history', 'Prints the recent_branches table') do
+    options[:inspect_history] = true
+  end
+  opts.on('-nNOTE', '--note=NOTE', 'Add a note for the current branch') do |note|
+    options[:note] = note
+  end
+  opts.on('-l', '--list', 'List 20 most recent branches') do
+    options[:list] = true
+  end
+end.parse!
+
+Signal.trap('TERM') do
+  puts 'Terminating...'
+  shutdown
+end
+
+logger = TTY::Logger.new
+
+@search_term = ARGV[0]&.strip
+search_term = @search_term
+
+@color = Pastel.new
+
+@branch_history = Git::Fancy::BranchHistory.new
+@branch_history.clean_missing_branches
+
+def prep_branch_results(results)
+  results.split("\n").map { |bn| bn.sub(/^\*/, '').strip }
+end
+
+if options[:delete_history]
+  @branch_history.purge_history!
+  logger.success @color.green('Removed branch history')
+  exit 0
+end
+
+if options[:inspect_history]
+  rows = @branch_history.inspect_history
+  require 'pp'
+  pp rows
+  exit 0
+end
+
+if options[:note]
+  @branch_history.add_branch @branch_history.current_branch
+  @branch_history.add_note options[:note]
+  logger.success @color.green('Note added')
+  exit 0
+end
+
+if options[:list]
+  branches = @branch_history.recent_branches(limit: 20, include_current: true)
+  if branches.empty?
+    logger.warn 'No recent branches found'
+    exit 0
+  end
+
+  puts 'Recent branches:'
+  branches.each do |branch|
+    time = branch.last_accessed ? Time.at(branch.last_accessed).strftime('%y-%m-%d') : nil
+    note = branch.note ? @color.yellow(branch.note) : nil
+    puts [time, branch.name, note].compact.join(' -- ')
+  end
+  exit 0
+end
+
+def find_branches(search_term)
+  if search_term
+    matching_branch_names = prep_branch_results(`git branch -l | grep -i #{search_term} | cut -f 1`)
+      .map { |bn| @branch_history.class::Branch.new(bn) }
+
+    matching_branch_notes = @branch_history.branches_matching_notes(search_term)
+    matching_branch_names.reject! { |b| matching_branch_notes.map(&:name).include?(b.name) }
+    matching_branch_notes + matching_branch_names
+  else
+    recent = @branch_history.recent_branches
+    recent.empty? ? @branch_history.local_branches : recent
+  end
+end
+
+branches = find_branches(search_term) || []
+
+def switch_branch(branch_name, location:)
+  logger = TTY::Logger.new
+  `git switch #{branch_name}`
+
+  @branch_history.add_branch(branch_name)
+  branch_note = @branch_history.branches_matching_notes(@search_term).find { |b| b.name == branch_name }&.note if @search_term
+  logger.success "Switched to #{location} branch: #{branch_name} #{branch_note ? @color.yellow(branch_note) : ''}"
+end
+
+def select_branch(branches, location: 'local', selected_branch: nil)
+  logger = TTY::Logger.new
+  prompt = TTY::Prompt.new
+
+  choices = branches.each_with_object({}) do |branch, hash|
+    time = branch.last_accessed ? Time.at(branch.last_accessed).strftime('%y-%m-%d') : nil
+    note = branch.note ? @color.yellow(branch.note) : nil
+    key = [time, branch.name, note].compact.join(' -- ')
+    hash[key] = branch.name
+  end
+
+  selection = prompt.select("Choose #{location} branch", choices.merge('none' => 'none'))
+  if selection == 'none'
+    logger.info 'Cancelling selection'
+    exit 0
+  end
+
+  switch_branch(selection, location:)
+end
+
+if branches.length == 1
+  branch_name = branches.first&.name
+  @branch_history.add_branch(branch_name)
+  #BranchHistory::Branch.new(branch_name).
+  raise 'Branch name is nil' if branch_name.nil?
+
+  switch_branch(branch_name, location: 'local')
+elsif branches.length > 1
+  logger.warn 'More than one branch name matched' unless search_term
+  select_branch(branches, location: 'local')
+else
+  logger.warn "No local branches named: '#{branches.join(', ')}' with that name were found"
+  remote_branches = prep_branch_results(`git branch -r | grep #{search_term} | cut -f 1`)
+
+  select_branch(remote_branches, location: 'remote')
+end

data/lib/git/fancy/branch_history.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require_relative 'db'
+require 'tty-logger'
+
+module Git
+  module Fancy
+    # SQLite3 database to keep track of recent branches
+    class BranchHistory
+      Branch = Struct.new(:name, :last_accessed, :note)
+
+      attr_reader :logger
+
+      def logger
+        @logger ||= TTY::Logger.new
+      end
+
+      def db = Db.instance.db
+
+      def local_branch_names
+        `git branch --sort='-*authordate' --format='%(refname:short)'`.split("\n")
+      end
+
+      def local_branches
+        to_branches(local_branch_names)
+      end
+
+      def recent_branches(limit: 10, include_current: false)
+        if include_current
+          sql = <<~SQL
+            SELECT name, last_accessed, note FROM recent_branches ORDER BY last_accessed DESC LIMIT ?
+          SQL
+          return to_branches db.execute(sql, [limit])
+        end
+
+        sql = <<~SQL
+          SELECT name, last_accessed, note FROM recent_branches WHERE name != ? ORDER BY last_accessed DESC LIMIT ?
+        SQL
+        to_branches db.execute(sql, [current_branch, limit])
+      end
+
+      def add_branch(branch_name)
+        sql = <<~SQL
+          INSERT INTO recent_branches (name, last_accessed) VALUES (?, ?)
+            ON CONFLICT DO UPDATE SET last_accessed=?
+        SQL
+        time = Time.now.to_i
+        db.execute(sql, [branch_name, time, time])
+      end
+
+      # Removes branches in the db that no longer exist locally
+      def clean_missing_branches
+        sql = <<~SQL
+          select name from recent_branches where name NOT IN (#{local_branch_names.map { |b| "'#{b}'" }.join(',')})
+        SQL
+        missing_branch_names = db.execute(sql).flatten
+
+        del_sql = "DELETE FROM recent_branches WHERE name IN (#{missing_branch_names.map { |b| "'#{b}'" }.join(',')})"
+
+        return if missing_branch_names.empty?
+
+        db.execute(del_sql)
+        logger.info "Removed missing local branches: #{missing_branch_names.join(', ')} branches from database"
+      end
+
+      def add_note(note, branch_name = nil)
+        branch_name ||= current_branch
+
+        sql = <<~SQL
+          UPDATE recent_branches SET note = ? WHERE name = ?
+        SQL
+        db.execute(sql, [note, branch_name])
+      end
+
+      def branches_matching_notes(search_term)
+        sql = <<~SQL
+          SELECT name, last_accessed, note
+          FROM recent_branches
+          WHERE note IS NOT NULL
+            AND LOWER(note) LIKE ?
+          ORDER BY last_accessed DESC
+        SQL
+        to_branches db.execute(sql, ["%#{search_term.downcase}%"])
+      end
+
+      def purge_history!
+        db.execute('DROP TABLE recent_branches')
+      end
+
+      def inspect_history
+        db.execute('SELECT * FROM recent_branches ORDER BY last_accessed DESC')
+      end
+
+      def current_branch
+        `git branch --show-current`.chomp
+      end
+
+      private
+
+      def to_branches(rows)
+        rows.map { |r| Branch.new(*r) }
+      end
+    end
+  end
+end
+

data/lib/git/fancy/db.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Git
+  module Fancy
+    class Db
+      FILE_PATH = File.join(Dir.home, '.git-fancy.db')
+      include Singleton
+
+      attr_reader :db
+
+      def initialize
+        @db = SQLite3::Database.new FILE_PATH
+        create_recent_branches_table
+      end
+
+      def create_recent_branches_table
+        return if table_exists?('recent_branches')
+
+        puts 'Creating and indexing recent_branches'
+        db.execute <<~SQL
+          CREATE TABLE recent_branches(
+            name TEXT,
+            last_accessed INTEGER,
+            note TEXT
+          );
+        SQL
+        db.execute 'CREATE UNIQUE INDEX recent_branches_branch_name ON recent_branches(name);'
+        db.execute 'CREATE INDEX recent_branches_last_accessed ON recent_branches(last_accessed);'
+      end
+
+      def table_exists?(table_name)
+        !db.execute("SELECT name FROM sqlite_master WHERE type='table' AND name=?;", [table_name]).empty?
+      end
+    end
+  end
+end

data/lib/git/fancy/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Git
+  module Fancy
+    VERSION = "0.1.0"
+  end
+end

data/lib/git/fancy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "fancy/db"
+require_relative "fancy/branch_history"
+require_relative "fancy/version"
+
+module Git
+  module Fancy
+  end
+end
+

data/sig/git/fancy.rbs

@@ -0,0 +1,6 @@
+module Git
+  module Fancy
+    VERSION: String
+    # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  end
+end

metadata

@@ -0,0 +1,100 @@
+--- !ruby/object:Gem::Specification
+name: git-fancy
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Sean McCleary
+bindir: exe
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This gem is a tool to switch between recent branches and add notes to
+  them.
+email:
+- seanmcc@gmail.com
+executables:
+- switch-branch
+extensions: []
+extra_rdoc_files: []
+files:
+- ".rspec"
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- LICENSE.txt
+- README.md
+- Rakefile
+- exe/switch-branch
+- lib/git/fancy.rb
+- lib/git/fancy/branch_history.rb
+- lib/git/fancy/db.rb
+- lib/git/fancy/version.rb
+- sig/git/fancy.rbs
+homepage: https://github.com/mrinterweb/git-fancy
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/mrinterweb/git-fancy
+  source_code_uri: https://github.com/mrinterweb/git-fancy
+  changelog_uri: https://github.com/mrinterweb/git-fancy/blob/main/CHANGELOG.md
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 3.1.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.6.8
+specification_version: 4
+summary: Fancy git branch switcher
+test_files: []