puppet-modulebuilder 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2a1887e9b40f9439cdf6fb1335b5ce7978d1ab3c4d806fc90c7ec735949957
-  data.tar.gz: 5961801ac2e64949b4367a8e7f3be1c0ef505008da5f30e0c80b4cc26ad60ff0
+  metadata.gz: caf535563497b6e0a7bd98c749821dd30c60e33174497449459c754fc8ebffd1
+  data.tar.gz: e72590d578145ced4d745cab78f32ea581208e537022b9d68ce6856bb3950664
 SHA512:
-  metadata.gz: 7cbf20f57e42e53825e1afc3a9f20c7c5e3334c7e2e360ff26f08e6cd7600de89c5fda05769b2242ec080c1c7e0796e295a47828cefca0f47b68dcc9fb631eaf
-  data.tar.gz: e78d9e044df24a6e87564173adfaa6f21d0cecff194440277657e5083a0edf67a6aad3924bb530f3a44018b1d7d77dbad449fbeb8f573d05f3855f602e841595
+  metadata.gz: 3d3d125ef17ee7c5598ead12a03c8cd210435d9dd11ee89289233f51ff2231d7dd46ddd2901f4301550a889eac540e8f8ece5ff43610a313f312b9563854261f
+  data.tar.gz: 16e26fef2258fbc132962aeb8bce6c0ede396fcd0d498778be63450e4df3b10ec9a2870e3043e8a11d2e16a1dcf42bd551dbd62e82d46ae7054f401f8178486f

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rake
+    versions:
+    - ">= 13.a, < 14"
+  - dependency-name: rubocop
+    versions:
+    - "> 0.68"

data/.travis.yml

@@ -7,11 +7,5 @@ env:
 jobs:
   include:
   - rvm: 2.7
-  - rvm: 2.5.7
-    before_install: gem install bundler -v 2.1.4
-  - rvm: 2.4.9
-    before_install: gem install bundler -v 2.1.4
-  - rvm: 2.1.9
-    script: "bundle exec rake spec # don't try to run rubocop on ancient ruby"
-    env:
-    - SIMPLECOV=no
+  - rvm: 2.5
+  - rvm: 2.4

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
 
+## [v0.3.0](https://github.com/puppetlabs/puppet-modulebuilder/tree/v0.3.0) (2021-05-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppet-modulebuilder/compare/v0.2.1...v0.3.0)
+
+**Implemented enhancements:**
+
+- Refresh dependency matrix; drop ruby 2.3 and earlier [\#35](https://github.com/puppetlabs/puppet-modulebuilder/pull/35) ([DavidS](https://github.com/DavidS))
+- Use Puppet 7 in development on Ruby 2.7+ [\#32](https://github.com/puppetlabs/puppet-modulebuilder/pull/32) ([ekohl](https://github.com/ekohl))
+- Add a setter for release\_name [\#31](https://github.com/puppetlabs/puppet-modulebuilder/pull/31) ([ekohl](https://github.com/ekohl))
+- Preserve directory mtimes [\#27](https://github.com/puppetlabs/puppet-modulebuilder/pull/27) ([ekohl](https://github.com/ekohl))
+- Use match\_path instead of match\_paths [\#26](https://github.com/puppetlabs/puppet-modulebuilder/pull/26) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Use correct source variable when warning about symlinks [\#36](https://github.com/puppetlabs/puppet-modulebuilder/pull/36) ([DavidS](https://github.com/DavidS))
+- Ignore all hidden files in the root dir [\#29](https://github.com/puppetlabs/puppet-modulebuilder/pull/29) ([ekohl](https://github.com/ekohl))
+
 ## [v0.2.1](https://github.com/puppetlabs/puppet-modulebuilder/tree/v0.2.1) (2020-06-08)
 
 [Full Changelog](https://github.com/puppetlabs/puppet-modulebuilder/compare/v0.2.0...v0.2.1)

data/Gemfile

@@ -6,25 +6,28 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+
   gem 'rake', '~> 12.0'
   gem 'rspec', '~> 3.0'
-  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
-    gem 'rubocop', ['~> 0.68', '< 0.82.0']
-    gem 'rubocop-rspec', '~> 1.38'
-
-    gem 'codecov', '~> 0.1'
-    gem 'github_changelog_generator', '~> 1.15', require: false
-    gem 'simplecov', '~> 0.18'
-    gem 'simplecov-console', '~> 0.6'
-  end
 
-  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
-    gem 'puppet', '~> 6.0'
-  elsif Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.4.0')
-    gem 'puppet', '~> 5.0' # rubocop:disable Bundler/DuplicatedGem Nope, not a duplicate!
-  else
-    gem 'puppet', '~> 4.0' # rubocop:disable Bundler/DuplicatedGem Nope, not a duplicate!
-  end
+  gem 'rubocop', ['~> 0.68', '< 0.82.0']
+  gem 'rubocop-rspec', '~> 1.38'
+
+  gem 'codecov', '~> 0.1'
+  gem 'github_changelog_generator', '~> 1.15', require: false
+  gem 'simplecov', '~> 0.18'
+  gem 'simplecov-console', '~> 0.6'
+
+  puppet_version = if ruby_version >= Gem::Version.new('2.7.0')
+                     '~> 7.0'
+                   elsif ruby_version >= Gem::Version.new('2.5.0')
+                     '~> 6.0'
+                   else
+                     '~> 5.0'
+                   end
+
+  gem 'puppet', puppet_version
 end
 
 # Evaluate Gemfile.local and ~/.gemfile if they exist

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/puppetlabs/puppet-modulebuilder.svg?branch=master)](https://travis-ci.com/puppetlabs/puppet-modulebuilder) [![Build status](https://ci.appveyor.com/api/projects/status/j9tosvq4a09iw0bx/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet-modulebuilder/branch/master)
+[![Build Status](https://travis-ci.com/puppetlabs/puppet-modulebuilder.svg?branch=main)](https://travis-ci.com/puppetlabs/puppet-modulebuilder) [![Build status](https://ci.appveyor.com/api/projects/status/j9tosvq4a09iw0bx/branch/main?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet-modulebuilder/branch/main)
 
 # Puppet::Modulebuilder
 

data/appveyor.yml

@@ -1,6 +1,11 @@
 ---
+environment:
+  matrix:
+    - RUBY_VERSION: 25-x64
+    - RUBY_VERSION: 24-x64
+
 install:
-  - set PATH=C:\Ruby25-x64\bin;%PATH%
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
   - set SIMPLECOV=yes
   - gem install bundler -v 2.1.4
   - bundle -v
@@ -10,7 +15,7 @@ build: off
 
 branches:
   only:
-    - master
+    - main
 
 before_test:
   - bundle env
@@ -22,4 +27,4 @@ test_script:
 # Uncomment this block to enable RDP access to the AppVeyor test instance for
 # debugging purposes.
 # on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

data/lib/puppet/modulebuilder/builder.rb

@@ -6,7 +6,7 @@ module Puppet::Modulebuilder
   # Class to build Puppet Modules from source
   class Builder
     DEFAULT_IGNORED = [
-      '/.git',
+      '/.*',
       '/pkg/',
       '~*',
       '/coverage',
@@ -53,7 +53,9 @@ module Puppet::Modulebuilder
     end
 
     # Return the path to the temporary build directory, which will be placed
-    # inside the target directory and match the release name (see #release_name).
+    # inside the target directory and match the release name
+    #
+    # @see #release_name
     def build_dir
       @build_dir ||= File.join(build_context[:parent_dir], build_context[:build_dir_name])
     end
@@ -72,7 +74,9 @@ module Puppet::Modulebuilder
     def stage_module_in_build_dir
       require 'find'
 
-      Find.find(source) do |path|
+      directories = [source]
+
+      staged = Find.find(source) do |path|
         next if path == source
 
         if ignored_path?(path)
@@ -80,9 +84,18 @@ module Puppet::Modulebuilder
           Find.prune
         else
           logger.debug("Staging #{path} for the build")
+          directories << path if file_directory?(path)
           stage_path(path)
         end
       end
+
+      # Reset directory mtimes. This must happen after the files have been
+      # copied since that modifies a directory's mtime
+      directories.each do |directory|
+        copy_mtime(directory)
+      end
+
+      staged
     end
 
     # Stage a file or directory from the module into the build directory.
@@ -112,6 +125,17 @@ module Puppet::Modulebuilder
       end
     end
 
+    def copy_mtime(path)
+      require 'pathname'
+
+      relative_path = Pathname.new(path).relative_path_from(Pathname.new(source))
+      dest_path = File.join(build_dir, relative_path)
+
+      validate_path_encoding!(relative_path.to_path)
+
+      fileutils_touch(dest_path, mtime: file_stat(path).mtime)
+    end
+
     # Check if the given path matches one of the patterns listed in the
     # ignore file.
     #
@@ -121,7 +145,7 @@ module Puppet::Modulebuilder
     def ignored_path?(path)
       path = path.to_s + '/' if File.directory?(path)
 
-      !ignored_files.match_paths([path], source).empty?
+      ignored_files.match_path(path, source)
     end
 
     # Warn the user about a symlink that would have been included in the
@@ -134,9 +158,9 @@ module Puppet::Modulebuilder
       require 'pathname'
 
       symlink_path = Pathname.new(path)
-      module_path = Pathname.new(module_dir)
+      module_path = Pathname.new(source)
 
-      logger.warn _('Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}.') % {
+      logger.warn 'Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}.' % {
         from: symlink_path.relative_path_from(module_path),
         to: symlink_path.realpath.relative_path_from(module_path),
       }
@@ -299,10 +323,14 @@ module Puppet::Modulebuilder
       file_exists?(package_file)
     end
 
-    # Combine the module name and version into a Forge-compatible dash
-    # separated string.
+    # The release name is used for the build directory and resulting package
+    # file.
+    #
+    # The default combines the module name and version into a Forge-compatible
+    # dash separated string. Unless you have an unusual use case this isn't set
+    # manually.
     #
-    # @return [String] The module name and version, joined by a dash.
+    # @return [String]
     def release_name
       @release_name ||= [
         metadata['name'],
@@ -310,6 +338,8 @@ module Puppet::Modulebuilder
       ].join('-')
     end
 
+    attr_writer :release_name
+
     # Checks if the path length will fit into the POSIX.1-1998 (ustar) tar
     # header format.
     #
@@ -408,6 +438,10 @@ module Puppet::Modulebuilder
       FileUtils.mkdir_p(dir, **options)
     end
 
+    def fileutils_touch(list, **options)
+      FileUtils.touch(list, **options)
+    end
+
     def file_stat(*args)
       File.stat(*args)
     end

data/lib/puppet/modulebuilder/version.rb

@@ -2,6 +2,6 @@
 
 module Puppet # rubocop:disable Style/ClassAndModuleChildren
   module Modulebuilder
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/puppet-modulebuilder.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/puppetlabs/puppet-modulebuilder'
-  spec.metadata['changelog_uri'] = 'https://github.com/puppetlabs/puppet-modulebuilder/blob/master/CHANGELOG.md'
+  spec.metadata['changelog_uri'] = 'https://github.com/puppetlabs/puppet-modulebuilder/blob/main/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -24,6 +24,6 @@ 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_runtime_dependency 'minitar', '~> 0.6'
-  spec.add_runtime_dependency 'pathspec', '~> 0.2.1'
+  spec.add_runtime_dependency 'minitar', '~> 0.9'
+  spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-modulebuilder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sheena
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -17,28 +17,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pathspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email:
 - sheena@puppet.com
@@ -48,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -68,7 +75,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/puppetlabs/puppet-modulebuilder
   source_code_uri: https://github.com/puppetlabs/puppet-modulebuilder
-  changelog_uri: https://github.com/puppetlabs/puppet-modulebuilder/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/puppetlabs/puppet-modulebuilder/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -84,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to set up puppet-modulebuilder