git_selector 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9779fa47e7532d0fbdd7b8ee0739f233c03360ff06092ebe6b6d9049555968fa
-  data.tar.gz: 3c749cee80e74603a426791954756039878bd486e4e6feed600cf7f4af14d135
+  metadata.gz: d212d92587ff373597832eb02bd269c3af4a933e7d849aeadd6f7682b1c8335f
+  data.tar.gz: 6f5294ff9a530f126b9aa380fd6a1ff77a81987a4096a89be6ed4c9822739beb
 SHA512:
-  metadata.gz: 0662ff04fb5260cf8bb03d9288812420a0a0e3fb6f0af98646530acbd17585cffe2ce22a6c5b935d07537db4f1d2a9148c4bf710d6cd6588d1dc966f24addd9f
-  data.tar.gz: '092d647c73756159c7f511ac3e87a0d9facff476d6d2d4d101cbce1f8f127648d0f7fae573f59b8d8d4308754f391d46b8da1040053cbeba8b9244353a38c966'
+  metadata.gz: 6c3a06122986717b4179a52e7ff2d1eedcc7ee91a617cbe44bcd4c5262f9cc29ae30bc2ddf7ef4d8336a00fec2bf769c1e06fa1640197f8bc63678c1993b8d8d
+  data.tar.gz: c6d13b22ffe66643c48a82fc579bacb2cc27793f2ffec5fc7dcbf12195aec98a206cae40d0eaaa2b12f0540caf94559480f47fdafdb2d91c1c43de006a7c81c9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    git_selector (0.1.4)
+    git_selector (0.2.0)
       git
-      tty-prompt-vim
+      tty-prompt
 
 GEM
   remote: https://rubygems.org/
@@ -51,8 +51,6 @@ GEM
     tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
-    tty-prompt-vim (0.1.0)
-      tty-prompt (~> 0.16)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "git_selector"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/git_selector.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'git'
-  spec.add_dependency 'tty-prompt-vim'
+  spec.add_dependency 'tty-prompt'
   spec.add_development_dependency 'rspec'
 end

data/lib/git_prompt.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'git'
+require 'tty-prompt'
+require 'logger'
+require_relative './treeish_extractor'
+
+class GitPrompt
+  SELECT_OPTIONS_PER_PAGE = 10
+
+  attr_reader :git, :extractor, :prompt, :logger
+
+  def initialize(git: nil)
+    @git = git || Git.open(Dir.pwd)
+    @extractor = TreeishExtractor.new(git: git)
+		@prompt = TTY::Prompt.new(quiet: true)
+
+		define_key_events
+    select_tag(extractor.recent_branch_names)
+  end
+
+  def define_key_events
+    prompt.on(:keypress) do |event|
+      if event.value == 'q'
+        exit
+      end
+
+      if event.value == 'j'
+        prompt.trigger(:keydown)
+      end
+
+      if event.value == 'k'
+        prompt.trigger(:keyup)
+      end
+
+
+      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
+    # 2 is for the prompt message
+    prompt.print TTY::Cursor.clear_lines(SELECT_OPTIONS_PER_PAGE + 2, :up)
+  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
+  end
+
+  def checkout(tag_name)
+    git.checkout(tag_name)
+  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.4"
+  VERSION = "0.2.0"
 end

data/lib/git_selector.rb

@@ -1,9 +1,9 @@
 # frozen_string_litral: true
 
 require_relative "./git_selector/version"
-require_relative '../lib/selector'
+require_relative '../lib/git_prompt'
 
 # require 'bundler/setup'
 # Bundler.require(:default)
 
-Selector.new.select_tag
+GitPrompt.new

data/lib/treeish_extractor.rb

@@ -0,0 +1,37 @@
+# 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)"
+    get_treeish_names(cmd)
+  end
+
+  def recent_branch_names
+    # TODO limit number of branches when arg is not given
+    cmd = 'git branch --sort=-committerdate'
+    get_treeish_names(cmd)
+  end
+
+  private
+
+  def get_treeish_names(cmd)
+    names = []
+    _stdin, stdout, _stderr, _wait_thr = Open3.popen3(cmd)
+    stdout.each(sep="\n") do |line|
+      # reject rev without a tag
+      # current branch has '* ' to indicate it's selected
+      names << line.strip.sub('* ', '') unless line =~ /-[\d]+-[a-z0-9]{8,}$/
+    end
+    names
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_selector
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 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
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt-vim
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,13 +69,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - bin/release/gits
 - bin/setup
 - git_selector.gemspec
+- lib/git_prompt.rb
 - lib/git_selector.rb
 - lib/git_selector/version.rb
-- lib/selector.rb
-- lib/tag_extractor.rb
+- lib/treeish_extractor.rb
 homepage: https://github.com/suzukimilanpaak/git_selector
 licenses:
 - MIT

data/lib/selector.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'git'
-require 'tty/prompt/vim'
-require 'logger'
-require_relative './tag_extractor'
-
-class Selector
-  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
-
-    define_key_events
-  end
-
-  def select_tag
-    message = 'j/↓: down, k/↑: up, Enter: choose tag, Type to filter tags'
-    prompt.select(message, filter: true, 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
-  end
-
-  def define_key_events
-    prompt.on(:keypress) do |event|
-      if event.value == "j"
-        prompt.trigger(:keydown)
-      end
-
-      if event.value == "k"
-        prompt.trigger(:keyup)
-      end
-
-      if event.value == "q"
-        exit
-      end
-    end
-  end
-
-  private
-
-  def checkout(tag_name)
-    git.checkout(tag_name)
-  rescue Git::GitExecuteError => e
-    prompt.error(e.message)
-  end
-end
-

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
-