git-story-workflow 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a262c355dd2d101911c442e5e9ba5d12da74967e3db37a600dc5f2f21ed1d9
-  data.tar.gz: bfe8ea9f227c933eaec80aae69bef429cac5d76eb311b0ddf40b7bd6247e7779
+  metadata.gz: c437719bf4e7298ee339477a48e37e6652a028876c7c1ef524953a24792b4099
+  data.tar.gz: 2dfe54728f5d8ad1d0655ad6e9c1706e905ae952af8678812002bb2fc6b20f46
 SHA512:
-  metadata.gz: b4957004998e3f360de92b4724a65a86ea3bc0e8264e5a740c1f8c6d4e725a4e787f449d429cfb2e5e738cd8c60cc81a38f3b481a10682282dc075c22a196ff4
-  data.tar.gz: 89b63867df083dccceb9673a9d18b6bfc04dcbe2e592cecf7a24826b753883079e5a8072d4645660a2e2af89427c516eba8019f3f55f189b825f1db9e4f7f3dd
+  metadata.gz: d32bb92036c60fbea1492caa8c79fc211d96aa60adc389386d9e8ed585d3613c8a3abf8562c19fafdf68450a6a21a3b4ff297a0df94ac111ff7a5317aa3b1942
+  data.tar.gz: 571614a5c236d81ea10bbe3628ff5bbf2812d6d1b2f68b479fcb2c0d02c6b2c55d54cbb367e3b3bf49592c8ef4e5b03cbc58f8098df6e7f276d018716135b85c

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/git-story-workflow.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: git-story-workflow 0.10.0 ruby lib
+# stub: git-story-workflow 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-story-workflow".freeze
-  s.version = "0.10.0"
+  s.version = "0.11.0"
 
   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-02-11"
+  s.date = "2020-02-28"
   s.description = "Gem abstracting a git workflow\u2026".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["git-story".freeze]

data/lib/git/story/app.rb

@@ -317,34 +317,25 @@ class Git::Story::App
   command doc: '[PATTERN] switch to story matching PATTERN'
   def switch(pattern = nil)
     fetch_commits
-    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 ? '⏻ ' + Search.on_blue(m) : '┊ ' + m } * ?\n
-      },
-      found: -> _answer, matches, selector {
-        matches[selector]
-      },
-      prompt: 'Story? %s'.bold,
-      output: STDOUT
-    ).start
-    if branch
+    if branch = pick_branch(prompt: 'Switch to story? %s')
       sh "git checkout #{branch}"
       return "Switched to story: #{branch}".green
     end
   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
+  end
+
   command doc: '[BRANCH] open branch on github'
   def github(branch = current(check: false))
     if url = github_url(branch)
@@ -364,6 +355,31 @@ class Git::Story::App
 
   private
 
+  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.10.0'
+  VERSION         = '0.11.0'
   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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar