git_curate 1.1.2 → 1.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d14ef21b3dceacc1b65f9d2ce51238b1f2841f1a0815afdc302ca97875c109
-  data.tar.gz: 246e45f78b57dd14cef91610ef09e3944f82b8559184248327a99759fd99b1bd
+  metadata.gz: 4460f5b9f1e2e1dc37bc0afbab3b0d67ab3a1a767d66c2e41c49a31de9ae8ceb
+  data.tar.gz: 64d28c60264cde31f088074f7d431ae8019f97fa0117b940c05cc9d40d855187
 SHA512:
-  metadata.gz: 5bd2a261e13944e2ef578ffd97e33719c9a191c11d8b7de5885ab75c980255df6fc52321863052b6c6d3c3a56e8690e77794ee56af914e3391da03d1e7312ce3
-  data.tar.gz: 0a79e2356319b7b31a454416bdc366b7924b85966c534bb6e122824279a4a459dc65daa6369780bd53342d53c28c2caacc06b9ebb92edbe0c78593f09ba2f450
+  metadata.gz: 6ffe2949a193e80a8fda6c480464eb73ac4f859309f2deb1f48c818f916566eac2a3b5f4fd6e97b031df6b673f79fc59df03262d44d934c754d3f1b45efa9d15
+  data.tar.gz: 3941f4ed634a97b83db6d13d91288e37271e61d8a1f9c73c2e88e492b9805c417f261c0bb9af49a9a8c6f7dd25759bb287f3adee5c907287041e65b87e84fb20

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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

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/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0.beta

data/lib/git_curate/branch.rb

@@ -1,9 +1,13 @@
+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+/
@@ -65,47 +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
+      rugged_branches = @@repo.branches
+      repo_head_target = @@repo.head.target
 
-    # 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
-      # 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("git branch").map do |line|
+      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]
+        rugged_branch = rugged_branches[proper_branch_name]
+        upstream = rugged_branch.upstream
         upstream_data =
-          if upstream_info.upstream
-            status = upstream_info.status
-            if status
-              status.gsub(/^\[/, "").gsub(/\]$/, "").capitalize
+          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_data]
-      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/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "1.1.2"
+  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.1.2
+  version: 1.2.0.beta
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -168,6 +168,7 @@ 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
@@ -185,9 +186,9 @@ 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: