zon-rb 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e8315346d015f85b7448071350fecfed55f786537ee0c9b7dd20d4890f5808
-  data.tar.gz: 4b06d71e623065c11255cdcff369bdbd9429a903083d26c922a6e6867ef79e2a
+  metadata.gz: c423818245cd12dc36a6bda5fce1666d7f85dbdbcf891196f4d9ecbc92342aaf
+  data.tar.gz: 167b2356621a36abe2a5730725262eddd303ce596fdf01377d618f829f040f0e
 SHA512:
-  metadata.gz: 18728d5a2095893cac9895e71039ec8503074d3b3600291f004d08998028d6bf32acd7f50a6e3aa74a4a82b07c1f94d1472040f41ff0b7d6ac01b11ece66fb1b
-  data.tar.gz: 7f8bf0654d20950c09c12efb9a761d00545abe672d30e5a54513bb0128fe3e07581ca6df6c6875332b64d887499778ed36f0b38d40c517e0367d4e7b1ed85563
+  metadata.gz: 4d5244cb30e7591f86e2764518c1768b3d5bb25536c75bc35992066a8966aef109e9e7a1e0129440f3e9bcd662847d1890402470aa6b3d7754afd559531aecc8
+  data.tar.gz: dde0161c7d0bd6d8d5e1107bf49841fbb9f16fb4a27149dda42dc0f1999b2e835830ea18506083d751327263f802738a450d51cb4dd1b95d999ff58e762b92c1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.3.2] - 2026-08-01
+
+- Temporary fix for calculating package hashes where "" is used as path.
+
 ## [0.2.0] - 2025-09-27
 
 - Added basic Zig package manifest support.

data/lib/zon/hasher.rb

@@ -33,7 +33,7 @@ module Zon
     class Hasher
       attr_reader :paths, :total_size, :digest
 
-      def initialize(package_path, manifest_name: "build.zig.zon")
+      def initialize(package_path, manifest_name: "build.zig.zon", debug: false)
         # Make sure we have a valid path to work with
         @package_path = package_path
         raise ArgumentError, "not a directory '#{@package_path}'" if not Dir.exist? @package_path
@@ -47,6 +47,7 @@ module Zon
         raise ArgumentError, "no 'version' field in ZON manifest '#{manifest_path}'" if not @manifest.key? :version
         raise ArgumentError, "no 'fingerprint' field in ZON manifest '#{manifest_path}'" if not @manifest.key? :fingerprint
         
+        @debug = debug
         @paths = []
         @results = {}
         @total_size = 0
@@ -58,7 +59,11 @@ module Zon
           if File.directory? full_path
             f = Find.find(full_path)
             f.each do |p|
-              next if File.directory? p
+              # TODO: it seems like when "" is used as path, hidden folders
+              # like .git are not considered but hidden files like .gitignore
+              # are. Make this more robust by removing all hidden folders that
+              # are not explicitely listed in the manifest.
+              next if File.directory? p or p.include? ".git/"
               
               pstr = p.delete_prefix(@package_path)[1..]
               @paths.append(pstr) if not @paths.include? pstr
@@ -87,6 +92,8 @@ module Zon
         # Hash all files individually  
         @paths.each do |str|
           @results[str] = Zon::Zig::Hasher::hash_file(@package_path, str)
+
+          puts "file: #{@results[str][:digest]}: #{str}" if @debug
         end 
 
         sha2 = Digest::SHA2.new

data/lib/zon/lexer.rb

@@ -9,6 +9,7 @@ module Zon
       RBRACE = 5
       EQUALS = 6
       COMMA = 7
+      LITERAL2 = 8
     end
 
     class Token
@@ -98,6 +99,8 @@ module Zon
             y << Token.new(TokenType::NUMBER, token_str)
           elsif self.is_literal? token_str
             y << Token.new(TokenType::LITERAL, token_str)
+          elsif self.is_at_literal? token_str
+            y << Token.new(TokenType::LITERAL2, token_str)
           else
             raise "Unknown token '#{token_str}' at index #{idx}"
           end
@@ -110,6 +113,11 @@ module Zon
       !!(token_str =~ literal_regex)
     end
 
+    def self.is_at_literal?(token_str)
+      literal_regex = /\.@\"[^"]+\"/
+      !!(token_str =~ literal_regex)
+    end
+
     def self.is_number?(token_str)
       number_regex = /\A
         [+-]?                  # optional sign

data/lib/zon/parser.rb

@@ -32,7 +32,7 @@ module Zon
 
         v = self.parse
 
-        if v.is_a? Symbol and self.next_token? Lexer::TokenType::EQUALS
+        if (v.is_a? Symbol or v.is_a? String) and self.next_token? Lexer::TokenType::EQUALS
           # This is a Zon struct, i.e. translate it to a Ruby hash
           k = v
           self.next_equals # skip equals
@@ -93,7 +93,9 @@ module Zon
 
       if @curr and @curr.type == Lexer::TokenType::LITERAL
         @curr.value[1..].to_sym # create sym from string without the '.'
-      elsif
+      elsif @curr and @curr.type == Lexer::TokenType::LITERAL2
+        @curr.value[3..-2]
+      else
         raise "Expected literal token but got '#{@curr.value}'"
       end
     end
@@ -107,6 +109,8 @@ module Zon
 
       if @curr.type == Lexer::TokenType::LITERAL
         value = @curr.value[1..].to_sym
+      elsif @curr.type == Lexer::TokenType::LITERAL2
+        value = @curr.value[3..-2]
       elsif @curr.type == Lexer::TokenType::STRING
         value = @curr.value[1..-2]
       elsif @curr.type == Lexer::TokenType::NUMBER

data/lib/zon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zon-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - David P. Sugar
@@ -32,13 +32,13 @@ files:
 - lib/zon/zig.rb
 - lib/zon/zon_grammar.treetop
 - sig/zon.rbs
-homepage: https://github.com/r4gus/zon-rb
+homepage: https://codeberg.org/r4gus/zon-rb
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/r4gus/zon-rb
-  source_code_uri: https://github.com/r4gus/zon-rb
-  changelog_uri: https://github.com/r4gus/zon-rb/blob/master/CHANGELOG.md
+  homepage_uri: https://codeberg.org/r4gus/zon-rb
+  source_code_uri: https://codeberg.org/r4gus/zon-rb
+  changelog_uri: https://codeberg.org/r4gus/zon-rb/raw/branch/master/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib