git-story-workflow 0.9.12 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3acae027af5cd4f0b585174804a628ae5f07ab7f5ed81c9cf0f6ea324771317
-  data.tar.gz: e6df688c535e7877baea001899bdc89f971f317d78c4ce25ab5d3fd64750f66f
+  metadata.gz: 594fee5ac595ddfe8ae4802bfc3bf4bef2c0f7c7b2e9f3ccbf76a9cbc7d8bd12
+  data.tar.gz: 2b2c6dace41b40c654dcfe7be680d22bf978696976d59de42abd27bdb68e071f
 SHA512:
-  metadata.gz: 3840b6c21619092377f7c9e07dea084a486a1853fe9e872ac1eb0b3008b3a567a8aae706fb0c196c090103c30db8b46c8eb5412683c30c11938b47ad0b51c0f4
-  data.tar.gz: 955b3fd2b94ffaaf06de061fdd745e98a230ba62464bd0208c41993af70d5646dfb1ff785e3f8a1e39d8fe993bff6601d751626373022fd4a8e75f7fdc2f3f84
+  metadata.gz: cf31372ba982c29af6e018ec82136bd2d254f0c728567d2ee0d1e4ccc38fe57442aafa38ad0634bc5bbc22910740113509074684dd83a024b99d509add46dc15
+  data.tar.gz: 600489c9074d8f73f57d8156ca440fe69332e25dc80470a736ad763bfe647b4845d580338791b59e116520d0207d2b3e976dae39ef338a726894834f25a1c2ad

data/Rakefile

@@ -22,6 +22,7 @@ GemHadar do
   dependency 'mize'
   dependency 'term-ansicolor'
   dependency 'complex_config'
+  dependency 'search_ui'
 
   development_dependency 'rake'
   development_dependency 'simplecov'

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.11.3

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.9.12 ruby lib
+# stub: git-story-workflow 0.11.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.9.12"
+  s.version = "0.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2020-01-15"
+  s.date = "2020-07-20"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<mize>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<term-ansicolor>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
@@ -45,5 +46,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mize>.freeze, [">= 0"])
     s.add_dependency(%q<term-ansicolor>.freeze, [">= 0"])
     s.add_dependency(%q<complex_config>.freeze, [">= 0"])
+    s.add_dependency(%q<search_ui>.freeze, [">= 0"])
   end
 end

data/lib/git/story/app.rb

@@ -3,6 +3,8 @@ require 'open-uri'
 require 'tins/go'
 require 'set'
 require 'infobar'
+require 'search_ui'
+require 'amatch'
 
 class Git::Story::App
   class ::String
@@ -13,6 +15,7 @@ class Git::Story::App
   extend Git::Story::Utils
   include ComplexConfig::Provider::Shortcuts
   include Tins::GO
+  include SearchUI
 
   annotate :command
 
@@ -33,9 +36,9 @@ class Git::Story::App
   def initialize(argv = ARGV.dup, debug: ENV['DEBUG'].to_i == 1)
     @rest_argv = (sep = argv.index('--')) ? argv.slice!(sep..-1).tap(&:shift) : []
     @argv      = argv
-    @opts    = go 'n:', @argv
-    @command = @argv.shift&.to_sym
-    @debug   = debug
+    @opts      = go 'n:', @argv
+    @debug     = debug
+    determine_command
   end
 
   def run
@@ -47,8 +50,11 @@ class Git::Story::App
         puts __send__(@command, *@argv)
       end
     else
-      @command and @command = @command.inspect
-      @command ||= 'n/a'
+      if @command
+        @command = @command.inspect
+      else
+        @command = 'n/a'
+      end
       STDERR.puts "Unknown command #{@command}\n\n#{help.join(?\n)}"
       exit 1
     end
@@ -61,7 +67,7 @@ class Git::Story::App
     longest = command_annotations.keys.map(&:size).max
     result.concat(
       command_annotations.map { |name, a|
-        "#{name.to_s.ljust(longest)} #{a[:doc]}"
+        "#{name.to_s.gsub(?_, ' ').ljust(longest)} #{a[:doc]}"
       }
     )
   end
@@ -314,30 +320,23 @@ class Git::Story::App
   command doc: '[PATTERN] switch to story matching PATTERN'
   def switch(pattern = nil)
     fetch_commits
-    ss = stories.map(&:story_base_name)
-    if pattern.present?
-      b = apply_pattern(pattern, ss)
-      if b.size == 1
-        b = b.first
-      else
-        b = nil
-      end
+    if branch = pick_branch(prompt: 'Switch to story? %s')
+      sh "git checkout #{branch}"
+      return "Switched to story: #{branch}".green
     end
-    loop do
-      unless b
-        b = complete prompt: 'Story <TAB>? '.bright_blue do |pattern|
-          apply_pattern(pattern, ss)
-        end&.strip
-        b.empty? and return
-      end
-      if branch = ss.find { |f| f == b }
-        sh "git checkout #{branch}"
-        return "Switched to story: #{branch}".green
-      else
-        b = nil
+  end
+
+  command doc: '[PATTERN] delete story branch matching PATTERN'
+  def delete(pattern = nil)
+    fetch_commits
+    if branch = pick_branch(prompt: 'Delete story branch? %s', symbol: ?⌦)
+      sh "git pull origin #{branch}"
+      sh "git branch -d #{branch}"
+      if ask(prompt: 'Delete remote branch? (y/N) ') =~ /\Ay\z/i
+        sh "git push origin #{branch} --delete"
       end
+      return "Deleted story branch: #{branch}".green
     end
-  rescue Interrupt
   end
 
   command doc: '[BRANCH] open branch on github'
@@ -359,6 +358,48 @@ class Git::Story::App
 
   private
 
+  def determine_command
+    c, command = [], nil
+    possible_commands = []
+    until @argv.empty?
+      c << @argv.shift
+      command = c.join(?_).to_sym
+      if command_of(command)
+        possible_commands << [ command, @argv.dup ]
+      end
+    end
+    unless possible_commands.empty?
+      @command, argv = possible_commands.last
+      @argv.replace(argv)
+    end
+    self
+  end
+
+  def pick_branch(prompt:, symbol: ?⏻)
+    ss = stories.map(&:story_base_name)
+    branch = Search.new(
+      match: -> answer {
+        answer = answer.strip.delete(?#).downcase
+
+        matcher = Amatch::PairDistance.new(answer)
+        matches = ss.map { |n| [ n, -matcher.similar(n.downcase) ] }.
+          select { |_, s| s < 0 }.sort_by(&:last).map(&:first)
+
+        matches.empty? and matches = ss
+        matches.first(Tins::Terminal.lines - 1)
+      },
+      query: -> _answer, matches, selector {
+        matches.each_with_index.
+          map { |m, i| i == selector ? "#{symbol} " + Search.on_blue(m) : '┊ ' + m } * ?\n
+      },
+      found: -> _answer, matches, selector {
+        matches[selector]
+      },
+      prompt: prompt.bold,
+      output: STDOUT
+    ).start
+  end
+
   def default_ref
     tags.last
   end

data/lib/git/story/version.rb

@@ -1,6 +1,6 @@
 module Git::Story
   # Git::Story version
-  VERSION         = '0.9.12'
+  VERSION         = '0.11.3'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-story-workflow
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.11.3
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: search_ui
+  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: Gem abstracting a git workflow…
 email: flori@ping.de
 executables:
@@ -172,7 +186,7 @@ homepage: http://flori.github.com/git-story-workflow
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Git-story-workflow
@@ -192,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Gem abstracting a git workflow
 test_files: