Merge pull request #108 from bastelfreak/minitar

minitar: Allow 1.x

Author: LukasAud

Gemfile

@@ -29,4 +29,8 @@ group :development do
 
   # Required for testing on Windows
   gem 'ffi', platforms: [:x64_mingw]
+  # puppet-modulebuilder supports minitar 0.x and 1.x
+  # puppet 8.10.0 can use `tar` (the linux CLI tool) *or* minitar 0.x
+  # on windows, puppet 8.10 defaults to minitar
+  gem 'minitar', '~> 0.9', platforms: [:x64_mingw]
 end

lib/puppet/modulebuilder/builder.rb

@@ -339,8 +339,7 @@ def release_name
     # header format.
     #
     # POSIX.1-2001 (which allows paths of infinite length) was adopted by GNU
-    # tar in 2004 and is supported by minitar 0.7 and above. Unfortunately
-    # much of the Puppet ecosystem still uses minitar 0.6.1.
+    # tar in 2004 and is supported by minitar 0.7 and above.
     #
     # POSIX.1-1998 tar format does not allow for paths greater than 256 bytes,
     # or paths that can't be split into a prefix of 155 bytes (max) and

puppet-modulebuilder.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   # minitar and pathspec is required for building Puppet modules
-  spec.add_dependency 'minitar', '~> 0.9'
+  spec.add_dependency 'minitar', '>= 0.9', '< 2'
   spec.add_dependency 'pathspec', '>= 0.2.1', '< 3.0.0'
 
   spec.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0'