git_curate 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc878f7afe05d52530f703159c8148c1e717b448c4464235fc5d98474f2b7d3
-  data.tar.gz: f7c99506b5e110f4fa8a371f6451be20001eb30f9eaec43b281d36dc0a9ef6e3
+  metadata.gz: 32a05c73884f0ccb28a0c77fbecce6aa123c866b8de6a519fd1dc02f5ae81475
+  data.tar.gz: fa8f0967a63ceb77a4cd325d47e9306882f1de712d656b63ccb6936386ecbc6d
 SHA512:
-  metadata.gz: 1f8218d0dae58c980c9e83037f07d76b78ee0a62936dc42d9643a610b247896d399e3eb820f721c43f490d2d913ae017757893ab7738c6e18a40da51046d03e3
-  data.tar.gz: 7f298ae39612aa6400113721b4fc4c93ae774bc0478de5973af480520fa48e9f305d896555a25d43c8ebd2847befbb2b2616083b8e4997c352ffdbc0fd45aca0
+  metadata.gz: a229f824eabb501d718b0533041c7308536fb939219391544b6cca176e5c278e52a0951d14d897142737226175e1911057c7306b430ca0e8752b2b6c920b8e38
+  data.tar.gz: e9166c2594376faeb422fbb4936d788249b59d5b6af530edd655c5f24d9be566615326337b490fb3185df50e1d1d0753bf8bf86d7bb6e55d0521409f43557520

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v1.0.1
+
+* Fix `fatal: bad revision '+'` error on encountering multiple worktrees.
+
 ### v1.0.0
 
 * Remove support for Ruby < v2.4.9.

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version][GV img]][Gem Version]
 [![Build Status][BS img]][Build Status]
 [![Coverage Status][CS img]][Coverage Status]
+[![Awesome][AR img]][Awesome Ruby]
 
 <img src="https://raw.githubusercontent.com/matt-harvey/git_curate/master/assets/demo.gif" width="1000" alt="Demo" />
 
@@ -81,7 +82,9 @@ License](http://opensource.org/licenses/MIT).
 [Gem Version]: https://rubygems.org/gems/git_curate
 [Build Status]: https://travis-ci.org/matt-harvey/git_curate
 [Coverage Status]: https://coveralls.io/github/matt-harvey/git_curate
+[Awesome Ruby]: https://awesome-ruby.com/#-git-tools
 
 [GV img]: https://img.shields.io/gem/v/git_curate.svg
 [BS img]: https://img.shields.io/travis/matt-harvey/git_curate.svg
 [CS img]: https://img.shields.io/coveralls/matt-harvey/git_curate.svg
+[AR img]: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/git_curate/branch.rb

@@ -3,12 +3,14 @@ module GitCurate
   class Branch
 
     # Regex for determining whether a "raw" branch name is the name of the current branch
-    CURRENT_BRANCH_REGEX = /^\*\s+/
+    # on this or another worktree.
+    CURRENT_BRANCH_REGEX = /^[+*]\s+/
 
     # Regexes for unpacking the output of `git branch -vv`
     BRANCH_NAME_REGEX = /\s+/
     LEADING_STAR_REGEX = /^\* /
-    REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+\[(.+?)\]/
+    LEADING_PLUS_REGEX = /^\+ /
+    REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+(\(.+\)\s+)?\[(?<remote_info>.+)\]/
 
     # Returns the branch name, with "* " prefixed if it's the current branch.
     attr_reader :raw_name
@@ -22,9 +24,19 @@ module GitCurate
       @proper_name ||= @raw_name.lstrip.sub(CURRENT_BRANCH_REGEX, '')
     end
 
-    # Returns truthy if and only if this is the currently checked out branch.
+    # Returns truthy if and only if this is the currently checked out branch on the current
+    # worktree.
+    def current_branch_this_worktree?
+      @current_branch_this_worktree ||= (@raw_name =~ LEADING_STAR_REGEX)
+    end
+
+    # Returns truthy if and only if this is the currently checked out branch on another worktree.
+    def current_branch_other_worktree?
+      @current_branch_other_worktree ||= (@raw_name =~ LEADING_PLUS_REGEX)
+    end
+
     def current?
-      @current ||= (@raw_name =~ CURRENT_BRANCH_REGEX)
+      current_branch_this_worktree? || current_branch_other_worktree?
     end
 
     # Return truthy if and only if this branch has been merged into the current HEAD.
@@ -81,11 +93,18 @@ module GitCurate
     # date, or ahead/behind).
     def self.branch_info
       Util.command_to_a("git branch -vv").map do |line|
-        line_is_current_branch = (line =~ LEADING_STAR_REGEX)
-        tidied_line = (line_is_current_branch ? line.gsub(LEADING_STAR_REGEX, "") : line)
+        line_is_current_branch = (line =~ CURRENT_BRANCH_REGEX)
+        tidied_line = (line_is_current_branch ? line.gsub(CURRENT_BRANCH_REGEX, "") : line)
         proper_branch_name = tidied_line.split(BRANCH_NAME_REGEX)[0]
-        raw_branch_name = (line_is_current_branch ? "* #{proper_branch_name}" : proper_branch_name)
-        remote_info = tidied_line[REMOTE_INFO_REGEX, 1]
+        raw_branch_name =
+          if line =~ LEADING_STAR_REGEX
+            "* #{proper_branch_name}"
+          elsif line =~ LEADING_PLUS_REGEX
+            "+ #{proper_branch_name}"
+          else
+            proper_branch_name
+          end
+        remote_info = tidied_line[REMOTE_INFO_REGEX, :remote_info]
         upstream_info =
           if remote_info.nil?
             "No upstream"
@@ -101,7 +120,8 @@ module GitCurate
       Util.command_output("git branch -D #{branches.map(&:proper_name).join(" ")} --")
     end
 
-    # raw_name should start in "* " if the current branch, but should otherwise have not whitespace.
+    # raw_name should start in "* " if the current branch on this worktree, "+ " if it's the current
+    # branch on another worktree, or otherwise have no whitespace.
     def initialize(raw_name, merged:, upstream_info:)
       @raw_name = raw_name
       @merged = merged

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -154,6 +154,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- assets/1920px-Topiary_Château_de_Hautefort_10.jpg
 - assets/demo.gif
 - bin/setup
 - exe/git-curate