git_curate 1.0.1 → 1.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32a05c73884f0ccb28a0c77fbecce6aa123c866b8de6a519fd1dc02f5ae81475
-  data.tar.gz: fa8f0967a63ceb77a4cd325d47e9306882f1de712d656b63ccb6936386ecbc6d
+  metadata.gz: 4460f5b9f1e2e1dc37bc0afbab3b0d67ab3a1a767d66c2e41c49a31de9ae8ceb
+  data.tar.gz: 64d28c60264cde31f088074f7d431ae8019f97fa0117b940c05cc9d40d855187
 SHA512:
-  metadata.gz: a229f824eabb501d718b0533041c7308536fb939219391544b6cca176e5c278e52a0951d14d897142737226175e1911057c7306b430ca0e8752b2b6c920b8e38
-  data.tar.gz: e9166c2594376faeb422fbb4936d788249b59d5b6af530edd655c5f24d9be566615326337b490fb3185df50e1d1d0753bf8bf86d7bb6e55d0521409f43557520
+  metadata.gz: 6ffe2949a193e80a8fda6c480464eb73ac4f859309f2deb1f48c818f916566eac2a3b5f4fd6e97b031df6b673f79fc59df03262d44d934c754d3f1b45efa9d15
+  data.tar.gz: 3941f4ed634a97b83db6d13d91288e37271e61d8a1f9c73c2e88e492b9805c417f261c0bb9af49a9a8c6f7dd25759bb287f3adee5c907287041e65b87e84fb20

data/.travis.yml

@@ -1,7 +1,7 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.4.9
+  - 2.4.10
   - 2.5.8
   - 2.6.6
-  - 2.7.1
+  - 2.7.2
+  - 3.0.0

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+### v1.2.0.beta
+
+* Fix for issue #16: "undefined method upstream" error on MacOS 15.7
+* Add rugged library
+
+### v1.1.2
+
+* Dependency version upgrades
+* Include Ruby v3 in automated tests
+
+### v1.1.1
+
+* Dependency version upgrades
+
+### 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/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in git_curate.gemspec
 gemspec
+
+gem "rugged", "~> 1.1"

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_
@@ -76,8 +77,7 @@ To run the test suite, run `bundle exec rake spec`. For a list of other Rake tas
 
 ## License
 
-The gem is available as open source under the terms of the [MIT
-License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 [Gem Version]: https://rubygems.org/gems/git_curate
 [Build Status]: https://travis-ci.org/matt-harvey/git_curate

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.2.0.beta

data/git_curate.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "highline", "2.0.3"
-  spec.add_runtime_dependency "tabulo", "2.5.0"
-  spec.add_runtime_dependency "tty-screen", "0.7.1"
+  spec.add_runtime_dependency "tabulo", "2.6.2"
+  spec.add_runtime_dependency "tty-screen", "0.8.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"

data/lib/git_curate/branch.rb

@@ -1,18 +1,19 @@
+require "rugged"
+
 module GitCurate
 
+  UpstreamInfo = Struct.new(:upstream, :status)
+
   class Branch
 
+    @@repo = Rugged::Repository.new(".")
+
     # 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
@@ -24,19 +25,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.
@@ -79,43 +69,43 @@ module GitCurate
 
     # Returns the local branches
     def self.local
-      merged_branch_raw_names = Util.command_to_a("git branch --merged").to_set
+      rugged_branches = @@repo.branches
+      repo_head_target = @@repo.head.target
+
+      Util.command_to_a("git branch").map do |line|
+        raw_branch_name = line.strip
+        proper_branch_name = raw_branch_name.gsub(CURRENT_BRANCH_REGEX, "")
+        rugged_branch = rugged_branches[proper_branch_name]
+        upstream = rugged_branch.upstream
+        upstream_data =
+          if upstream
+            target_id = rugged_branch.target_id
+            ahead, behind = @@repo.ahead_behind(target_id, upstream.target_id)
+            parts = []
+            parts << "ahead #{ahead}" if ahead != 0
+            parts << "behind #{behind}" if behind != 0
+            if parts.any?
+              parts.join(", ").capitalize
+            else
+              "Up to date"
+            end
+          else
+            "No upstream"
+          end
+
+        target = rugged_branch.resolve.target
+        merged = (@@repo.merge_base(repo_head_target, target) == target.oid)
 
-      branch_info.map do |raw_name, info|
-        new(raw_name, merged: merged_branch_raw_names.include?(raw_name), upstream_info: info)
+        new(
+          raw_branch_name,
+          merged: merged,
+          upstream_info: upstream_data,
+        )
       end
     end
 
     private
 
-    # Returns a Hash containing, as keys, the raw names of all local branches and, as values,
-    # 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|
-        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
-        remote_info = tidied_line[REMOTE_INFO_REGEX, :remote_info]
-        upstream_info =
-          if remote_info.nil?
-            "No upstream"
-          else
-            comparison_raw = remote_info.split(":")
-            comparison_raw.length < 2 ? "Up to date" : comparison_raw[1].strip.capitalize
-          end
-        [raw_branch_name, upstream_info]
-      end.to_h
-    end
-
     def self.delete_multi(*branches)
       Util.command_output("git branch -D #{branches.map(&:proper_name).join(" ")} --")
     end

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.1"
+  VERSION = "1.2.0.beta"
 end

data/play.rb

@@ -0,0 +1,31 @@
+require "rugged"
+
+repo = Rugged::Repository.new(".")
+
+current_branch_name = repo.head.name.sub(/^refs\/heads\//, '')
+
+repo.branches.each_name(:local) do |branch_name|
+  branch_reference = repo.references["refs/heads/#{branch_name}"]
+  branch = repo.branches[branch_name]
+  is_current = current_branch_name == branch_name
+  target_id = branch.target_id
+  top_commit = branch_reference.log.first
+  commit = repo.lookup(target_id)
+
+  target = branch.resolve.target
+  merged = repo.merge_base(repo.head.target, target) == target.oid
+
+  puts "Branch: #{is_current ? '* ' + branch_name : branch_name}"
+  puts "date: #{commit.time}"
+  puts "hash: #{target_id}"
+  puts "author: #{top_commit[:committer][:name]}"
+  puts "subject: #{commit.message.split($/, -1)[0]}"
+  if branch.upstream
+    puts "upstream: #{branch.upstream.name}"
+    ahead, behind = repo.ahead_behind(target_id, branch.upstream.target_id)
+    puts "ahead: #{ahead}"
+    puts "behind: #{behind}"
+  end
+  puts "merged: #{merged ? 'Merged' : 'Not merged'}"
+  puts "*****************"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0.beta
 platform: ruby
 authors:
 - Matthew Harvey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,13 +168,14 @@ files:
 - lib/git_curate/runner.rb
 - lib/git_curate/util.rb
 - lib/git_curate/version.rb
+- play.rb
 homepage: https://github.com/matt-harvey/git_curate
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/matt-harvey/git_curate
   changelog_uri: https://raw.githubusercontent.com/matt-harvey/git_curate/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple git branch curation tool
 test_files: []