fixup! chore: Prepare for release of 1.1.0

Author: halostatue

Rakefile

@@ -29,7 +29,6 @@ hoe = Hoe.spec "minitar" do
     val["rubygems_mfa_required"] = "true"
   }
 
-  extra_dev_deps << ["base64", "~> 0.2"]
   extra_dev_deps << ["hoe", "~> 4.0"]
   extra_dev_deps << ["hoe-halostatue", "~> 2.1", ">= 2.1.1"]
   extra_dev_deps << ["irb", "~> 1.0"]
@@ -89,8 +88,8 @@ task docs: :rerdoc
 
 task :console do
   arguments = %w[irb]
-  arguments.push(*spec.spec.require_paths.map { |dir| "-I#{dir}" })
-  arguments.push("-r#{spec.spec.name.gsub("-", File::SEPARATOR)}")
+  arguments.push(*hoe.spec.require_paths.map { |dir| "-I#{dir}" })
+  arguments.push("-r#{hoe.spec.name.gsub("-", File::SEPARATOR)}")
   unless system(*arguments)
     error "Command failed: #{show_command}"
     abort

minitar.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<base64>.freeze, ["~> 0.2".freeze])
   s.add_development_dependency(%q<hoe>.freeze, ["~> 4.0".freeze])
   s.add_development_dependency(%q<hoe-halostatue>.freeze, ["~> 2.1".freeze, ">= 2.1.1".freeze])
   s.add_development_dependency(%q<irb>.freeze, ["~> 1.0".freeze])

test/minitest_helper.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "base64"
 require "fileutils"
 require "minitar"
 require "pathname"

test/support/minitar_test_helpers/tarball.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open3"
+
 # Test assertions and helpers for working with tarballs.
 #
 # Includes Minitar in-memory and on-disk operations and GNU tar helpers.
@@ -143,14 +145,7 @@ def prepare_workspace(with_files:)
   def gnu_tar_create_in_workspace
     missing_workspace!
 
-    if Minitar.windows?
-      p @workspace.tarball.to_s, @workspace.source.to_s
-    end
-
-    system(
-      GNU_TAR, "-cf", @workspace.tarball.to_s, "-C", @workspace.source.to_s, ".",
-      exception: true
-    )
+    __gnu_tar(:create)
 
     assert @workspace.tarball.file?, "Workspace tarball not created by GNU tar"
     assert @workspace.tarball.size > 0, "Workspace tarball should not be empty"
@@ -162,10 +157,7 @@ def gnu_tar_extract_in_workspace
     assert @workspace.tarball.file?, "Workspace tarball not present for extraction"
     assert @workspace.tarball.size > 0, "Workspace tarball should not be empty"
 
-    system(
-      GNU_TAR, "-xf", @workspace.tarball.to_s, "-C", @workspace.target.to_s,
-      exception: true
-    )
+    __gnu_tar(:extract)
   end
 
   def gnu_tar_list_in_workspace
@@ -174,7 +166,7 @@ def gnu_tar_list_in_workspace
     assert @workspace.tarball.file?, "Workspace tarball not present for extraction"
     assert @workspace.tarball.size > 0, "Workspace tarball should not be empty"
 
-    `#{GNU_TAR} -tf "#{@workspace.tarball}" 2>/dev/null`.strip.split($/)
+    __gnu_tar(:list).strip.split($/)
   end
 
   def minitar_pack_in_workspace
@@ -285,5 +277,47 @@ def missing_workspace!
     raise "Missing workspace" unless defined?(@workspace)
   end
 
+  def __gnu_tar(action)
+    missing_workspace!
+
+    cmd = [GNU_TAR]
+    cmd.push("--force-local") if Minitar.windows?
+
+    case action
+    when :create
+      cmd.push("-cf", @workspace.tarball.to_s, "-C", @workspace.source.to_s, ".")
+    when :extract
+      cmd.push("-xf", @workspace.tarball.to_s, "-C", @workspace.target.to_s)
+    when :list
+      cmd.push("-tf", @workspace.tarball.to_s)
+    end
+
+    stdout_str = ""
+    stderr_str = ""
+    status = nil
+
+    Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thr|
+      stdin.close
+      out_t = Thread.new { stdout.read }
+      err_t = Thread.new { stderr.read }
+      stdout_str = out_t.value.to_s
+      stderr_str = err_t.value.to_s
+      status = wait_thr.value
+    end
+
+    unless status.success?
+      warn stdout_str unless stdout_str.empty?
+      warn stderr_str unless stderr_str.empty?
+
+      if status.exited?
+        raise "command #{cmd.join(" ")} failed (exit status: #{status.exitstatus})"
+      else
+        raise "command #{cmd.join(" ")} failed (status: #{status.inspect})"
+      end
+    end
+
+    stdout_str
+  end
+
   Minitest::Test.send(:include, self)
 end