git_curate 1.0.2 → 1.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f00058b5232e499100bf5a03447ed891a640c3efb8b9c1ce9adae50bf84b02
-  data.tar.gz: bb443922c86047f3356e01eb160e83cbed0eb3ff8038826d03d2de3baef81f7b
+  metadata.gz: 0d25c82cca61f81731702b5ff45d30a44ed5778304c49a0a250171f268fd8ce9
+  data.tar.gz: b4ad3c50995bcee65fb57c6455b70b6960cf7ee5309265e70fd95f6a80c666ea
 SHA512:
-  metadata.gz: 699f1b52fd674860eb71c8fc3c9eb4b43d8fbc884f5616d48781d965de50702ef910e6bea2d57b9bdd88a0f63c6aae976f497ab8de3a7a7819b1841edc0ef7a4
-  data.tar.gz: 100ec40a8f8a23ebcef141c7ef7bd4df970719a7e0c9e76ebde4c8bf9d823a9c36a3010cc3732442e29bf2c714bb909eb9ff83f88ac5ba43063ebd0b8aa024fd
+  metadata.gz: 317df38e0f8d54f750544346570961ac09c4d5f03c5b1593c3423d53e461cb8c64b2d1e669453c3bf2f9ade9cd8a1c1336ba2aea4edc3a29b401912b8c374259
+  data.tar.gz: 6b6f5d5fee3bd0c6b96114afd5fda13ecd6cfc99d1ba5ebeff7fe16de44e5fe74239e530589adcec0423034d25a9918413af45b36771a758236693fb6a77737f

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, v1.2.0.beta2
+
+* 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/README.md

@@ -77,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.2
+1.2.0.beta2

data/git_curate.gemspec

@@ -29,8 +29,9 @@ 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 "rugged", "1.1.0"
+  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
@@ -68,53 +69,43 @@ module GitCurate
 
     # Returns the local branches
     def self.local
-      merged_branch_raw_names = Util.command_to_a("git branch --merged").to_set
-
-      branch_info.map do |raw_name, info|
-        new(raw_name, merged: merged_branch_raw_names.include?(raw_name), upstream_info: info)
-      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
-      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]
-        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
+      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
-        [raw_branch_name, upstream_info]
-      end
 
-      info.to_h
+        target = rugged_branch.resolve.target
+        merged = (@@repo.merge_base(repo_head_target, target) == target.oid)
+
+        new(
+          raw_branch_name,
+          merged: merged,
+          upstream_info: upstream_data,
+        )
+      end
     end
 
+    private
+
     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.2"
+  VERSION = "1.2.0.beta2"
 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.2
+  version: 1.2.0.beta2
 platform: ruby
 authors:
 - Matthew Harvey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -24,34 +24,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
     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 +182,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 +200,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: []