onceover 3.17.2 → 3.19.1

data/lib/onceover/group.rb

@@ -60,6 +60,7 @@ class Onceover
       @@all
     end
 
+    # rubocop:disable Lint/DuplicateBranch
     def self.valid_members?(members)
       # Check that they are all the same type
       # Also catch any errors to assume it's invalid
@@ -71,9 +72,10 @@ class Onceover
         else
           return false
         end
-      rescue StandardErroor
+      rescue StandardError
         return false
       end
     end
+    # rubocop:enable Lint/DuplicateBranch
   end
 end

data/lib/onceover/rspec/formatters.rb

@@ -12,7 +12,9 @@ class OnceoverFormatter
   )
 
   COMPILATION_ERROR      = %r{error during compilation: (?<error>.*)}
+  # rubocop:disable Lint/MixedRegexpCaptureTypes
   ERROR_WITH_LOCATION    = %r{(?<error>.*?)\s(at )?(\((file: (?<file>.*?), )?line: (?<line>\d+)(, column: (?<column>\d+))?\))(; )?}
+  # rubocop:enable Lint/MixedRegexpCaptureTypes
   ERROR_WITHOUT_LOCATION = %r{(?<error>.*?)\son node}
 
   def initialize output
@@ -72,6 +74,8 @@ class OnceoverFormatter
     @output << "\n"
   end
 
+  # rubocop:disable Style/CombinableLoops
+  #
   # This method takes a notification and formats it into a hash that can be
   # printed easily
   def extract_failures notification
@@ -90,6 +94,7 @@ class OnceoverFormatter
 
     grouped
   end
+  # rubocop:enable Style/CombinableLoops
 
   # Extaracts data out of RSpec failres
   def extract_failure_data(fails)
@@ -309,4 +314,4 @@ class FailureCollector
       end
     }
   end
-end
+end

data/lib/onceover/runner.rb

@@ -1,4 +1,5 @@
 require 'backticks'
+require 'io/console'
 
 class Onceover
   class Runner
@@ -24,8 +25,8 @@ class Onceover
       FileUtils.mkdir_p("#{@repo.tempdir}/spec/classes")
       FileUtils.mkdir_p("#{@repo.tempdir}/spec/acceptance/nodesets")
 
-      # Copy our entire spec directory over
-      FileUtils.cp_r("#{@repo.spec_dir}", "#{@repo.tempdir}")
+      # Copy specified spec files over
+      @config.copy_spec_files(@repo)
 
       # Create the Rakefile so that we can take advantage of the existing tasks
       @config.write_rakefile(@repo.tempdir, "spec/classes/**/*_spec.rb")
@@ -36,8 +37,6 @@ class Onceover
       # Create spec_helper_accpetance.rb
       @config.write_spec_helper_acceptance("#{@repo.tempdir}/spec", @repo)
 
-      # TODO: Remove all tests that do not match set tags
-
       if @mode.include?(:spec)
         # Verify all of the spec tests
         @config.spec_tests.each { |test| @config.verify_spec_test(@repo, test) }
@@ -83,8 +82,10 @@ class Onceover
           ENV['RUBYOPT']   = ENV['RUBYOPT'].to_s + ' -W0'
         end
 
-        #`bundle install --binstubs`
-        #`bin/rake spec_standalone`
+        # NOTE: This is the way to provide options to rspec according to:
+        # https://github.com/puppetlabs/puppetlabs_spec_helper/blob/master/lib/puppetlabs_spec_helper/rake_tasks.rb#L51
+        ENV['CI_SPEC_OPTIONS'] = ENV['CI_SPEC_OPTIONS'].to_s + @config.filter_tags.map { |tag| " --tag #{tag}" }.join unless @config.filter_tags.nil?
+
         if @config.opts[:parallel]
           logger.debug "Running #{@command_prefix}rake parallel_spec from #{@repo.tempdir}"
           result = run_command(@command_prefix.strip.split, 'rake', 'parallel_spec')

data/lib/onceover/test.rb

@@ -25,10 +25,11 @@ class Onceover
       @classes = []
       @test_config = test_config
       @test_config.delete('classes') # remove classes from the config
-      @tags = @test_config['tags']
 
       # Make sure that tags are an array
-      @test_config['tags'] = [@test_config['tags']].flatten if @test_config['tags']
+      @test_config['tags'] ||= []
+      @test_config['tags'] = [@test_config['tags']].flatten
+      @tags = @test_config['tags']
 
       # Get the nodes we are working on
       if Onceover::Group.find(on_this)

data/lib/onceover/testconfig.rb

@@ -50,6 +50,7 @@ class Onceover
       @before_conditions = config['before'] || []
       @after_conditions  = config['after']
       @strict_variables  = opts[:strict_variables] ? 'yes' : 'no'
+      @included_specs    = [config['include_spec_files'] || ['**/*']].flatten
       
       # Set dynamic defaults for format
       if Array(opts[:format]) == [:defaults]
@@ -236,6 +237,19 @@ class Onceover
       )
     end
 
+    def copy_spec_files(repo)
+      source_files = @included_specs.map { |glob| Dir.glob "#{repo.spec_dir}/#{glob}" }.flatten.uniq
+      source_files.each do |source_file|
+        target_file = File.join(repo.tempdir, 'spec', source_file.sub(/^#{repo.spec_dir}/, ''))
+        if File.directory?(source_file)
+          FileUtils.cp_r source_file, target_file unless File.exists? target_file
+        else
+          FileUtils.mkdir_p File.dirname target_file
+          FileUtils.cp source_file, target_file
+        end
+      end
+    end
+
     def create_fixtures_symlinks(repo)
       logger.debug "Creating fixtures symlinks"
       FileUtils.rm_rf("#{repo.tempdir}/spec/fixtures/modules")
@@ -275,16 +289,25 @@ class Onceover
           # Remove tests that do not have matching tags
           tests.keep_if do |test|
             filter_list.any? do |filter|
-              if test.send(method)
-                test.send(method).include?(filter)
-              else
-                false
-              end
+              filter_test test, method, filter
             end
           end
         end
       end
       tests
     end
+
+    def filter_test(test, method, filter)
+      if test.send(method)
+        if method == 'tags' && filter.start_with?('~')
+          filter = filter.sub(/^~/, '')
+          ! test.send(method).include?(filter)
+        else
+          test.send(method).include?(filter)
+        end
+      else
+        false
+      end
+    end
   end
 end

data/onceover.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.17.2"
+  s.version     = "3.19.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'colored', '~> 1.2'
   s.add_runtime_dependency 'cri', '>= 2.6'
   s.add_runtime_dependency 'deep_merge', '>= 1.0.0'
-  s.add_runtime_dependency 'facter', '< 4.0.0'
   s.add_runtime_dependency 'git'
   s.add_runtime_dependency 'logging', '>= 2.0.0'
   s.add_runtime_dependency 'multi_json', '~> 1.10'
@@ -37,4 +36,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'terminal-table', '>= 1.8.0'
   s.add_runtime_dependency 'versionomy', '>= 0.5.0'
 
+  s.add_development_dependency 'cucumber', '~> 4.1'
+  s.add_development_dependency 'pry', '~> 0.13.1'
+  s.add_development_dependency 'rubocop', '~> 1.6', '>= 1.6.1'
+  s.add_development_dependency 'rubygems-tasks', '~> 0.2.5'
 end

data/spec/fixtures/controlrepos/basic/manifests_alternate/site.pp

@@ -0,0 +1,2 @@
+# This will fail all compilations so that we can quickly tell if it's being used
+fail('Using alternate site.pp')

data/spec/fixtures/controlrepos/caching/Puppetfile

@@ -1,17 +1,17 @@
-forge "http://forge.puppetlabs.com"
-#
-# I want to download some modules to check if r10k feature in Onceover works correctly.
-#
-
-# Versions should be updated to be the latest at the time you start
-mod "puppetlabs/stdlib",      '4.11.0'
-
-# Modules from Git
-# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
-mod 'apache',
- :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
- :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
-
-#mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :branch => 'docs_experiment'
+forge "http://forge.puppetlabs.com"
+#
+# I want to download some modules to check if r10k feature in Onceover works correctly.
+#
+
+# Versions should be updated to be the latest at the time you start
+mod "puppetlabs/stdlib",      '4.11.0'
+
+# Modules from Git
+# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+mod 'apache',
+ :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+ :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :branch => 'docs_experiment'

data/spec/fixtures/controlrepos/caching/manifests/site.pp

@@ -29,4 +29,5 @@ node default {
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }
+  fail('This was using the manifest setting from environment.conf')
 }

data/spec/fixtures/controlrepos/custom_puppetfile/Puppetfile.custom

@@ -0,0 +1,3 @@
+forge "http://forge.puppetlabs.com"
+
+mod "puppet/extlib"

data/spec/fixtures/controlrepos/custom_puppetfile/environment.conf

@@ -0,0 +1,7 @@
+modulepath          = site:modules:$basemodulepath
+
+# Comments!    
+
+value_with_equals = 'foo=bar'
+
+config_version      = 'scripts/config_version.sh $environmentpath $environment'

data/spec/fixtures/controlrepos/windows/Puppetfile

@@ -1,3 +1,8 @@
 forge "http://forge.puppetlabs.com"
 
-mod 'puppetlabs-acl', '3.1.1'
+mod 'puppetlabs-acl', '3.2.1'
+mod 'puppetlabs-chocolatey', '5.2.0'
+mod 'puppetlabs-stdlib', '6.5.0'
+mod 'puppetlabs-powershell', '4.1.0'
+mod 'puppetlabs-pwshlib', '0.6.3'
+mod 'puppetlabs-registry', '3.2.0'

data/spec/fixtures/controlrepos/windows/site-modules/role/manifests/choco.pp

@@ -0,0 +1,9 @@
+# Choco
+class role::choco {
+  include ::chocolatey
+
+  package { 'winzip':
+    ensure   => 'present',
+    provider => 'chocolatey',
+  }
+}

data/templates/test_spec.rb.erb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% test.classes.each do |cls| -%>
-describe "<%= cls.name %>" do
+describe "<%= cls.name %>"<%= test.tags.map { |tag| ",#{tag}: true "}.join %> do
 
 <% test.nodes.each do |node| -%>
   context "using fact set <%= node.name %>" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.17.2
+  version: 3.19.1
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +248,68 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 description: Automatically generates tests for your Puppet code
 email:
 - dylan.ratcliffe@puppet.com
@@ -270,14 +318,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
 - ".gitmodules"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
-- appveyor.yml
 - bin/onceover
 - factsets/AIX-6.1-powerpc.json
 - factsets/AIX-7.1-powerpc.json
@@ -287,10 +335,14 @@ files:
 - factsets/CentOS-6.6-32.json
 - factsets/CentOS-6.6-64.json
 - factsets/CentOS-7.0-64.json
+- factsets/CentOS-8.3.2011-64.json
+- factsets/Debian-10.4-64.json
 - factsets/Debian-6.0.10-32.json
 - factsets/Debian-6.0.10-64.json
 - factsets/Debian-7.8-32.json
 - factsets/Debian-7.8-64.json
+- factsets/Debian-8.11-64.json
+- factsets/Debian-9.12-64.json
 - factsets/RHEL-6.7.json
 - factsets/RHEL-7.4.json
 - factsets/SLES-11.3-64.json
@@ -300,6 +352,7 @@ files:
 - factsets/Ubuntu-14.04-32.json
 - factsets/Ubuntu-14.04-64.json
 - factsets/Ubuntu-18.04-64.json
+- factsets/Ubuntu-20.04-64.json
 - factsets/Windows_Server-2008r2-64.json
 - factsets/Windows_Server-2012r2-64.json
 - factsets/solaris-10_u9-sparc-64.json
@@ -347,6 +400,7 @@ files:
 - spec/fixtures/controlrepos/basic/hieradata/common.yaml
 - spec/fixtures/controlrepos/basic/hieradata/nodes/example-node.yaml
 - spec/fixtures/controlrepos/basic/manifests/site.pp
+- spec/fixtures/controlrepos/basic/manifests_alternate/site.pp
 - spec/fixtures/controlrepos/basic/site/profile/manifests/base.pp
 - spec/fixtures/controlrepos/basic/site/profile/manifests/example.pp
 - spec/fixtures/controlrepos/basic/site/role/manifests/database_server.pp
@@ -374,6 +428,8 @@ files:
 - spec/fixtures/controlrepos/caching/spec/r10k.yaml
 - spec/fixtures/controlrepos/control_branch/Puppetfile
 - spec/fixtures/controlrepos/control_branch/environment.conf
+- spec/fixtures/controlrepos/custom_puppetfile/Puppetfile.custom
+- spec/fixtures/controlrepos/custom_puppetfile/environment.conf
 - spec/fixtures/controlrepos/factsets/environment.conf
 - spec/fixtures/controlrepos/factsets/site/profile/manifests/base.pp
 - spec/fixtures/controlrepos/factsets/site/role/manifests/example.pp
@@ -394,6 +450,7 @@ files:
 - spec/fixtures/controlrepos/windows/Puppetfile
 - spec/fixtures/controlrepos/windows/environment.conf
 - spec/fixtures/controlrepos/windows/site-modules/role/manifests/acl.pp
+- spec/fixtures/controlrepos/windows/site-modules/role/manifests/choco.pp
 - spec/fixtures/controlrepos/windows/site-modules/role/manifests/groups.pp
 - spec/fixtures/controlrepos/windows/site-modules/role/manifests/users.pp
 - spec/fixtures/controlrepos/windows/site/role/manifests/groups.pp