git_curate 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a05c73884f0ccb28a0c77fbecce6aa123c866b8de6a519fd1dc02f5ae81475
-  data.tar.gz: fa8f0967a63ceb77a4cd325d47e9306882f1de712d656b63ccb6936386ecbc6d
+  metadata.gz: 50f00058b5232e499100bf5a03447ed891a640c3efb8b9c1ce9adae50bf84b02
+  data.tar.gz: bb443922c86047f3356e01eb160e83cbed0eb3ff8038826d03d2de3baef81f7b
 SHA512:
-  metadata.gz: a229f824eabb501d718b0533041c7308536fb939219391544b6cca176e5c278e52a0951d14d897142737226175e1911057c7306b430ca0e8752b2b6c920b8e38
-  data.tar.gz: e9166c2594376faeb422fbb4936d788249b59d5b6af530edd655c5f24d9be566615326337b490fb3185df50e1d1d0753bf8bf86d7bb6e55d0521409f43557520
+  metadata.gz: 699f1b52fd674860eb71c8fc3c9eb4b43d8fbc884f5616d48781d965de50702ef910e6bea2d57b9bdd88a0f63c6aae976f497ab8de3a7a7819b1841edc0ef7a4
+  data.tar.gz: 100ec40a8f8a23ebcef141c7ef7bd4df970719a7e0c9e76ebde4c8bf9d823a9c36a3010cc3732442e29bf2c714bb909eb9ff83f88ac5ba43063ebd0b8aa024fd

data/README.md

@@ -11,7 +11,7 @@
 
 After a while, my local repo becomes cluttered with branches, and `git branch` outputs an awkwardly
 long list. I want to delete some of those branches to bring that list back under control; but I
-can't always remember which branches I want to keep from the branch names alone; and inspecting them
+can’t always remember which branches I want to keep from the branch names alone; and inspecting them
 one at a time and _then_ running `git branch -D` in a separate step, is painful.
 
 `git curate` is intended to ease this pain. It steps you through the local branches of a repo one at
@@ -27,12 +27,12 @@ a time, outputting the following information about each:
 You can then select whether to delete or keep each branch as you go.
 
 **NOTE** `git curate` does _not_ run `git fetch` prior to generating its output. If you want to
-be sure that the "Status vs upstream" column reflects the latest state of the upstream branches
+be sure that the “Status vs upstream” column reflects the latest state of the upstream branches
 as per their remote repository, you should run `git fetch` first.
 
 ## Installation
 
-You'll need Ruby (v2.4.9 or greater) installed. Run:
+You’ll need Ruby (v2.4.9 or greater) installed. Run:
 
 ```
 gem install git_curate
@@ -51,15 +51,16 @@ git curate
 This will step you through your local branches one at a time, outputting some information about
 each, and asking you whether to keep or delete each branch.
 
-At each branch, enter "k"—or simply press Enter—to _keep_ the branch and move to the next one;
-or enter "d" to select the branch for deletion.
+At each branch, enter “k”—or simply press Enter—to _keep_ the branch and move to the next one;
+or enter “d” to select the branch for deletion.
 
-Entering "e" will end the session immediately, deleting all selected branches; and "a" will
+Entering “e” will end the session immediately, deleting all selected branches; and “a” will
 abort the session without deleting any branches. Once the final branch has been considered,
 any selected branches will be immediately deleted.
 
 Note the branch you are currently on will not be included in the list, as `git` does not allow you to delete
-the branch you're on.
+the branch you’re on. (The same applies to any branches that are currently checked out in other
+[worktrees](https://git-scm.com/docs/git-worktree).)
 
 If you just want to view the information about your local branches without stepping through
 them interactively, enter `git curate --list` or `git curate -l`. Your current branch _will_

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/git_curate/branch.rb

@@ -10,7 +10,7 @@ module GitCurate
     BRANCH_NAME_REGEX = /\s+/
     LEADING_STAR_REGEX = /^\* /
     LEADING_PLUS_REGEX = /^\+ /
-    REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+(\(.+\)\s+)?\[(?<remote_info>.+)\]/
+    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
@@ -24,19 +24,8 @@ 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 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_branch_this_worktree? || current_branch_other_worktree?
+      @current ||= (@raw_name =~ CURRENT_BRANCH_REGEX)
     end
 
     # Return truthy if and only if this branch has been merged into the current HEAD.
@@ -92,7 +81,15 @@ module GitCurate
     # a brief description of each branch's status relative to its upstream branch (up to
     # date, or ahead/behind).
     def self.branch_info
-      Util.command_to_a("git branch -vv").map do |line|
+      command_0 = "git for-each-ref --format='%(refname:short) .. %(upstream:short)' refs/heads"
+      command_1 = "git branch -vv"
+
+      branches_with_remotes = Util.command_to_a(command_0).map do |line|
+        parts = line.split(" .. ")
+        [parts[0], parts[1] || nil]
+      end.to_h
+
+      info = Util.command_to_a(command_1).map do |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]
@@ -104,16 +101,18 @@ module GitCurate
           else
             proper_branch_name
           end
-        remote_info = tidied_line[REMOTE_INFO_REGEX, :remote_info]
         upstream_info =
-          if remote_info.nil?
-            "No upstream"
-          else
+          if branches_with_remotes[proper_branch_name]
+            remote_info = tidied_line[REMOTE_INFO_REGEX, :remote_info]
             comparison_raw = remote_info.split(":")
             comparison_raw.length < 2 ? "Up to date" : comparison_raw[1].strip.capitalize
+          else
+            "No upstream"
           end
         [raw_branch_name, upstream_info]
-      end.to_h
+      end
+
+      info.to_h
     end
 
     def self.delete_multi(*branches)

data/lib/git_curate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline