puppet-check 1.5.0 → 2.0.1

data/lib/puppet-check/data_parser.rb

@@ -4,8 +4,6 @@ require_relative '../puppet-check'
 class DataParser
   # checks yaml (.yaml/.yml)
   def self.yaml(files)
-    return if files.empty?
-
     require 'yaml'
 
     files.each do |file|
@@ -18,7 +16,7 @@ class DataParser
         warnings = []
 
         # perform some rudimentary hiera checks if data exists and is hieradata
-        warnings = hiera(parsed, file) unless (parsed.class.to_s == 'NilClass') || (File.basename(file) == 'hiera.yaml')
+        warnings = hiera(parsed, file) if parsed && (File.basename(file) != 'hiera.yaml')
 
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -28,15 +26,19 @@ class DataParser
 
   # checks eyaml (.eyaml/.eyml)
   def self.eyaml(files, public, private)
-    return if files.empty?
-
     require 'openssl'
 
     # keys specified?
-    return warn 'Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.' if public.nil? || private.nil?
+    if public.nil? || private.nil?
+      PuppetCheck.settings[:ignored_files].concat(files)
+      return warn 'Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.'
+    end
 
     # keys exist?
-    return warn 'Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.' unless File.file?(public) && File.file?(private)
+    unless File.file?(public) && File.file?(private)
+      PuppetCheck.settings[:ignored_files].concat(files)
+      return warn 'Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.'
+    end
 
     # setup decryption
     rsa = OpenSSL::PKey::RSA.new(File.read(private))
@@ -52,14 +54,14 @@ class DataParser
 
       # check yaml syntax
       begin
-        parsed = YAML.safe_load(decrypted)
+        parsed = YAML.load_file(decrypted)
       rescue StandardError => err
         PuppetCheck.settings[:error_files].push("#{file}:\n#{err.to_s.gsub("(#{file}): ", '')}")
       else
         warnings = []
 
         # perform some rudimentary hiera checks if data exists and is hieradata
-        warnings = hiera(parsed, file) unless (parsed.class.to_s == 'NilClass') || (File.basename(file) == 'hiera.yaml')
+        warnings = hiera(parsed, file) if parsed
 
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -69,8 +71,6 @@ class DataParser
 
   # checks json (.json)
   def self.json(files)
-    return if files.empty?
-
     require 'json'
 
     files.each do |file|
@@ -85,7 +85,7 @@ class DataParser
         # check metadata.json
         if File.basename(file) == 'metadata.json'
           # metadata-json-lint has issues and is essentially no longer maintained, so here is an improved and leaner version of it
-          require 'spdx-licenses'
+          require 'rubygems/util/licenses'
 
           # check for errors
           errors = []
@@ -97,9 +97,8 @@ class DataParser
 
           # check requirements and dependencies keys
           %w[requirements dependencies].each do |key|
-            # skip if key is missing or or value is an empty string, array, or hash
-            next unless parsed.key?(key)
-            next if parsed[key].empty?
+            # skip if key is missing or value is an empty string, array, or hash
+            next if !parsed.key?(key) || parsed[key].empty?
 
             # check that dependencies and requirements are an array of hashes
             next errors.push("Field '#{key}' is not an array of hashes.") unless (parsed[key].is_a? Array) && (parsed[key][0].is_a? Hash)
@@ -113,14 +112,14 @@ class DataParser
               names << name
 
               # warn and skip if key is missing
-              next warnings.push("'#{req_dep['name']}' is missing a 'version_requirement' key.") if req_dep['version_requirement'].class.to_s == 'NilClass'
+              next warnings.push("'#{req_dep['name']}' is missing a 'version_requirement' key.") if req_dep['version_requirement'].nil?
 
               # warn and skip if no upper bound
               next warnings.push("'#{req_dep['name']}' is missing an upper bound.") unless req_dep['version_requirement'].include?('<')
 
               # check for semantic versioning
-              if key == 'dependencies'
-                warnings.push("'#{req_dep['name']}' has non-semantic versioning in its 'version_requirement' key.") unless req_dep['version_requirement'] =~ /\d\.\d\.\d.*\d\.\d\.\d/
+              if key == 'dependencies' && req_dep['version_requirement'] !~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/
+                warnings.push("'#{req_dep['name']}' has non-semantic versioning in its 'version_requirement' key.")
               end
             end
           end
@@ -161,14 +160,38 @@ class DataParser
             warnings.push('Recommended field \'operatingsystem_support\' not found.')
           end
 
-          # check for spdx license (rubygems/util/licenses for rubygems >= 2.5 in the far future)
-          if parsed.key?('license') && !SpdxLicenses.exist?(parsed['license']) && parsed['license'] !~ /[pP]roprietary/
+          # check for spdx license
+          if parsed.key?('license') && !Gem::Licenses.match?(parsed['license']) && parsed['license'] !~ /[pP]roprietary/
             warnings.push("License identifier '#{parsed['license']}' is not in the SPDX list: http://spdx.org/licenses/")
           end
-        # assume this is hieradata
-        else
+        # assume this is task metadata if it has this key
+        elsif parsed.key?('description')
+          # check that description is a string
+          warnings.push('description value is not a String') unless parsed['description'].is_a?(String)
+          # check that input_method is one of three possible values
+          if parsed.key?('input_method')
+            if parsed['input_method'].is_a?(String)
+              warnings.push('input_method value is not one of environment, stdin, or powershell') unless %w[environment stdin powershell].include?(parsed['input_method'])
+            else
+              warnings.push('input_method value is not a String')
+            end
+          end
+          # check that parameters is a hash
+          if parsed.key?('parameters') && !parsed['parameters'].is_a?(Hash)
+            warnings.push('parameters value is not a Hash')
+          end
+          # check that puppet_task_version is an integer
+          if parsed.key?('puppet_task_version') && !parsed['puppet_task_version'].is_a?(Integer)
+            warnings.push('puppet_task_version value is not an Integer')
+          end
+          # check that supports_noop is a boolean
+          if parsed.key?('supports_noop') && !(parsed['supports_noop'].is_a?(TrueClass) || parsed['supports_noop'].is_a?(FalseClass))
+            warnings.push('supports_noop value is not a Boolean')
+          end
+        # assume this is hieradata and ensure it is non-empty
+        elsif parsed
           # perform some rudimentary hiera checks if data exists
-          warnings = hiera(parsed, file) unless parsed.class.to_s == 'NilClass'
+          warnings = hiera(parsed, file)
         end
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -181,15 +204,19 @@ class DataParser
     private_class_method :method
     warnings = []
 
-    data.each do |key, value|
-      # check for nil values in the data (nil keys are fine)
-      if (value.is_a?(Hash) && value.values.any?(&:nil?)) || (value.class.to_s == 'NilClass')
-        warnings.push("Value(s) missing in key '#{key}'.")
+    # disregard nil/undef value data check if default values (common)
+    unless file =~ /^common/
+    # unless /^common/.match?(file) TODO: use when ruby >= 2.4
+      data.each do |key, value|
+        # check for nil values in the data (nil keys are fine)
+        if (value.is_a?(Hash) && value.values.any?(&:nil?)) || value.nil?
+          warnings.push("Value(s) missing in key '#{key}'.")
+        end
       end
     end
 
     # check that '---' does not show up more than once in the hieradata
-    warnings.push('The string --- appears more than once in this data and Hiera will fail to parse it correctly.') if File.read(file).scan(/---/).count >= 2
+    warnings.push('The string --- appears more than once in this data and Hiera may fail to parse it correctly.') if File.read(file).scan(/---/).count >= 2
 
     warnings
   end

data/lib/puppet-check/output_results.rb

@@ -22,7 +22,7 @@ class OutputResults
   end
 
   # output the results as yaml or json
-  def self.markup
+  def self.markup(settings)
     # generate output hash
     hash = {}
     hash['errors'] = PuppetCheck.settings[:error_files] unless PuppetCheck.settings[:error_files].empty?
@@ -31,14 +31,15 @@ class OutputResults
     hash['ignored'] = PuppetCheck.settings[:ignored_files] unless PuppetCheck.settings[:ignored_files].empty?
 
     # convert hash to markup language
-    if PuppetCheck.settings[:output_format] == 'yaml'
+    case settings[:output_format]
+    when 'yaml'
       require 'yaml'
       puts Psych.dump(hash, indentation: 2)
-    elsif PuppetCheck.settings[:output_format] == 'json'
+    when 'json'
       require 'json'
       puts JSON.pretty_generate(hash)
     else
-      raise "puppet-check: Unsupported output format '#{PuppetCheck.settings[:output_format]}' was specified."
+      raise "puppet-check: Unsupported output format '#{settings[:output_format]}' was specified."
     end
   end
 end

data/lib/puppet-check/puppet_parser.rb

@@ -4,33 +4,53 @@ require_relative '../puppet-check'
 # executes diagnostics on puppet files
 class PuppetParser
   # checks puppet (.pp)
-  def self.manifest(files, future, style, pl_args)
-    return if files.empty?
-
+  def self.manifest(files, style, pl_args)
     require 'puppet/face'
 
     # prepare the Puppet settings for the error checking
     Puppet.initialize_settings unless Puppet.settings.app_defaults_initialized?
-    Puppet[:parser] = 'future' if future && (Puppet::PUPPETVERSION.to_i < 4)
 
     files.each do |file|
-      # setup error logging and collection
+      # setup error logging and collection; warnings logged for all versions, but errors for only puppet < 6.5
       errors = []
       Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(errors))
 
       # check puppet syntax
       begin
-        Puppet::Face[:parser, :current].validate(file)
+        # initialize message
+        message = ''
+        # in puppet >= 6.5 the return of this method is a hash with the error
+        new_error = Puppet::Face[:parser, :current].validate(file)
+        # puppet 6.5 output format is now a hash from the face api
+        if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('6.5.0') && new_error != {}
+          message = new_error.values.map(&:to_s).join("\n").gsub(/ \(file: #{File.absolute_path(file)}(, |\))/, '').gsub(/Could not parse.*: /, '')
+        end
       # this is the actual error that we need to rescue Puppet::Face from
       rescue SystemExit
-        # puppet 5 can only do one error per line and outputs fake dir env info
-        next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')}") if Puppet::PUPPETVERSION.to_i == 5
-        # puppet < 5 parser output style
-        next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}")
+        # puppet 5.4-6.4 has a new validator output format and eof errors have fake dir env info
+        if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.4') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('6.5')
+          message = errors.map(&:to_s).join("\n").gsub(/file: #{File.absolute_path(file)}(, |\))/, '').gsub(/Could not parse.*: /, '')
+        # puppet 5.0-5.2 can only do one error per line and outputs fake dir env info
+        elsif Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.0') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('5.3')
+          message = errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')
+        end
+        # puppet < 5 and 5.3 parser output style
+        message = errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')
       end
+      # output message
+      next PuppetCheck.settings[:error_files].push("#{file}:\n#{message}") unless message.empty?
 
       # initialize warnings with output from the parser if it exists, since the output is warnings if Puppet::Face did not trigger a SystemExit
-      warnings = errors.empty? ? "#{file}:" : "#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}"
+      warnings = "#{file}:"
+      unless errors.empty?
+        # puppet 5.4-5.x has a new validator output format
+        warnings << if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.4')
+                      "\n#{errors.map(&:to_s).join("\n").gsub("file: #{File.absolute_path(file)}, ", '')}"
+                    # puppet <= 5.3 validator output format
+                    else
+                      "\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}"
+                    end
+      end
       Puppet::Util::Log.close_all
 
       # check puppet style
@@ -62,14 +82,9 @@ class PuppetParser
 
   # checks puppet template (.epp)
   def self.template(files)
-    return if files.empty?
-
     require 'puppet/pops'
 
     files.each do |file|
-      # puppet before version 4 cannot check template syntax
-      next PuppetCheck.settings[:ignored_files].push("#{file}: ignored due to Puppet < 4") if Puppet::PUPPETVERSION.to_i < 4
-
       # check puppet template syntax
       begin
         # credits to gds-operations/puppet-syntax for the parser function call

data/lib/puppet-check/rspec_puppet_support.rb

@@ -3,22 +3,22 @@ class RSpecPuppetSupport
   # code diagram:
   # 'puppetcheck:spec' task invokes 'run'
   # 'run' invokes 'file_setup' always and 'dependency_setup' if metadata.json exists
-  # 'dependency_setup' invokes 'git/forge/hg' if dependencies exist and git/forge/hg is download option
+  # 'dependency_setup' invokes 'git/forge/svn/hg' if dependencies exist and git/forge/svn/hg is download option
   # 'git/forge/svn/hg' downloads module fixture appropriately
 
   # prepare the spec fixtures directory for rspec-puppet testing
   def self.run
     # ensure this method does not do anything inside module dependencies
     specdirs = Dir.glob('**/spec').reject { |dir| dir =~ /fixtures/ }
-    return if specdirs.class.to_s == 'NilClass'
+    return if specdirs.empty?
 
     # setup fixtures for rspec-puppet testing
     specdirs.each do |specdir|
       # skip to next specdir if it does not seem like a puppet module
-      next unless File.directory?(specdir + '/../manifests')
+      next unless File.directory?("#{specdir}/../manifests")
 
       # change to module directory
-      Dir.chdir(specdir + '/..')
+      Dir.chdir("#{specdir}/..")
 
       # grab the module name from the directory name of the module to pass to file_setup
       file_setup(File.basename(Dir.pwd))
@@ -40,11 +40,21 @@ class RSpecPuppetSupport
     File.write('spec/fixtures/manifests/site.pp', '') unless File.file?('spec/fixtures/manifests/site.pp')
 
     # symlink the module into spec/fixtures/modules
-    File.symlink("../../../#{module_name}", "spec/fixtures/modules/#{module_name}") unless File.exist?("spec/fixtures/modules/#{module_name}")
+    if File.exist?("spec/fixtures/modules/#{module_name}")
+      # check if target is a symlink
+      if File.symlink?("spec/fixtures/modules/#{module_name}")
+        # check if target is correct
+        warn "spec/fixtures/modules/#{module_name} is not a symlink to the correct source! Your tests may fail because of this!" unless File.readlink("spec/fixtures/modules/#{module_name}") == File.expand_path("../../../../#{module_name}")
+      else
+        warn "spec/fixtures/modules/#{module_name} is not a symlink! Your tests may fail because of this!"
+      end
+    else
+      File.symlink("../../../../#{module_name}", "spec/fixtures/modules/#{module_name}")
+    end
 
     # create spec_helper if missing
     return if File.file?('spec/spec_helper.rb')
-    File.open('spec/spec_helper.rb', 'w') { |file| file.puts "require 'rspec-puppet'\n\nfixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))\n\nRSpec.configure do |c|\n  c.module_path     = File.join(fixture_path, 'modules')\n  c.manifest_dir    = File.join(fixture_path, 'manifests')\n  c.manifest        = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'manifests', 'site.pp')\n  c.environmentpath = File.join(Dir.pwd, 'spec')\nend" }
+    File.open('spec/spec_helper.rb', 'w') { |file| file.puts "require 'rspec-puppet/spec_helper'\n" }
   end
 
   # setup the module dependencies for rspec-puppet testing
@@ -56,7 +66,7 @@ class RSpecPuppetSupport
     parsed = JSON.parse(File.read('metadata.json'))
 
     # grab dependencies if they exist
-    return if parsed['dependencies'].empty?
+    return unless parsed.key?('dependencies')
     parsed['dependencies'].each do |dependency_hash|
       # determine how the user wants to download the module dependency
       if dependency_hash.key?('git')
@@ -71,6 +81,7 @@ class RSpecPuppetSupport
         warn "#{dependency_hash['name']} has an unspecified, or specified but unsupported, download method."
       end
     end
+    Process.waitall
   end
 
   # download external module dependency with git
@@ -79,7 +90,11 @@ class RSpecPuppetSupport
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(git_url, '.git')}"
     # is the module present and already cloned with git? do a pull; otherwise, do a clone
-    File.directory?("#{path}/.git") ? system("git -C #{path} pull") : system("git clone #{args} #{git_url} #{path}")
+    begin
+      File.directory?("#{path}/.git") ? spawn("git -C #{path} pull") : spawn("git clone #{args} #{git_url} #{path}")
+    rescue Errno::ENOENT
+      warn 'git is not installed and cannot be used to retrieve dependency modules'
+    end
   end
 
   # download external module dependency with forge
@@ -87,7 +102,7 @@ class RSpecPuppetSupport
     private_class_method :method
     # is the module present? do an upgrade; otherwise, do an install
     subcommand = File.directory?("spec/fixtures/modules/#{forge_name}") ? 'upgrade' : 'install'
-    system("puppet module #{subcommand} --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
+    spawn("puppet module #{subcommand} --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
   end
 
   # download external module dependency with svn
@@ -96,7 +111,11 @@ class RSpecPuppetSupport
     # establish path to checkout module to
     path = "spec/fixtures/modules/#{File.basename(svn_url)}"
     # is the module present and already checked out with svn? do an update; otherwise, do a checkout
-    File.directory?("#{path}/.svn") ? system("svn update #{path}") : system("svn co #{args} #{svn_url} #{path}")
+    begin
+      File.directory?("#{path}/.svn") ? spawn("svn update #{path}") : spawn("svn co #{args} #{svn_url} #{path}")
+    rescue Errno::ENOENT
+      warn 'subversion is not installed and cannot be used to retrieve dependency modules'
+    end
   end
 
   # download external module dependency with hg
@@ -105,6 +124,10 @@ class RSpecPuppetSupport
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(hg_url)}"
     # is the module present and already cloned with hg? do a pull and update; otherwise do a clone
-    File.directory?("#{path}/.hg") ? system("hg --cwd #{path} pull; hg --cwd #{path} update") : system("hg clone #{args} #{hg_url} #{path}")
+    begin
+      File.directory?("#{path}/.hg") ? spawn("hg --cwd #{path} pull; hg --cwd #{path} update") : spawn("hg clone #{args} #{hg_url} #{path}")
+    rescue Errno::ENOENT
+      warn 'mercurial is not installed and cannot be used to retrieve dependency modules'
+    end
   end
 end

data/lib/puppet-check/ruby_parser.rb

@@ -9,7 +9,7 @@ class RubyParser
       # check ruby syntax
       begin
         # prevents ruby code from actually executing
-        catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}") }
+        catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}", file) }
       rescue ScriptError, StandardError => err
         PuppetCheck.settings[:error_files].push("#{file}:\n#{err}")
       else
@@ -18,7 +18,7 @@ class RubyParser
           require 'rubocop'
 
           # check RuboCop and collect warnings
-          rubocop_warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--format', 'emacs', file]) }
+          rubocop_warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--require', 'rubocop-performance', '--format', 'emacs', file]) }
           warnings = rubocop_warnings == '' ? '' : rubocop_warnings.split("#{File.absolute_path(file)}:").join('')
 
           # check Reek and collect warnings
@@ -37,8 +37,6 @@ class RubyParser
 
   # checks ruby template (.erb)
   def self.template(files)
-    return if files.empty?
-
     require 'erb'
 
     files.each do |file|
@@ -66,22 +64,22 @@ class RubyParser
       require 'rubocop'
       # cop named differently depending upon version
       filename_cop = RuboCop::Version::STRING.to_f >= 0.5 ? 'Naming/FileName' : 'Style/FileName'
+      # RuboCop is grumpy about non-snake_case filenames so disable the FileName check
+      rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},#{filename_cop}" : rc_args.concat(['--except', filename_cop])
     end
 
     files.each do |file|
       # check librarian puppet syntax
       begin
         # prevents ruby code from actually executing
-        catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}") }
+        catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}", file) }
       rescue SyntaxError, LoadError, ArgumentError => err
         PuppetCheck.settings[:error_files].push("#{file}:\n#{err}")
       # check librarian puppet style
       else
         if style
           # check Rubocop
-          # RuboCop is grumpy about non-snake_case filenames so disable the FileName check
-          rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},#{filename_cop}" : rc_args.concat(['--except', filename_cop])
-          warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--format', 'emacs', file]) }
+          warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--require', 'rubocop-performance', '--format', 'emacs', file]) }
 
           # collect style warnings
           next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.split("#{File.absolute_path(file)}:").join('')}") unless warnings.empty?

data/lib/puppet-check/tasks.rb

@@ -14,10 +14,10 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
     namespace :puppetcheck do
       desc 'Execute Puppet-Check file checks'
       task :file do
-        PuppetCheck.new.run(Dir.glob('*'))
+        PuppetCheck.new.run(PuppetCheck.settings, Dir.glob('*'))
       end
 
-      # rspec, rspec-puppet, and beaker tasks
+      # rspec and rspec-puppet tasks
       begin
         require 'rspec/core/rake_task'
         require_relative 'rspec_puppet_support'
@@ -30,22 +30,26 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
           task.pattern = spec_dirs.empty? ? 'skip_rspec' : spec_dirs
           task.rspec_opts = '-f json' if PuppetCheck.settings[:output_format] == 'json'
         end
-
-        desc 'Execute Beaker acceptance tests'
-        RSpec::Core::RakeTask.new(:beaker) do |task|
-          # generate tasks for all recognized directories and ensure acceptance tests inside module dependencies are ignored
-          acceptance_dirs = Dir.glob('**/acceptance').reject { |dir| dir =~ /fixtures/ }
-          task.pattern = acceptance_dirs.empty? ? 'skip_beaker' : acceptance_dirs
-          task.rspec_opts = '-f json' if PuppetCheck.settings[:output_format] == 'json'
-        end
       rescue LoadError
         desc 'RSpec is not installed.'
         task :spec do
-          puts 'RSpec is not installed. The RSpec/RSpecPuppet tasks will not be available.'
+          puts 'RSpec is not installed. The RSpec/RSpec-Puppet tasks will not be available.'
         end
-        desc 'RSpec is not installed.'
+      end
+
+      # beaker tasks
+      begin
+        require 'beaker/tasks/quick_start'
+
+        desc 'Execute Beaker acceptance tests'
+        task :beaker, %i[hypervisor] do |_, args|
+          args[:hypervisor] = 'vagrant' if args[:hypervisor].nil?
+          Rake::Task["beaker_quickstart:run_test[#{args[:hypervisor]}]"].invoke
+        end
+      rescue LoadError
+        desc 'Beaker is not installed.'
         task :beaker do
-          puts 'RSpec is not installed. The Beaker tasks will not be available.'
+          puts 'Beaker is not installed. The Beaker tasks will not be available.'
         end
       end