git_selector 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d212d92587ff373597832eb02bd269c3af4a933e7d849aeadd6f7682b1c8335f
-  data.tar.gz: 6f5294ff9a530f126b9aa380fd6a1ff77a81987a4096a89be6ed4c9822739beb
+  metadata.gz: cb239a7bd25eb04147c34c2abf08b85a0011c340de26c5ec6ab432f199fdcc68
+  data.tar.gz: b1d5fb88077a842a73e49906f23595920fca485272d3da4ca5d101d01da17e29
 SHA512:
-  metadata.gz: 6c3a06122986717b4179a52e7ff2d1eedcc7ee91a617cbe44bcd4c5262f9cc29ae30bc2ddf7ef4d8336a00fec2bf769c1e06fa1640197f8bc63678c1993b8d8d
-  data.tar.gz: c6d13b22ffe66643c48a82fc579bacb2cc27793f2ffec5fc7dcbf12195aec98a206cae40d0eaaa2b12f0540caf94559480f47fdafdb2d91c1c43de006a7c81c9
+  metadata.gz: ad33d9bf74f706bd203588628ad0fc4a91936545c8e50755791331481cb7e2e413c64b667a5bd21de7852b733005783a1b6203a0d7d02725da3681a99b566634
+  data.tar.gz: c4ff0b4254aaf8bc701790b64ec3bd2ada32e1b31a825db122b7dc5da4043bebf62473c837b77056d24312e8df2e59d3d84a98c10c4a8b083d33e383fe6332b1

data/Gemfile.lock

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

data/lib/git_prompt.rb

@@ -4,6 +4,7 @@ require 'git'
 require 'tty-prompt'
 require 'logger'
 require_relative './treeish_extractor'
+require_relative './monkey_patches/tty/prompt.rb'
 
 class GitPrompt
   SELECT_OPTIONS_PER_PAGE = 10
@@ -13,10 +14,10 @@ class GitPrompt
   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)
+    create_prompt
+    define_key_events
+    select_tag(extractor.recent_tag_names)
   end
 
   def define_key_events
@@ -25,6 +26,8 @@ class GitPrompt
         exit
       end
 
+      # move up/down in the list
+
       if event.value == 'j'
         prompt.trigger(:keydown)
       end
@@ -33,6 +36,7 @@ class GitPrompt
         prompt.trigger(:keyup)
       end
 
+      # Select a mode
 
       if event.value == 'b'
         clear_prompt
@@ -49,8 +53,11 @@ class GitPrompt
   private
 
   def clear_prompt
-    # 2 is for the prompt message
-    prompt.print TTY::Cursor.clear_lines(SELECT_OPTIONS_PER_PAGE + 2, :up)
+    prompt.clear_list
+  end
+
+  def create_prompt
+    @prompt = TTY::Prompt.new(quiet: true)
   end
 
   def select_tag(treeish_names)
@@ -69,13 +76,13 @@ class GitPrompt
       prompt.ok 'No tags were found'
     end
   rescue TTY::Reader::InputInterrupt => e
-    exit
+    # 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.2.0"
+  VERSION = "0.2.2"
 end

data/lib/monkey_patches/tty/prompt/list.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module TTY
+  class Prompt
+    class List
+      def clear
+
+      end
+    end
+  end
+end
+

data/lib/monkey_patches/tty/prompt.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../../git_prompt.rb'
+require_relative './prompt/list.rb'
+
+module TTY
+  class Prompt
+
+    # original - https://github.com/piotrmurach/tty-prompt/blob/master/lib/tty/prompt.rb#L226-L250
+    def invoke_select(object, question, *args, &block)
+      options = Utils.extract_options!(args)
+      choices = if args.empty? && !block
+                  possible = options.dup
+                  options = {}
+                  possible
+                elsif args.size == 1 && args[0].is_a?(Hash)
+                  Utils.extract_options!(args)
+                else
+                  args.flatten
+                end
+
+      @list = object.new(self, **options)
+      @list.(question, choices, &block)
+    end
+
+    def unsubscribe_list
+      self.unsubscribe(@list)
+    end
+
+    def clear_list
+      @done = true
+      # @list = nil
+      unsubscribe_list
+      # 2 is for the prompt message
+      print(TTY::Cursor.clear_lines(GitPrompt::SELECT_OPTIONS_PER_PAGE + 2, :up))
+    end
+
+    def purge_list
+      @list = nil
+    end
+  end
+end

data/lib/treeish_extractor.rb

@@ -13,24 +13,30 @@ class TreeishExtractor
   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)
+    # 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'
-    get_treeish_names(cmd)
+    # 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)
+  def get_treeish_names(cmd, selecting_rule)
     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,}$/
+      selecting_rule.call(line, names)
     end
     names
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_selector
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tatsuya Suzuki
@@ -76,6 +76,8 @@ files:
 - lib/git_prompt.rb
 - lib/git_selector.rb
 - lib/git_selector/version.rb
+- lib/monkey_patches/tty/prompt.rb
+- lib/monkey_patches/tty/prompt/list.rb
 - lib/treeish_extractor.rb
 homepage: https://github.com/suzukimilanpaak/git_selector
 licenses: