git_selector 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2734e6da62645d6b903f92142553b2dd991a20faa809ce0662f796cd0c822c
-  data.tar.gz: 682eda4bf7d7c1e4387b8a42de0e4bd2bb1ecfac49c218abccd56636876128c4
+  metadata.gz: a5542bea66cbcdb66da2a5819c0a237a4b6b1eb60f861fde66584d0456068084
+  data.tar.gz: 23e70bbc2fa0285da59cf4d61fc69158c0c952b0ae9a7104c19635c13bb8af86
 SHA512:
-  metadata.gz: 1109670e78c2e653966b8e45f83367d55dc5924bca9db76b7c0facc7a4225585b0a0a29a4a04604b82adecc8f9e64105bf8e48942797d408b11dcc71be9961ff
-  data.tar.gz: 3779f33f9e2385d07aeb0e6ffd48b2c8f21cc6296f09f3482bdb121a9908936a646047d876640db46ef98da2d04c0dd4606d1cc9a5a3a9813933ea90e3b30ef8
+  metadata.gz: 3be88e8b39bd7c2639be38f59df491728dfa7d31253a10a609b60ab481a8717a4383a873e9097427223107f18b31bc3df70c4ead430a094ffc9df20dc4ec46ac
+  data.tar.gz: 30ac1fc2c1431719f188f1ecc24400840f6fd0064093cb2afb756726cf0c03df718d1cf673b202157984ef4359087b9224c5adbb2e69cb6b422eb85b55342a64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_selector (0.1.5)
+    git_selector (0.2.1)
       git
       tty-prompt
 

data/lib/git_prompt.rb

@@ -3,52 +3,86 @@
 require 'git'
 require 'tty-prompt'
 require 'logger'
-require_relative './tag_extractor'
+require_relative './treeish_extractor'
+require_relative './monkey_patches/tty/prompt.rb'
 
 class GitPrompt
+  SELECT_OPTIONS_PER_PAGE = 10
+
   attr_reader :git, :extractor, :prompt, :logger
 
   def initialize(git: nil)
     @git = git || Git.open(Dir.pwd)
-    @extractor = TagExtractor.new(git: git)
-    @prompt = TTY::Prompt.new
+    @extractor = TreeishExtractor.new(git: git)
 
+    create_prompt
     define_key_events
-  end
-
-  def select_tag
-    message = 'j/↓: down, k/↑: up, Enter: choose tag, Type to filter tags'
-    prompt.select(message, filter: false, per_page: 10) do |menu|
-      extractor.recent_tag_names.each do |tag_name|
-        menu.choice tag_name, -> { checkout(tag_name) }
-      end
-    end
-  rescue TTY::Reader::InputInterrupt => e
-    exit
+    select_tag(extractor.recent_tag_names)
   end
 
   def define_key_events
     prompt.on(:keypress) do |event|
-      if event.value == "j"
+      if event.value == 'q'
+        exit
+      end
+
+      # move up/down in the list
+
+      if event.value == 'j'
         prompt.trigger(:keydown)
       end
 
-      if event.value == "k"
+      if event.value == 'k'
         prompt.trigger(:keyup)
       end
 
-      if event.value == "q"
-        exit
+      # Select a mode
+
+      if event.value == 'b'
+        clear_prompt
+        select_tag(extractor.recent_branch_names)
+      end
+
+      if event.value == 't'
+        clear_prompt
+        select_tag(extractor.recent_tag_names)
       end
     end
   end
 
   private
 
+  def clear_prompt
+    prompt.clear_list
+  end
+
+  def create_prompt
+    @prompt = TTY::Prompt.new(quiet: true)
+  end
+
+  def select_tag(treeish_names)
+    message = <<~MSG.chomp
+      j: down, k: up, q: quit, Enter: choose tag
+      [b] branch mode [t] tag mode
+    MSG
+
+    if treeish_names.size > 0
+      prompt.select(message, filter: false, per_page: SELECT_OPTIONS_PER_PAGE) do |menu|
+        treeish_names.each do |tag_name|
+          menu.choice tag_name, -> { checkout(tag_name) }
+        end
+      end
+    else
+      prompt.ok 'No tags were found'
+    end
+  rescue TTY::Reader::InputInterrupt => e
+    # exit automatically
+  end
+
   def checkout(tag_name)
     git.checkout(tag_name)
+    exit
   rescue Git::GitExecuteError => e
     prompt.error(e.message)
   end
 end
-

data/lib/git_selector/version.rb

@@ -1,3 +1,3 @@
 module GitSelector
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end

data/lib/git_selector.rb

@@ -6,4 +6,4 @@ require_relative '../lib/git_prompt'
 # require 'bundler/setup'
 # Bundler.require(:default)
 
-GitPrompt.new.select_tag
+GitPrompt.new

data/lib/treeish_extractor.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'git'
+require 'open3'
+
+class TreeishExtractor
+  attr_reader :git
+
+  def initialize(git: nil)
+    @git = git || Git.open(Dir.pwd)
+  end
+
+  def recent_tag_names
+    # TODO unlimit number of tags when arg is given
+    cmd = "git describe --tags $(git rev-list --tags --max-count=1000)"
+    # reject commits without a tag
+    selecting_rule = ->(line, names) do
+      names << line.strip unless line =~ /-[\d]+-[a-z0-9]{8,}$/
+    end
+    get_treeish_names(cmd, selecting_rule)
+  end
+
+  def recent_branch_names
+    # TODO limit number of branches when arg is not given
+    cmd = 'git branch --sort=-committerdate'
+    # a current branch is prefixed with '* ' to indicate it's selected
+    selecting_rule = ->(line, names) do
+      names << line.strip.sub('* ', '') unless line =~ /HEAD detached/
+    end
+    get_treeish_names(cmd, selecting_rule)
+  end
+
+  private
+
+  def get_treeish_names(cmd, selecting_rule)
+    names = []
+    _stdin, stdout, _stderr, _wait_thr = Open3.popen3(cmd)
+    stdout.each(sep="\n") do |line|
+      selecting_rule.call(line, names)
+    end
+    names
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_selector
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Tatsuya Suzuki
 autorequire: 
 bindir: bin/release
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -76,7 +76,7 @@ files:
 - lib/git_prompt.rb
 - lib/git_selector.rb
 - lib/git_selector/version.rb
-- lib/tag_extractor.rb
+- lib/treeish_extractor.rb
 homepage: https://github.com/suzukimilanpaak/git_selector
 licenses:
 - MIT

data/lib/tag_extractor.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'git'
-require 'open3'
-
-class TagExtractor
-  attr_reader :git, :shas_names
-
-  def initialize(git: nil)
-    @git = git || Git.open(Dir.pwd)
-  end
-
-  def recent_tag_names
-    if head_changed?
-      tag_names = []
-      # TODO unlimit tags when arg is given
-      cmd = "git describe --tags $(git rev-list --tags --max-count=1000)"
-      _stdin, stdout, _stderr, _wait_thr = Open3.popen3(cmd)
-      stdout.each(sep="\n") do |line|
-        # reject rev without a tag
-        tag_names << line.chomp unless line =~ /-[\d]+-[a-z0-9]{8,}$/
-      end
-      @tag_names = tag_names
-    else
-      @tag_names
-    end
-  end
-
-  private
-
-  def shas_names
-    if head_changed?
-      @shas_names = git.tags.each_with_object({}) { |t, sum| (sum[t.sha] ||= []) << t.name }
-    else
-      @shas_names
-    end
-  end
-
-  def head_changed?
-    changed = (@head_sha != git.log(1).first.sha)
-    @head_sha = git.log(1).first.sha
-    changed
-  end
-end
-