swhid 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5130c9128fd1942d8a4a01eecb6d5f403f38fc2ce53d72323b08350e30bdf4
-  data.tar.gz: a7c5c116fcd54c08f7d51b4125d4871f25b98aacc4f7ab818ebae670fc0972c9
+  metadata.gz: 55ef264a7547cae4c3e201c8c4b745ea42437173efd681623bf7307c0bf58b0d
+  data.tar.gz: d851e19c5511018c5ded8e853306650414b1708a99fd10837f2e6d62a6266f13
 SHA512:
-  metadata.gz: ad64d5ffad60fde8ec7399abcd63af7c34ae203c54f469df9866283864f1850c0f9b1c112ab89300c7ea52f56d5809189bbe6ec0bd2c9fc2ed85510daa3b2d37
-  data.tar.gz: a44ef79ecd7a5d64f4d29c56f470b749ab61eac0d3f3ddd29c8b4798f334fa3f43222b8b463819f221e5687ca1355f7c23b7754be43a739009aafa4adba3e3cd
+  metadata.gz: db250c4038a39aa01d3a73c83a1d11ebf907a7465649b69cbff3ed3c9b44e758519c2573ca949fabc996b43ae737a5259d41c1d143ecb1dc980813dc2d6c54cc
+  data.tar.gz: abaa8a4ca6c33cc718c28f573641a207c6458c8dcb4df4440759583cd1dd9394a60c507c0d29795e4149218b1bcba8b212ee83114e1bbf6a6f0ebe99135328ef

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.4.1] - 2026-01-13
+
+### Fixed
+- Resolve symlinks when matching paths for Git index permission lookups
+
+## [0.4.0] - 2026-01-12
+
+### Added
+- Windows support for directory SWHID computation
+- File permissions read from Git index on Windows where filesystem permissions unavailable
+- Optional `permissions:` parameter for `FromFilesystem.from_directory_path` to pass explicit file modes
+- CI testing on Windows (Ruby 3.4 and 4.0)
+
+### Changed
+- Archive extraction in tests now uses pure Ruby (Zlib/TarReader/Zip) instead of shell commands
+
 ## [0.3.1] - 2025-11-23
 
 ### Fixed

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Andrew Nesbitt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -261,6 +261,36 @@ SWHIDs can include optional qualifiers to provide context:
 
 The hash computation for content, directory, revision, and release objects is compatible with Git's object hashing. This means you can use this gem to compute the same hashes that Git would produce for the same objects.
 
+## Windows Support
+
+The library works on Windows with some considerations for file permissions.
+
+Directory SWHIDs include file permission bits (executable vs non-executable). Windows doesn't store Unix-style permissions, so the library uses these strategies:
+
+1. **Files in a Git repository**: Permissions are read from the Git index, which works correctly on all platforms.
+
+2. **Extracted archives**: When extracting tar.gz files, pass the permissions from tar headers:
+
+```ruby
+require 'zlib'
+require 'rubygems/package'
+
+permissions = {}
+Zlib::GzipReader.open(tarball) do |gz|
+  Gem::Package::TarReader.new(gz) do |tar|
+    tar.each do |entry|
+      next unless entry.file?
+      File.binwrite(dest_path, entry.read)
+      permissions[dest_path] = entry.header.mode
+    end
+  end
+end
+
+swhid = Swhid::FromFilesystem.from_directory_path(extract_dir, permissions: permissions)
+```
+
+3. **Other directories**: Without Git or explicit permissions, Windows will treat all files as non-executable. If the directory contains executable files, the hash will differ from Linux/macOS.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -274,3 +304,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/andrew
 ## Code of Conduct
 
 Everyone interacting in the Swhid project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/andrew/swhid/blob/main/CODE_OF_CONDUCT.md).
+
+## License
+
+[MIT](LICENSE)

data/lib/swhid/from_filesystem.rb

@@ -5,15 +5,23 @@ require "find"
 
 module Swhid
   module FromFilesystem
-    def self.from_directory_path(path)
+    def self.from_directory_path(path, git_repo: nil, permissions: nil)
       raise ArgumentError, "Path does not exist: #{path}" unless File.exist?(path)
       raise ArgumentError, "Path is not a directory: #{path}" unless File.directory?(path)
 
-      entries = build_entries(path)
+      git_repo ||= discover_git_repo(path)
+      entries = build_entries(path, git_repo: git_repo, permissions: permissions)
       Swhid.from_directory(entries)
     end
 
-    def self.build_entries(dir_path)
+    def self.discover_git_repo(path)
+      require "rugged"
+      Rugged::Repository.discover(path)
+    rescue Rugged::RepositoryError, Rugged::OSError
+      nil
+    end
+
+    def self.build_entries(dir_path, git_repo: nil, permissions: nil)
       entries = []
 
       Dir.foreach(dir_path) do |name|
@@ -28,9 +36,9 @@ module Swhid
                   target_hash = Swhid.from_content(target_content).object_hash
                   { name: name, type: :symlink, target: target_hash }
                 elsif stat.directory?
-                  target_swhid = from_directory_path(full_path)
+                  target_swhid = from_directory_path(full_path, git_repo: git_repo, permissions: permissions)
                   { name: name, type: :dir, target: target_swhid.object_hash }
-                elsif stat.executable?
+                elsif file_executable?(full_path, stat, git_repo, permissions)
                   content = File.binread(full_path)
                   target_hash = Swhid.from_content(content).object_hash
                   { name: name, type: :exec, target: target_hash }
@@ -45,5 +53,46 @@ module Swhid
 
       entries
     end
+
+    def self.file_executable?(full_path, stat, git_repo, permissions = nil)
+      # Check explicit permissions map first (from tar extraction, etc.)
+      if permissions
+        real_path = File.realpath(full_path) rescue File.expand_path(full_path)
+        mode = permissions[full_path] || permissions[real_path]
+        return (mode & 0o111) != 0 if mode
+      end
+
+      # Check Git index for tracked files
+      if git_repo
+        relative_path = relative_path_in_repo(full_path, git_repo)
+        if relative_path
+          entry = git_repo.index[relative_path]
+          if entry
+            mode = entry[:mode]
+            return (mode & 0o111) != 0
+          end
+        end
+      end
+
+      # Fall back to filesystem
+      stat.executable?
+    end
+
+    def self.relative_path_in_repo(full_path, git_repo)
+      repo_workdir = git_repo.workdir
+      return nil unless repo_workdir
+
+      # Use realpath to resolve symlinks (e.g., /tmp -> /private/tmp on macOS)
+      full_path = File.realpath(full_path) rescue File.expand_path(full_path)
+      repo_workdir = File.realpath(repo_workdir) rescue File.expand_path(repo_workdir)
+
+      # Ensure repo_workdir ends with separator for proper prefix matching
+      repo_workdir = repo_workdir.chomp("/").chomp("\\") + "/"
+
+      return nil unless full_path.start_with?(repo_workdir)
+
+      relative = full_path.sub(repo_workdir, "")
+      relative.tr("\\", "/")
+    end
   end
 end

data/lib/swhid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swhid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Nesbitt
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- LICENSE
 - README.md
 - Rakefile
 - benchmark/benchmark.rb
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.1
 specification_version: 4
 summary: Generate and parse SoftWare Hash IDentifiers (SWHIDs)
 test_files: []