swhid 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e5d6a13e7f6d44bed90224e6ff6b1418bd9501b7bd14c1ef00d5d7adbbeb3c
-  data.tar.gz: 712d0c4136e0ac2c5d11b38b73cbf77d75bbf87b188fc998a3f716e4f9e8ff98
+  metadata.gz: ab5130c9128fd1942d8a4a01eecb6d5f403f38fc2ce53d72323b08350e30bdf4
+  data.tar.gz: a7c5c116fcd54c08f7d51b4125d4871f25b98aacc4f7ab818ebae670fc0972c9
 SHA512:
-  metadata.gz: 7fa9985d872d26ade840cdb509319fe27795dbd7bbac18b9a4141eb291dcee55cdeb5be31ad94a2fd557b2d676124016c955303bee9a7b4dac1ff698fc22ddc9
-  data.tar.gz: e99b1253233fd0862a7b57da14ca6367036e5cb50b4d153ffe154165be2635bf8f7579a5a8d3ae10757972dfc511d591c9485bf66cca001db8336b5dc08d4349
+  metadata.gz: ad64d5ffad60fde8ec7399abcd63af7c34ae203c54f469df9866283864f1850c0f9b1c112ab89300c7ea52f56d5809189bbe6ec0bd2c9fc2ed85510daa3b2d37
+  data.tar.gz: a44ef79ecd7a5d64f4d29c56f470b749ab61eac0d3f3ddd29c8b4798f334fa3f43222b8b463819f221e5687ca1355f7c23b7754be43a739009aafa4adba3e3cd

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.3.1] - 2025-11-23
+
+### Fixed
+- Snapshot implementation now includes HEAD symbolic reference
+- Extra headers extraction for signed commits (gpgsig, mergetag, etc.)
+- Tag-of-tag support (tags pointing to other tag objects)
+- Extra headers extraction for signed tags
+
 ## [0.3.0] - 2025-11-23
 
 - `directory` CLI command - Generate SWHID for directory from filesystem

data/lib/swhid/from_git.rb

@@ -22,8 +22,8 @@ module Swhid
         message: commit.message
       }
 
-      # Extract extra headers if present
-      extra_headers = extract_extra_headers(commit)
+      # Extract extra headers if present (like gpgsig, svn headers, etc)
+      extra_headers = extract_extra_headers(repo, commit)
       metadata[:extra_headers] = extra_headers unless extra_headers.empty?
 
       Swhid.from_revision(metadata)
@@ -42,6 +42,7 @@ module Swhid
       if tag_obj.is_a?(Rugged::Tag::Annotation)
         target_type = case tag_obj.target
                       when Rugged::Commit then "rev"
+                      when Rugged::Tag::Annotation then "rel"
                       when Rugged::Tree then "dir"
                       when Rugged::Blob then "cnt"
                       else "rev"
@@ -59,6 +60,10 @@ module Swhid
           metadata[:author_timezone] = format_timezone(tag_obj.tagger[:time])
         end
 
+        # Extract extra headers if present (like gpgsig for signed tags)
+        extra_headers = extract_tag_extra_headers(repo, tag_obj)
+        metadata[:extra_headers] = extra_headers unless extra_headers.empty?
+
         Swhid.from_release(metadata)
       else
         # Lightweight tag - points directly to commit
@@ -70,12 +75,27 @@ module Swhid
       repo = Rugged::Repository.new(repo_path)
       branches = []
 
+      # Check for HEAD first
+      head_path = File.join(repo.path, "HEAD")
+      if File.exist?(head_path)
+        head_content = File.read(head_path).strip
+        if head_content.start_with?("ref:")
+          # HEAD is a symbolic ref
+          target_ref = head_content.sub("ref: ", "")
+          branches << {
+            name: "HEAD",
+            target_type: "alias",
+            target: target_ref
+          }
+        end
+      end
+
       # Get all references (branches and tags)
       repo.references.each do |ref|
         ref_name = ref.name
 
         if ref.type == :symbolic
-          # This is an alias (like HEAD pointing to refs/heads/main)
+          # This is an alias (symbolic ref)
           target_ref_name = ref.target
           branches << {
             name: ref_name,
@@ -125,11 +145,75 @@ module Swhid
       format("%s%02d%02d", sign, hours, minutes)
     end
 
-    def self.extract_extra_headers(commit)
+    def self.extract_extra_headers(repo, commit)
       # Rugged doesn't expose extra headers directly
-      # We would need to parse the raw commit object for this
-      # For now, return empty array
-      []
+      # We need to parse the raw commit object
+      raw_data = repo.read(commit.oid).data
+      lines = raw_data.split("\n")
+
+      extra_headers = []
+      in_headers = true
+
+      lines.each do |line|
+        # Stop when we hit the blank line before the message
+        if line.empty?
+          in_headers = false
+          next
+        end
+
+        next unless in_headers
+
+        # Skip standard headers
+        next if line.start_with?("tree ", "parent ", "author ", "committer ")
+
+        # Extract extra headers (like gpgsig, mergetag, svn-repo-uuid, etc)
+        if line.start_with?(" ")
+          # Continuation of previous header
+          if extra_headers.any?
+            extra_headers.last[1] += "\n#{line[1..]}"
+          end
+        elsif line.include?(" ")
+          key, value = line.split(" ", 2)
+          extra_headers << [key, value]
+        end
+      end
+
+      extra_headers
+    end
+
+    def self.extract_tag_extra_headers(repo, tag)
+      # Parse raw tag object for extra headers
+      raw_data = repo.read(tag.oid).data
+      lines = raw_data.split("\n")
+
+      extra_headers = []
+      in_headers = true
+
+      lines.each do |line|
+        # Stop when we hit the blank line before the message
+        if line.empty?
+          in_headers = false
+          next
+        end
+
+        next unless in_headers
+
+        # Skip standard tag headers
+        next if line.start_with?("object ", "type ", "tag ", "tagger ")
+
+        # Extract extra headers (like gpgsig for signed tags)
+        if line.start_with?(" ")
+          # Continuation of previous header
+          if extra_headers.any?
+            extra_headers.last[1] += "\n#{line[1..]}"
+          end
+        elsif line.include?(" ")
+          key, value = line.split(" ", 2)
+          extra_headers << [key, value]
+        end
+      end
+
+      extra_headers
     end
   end
 end

data/lib/swhid/objects/release.rb

@@ -39,6 +39,11 @@ module Swhid
           lines << author_line
         end
 
+        extra_headers = metadata[:extra_headers] || []
+        extra_headers.each do |key, value|
+          lines << format_header_line(key, value)
+        end
+
         result = lines.join("\n") + "\n"
 
         if metadata[:message]
@@ -54,6 +59,11 @@ module Swhid
         "#{prefix} #{person_escaped} #{timestamp} #{tz}"
       end
 
+      def self.format_header_line(key, value)
+        value_escaped = value.gsub("\n", "\n ")
+        "#{key} #{value_escaped}"
+      end
+
       def self.extract_target(target)
         case target
         when Hash

data/lib/swhid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Swhid
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swhid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Nesbitt