git_curate 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354154ef2b612e1b4831e2c42296317782e313286ea8686e039d8a96b406c4bc
-  data.tar.gz: ec34593d4e28187ab7d6e9aa45dbf5aa9e5689e2075427034e19738cb70e3357
+  metadata.gz: e1c8358c5021c6985ce3e6d701d607a2df341cc4ed2ba20dac43c13912a1fe44
+  data.tar.gz: c30b0e19d28f7ae48e5fb59372da44158940b8b79008c9d2a07f3b3e8d7d6534
 SHA512:
-  metadata.gz: 8fbb8bfce7b43df4eafc43933fe88fdaf283940475f3c2b6fb665f8c62d1ce2a044e6938850e10e789b9df757662d8353535411eedf7caa1842d4a1e0c837fff
-  data.tar.gz: 1bb25f41bb89503970202c6169dfeac3c5f7e957fb5227347f8fd0ca665d480f43846205316b1ea21c03cad76241e64a9b7c8681984e225417275000881aff3d
+  metadata.gz: 2a872d7d0555cab6a4d4df1d33c96cda3cce1952c09cda057816065e81a7af65c033196365ed0207a255c5cf9c0b190cd500376ca8620b9738084b683064e88c
+  data.tar.gz: 8e842c8f27654e625bcc9b895064a49764c6d67fd0c0b340c8ba900bcd6ad0850b66c836158e08fab0f04d03a3cd98b6dba6c38e84472ab7aa6c97c1db80b72c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.4.0
+
+* Add "Status vs upstream" column.
+
 ### v0.3.0
 
 * Add "Merged into HEAD?" column.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_curate (0.3.0)
+    git_curate (0.4.0)
       highline (= 2.0.0)
       tabulo (= 1.2.0)
 

data/README.md

@@ -12,9 +12,15 @@ can't always remember which branches I want to keep from the branch names alone;
 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
-a time, outputting a small amount of information about each branch (last commit date, author and
-summary, and whether the branch has been merged into the current HEAD), and prompting you either to
-keep or to delete each branch as you go.
+a time, outputting the following information about each:
+
+* Last commit date
+* Last commit author
+* Last commit subject
+* Whether the branch has been merged into the current HEAD
+* The status of the branch relative to the upstream branch it is tracking (if any)
+
+You can then select whether to delete or keep each branch as you go.
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/git_curate/runner.rb

@@ -1,5 +1,9 @@
 module GitCurate
 
+  # Regexes for unpacking the output of `git branch -vv`
+  BRANCH_NAME_REGEX = /\s+/
+  REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+\[(.+?)\]/
+
   class Runner
 
     def run
@@ -10,6 +14,7 @@ module GitCurate
 
       branches = command_to_a("git branch").reject { |b| current_branch?(b) }
       merged_branches = command_to_a("git branch --merged").reject { |b| current_branch?(b) }.to_set
+      upstreams = upstream_branches
 
       table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
         horizontal_rule_character: "-", column_padding: 0) do |t|
@@ -28,17 +33,21 @@ module GitCurate
           `git log -n1 --format='format:%s' #{branch}`
         end
 
-        t.add_column("Merged into HEAD?", align_header: :left) do |branch|
+        t.add_column("Merged\ninto HEAD?", align_header: :left) do |branch|
           merged_branches.include?(branch) ? "Merged" : "Not merged"
         end
+
+        t.add_column("Status vs\nupstream", align_header: :left) do |branch|
+          upstreams.fetch(branch, "No upstream")
+        end
       end
 
-      table.shrinkwrap!(max_table_width: 125)
+      table.shrinkwrap!(max_table_width: 150)
 
       branches_to_delete = []
 
       table.each_with_index do |row, index|
-        case HighLine.ask("#{row} Mark for deletion? [y/n/done/abort/help] ")
+        case HighLine.ask("#{row} Delete? [y/n/done/abort/help] ")
         when "y"
           branches_to_delete << row.to_h[:branch]
         when "n"
@@ -69,6 +78,27 @@ module GitCurate
       branch =~ /^\s*\*/
     end
 
+    # Returns a Hash containing, as keys, all local branches that have upstream branches (excluding
+    # the current branch) and, as values, a brief description of each branch's status relative
+    # to its upstream branch (up to date, or ahead/behind)
+    def upstream_branches
+      command_to_a("git branch -vv").map do |line|
+        branch_name = line.split(BRANCH_NAME_REGEX)[0]
+        remote_info = line[REMOTE_INFO_REGEX, 1]
+        if remote_info.nil?
+          nil
+        else
+          comparison_raw = remote_info.split(":")
+          comparison = if comparison_raw.length < 2
+                         "Up to date"
+                       else
+                         comparison_raw[1].strip.capitalize
+                       end
+          [branch_name, comparison]
+        end
+      end.compact.to_h
+    end
+
     def finalize(branches_to_delete)
       if branches_to_delete.size != 0
         puts

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline