fontist 3.0.19 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2892a051558c7fca54573398a4d81a65b24365a3a42c2aaedac27f38ed85a70f
-  data.tar.gz: d24c202473b5a65e7c282d99802bf5f443d664ca5bceaa61349a912dea2c00bf
+  metadata.gz: 439f0978a5d10a8e48403d57e994b299bb143f851f76144373431ab570734c0d
+  data.tar.gz: 142da201af7fcfb87516b2923087066503427d9109a666895c06ba619ad8e07f
 SHA512:
-  metadata.gz: e8833cb9fc107eaf9b3a3f8d470735d7c269c35a12ecaf69cba222553ec2bd2db20b19e8ee3d9482b0f92127dfbf11ff24808a81e942e471ad52b4e79dc4e032
-  data.tar.gz: d72ce09d1cb402e2c35b16116fec1a562e67fb020fd217ce1289ca9784305d15da7fb55fd0e58b90f290b1217fed442b5e7f7aaa060256067d952248eea2c714
+  metadata.gz: 2b14c5130d4e6b6b9fb6e4c385860763a83fd357f4aa1e78b9268eb4194b9de83c17551d51cdb0f4a4c9d6a1925c91892e712c1255806ad5db4507b8862f095a
+  data.tar.gz: 25d0691a0263605ac7de8d65865619cca478ce2085667de0d06275e49415acad4ba8b484727757d5b0303c71c12c879fba01727acee202db5aeb2de2e736793b

data/lib/fontist/repo.rb

@@ -1,4 +1,5 @@
 require "git"
+require "open3"
 require "paint"
 
 module Fontist
@@ -26,7 +27,7 @@ module Fontist
       repo = Git.open(path)
 
       {
-        url: repo.config["remote.origin.url"],
+        url: repo.config_get("remote.origin.url")&.value,
         revision: revision(repo),
         created: created(repo),
         updated: updated(repo),
@@ -42,19 +43,24 @@ module Fontist
     end
 
     def revision(repo)
-      repo.log.first.sha[0..6]
+      repo.gcommit("HEAD").sha[0..6]
     end
 
     def created(repo)
-      repo.gcommit(repo.log.last.sha).date
+      # git 6.0's Commands::Log clobbers the public Git::Log, breaking
+      # log#first/#last (ruby-git regression); ask the git binary for
+      # the root commit instead
+      root, _err = Open3.capture2("git", "-C", repo.dir.to_s,
+                                  "rev-list", "--max-parents=0", "HEAD")
+      repo.gcommit(root.lines.first.strip).date
     end
 
     def updated(repo)
-      repo.gcommit(repo.log.first.sha).date
+      repo.gcommit("HEAD").date
     end
 
     def dirty?(repo)
-      !repo.status.changed.empty?
+      !repo.status_info.changed.empty?
     end
   end
 
@@ -122,7 +128,8 @@ module Fontist
       rescue StandardError => e
         # Catch all git-related errors
         if e.class.name.include?("Git") || e.message.match?(/git|pull|repository/i)
-          handle_git_error(name, git.config["remote.origin.url"], e, :update)
+          url = git.config_get("remote.origin.url")&.value
+          handle_git_error(name, url, e, :update)
         else
           raise
         end
@@ -164,7 +171,7 @@ module Fontist
 
           begin
             git = Git.open(repo_path_obj)
-            existing_url = git.config["remote.origin.url"]
+            existing_url = git.config_get("remote.origin.url")&.value
             return repo_name if normalize_git_url(existing_url) == normalized_target
           rescue StandardError
             # Skip repos that can't be opened

data/lib/fontist/update.rb

@@ -32,14 +32,14 @@ module Fontist
               Git.open(Fontist.formulas_repo_path)
             else
               Git.init(Fontist.formulas_repo_path.to_s).tap do |g|
-                g.add_remote("origin", Fontist.formulas_repo_url)
+                g.remote_add("origin", Fontist.formulas_repo_url)
               end
             end
 
       return git.pull("origin", @branch) if git.current_branch == @branch
 
-      git.config("remote.origin.fetch",
-                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.config_set("remote.origin.fetch",
+                     "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
       git.fetch
       git.checkout(@branch)
       git.pull("origin", @branch)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.19".freeze
+  VERSION = "3.0.20".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
 platform: ruby
 authors:
 - Ribose Inc.