bitfab 0.51.4 → 0.51.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b739123699ec796d304175df24d0ff07ffa098b95c31d878370a07c7b9cb34c6
-  data.tar.gz: 6895704bbaf7f045b704a2ac71a7502a5f5b205792abd80af1b9d4fa124879d7
+  metadata.gz: 6bf8a9d45207caf1c5a6ef62a0e9ad6af43e5ccd904a25c8b8cd1fefd73795b9
+  data.tar.gz: 684d7a18b4dc4cde5df27bce58e9be1a7ed3dbd8a644638148d81746cd9e7683
 SHA512:
-  metadata.gz: c4b895369cabdcec196d957e92bc2cf13dfe972efa3342ffbb0bc705f7670050cf60a7f85c4132dd92b394c59c338acc41c7bbb5597cb1a8aa160f501a5d3895
-  data.tar.gz: 810b845093e98709f56162422a9e87e1de46180e91224a0a60c67abc2f04f39ef1a3add5ac8f31e374c656920dc95c2aec79f6731c8160e0af98884791cf5450
+  metadata.gz: f3ffe75284ce984a57b524746a640ad8b51a10b32d4835d35a1d692415a23cfd09a7730105825713919c519e5dc256b444ba329c4bd0783f24a07e933315cb87
+  data.tar.gz: c9da6e278539c0fe49d5192d05624ce0e1ba0f36ce0e9e8bf23511fd336bc39a3b58427d1196fee0418a7569f2920aefa5c9f456c57d246d1d01ebabb0306b21

data/lib/bitfab/git_command.rb

@@ -8,8 +8,9 @@ module Bitfab
 
     module_function
 
-    def run(cwd, args, timeout:)
-      Open3.popen3("git", *args, chdir: cwd, **spawn_options) do |stdin, stdout, stderr, wait_thread|
+    def run(cwd, args, timeout:, env: nil)
+      command = env ? [env, "git", *args] : ["git", *args]
+      Open3.popen3(*command, chdir: cwd, **spawn_options) do |stdin, stdout, stderr, wait_thread|
         stdin.close
         out = +""
         reader = Thread.new { out = read_all(stdout) }

data/lib/bitfab/git_state.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "tmpdir"
+require_relative "git_command"
+
+module Bitfab
+  module GitState
+    DISABLE_ENV = "BITFAB_DISABLE_GIT_STATE"
+    GIT_TIMEOUT_SECONDS = 30
+    SHA_PATTERN = /\A[0-9a-f]{40}\z/
+
+    module_function
+
+    def git(cwd, *args, env: nil)
+      GitCommand.run(cwd, args, timeout: GIT_TIMEOUT_SECONDS, env: env)&.strip
+    end
+
+    def text(value)
+      trimmed = value&.strip
+      (trimmed.nil? || trimmed.empty?) ? nil : trimmed
+    end
+
+    def sha(value)
+      trimmed = text(value)
+      (trimmed && SHA_PATTERN.match?(trimmed)) ? trimmed : nil
+    end
+
+    def empty?(state)
+      state.values.all?(&:nil?)
+    end
+
+    def resolve_working_tree_sha(root)
+      Dir.mktmpdir("bitfab-git-") do |dir|
+        env = {"GIT_INDEX_FILE" => File.join(dir, "index")}
+        return nil if git(root, "read-tree", "HEAD", env: env).nil?
+        return nil if git(root, "add", "-A", "--", root, env: env).nil?
+
+        sha(git(root, "write-tree", env: env))
+      end
+    rescue
+      nil
+    end
+
+    def resolve(cwd)
+      refs = git(cwd, "rev-parse", "--show-toplevel", "HEAD", "HEAD^{tree}")
+      lines = refs.to_s.split("\n")
+      root = text(lines[0])
+      return nil if root.nil?
+
+      state = {
+        "githubEmail" => text(git(cwd, "config", "user.email")),
+        "branch" => text(git(cwd, "symbolic-ref", "--short", "-q", "HEAD")),
+        "commitSha" => sha(lines[1]),
+        "baseSha" => sha(lines[2]),
+        "experimentSha" => resolve_working_tree_sha(root)
+      }
+      empty?(state) ? nil : state
+    end
+
+    def resolved
+      return nil unless ENV[DISABLE_ENV].to_s.empty?
+
+      safe_resolve
+    end
+
+    def safe_resolve
+      resolve(Dir.pwd)
+    rescue
+      nil
+    end
+  end
+end

data/lib/bitfab/http_client.rb

@@ -4,6 +4,7 @@ require "net/http"
 require "json"
 require "uri"
 
+require_relative "git_state"
 require_relative "compress"
 require_relative "constants"
 require_relative "serialize"
@@ -207,6 +208,8 @@ module Bitfab
       end
       payload["graderIds"] = grader_ids unless grader_ids.nil?
       payload["dbBranchSettings"] = db_branch_settings unless db_branch_settings.nil?
+      git_state = GitState.resolved
+      payload["git"] = git_state if git_state
 
       # When DB branching is on, the server resolves a Neon preview branch per
       # item (snapshot + restore + poll), which can run several seconds each,

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.51.4"
+  VERSION = "0.51.5"
 end

data/lib/bitfab.rb

@@ -10,6 +10,7 @@ require_relative "bitfab/serialize"
 require_relative "bitfab/db_snapshot"
 require_relative "bitfab/git_command"
 require_relative "bitfab/commit_ref"
+require_relative "bitfab/git_state"
 require_relative "bitfab/span_context"
 require_relative "bitfab/http_client"
 require_relative "bitfab/datasets"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.51.4
+  version: 0.51.5
 platform: ruby
 authors:
 - Harvest Team
@@ -146,6 +146,7 @@ files:
 - lib/bitfab/datasets.rb
 - lib/bitfab/db_snapshot.rb
 - lib/bitfab/git_command.rb
+- lib/bitfab/git_state.rb
 - lib/bitfab/http_client.rb
 - lib/bitfab/mock_override.rb
 - lib/bitfab/otel.rb