git-fancy 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d92ba033793ea978318c6ca53b07088bbd769bb2255e54788cd76289368af265
-  data.tar.gz: c7dc19e5a4a1d378f32012cbe84516cb623c8530f3f1656d4a25da91422828b4
+  metadata.gz: 685d5e178fb8233c3c22be3c24618b164c8e11ef96b809dada54ee831ffdd04e
+  data.tar.gz: ce0556c30dfb4e1b3ec8ff83b3f1fc19fb10c890696ec609358f2ce7c81bb4c8
 SHA512:
-  metadata.gz: 9b9149fa76d4256400ee1b8f9569bbc01cb8c5f14d42a174cc9a5f574b4685fefc0aa81346a044a256b2d09befa2e811b9c3df560d2ee0400cd199742b17e837
-  data.tar.gz: 75592f89347bcd62bbb8aa79251c4316639ecdd839e5974b9f486b365eeda80c457b2fcbedff0caa47ffb9deded0c96401255fb0be4a2d6709b1f9fd78663171
+  metadata.gz: d00a35e7f8e172ba10759dae5a62c6eee46f5519f54e66295dbfa51a0958c55b40edc3d2fb9583b91562a4de51a646d1f87b3191ae7a5ac320f77b8fb7426cd4
+  data.tar.gz: cbcd6327de0c9b9708d4cd1e75f383515f2bd84c5aaab6263df43afb890330aead57333f5627a7f40d020389890010eaccf88eda59d41feb3c132e90cc9c9b97

data/README.md

@@ -1,28 +1,42 @@
 # Git::Fancy
 
-TODO: Delete this and the text below, and describe your gem
+Git fancy is a command line tool that makes switching between git branches faster and easier.
+It also allows you to annotate branches and quickly match branches based on either part of the branch name or notes.
 
-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.
+Git fancy tracks branches by most recently used.
 
-## Installation
+![Kapture 2025-05-06 at 02 31 07](https://github.com/user-attachments/assets/238e45c0-e612-4d58-8bd4-543356f52730)
 
-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:
+## Installation
 
-```bash
-bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+```console
+$ gem install git-fancy
 ```
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+## Usage
 
-```bash
-gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+The `sb` command is an alias for `switch-branch`. Both commands can be used interchangeably.
+
+To list recently used branches: (sb only tracks recently used branches when you use sb to switch branches)
+```console
+sb
 ```
 
-## Usage
+To switch to a branch when you only have a portion of a branch name:
+```console
+sb <portion_of_branch_name>
+```
+
+To annotate the current branch you are on:
+```console
+sb -n "make the logo bigger"
+```
 
-TODO: Write usage instructions here
+List all of the branches git fancy is tracking:
+```console
+sb -l
+```
 
 ## Development
 

data/exe/sb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+# This is just an alias for the switch-branch script
+path = File.join(__dir__, 'switch-branch')
+eval(File.read(path)) if File.exist?(path)

data/exe/switch-branch

@@ -4,10 +4,13 @@
 # Switch to git branch by matching part of a name
 
 require 'optparse'
+require 'pastel'
 require 'tty-prompt'
 require 'tty-logger'
 require 'sqlite3'
 require 'git/fancy'
+require 'open3'
+require 'debug'
 
 options = {}
 
@@ -27,12 +30,31 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+logger = TTY::Logger.new do |config|
+  config.handlers = [[:console, {
+    styles: {
+      info: {
+        color: :green,
+        symbol: '→',
+        label: nil,
+        levelpad: 0,
+      },
+      warn: {
+        label: nil,
+      },
+      error: {
+        label: nil,
+      },
+    }
+  }]]
+end
+@logger = logger
+
 Signal.trap('TERM') do
-  puts 'Terminating...'
+  @logger.error 'Terminating...'
   shutdown
 end
 
-logger = TTY::Logger.new
 
 @search_term = ARGV[0]&.strip
 search_term = @search_term
@@ -48,7 +70,7 @@ end
 
 if options[:delete_history]
   @branch_history.purge_history!
-  logger.success @color.green('Removed branch history')
+  @logger.success @color.green('Removed branch history')
   exit 0
 end
 
@@ -62,22 +84,22 @@ end
 if options[:note]
   @branch_history.add_branch @branch_history.current_branch
   @branch_history.add_note options[:note]
-  logger.success @color.green('Note added')
+  @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'
+    @logger.warn 'No recent branches found'
     exit 0
   end
 
-  puts 'Recent branches:'
+  @logger.info 'Recent branches:'
   branches.each do |branch|
-    time = branch.last_accessed ? Time.at(branch.last_accessed).strftime('%y-%m-%d') : nil
+    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(' -- ')
+    puts [time, branch.name, note].compact.join(@color.dim(' → '))
   end
   exit 0
 end
@@ -99,32 +121,35 @@ end
 branches = find_branches(search_term) || []
 
 def switch_branch(branch_name, location:)
-  logger = TTY::Logger.new
-  `git switch #{branch_name}`
+  Open3.popen3("git switch #{branch_name}") do |stdin, stdout, stderr, wait_thr|
+    # For some reason, even succesful git switch goes to stderr
+    out = stderr.read
+    if wait_thr.value.success?
+      @logger.success @color.green(out.strip)
+    else
+      # Also for some reason errors are duplicated
+      @logger.error @color.red(out.split("\nerror: ").first.strip)
+      exit 1
+    end
+  end
 
   @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:)
+  prompt = TTY::Prompt.new
+  cancel_str = @color.dim('ctrl-c to cancel')
+  selection = prompt.select("Choose #{location} branch #{cancel_str}", choices)
+  switch_branch(selection, location:) if selection != 'none'
+rescue TTY::Reader::InputInterrupt
+  exit 0
 end
 
 if branches.length == 1
@@ -135,10 +160,10 @@ if branches.length == 1
 
   switch_branch(branch_name, location: 'local')
 elsif branches.length > 1
-  logger.warn 'More than one branch name matched' unless search_term
+  @logger.warn 'More than one branch name matched' if search_term
   select_branch(branches, location: 'local')
 else
-  logger.warn "No local branches named: '#{branches.join(', ')}' with that name were found"
+  @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')

data/lib/git/fancy/version.rb

@@ -2,6 +2,6 @@
 
 module Git
   module Fancy
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fancy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Sean McCleary
@@ -56,6 +56,7 @@ description: This gem is a tool to switch between recent branches and add notes
 email:
 - seanmcc@gmail.com
 executables:
+- sb
 - switch-branch
 extensions: []
 extra_rdoc_files: []
@@ -67,6 +68,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- exe/sb
 - exe/switch-branch
 - lib/git/fancy.rb
 - lib/git/fancy/branch_history.rb