zip_tricks 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c7e14be1038151588e016705af5249cacbfea8a
-  data.tar.gz: fc4e68ce38ea2091f7a718a8dcfff09d3e40fbb6
+SHA256:
+  metadata.gz: abccaae29c08d47d71a7c6709fbba2ccffce423798dbb159bbfdc9f832eafc93
+  data.tar.gz: ba5375f2fbd1617ffdf6c42ddd690f211e771c6eb4cb84c8a2e9323784acfd7c
 SHA512:
-  metadata.gz: 05d776ff8a5c0cea81f66aba9ac37ad2400c0abea38660ca94365f15649c5d9cc8c06f6d768d2f657b70fae823fe6704bcd335611ff9693e9550246cc04ba7e6
-  data.tar.gz: de2264703c398fba2d9a0c44b485206f2acdfb119c9aff76ab8855e2d84cdc2be4da6802af7fbe967f780229d8582d256439ee923c59aa0782d4b1d07b9104f0
+  metadata.gz: dbd7498e71a1dbb967374a2360e2216ab33924ba263600f795e11787b759aa08c5b2ba3b5085bc4a8362026e87098f18552d0409e23ab03375cf0d89e8bd20d8
+  data.tar.gz: f337fba0f07875b449ba3b5f5a593b30b2b810ca2aa79b473942a751a47d1db4c0ebbbe099faa474fe4c7a952b1ee030f6f94ed319835a3ba73c1e7cf65648e5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.8.1
+
+* Fix extended timestamp extra field output. The first bit of the flag would be set instead of the last bit of
+  the flag, which made it impossible for Rubyzip to read the timestamp of the entry - and it would also make
+  the extra field useless for most reading applications.
+
 ## 4.8.0
 
 * Make sure that when directories clobber files and vice versa we raise a clear error. Add `PathSet` which keeps track of entries

data/lib/zip_tricks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZipTricks
-  VERSION = '4.8.0'
+  VERSION = '4.8.1'
 end

data/lib/zip_tricks/zip_writer.rb

@@ -118,7 +118,7 @@ class ZipTricks::ZipWriter
     if requires_zip64
       extra_fields << zip_64_extra_for_local_file_header(compressed_size: compressed_size, uncompressed_size: uncompressed_size)
     end
-    extra_fields << timestamp_extra(mtime)
+    extra_fields << timestamp_extra_for_local_file_header(mtime)
 
     io << [extra_fields.size].pack(C_UINT2)                # extra field length              2 bytes
 
@@ -182,7 +182,7 @@ class ZipTricks::ZipWriter
                                                                      compressed_size: compressed_size,
                                                                      uncompressed_size: uncompressed_size)
     end
-    extra_fields << timestamp_extra(mtime)
+    extra_fields << timestamp_extra_for_central_directory_entry(mtime)
 
     io << [extra_fields.size].pack(C_UINT2)                 # extra field length              2 bytes
 
@@ -345,12 +345,14 @@ class ZipTricks::ZipWriter
     pack_array(data_and_packspecs)
   end
 
-  # Writes the extended timestamp information field. The spec defines 2
+  # Writes the extended timestamp information field for local headers.
+  #
+  # The spec defines 2
   # different formats - the one for the local file header can also accomodate the
   # atime and ctime, whereas the one for the central directory can only take
   # the mtime - and refers the reader to the local header extra to obtain the
   # remaining times
-  def timestamp_extra(mtime)
+  def timestamp_extra_for_local_file_header(mtime)
     #         Local-header version:
     #
     #         Value         Size        Description
@@ -378,16 +380,21 @@ class ZipTricks::ZipWriter
     #       bit 1           if set, access time is present
     #       bit 2           if set, creation time is present
     #       bits 3-7        reserved for additional timestamps; not set
-    flags = 0b10000000 # Set bit 1 only to indicate only mtime is present
+    flags = 0b00000001 # Set the lowest bit only, to indicate that only mtime is present
     data_and_packspecs = [
       0x5455, C_UINT2,  # tag for this extra block type ("UT")
-      (1 + 4), C_UINT2, # the size of this block (1 byte used for the Flag + 1 long used for the timestamp)
+      (1 + 4), C_UINT2, # the size of this block (1 byte used for the Flag + 3 longs used for the timestamp)
       flags, C_CHAR,   # encode a single byte
       mtime.utc.to_i, C_INT4, # Use a signed long, not the unsigned one used by the rest of the ZIP spec.
     ]
+    # The atime and ctime can be omitted if not present
     pack_array(data_and_packspecs)
   end
 
+  # Since we do not supply atime or ctime, the contents of the two extra fields (central dir and local header)
+  # is exactly the same, so we can use a method alias.
+  alias_method :timestamp_extra_for_central_directory_entry, :timestamp_extra_for_local_file_header
+
   # Writes the Zip64 extra field for the central directory header.It differs from the extra used in the local file header because it
   # also contains the location of the local file header in the ZIP as an 8-byte int.
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip_tricks
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,8 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Stream out ZIP files from Ruby