git_curate 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0620507e22ffbb2e96ad04a04894299f7f6efcb55c38a8b1e7e7650de3f5576c
-  data.tar.gz: 37e1ec6214029e452e9aa2c236b6cb5a002153ddb6931dc80b2f26bb0da0fd60
+  metadata.gz: 0f8a9157f39dcb50cf904d375b61d8ebf602611ce50cad41b0448db33d746de4
+  data.tar.gz: 7f8465222b4dfc420bd823ca97b936bfdb10c688cb20e030a60f56b94c527096
 SHA512:
-  metadata.gz: 6b89724ae483edce819bc05f2fda7dd3be3f9325789001b15473cd0d61559cedc9f6a3a37e75c030422f86832db00fd9d3d821c4f3d9a35e987c53b0b50b5049
-  data.tar.gz: 2889af0076307950a90925dc5aa95bd0ebd522ac475e7ece58bb88af4bd93f8e0fb678c30abf81ad81b20a8b3dd2e323f2ddba4083a7b4abbb3a8d5ff15054ce
+  metadata.gz: 9394485c4054ebfaff8fb98b1818efdae552fe3e9724b5f18dafc1064379915c6509031858e5e26cd2b7e2dbd48a9954b15f56dfa0b22334f891a0612368b6ee
+  data.tar.gz: af7835213e93526f5774f61287dbf6051dae5e50fa2f7bb1496683013ed4901dea8db358cdacb11a7e1fe672ca968c64959bd3223d5da6ec66c42d7f4535ad88

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 **/.*.swp
 coverage
+play.rb

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 2.4.9
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
+  - 2.4.10
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+### v1.2.0
+
+* Fix issue #16: "undefined method 'upstream'" error on MacOS 15.7
+* Use [rugged](https://github.com/libgit2/rugged) library to get various branch information,
+  decreasing reliance of parsing `git` CLI output, and increasing robustness of the application
+  across platforms.
+* Dependency version upgrades
+
+### v1.1.2
+
+* Dependency version upgrades
+* Include Ruby v3 in automated tests
+
 ### v1.1.1
 
 * Dependency version upgrades

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/git_curate.gemspec

@@ -29,7 +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.6.1"
+  spec.add_runtime_dependency "rugged", "1.1.0"
+  spec.add_runtime_dependency "tabulo", "2.6.3"
   spec.add_runtime_dependency "tty-screen", "0.8.1"
 
   spec.add_development_dependency "bundler"

data/lib/git_curate.rb

@@ -1,5 +1,6 @@
 require "git_curate/app"
 require "git_curate/branch"
+require "git_curate/commit"
 require "git_curate/cli_parser"
 require "git_curate/copyright"
 require "git_curate/exceptions"

data/lib/git_curate/branch.rb

@@ -1,6 +1,6 @@
-module GitCurate
+require "rugged"
 
-  UpstreamInfo = Struct.new(:upstream, :status)
+module GitCurate
 
   class Branch
 
@@ -44,68 +44,63 @@ module GitCurate
     end
 
     def last_commit_date
-      initialize_last_commit_data
-      @last_commit_date
+      last_commit.date
     end
 
     def hash
-      initialize_last_commit_data
-      @hash
+      last_commit.hash
     end
 
     def last_author
-      initialize_last_commit_data
-      @last_author
+      last_commit.author
     end
 
     def last_subject
-      initialize_last_commit_data
-      @last_subject
+      last_commit.subject
     end
 
     # Returns the local branches
     def self.local
-      merged_branch_raw_names = Util.command_to_a("git branch --merged").to_set
+      toplevel_dir = Util.command_output("git rev-parse --show-toplevel").strip
+      repo = Rugged::Repository.new(toplevel_dir)
 
-      branch_info.map do |raw_name, info|
-        new(raw_name, merged: merged_branch_raw_names.include?(raw_name), upstream_info: info)
-      end
-    end
+      rugged_branches = repo.branches
+      repo_head_target = repo.head.target
 
-    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
-      # 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
@@ -118,16 +113,13 @@ module GitCurate
       @upstream_info = upstream_info
     end
 
-    # Returns an array with [date, author, subject], each as a string.
-    def initialize_last_commit_data
-      return if @last_commit_data
-
-      # For Windows compatibility we need double quotes around the format string, as well as spaces
-      # between the placeholders.
-      command = %Q(git log -n1 --date=short --format=format:"%cd %n %h %n %an %n %s" #{proper_name} --)
-      @last_commit_data = Util.command_to_a(command)
-
-      @last_commit_date, @hash, @last_author, @last_subject = @last_commit_data
+    def last_commit
+      @last_commit ||= begin
+        # For Windows compatibility we need double quotes around the format string, as well as spaces
+        # between the placeholders.
+        command = %Q(git log -n1 --date=short --format=format:"%cd %n %h %n %an %n %s" #{proper_name} --)
+        Commit.new(*Util.command_to_a(command))
+      end
     end
 
   end

data/lib/git_curate/commit.rb

@@ -0,0 +1,5 @@
+module GitCurate
+
+  Commit = Struct.new(:date, :hash, :author, :subject)
+
+end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthew Harvey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -24,20 +24,34 @@ 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.6.1
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +177,7 @@ files:
 - lib/git_curate/app.rb
 - lib/git_curate/branch.rb
 - lib/git_curate/cli_parser.rb
+- lib/git_curate/commit.rb
 - lib/git_curate/copyright.rb
 - lib/git_curate/exceptions.rb
 - lib/git_curate/runner.rb
@@ -174,7 +189,7 @@ licenses:
 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
@@ -190,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple git branch curation tool
 test_files: []