Merge pull request #8673 from unasuke/accepts-mtime-to-tar-writer-add-file

Add mtime to Gem::Package::TarWriter#add_file argument

(cherry picked from commit 3ad1ed8)

Author: duckinator

lib/rubygems/package/tar_writer.rb

@@ -95,10 +95,11 @@ def initialize(io)
   end
 
   ##
-  # Adds file +name+ with permissions +mode+, and yields an IO for writing the
-  # file to
+  # Adds file +name+ with permissions +mode+ and mtime +mtime+ (sets
+  # Gem.source_date_epoch if not specified), and yields an IO for
+  # writing the file to
 
-  def add_file(name, mode) # :yields: io
+  def add_file(name, mode, mtime=nil) # :yields: io
     check_closed
 
     name, prefix = split_name name
@@ -118,7 +119,7 @@ def add_file(name, mode) # :yields: io
 
     header = Gem::Package::TarHeader.new name: name, mode: mode,
                                          size: size, prefix: prefix,
-                                         mtime: Gem.source_date_epoch
+                                         mtime: mtime || Gem.source_date_epoch
 
     @io.write header
     @io.pos = final_pos

test/rubygems/test_gem_package_tar_writer.rb

@@ -50,6 +50,19 @@ def test_add_file_source_date_epoch
     end
   end
 
+  def test_add_file_with_mtime
+    Time.stub :now, Time.at(1_458_518_157) do
+      mtime = Time.now
+
+      @tar_writer.add_file "x", 0o644, mtime do |f|
+        f.write "a" * 10
+      end
+
+      assert_headers_equal(tar_file_header("x", "", 0o644, 10, mtime),
+                         @io.string[0, 512])
+    end
+  end
+
   def test_add_symlink
     Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_symlink "x", "y", 0o644