git_curate 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f00058b5232e499100bf5a03447ed891a640c3efb8b9c1ce9adae50bf84b02
-  data.tar.gz: bb443922c86047f3356e01eb160e83cbed0eb3ff8038826d03d2de3baef81f7b
+  metadata.gz: 6aa1d8d2c88d0f8d13be7d60fe85d74eaeaf9dbb86e45405936fd00fc72dc538
+  data.tar.gz: f6e4249ab9a8dae3d505102785c6c946703486cbf730f67d0b120bd038b182ce
 SHA512:
-  metadata.gz: 699f1b52fd674860eb71c8fc3c9eb4b43d8fbc884f5616d48781d965de50702ef910e6bea2d57b9bdd88a0f63c6aae976f497ab8de3a7a7819b1841edc0ef7a4
-  data.tar.gz: 100ec40a8f8a23ebcef141c7ef7bd4df970719a7e0c9e76ebde4c8bf9d823a9c36a3010cc3732442e29bf2c714bb909eb9ff83f88ac5ba43063ebd0b8aa024fd
+  metadata.gz: f5f0452a0548356888aa03caec3638a8ea28d15bff2aca56fb18ff29908c00d13d7cc0df4e9c7ed1a76ef9f5fb20227a33b52f5a2e27c0fdf939eeba025e3005
+  data.tar.gz: 992422984592b999295f4d4ec09af8f97b5d0b02e3ee506506393344e88ad947344d5e09152780fe5969ee2dd8ee3caa28c291c6ad57c4ba7e462814a1349dbe

data/.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: ruby
 rvm:
   - 2.4.9

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+### v1.1.0
+
+#### Change that may be breaking for an obscure use case
+
+* Output more helpful message in case there are no deletable branches when `git curate` run without `-l`/`--list` flag.
+
+This will be a breaking change but only in the unlikely event that the output of `git curate` is being piped
+through or processed by another program when run in _interactive_ (non-`--list`) mode.
+
+_New behaviour when there are no deletable branches:_
+Outputs `There are no local branches that can be deleted.`
+
+_Old behaviour when there are no deletable branches:_
+Outputs (irrelevantly and confusingly) the legend of interactive commands, followed by the message
+`No branches deleted.`
+
+### v1.0.2
+
+* Fix incorrect status-vs-upstream when commit subject begins with square-bracket-enclosed string.
+
 ### v1.0.1
 
 * Fix `fatal: bad revision '+'` error on encountering multiple worktrees.

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/git_curate/branch.rb

@@ -1,18 +1,15 @@
 module GitCurate
 
+  UpstreamInfo = Struct.new(:upstream, :status)
+
   class Branch
 
     # Regex for determining whether a "raw" branch name is the name of the current branch
     # 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 = /^\* /
-    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.
+    # Returns the branch name, with "* " prefixed if it's the current branch on the current
+    # worktree, or "+ " if it's the current branch on another worktree.
     attr_reader :raw_name
 
     # Returns a human-friendly string describing the status of the branch relative to the upstream branch
@@ -81,35 +78,29 @@ 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
-      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]
+      # Double quotes around the format string to ensure Windows compatibility.
+      command = 'git for-each-ref --format="%(refname:short) .. %(upstream:short) .. %(upstream:track)" refs/heads'
+      branches_with_remotes = Util.command_to_a(command).map do |line|
+        parts = line.split("..", -1).map { |s| s.strip! ; s.empty? ? nil : s }
+        [parts[0], UpstreamInfo.new(parts[1], parts[2])]
       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]
-        raw_branch_name =
-          if line =~ LEADING_STAR_REGEX
-            "* #{proper_branch_name}"
-          elsif line =~ LEADING_PLUS_REGEX
-            "+ #{proper_branch_name}"
-          else
-            proper_branch_name
-          end
-        upstream_info =
-          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
+      info = Util.command_to_a("git branch").map do |line|
+        raw_branch_name = line.strip
+        proper_branch_name = raw_branch_name.gsub(CURRENT_BRANCH_REGEX, "")
+        upstream_info = branches_with_remotes[proper_branch_name]
+        upstream_data =
+          if upstream_info.upstream
+            status = upstream_info.status
+            if status
+              status.gsub(/^\[/, "").gsub(/\]$/, "").capitalize
+            else
+              "Up to date"
+            end
           else
             "No upstream"
           end
-        [raw_branch_name, upstream_info]
+        [raw_branch_name, upstream_data]
       end
 
       info.to_h

data/lib/git_curate/runner.rb

@@ -26,17 +26,11 @@ module GitCurate
         return EXIT_FAILURE
       end
 
-      if interactive?
-        puts
-        print_help
-        puts
-      end
-
       branches = Branch.local
       branches.reject!(&:current?) if interactive?
 
       table = Tabulo::Table.new(branches, border: :reduced_ascii, column_padding: 0, align_header: :left) do |t|
-        t.add_column(:branch, header: "Branch") { |b| b.displayable_name(pad: !interactive?) }
+        t.add_column("Branch") { |b| b.displayable_name(pad: !interactive?) }
         t.add_column("Last commit:#{$/}Date", &:last_commit_date)
         t.add_column("#{$/}Hash", &:hash)
         t.add_column("#{$/}Author", &:last_author)
@@ -57,6 +51,15 @@ module GitCurate
         return EXIT_SUCCESS
       end
 
+      if branches.empty?
+        puts "There are no local branches that can be deleted."
+        return EXIT_SUCCESS
+      end
+
+      puts
+      print_help
+      puts
+
       table.each_with_index do |row, index|
         case HighLine.ask("#{row} #{prompt}").downcase
         when "d"

data/lib/git_curate/version.rb

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

metadata

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