puppetlabs_spec_helper 2.14.1 → 4.0.0

data/lib/puppetlabs_spec_helper/tasks/check_symlinks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathspec'
 
 module PuppetlabsSpecHelper; end
@@ -33,7 +35,7 @@ class PuppetlabsSpecHelper::Tasks::CheckSymlinks
   end
 
   def ignored?(path)
-    path = path.to_s + '/' if File.directory?(path)
+    path = "#{path}/" if File.directory?(path)
 
     !ignore_pathspec.match_paths([path], Dir.pwd).empty?
   end
@@ -42,6 +44,7 @@ class PuppetlabsSpecHelper::Tasks::CheckSymlinks
     @ignore_pathspec ||= PathSpec.new(DEFAULT_IGNORED).tap do |pathspec|
       IGNORE_LIST_FILES.each do |f|
         next unless File.file?(f) && File.readable?(f)
+
         File.open(f, 'r') { |fd| pathspec.add(fd) }
       end
     end

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'open3'
 require 'json'
 
 module PuppetlabsSpecHelper; end
 module PuppetlabsSpecHelper::Tasks; end
+
 module PuppetlabsSpecHelper::Tasks::FixtureHelpers
   # This is a helper for the self-symlink entry of fixtures.yml
   def source_dir
     Dir.pwd
   end
 
+  # @return [String] - the name of current module
   def module_name
     raise ArgumentError unless File.file?('metadata.json') && File.readable?('metadata.json')
 
@@ -23,16 +27,48 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     File.basename(Dir.pwd).split('-').last
   end
 
-  # cache the repositories and return a hash object
+  def module_version(path)
+    metadata_path = File.join(path, 'metadata.json')
+    raise ArgumentError unless File.file?(metadata_path) && File.readable?(metadata_path)
+
+    metadata = JSON.parse(File.read(metadata_path))
+    metadata.fetch('version', nil) || '0.0.1'
+  rescue JSON::ParserError, ArgumentError
+    logger.warn "Failed to find module version at path #{path}"
+    '0.0.1'
+  end
+
+  # @return [Hash] - returns a hash of all the fixture repositories
+  # @example
+  # {"puppetlabs-stdlib"=>{"target"=>"https://gitlab.com/puppetlabs/puppet-stdlib.git",
+  # "ref"=>nil, "branch"=>"main", "scm"=>nil,
+  # }}
   def repositories
-    unless @repositories
-      @repositories = fixtures('repositories')
-    end
-    @repositories
+    @repositories ||= fixtures('repositories') || {}
+  end
+
+  # @return [Hash] - returns a hash of all the fixture forge modules
+  # @example
+  # {"puppetlabs-stdlib"=>{"target"=>"spec/fixtures/modules/stdlib",
+  # "ref"=>nil, "branch"=>nil, "scm"=>nil,
+  # "flags"=>"--module_repository=https://myforge.example.com/", "subdir"=>nil}}
+  def forge_modules
+    @forge_modules ||= fixtures('forge_modules') || {}
+  end
+
+  # @return [Hash] - a hash of symlinks specified in the fixtures file
+  def symlinks
+    @symlinks ||= fixtures('symlinks') || {}
   end
 
+  # @return [Hash] - returns a hash with the module name and the source directory
   def auto_symlink
-    { module_name => '#{source_dir}' }
+    { module_name => "\#{source_dir}" }
+  end
+
+  # @return [Boolean] - true if the os is a windows system
+  def windows?
+    !!File::ALT_SEPARATOR
   end
 
   def fixtures(category)
@@ -77,7 +113,6 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
 
     result = {}
     if fixtures.include?(category) && !fixtures[category].nil?
-
       defaults = { 'target' => 'spec/fixtures/modules' }
 
       # load defaults from the `.fixtures.yml` `defaults` section
@@ -94,28 +129,39 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
         end
         # there should be a warning or something if it's not a hash...
         next unless opts.instance_of?(Hash)
+
         # merge our options into the defaults to get the
         # final option list
         opts = defaults.merge(opts)
 
         next unless include_repo?(opts['puppet_version'])
 
-        real_target = eval('"' + opts['target'] + '"')
-        real_source = eval('"' + opts['repo'] + '"')
+        real_target = eval("\"#{opts['target']}\"", binding, __FILE__, __LINE__) # evaluating target reference in this context (see auto_symlink)
+        real_source = eval("\"#{opts['repo']}\"", binding, __FILE__, __LINE__) # evaluating repo reference in this context (see auto_symlink)
 
-        result[real_source] = {
+        result[real_source] = validate_fixture_hash!(
           'target' => File.join(real_target, fixture),
-          'ref' => opts['ref'],
+          'ref' => opts['ref'] || opts['tag'],
           'branch' => opts['branch'],
           'scm' => opts['scm'],
           'flags' => opts['flags'],
           'subdir' => opts['subdir'],
-        }
+        )
       end
     end
     result
   end
 
+  def validate_fixture_hash!(hash)
+    # Can only validate git based scm
+    return hash unless hash['scm'] == 'git'
+
+    # Forward slashes in the ref aren't allowed. And is probably a branch name.
+    raise ArgumentError, "The ref for #{hash['target']} is invalid (Contains a forward slash). If this is a branch name, please use the 'branch' setting instead." if hash['ref'] =~ %r{/}
+
+    hash
+  end
+
   def include_repo?(version_range)
     if version_range && defined?(SemanticPuppet)
       puppet_spec = Gem::Specification.find_by_name('puppet')
@@ -149,6 +195,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     unless File.exist?(target)
       raise "Failed to clone #{scm} repository #{remote} into #{target}"
     end
+
     result
   end
 
@@ -196,7 +243,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
   end
 
   def git_remote_url(target)
-    output, status = Open3.capture2e('git', '-C', target, 'remote', 'get-url', 'origin')
+    output, status = Open3.capture2e('git', '--git-dir', File.join(target, '.git'), 'ls-remote', '--get-url', 'origin')
     status.success? ? output.strip : nil
   end
 
@@ -219,7 +266,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
               else
                 Logger::INFO
               end
-      @logger = Logger.new(STDERR)
+      @logger = Logger.new($stderr)
       @logger.level = level
     end
     @logger
@@ -229,12 +276,13 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     # The problem with the relative path is that PMT doesn't expand the path properly and so passing in a relative path here
     # becomes something like C:\somewhere\backslashes/spec/fixtures/work-dir on Windows, and then PMT barfs itself.
     # This has been reported as https://tickets.puppetlabs.com/browse/PUP-4884
-    File.expand_path((ENV['MODULE_WORKING_DIR']) ? ENV['MODULE_WORKING_DIR'] : 'spec/fixtures/work-dir')
+    File.expand_path(ENV['MODULE_WORKING_DIR'] || 'spec/fixtures/work-dir')
   end
 
   # returns the current thread count that is currently active
   # a status of false or nil means the thread completed
   # so when anything else we count that as a active thread
+  # @return [Integer] - current thread count
   def current_thread_count(items)
     active_threads = items.find_all do |_item, opts|
       if opts[:thread]
@@ -247,79 +295,47 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     active_threads.count
   end
 
-  # returns the max_thread_count
-  # because we may want to limit ssh or https connections
+  # @summary Set a limit on the amount threads used, defaults to 10
+  #   MAX_FIXTURE_THREAD_COUNT can be used to set this limit
+  # @return [Integer] - returns the max_thread_count
   def max_thread_limit
-    unless @max_thread_limit
-      # the default thread count is 10 but can be
-      # raised by using environment variable MAX_FIXTURE_THREAD_COUNT
-      @max_thread_limit = if ENV['MAX_FIXTURE_THREAD_COUNT'].to_i > 0
-                            ENV['MAX_FIXTURE_THREAD_COUNT'].to_i
-                          else
-                            10 # the default
-                          end
-    end
-    @max_thread_limit
+    @max_thread_limit ||= (ENV['MAX_FIXTURE_THREAD_COUNT'] || 10).to_i
   end
-end
-include PuppetlabsSpecHelper::Tasks::FixtureHelpers
 
-desc 'Create the fixtures directory'
-task :spec_prep do
-  # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
-  # uses this to check for Windows
-  is_windows = !!File::ALT_SEPARATOR
-  if is_windows
-    begin
-      require 'win32/dir'
-    rescue LoadError
-      $stderr.puts 'win32-dir gem not installed, falling back to executing mklink directly'
-    end
-  end
-
-  # git has a race condition creating that directory, that would lead to aborted clone operations
-  FileUtils.mkdir_p('spec/fixtures/modules')
-
-  repositories.each do |remote, opts|
-    scm = 'git'
-    target = opts['target']
-    subdir = opts['subdir']
-    ref = opts['ref']
-    scm = opts['scm'] if opts['scm']
-    branch = opts['branch'] if opts['branch']
-    flags = opts['flags']
-    # get the current active threads that are alive
-    count = current_thread_count(repositories)
-    if count < max_thread_limit
-      logger.debug "New Thread started for #{remote}"
-      # start up a new thread and store it in the opts hash
-      opts[:thread] = Thread.new do
-        if valid_repo?(scm, target, remote)
-          update_repo(scm, target)
-        else
-          clone_repo(scm, remote, target, subdir, ref, branch, flags)
+  # @param items [Hash] - a hash of either repositories or forge modules
+  # @param [Block] - the method you wish to use to download the item
+  def download_items(items)
+    items.each do |remote, opts|
+      # get the current active threads that are alive
+      count = current_thread_count(items)
+      if count < max_thread_limit
+        logger.debug "New Thread started for #{remote}"
+        # start up a new thread and store it in the opts hash
+        opts[:thread] = Thread.new do
+          yield(remote, opts)
         end
-        revision(scm, target, ref) if ref
-        remove_subdirectory(target, subdir) if subdir
+      else
+        # the last thread started should be the longest wait
+        item, item_opts = items.find_all { |_i, o| o.key?(:thread) }.last
+        logger.debug "Waiting on #{item}"
+        item_opts[:thread].join # wait for the thread to finish
+        # now that we waited lets try again
+        redo
       end
-    else
-      # the last thread started should be the longest wait
-      item, item_opts = repositories.find_all { |_i, o| o.key?(:thread) }.last
-      logger.debug "Waiting on #{item}"
-      item_opts[:thread].join # wait for the thread to finish
-      # now that we waited lets try again
-      redo
     end
+    # wait for all the threads to finish
+    items.each { |_remote, opts| opts[:thread].join }
   end
 
-  # wait for all the threads to finish
-  repositories.each { |_remote, opts| opts[:thread].join }
-
-  fixtures('symlinks').each do |target, link|
+  # @param target [String] - the target directory
+  # @param link [String] - the name of the link you wish to create
+  # works on windows and linux
+  def setup_symlink(target, link)
     link = link['target']
-    next if File.symlink?(link)
+    return if File.symlink?(link)
+
     logger.info("Creating symlink from #{link} to #{target}")
-    if is_windows
+    if windows?
       target = File.join(File.dirname(link), target) unless Pathname.new(target).absolute?
       if Dir.respond_to?(:create_junction)
         Dir.create_junction(link, target)
@@ -331,7 +347,35 @@ task :spec_prep do
     end
   end
 
-  fixtures('forge_modules').each do |remote, opts|
+  # @return [Boolean] - returns true if the module was downloaded successfully, false otherwise
+  # @param [String] - the remote url or namespace/name of the module to download
+  # @param [Hash] - list of options such as version, branch, ref
+  def download_repository(remote, opts)
+    scm = 'git'
+    target = opts['target']
+    subdir = opts['subdir']
+    ref = opts['ref']
+    scm = opts['scm'] if opts['scm']
+    branch = opts['branch'] if opts['branch']
+    flags = opts['flags']
+    if valid_repo?(scm, target, remote)
+      update_repo(scm, target)
+    else
+      clone_repo(scm, remote, target, subdir, ref, branch, flags)
+    end
+    revision(scm, target, ref) if ref
+    remove_subdirectory(target, subdir) if subdir
+  end
+
+  # @return [String] - the spec/fixtures/modules directory in the module root folder
+  def module_target_dir
+    @module_target_dir ||= File.expand_path('spec/fixtures/modules')
+  end
+
+  # @return [Boolean] - returns true if the module was downloaded successfully, false otherwise
+  # @param [String] - the remote url or namespace/name of the module to download
+  # @param [Hash] - list of options such as version
+  def download_module(remote, opts)
     ref = ''
     flags = ''
     if opts.instance_of?(String)
@@ -342,34 +386,60 @@ task :spec_prep do
       flags = " #{opts['flags']}" if opts['flags']
     end
 
-    next if File.directory?(target)
+    return false if File.directory?(target) && (ref.empty? || opts['ref'] == module_version(target))
+
+    # The PMT cannot handle multi threaded runs due to cache directory collisons
+    # so we randomize the directory instead.
+    # Does working_dir even need to be passed?
+    Dir.mktmpdir do |working_dir|
+      command = "puppet module install#{ref}#{flags} --ignore-dependencies" \
+      ' --force' \
+      " --module_working_dir \"#{working_dir}\"" \
+      " --target-dir \"#{module_target_dir}\" \"#{remote}\""
 
-    working_dir = module_working_directory
-    target_dir = File.expand_path('spec/fixtures/modules')
+      unless system(command)
+        raise "Failed to install module #{remote} to #{module_target_dir}"
+      end
+    end
+    $CHILD_STATUS.success?
+  end
+end
 
-    command = 'puppet module install' + ref + flags + \
-              ' --ignore-dependencies' \
-              ' --force' \
-              " --module_working_dir \"#{working_dir}\"" \
-              " --target-dir \"#{target_dir}\" \"#{remote}\""
+include PuppetlabsSpecHelper::Tasks::FixtureHelpers # DSL include # rubocop:disable Style/MixinUsage
 
-    unless system(command)
-      raise "Failed to install module #{remote} to #{target_dir}"
+desc 'Create the fixtures directory'
+task :spec_prep do
+  # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
+  # uses this to check for Windows
+  if windows?
+    begin
+      require 'win32/dir'
+    rescue LoadError
+      warn 'win32-dir gem not installed, falling back to executing mklink directly'
     end
   end
 
+  # git has a race condition creating that directory, that would lead to aborted clone operations
+  FileUtils.mkdir_p('spec/fixtures/modules')
+
+  symlinks.each { |target, link| setup_symlink(target, link) }
+
+  download_items(repositories) { |remote, opts| download_repository(remote, opts) }
+
+  download_items(forge_modules) { |remote, opts| download_module(remote, opts) }
+
   FileUtils.mkdir_p('spec/fixtures/manifests')
   FileUtils.touch('spec/fixtures/manifests/site.pp')
 end
 
 desc 'Clean up the fixtures directory'
 task :spec_clean do
-  fixtures('repositories').each do |_remote, opts|
+  repositories.each do |_remote, opts|
     target = opts['target']
     FileUtils.rm_rf(target)
   end
 
-  fixtures('forge_modules').each do |_remote, opts|
+  forge_modules.each do |_remote, opts|
     target = opts['target']
     FileUtils.rm_rf(target)
   end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module PuppetlabsSpecHelper
-  VERSION = '2.14.1'.freeze
+  VERSION = '4.0.0'
 
   # compat for pre-1.2.0 users; deprecated
   module Version

data/puppet_spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
 
 require 'puppetlabs_spec_helper/puppet_spec_helper'

data/puppetlabs_spec_helper.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'puppetlabs_spec_helper/version'
 
@@ -20,18 +20,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.4')
+
   spec.add_runtime_dependency 'mocha', '~> 1.0'
+  spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 1.1.0'
   spec.add_runtime_dependency 'puppet-lint', '~> 2.0'
-  spec.add_runtime_dependency 'puppet-syntax', '~> 2.0'
+  spec.add_runtime_dependency 'puppet-syntax', ['>= 2.0', '< 4']
   spec.add_runtime_dependency 'rspec-puppet', '~> 2.0'
-  spec.add_runtime_dependency 'pathspec', '~> 0.2.1'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'fakefs', ['>= 0.13.3', '< 2']
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'puppet'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', ['>= 10.0', '< 14']
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'gettext-setup', '~> 0.29'
-  spec.add_development_dependency 'fakefs', '~> 0.13.3'
 end