onceover 3.22.0 → 4.0.0

data/Gemfile

@@ -10,12 +10,13 @@ end
 
 group :test do
   # Required for the final controlrepo tests
+  gem 'rexml', '~> 3.3', '>= 3.3.9'
   gem 'toml-rb'
 end
 
 group :development do
-  gem 'pry'
   gem 'cucumber'
+  gem 'pry'
   gem 'rubocop'
   gem 'rubygems-tasks'
 end
@@ -29,3 +30,8 @@ end
 if File.exist?(File.join(Dir.home, '.gemfile'))
   eval(File.read(File.join(Dir.home, '.gemfile')), binding)
 end
+
+group :release do
+  gem 'faraday-retry', require: false
+  gem 'github_changelog_generator', require: false
+end

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,5 +1,10 @@
 # Onceover
 
+[![License](https://img.shields.io/github/license/voxpupuli/onceover.svg)](https://github.com/voxpupuli/onceover/blob/master/LICENSE)
+[![Donated by dylanratcliffe](https://img.shields.io/badge/donated%20by-dylanratcliffe-fb7047.svg)](#transfer-notice)
+[![RubyGem Version](https://img.shields.io/gem/v/onceover.svg)](https://rubygems.org/gems/onceover)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/onceover.svg)](https://rubygems.org/gems/onceover)
+
 *The gateway drug to automated infrastructure testing with Puppet*
 
 Onceover is a tool to automatically run basic tests on an entire Puppet control repository.
@@ -8,8 +13,6 @@ It includes automatic parsing of the `Puppetfile`, `environment.conf` and others
 
 **New in v3.19.1: I've reversed the decision to have onceover use `site.pp` in the same way Puppet does. From now on your `manifest` setting in `environment.conf` will be ignored and your `site.pp` will only be used if you explicitly set the `manifest` option in the CLI or config file.**
 
-[![Build Status](https://travis-ci.com/dylanratcliffe/onceover.svg?branch=master)](https://travis-ci.com/dylanratcliffe/onceover) [![Build status](https://ci.appveyor.com/api/projects/status/2ys2ggkgln69hmyf/branch/master?svg=true)](https://ci.appveyor.com/project/dylanratcliffe/onceover/branch/master)
-
 ## Table of Contents
 
   - [Overview](#overview)
@@ -21,6 +24,7 @@ It includes automatic parsing of the `Puppetfile`, `environment.conf` and others
     - [Puppetfile](#puppetfile)
   - [Spec testing](#spec-testing)
     - [Adding your own spec tests](#adding-your-own-spec-tests)
+    - [Vendored Modules](#vendored-modules)
   - [Using Workarounds](#using-workarounds)
   - [Extra tooling](#extra-tooling)
     - [Plugins](#plugins)
@@ -33,6 +37,7 @@ It includes automatic parsing of the `Puppetfile`, `environment.conf` and others
     - [Ruby Warnings](#ruby-warnings)
     - [Rake tasks](#rake-tasks)
       - [generate_fixtures](#generate_fixtures)
+      - [generate_vendor_cache](#generate_vendor_cache)
 
 ## Overview
 
@@ -65,6 +70,7 @@ This toolset requires some [configuration](#configuration) before it can be used
     ```shell
     bundle exec onceover init
     ```
+
 1. Run your spec tests!
 
     ```shell
@@ -179,6 +185,7 @@ Hopefully this config file will be fairly self explanatory once you see it, but
     **Note**: The facts are available through the `node_facts` hash and the trusted facts as `trusted_facts`.
 
     Exmaple:
+
     ```yaml
     after:
       - "puts 'Test finished running'"
@@ -200,6 +207,7 @@ Hopefully this config file will be fairly self explanatory once you see it, but
     This setting overrides defaults for the `Onceover::Controlrepo` class' `opts` hash.
 
     Example:
+
     ```yaml
     opts:
       :facts_dirs:                           # Remember: `opts` keys are symbols!
@@ -385,9 +393,10 @@ In this case, you're all set and onceover will auto-magically pick those up for
 **Note**: The top level `trusted` hash takes precidence over the `trusted[extensions]` hash nested under `values`. Meaning that if you have any specified at the top level, any nested ones will not be considered. So pick **ONE** method and stick with that.
 
 #### Trusted Certname
-**Note:** When testing with Puppet >= 4.3 the trusted facts hash will have the standard trusted fact keys (certname, domain, and hostname) populated based on the node name (as set with :node). 
 
-To support the resolution of the trusted fact `certname` in auto-generated spec tests, onceover will set `:node` to the value of `trusted[certname]` where present in the source factset. 
+**Note:** When testing with Puppet >= 4.3 the trusted facts hash will have the standard trusted fact keys (certname, domain, and hostname) populated based on the node name (as set with :node).
+
+To support the resolution of the trusted fact `certname` in auto-generated spec tests, onceover will set `:node` to the value of `trusted[certname]` where present in the source factset.
 
 For example: A spec test generated by the factset below would result in `:node` == `node.puppetlabs.net`.
 
@@ -425,8 +434,9 @@ If `trusted[certname]` is absent, the value of `:node` will default to the FQDN
 ```
 
 See the following rspec-puppet links for more information:
- - [Specifying the FQDN of the test node](https://github.com/puppetlabs/rspec-puppet#specifying-the-fqdn-of-the-test-node)
- - [Specifying trusted facts](https://github.com/puppetlabs/rspec-puppet#specifying-trusted-facts)
+
+- [Specifying the FQDN of the test node](https://github.com/puppetlabs/rspec-puppet#specifying-the-fqdn-of-the-test-node)
+- [Specifying trusted facts](https://github.com/puppetlabs/rspec-puppet#specifying-trusted-facts)
 
 #### Trusted External Data
 
@@ -488,7 +498,7 @@ In these instances it may be worth creating a hierarchy level that simply includ
 
 Organisations often reference modules from their own git servers in the `Puppetfile`, like this:
 
-```
+```ruby
 mod "puppetlabs-apache",
   :git => "https://git.megacorp.com/pup/puppetlabs-apache.git",
   :tag => "v5.4.0"
@@ -498,7 +508,7 @@ Under the hood, `onceover` uses `r10k` to download the modules in your `Puppetfi
 If you get errors downloading modules from `git`, its because `r10k`'s call to your underlying `git` command has failed.
 `onceover` tells you the command that `r10k` tried to run, so if you get an error like this:
 
-```
+```text
 INFO     -> Updating module /Users/dylan/control-repo/.onceover/etc/puppetlabs/code/environments
 /production/modules/apache
 ERROR    -> Command exited with non-zero exit code:
@@ -516,14 +526,17 @@ Exit code: 128
 
 Then the approach to debug it would be to run the command that Onceover suggested:
 
-```
+```shell
 git --git-dir /Users/dylan/.r10k/git/ssh---git.megacorp.com-pup-puppetlabs_apache.git fetch origin --prune
 ```
 
 In this case, running the command interactively gives us a prompt to add the server to our `~/.ssh/known_hosts` file, which fixes the problem permanently:
 
-```
+```shell
 $ git --git-dir /Users/dylan/.r10k/git/ssh---git.megacorp.com-pup-puppetlabs_apache.git fetch origin --prune
+```
+
+```text
 The authenticity of host 'git.megacorp.com (123.456.789.101)' can't be established.
 ...
 Warning: Permanently added 'git.megacorp.com,123.456.789.101' (RSA) to the list of known hosts.
@@ -605,13 +618,37 @@ If you want to see Puppet's output, you can set the `SHOW_PUPPET_OUTPUT` environ
 
 `SHOW_PUPPET_OUTPUT=true onceover run spec`
 
+### Vendored Modules
+
+As of Puppet 6.0 some resource types were removed from Puppet and repackaged as individual modules. These supported type modules are still included in the `puppet-agent` package, so you don't have to download them from the Forge. However, this does not apply to the `puppet` gem used when spec testing. This frequently results in users wondering why their Puppet manifests apply just fine on a node, but their tests fail with messages like `Unknown resource type: cron_core` for example. A common workaround for this problem was to add said modules into your Puppetfile, thus requiring manual management.
+
+Onceover now has the ability to remove that manual process for you by querying Github's API to determine which versions are in use by the version of the [puppet-agent package](https://github.com/puppetlabs/puppet-agent/tree/main/configs/components) you are testing against.
+
+This functionality is opt in, so to use it configure the following:
+
+```yaml
+# onceover.yaml
+opts:
+  auto_vendored: true
+```
+
+or on the cli:
+
+```shell
+bundle exec onceover run spec --auto_vendored=true
+```
+
+Essentially what this is doing is resolving any of these [supported type modules](https://www.puppet.com/docs/puppet/8/type#supported-type-modules-in-puppet-agent) that are not already specified in your Puppetfile, and adding them to the copy Onceover uses to deploy into its working directory structure.
+
+CI/CD pipeline users are encouraged to provide Onceover with a cache of the module versions to test against in order to avoid hitting Githubs API ratelimit. To do so, the [generate_vendor_cache](#generate_vendor_cache) rake task can be used to populate the cache into your `spec/vendored_modules` directory.
+
 ## Using workarounds
 
 There may be situations where you cannot test everything that is in your puppet code, some common reasons for this include:
 
-  - Code is destined for a Puppet Master but the VM image is not a Puppet Master which means we can't restart certain services etc.
-  - A file is being pulled from somewhere that is only accessible in production
-  - Something is trying to connect to something else that does not exist
+- Code is destined for a Puppet Master but the VM image is not a Puppet Master which means we can't restart certain services etc.
+- A file is being pulled from somewhere that is only accessible in production
+- Something is trying to connect to something else that does not exist
 
 Fear not! There is a solution for this, it's also a good way to practice writing *nasty* puppet code. For this exact purpose I have added the ability for onceover to include extra bits of code in the tests to fix things like this. All you need to do is put a file/s containing puppet code here:
 
@@ -673,8 +710,8 @@ Onceover now allows for plugins. To use a plugin simply install a gem with a nam
 
 Useful plugins:
 
-  - [onceover-codequality](https://github.com/declarativesystems/onceover-codequality) _Check lint and syntax_
-  - [onceover-octocatalog-diff](https://github.com/dylanratcliffe/onceover-octocatalog-diff) _See the differences between two versions of a catalog_
+- [onceover-codequality](https://github.com/declarativesystems/onceover-codequality) _Check lint and syntax_
+- [onceover-octocatalog-diff](https://github.com/voxpupuli/onceover-octocatalog-diff) _See the differences between two versions of a catalog_
 
 If you want to write your own plugin, take a look at [onceover-helloworld](https://github.com/declarativesystems/onceover-helloworld) to help you get started.
 
@@ -879,6 +916,12 @@ fixtures:
 
 Notice that the symlinks are not the ones that we provided in `environment.conf`? This is because the rake task will go into each of directories, find the modules and create a symlink for each of them (This is what rspec expects).
 
+#### generate_vendor_cache
+
+`bundle exec rake generate_vendor_cache`
+
+This task will query Github's API to determine the versions of the vendored modules in use by the version of the puppet agent you are testing against, and cache that information in `control-repo/spec/vendored_modules`. This way your pipelines won't need to reach out for this information each time Onceover is ran with `auto_vendored` enabled.
+
 ## Developing Onceover
 
 Install gem dependencies:
@@ -897,23 +940,26 @@ Execute tests
 
 Cheers to all of those who helped out:
 
-  - @jessereynolds
-  - @op-ct
-  - @GeoffWilliams
-  - @beergeek
-  - @jairojunior
-  - @natemccurdy
-  - @aardvark
-  - @Mandos
-  - @Nekototori
-  - @LMacchi
-  - @tabakhase
-  - @binford2k
-  - @raphink
-  - @tequeter
-  - @alexjfisher
-  - @smortex
-  - @16c7x
-  - @neomilium
-  - @chlawren
-
+- @jessereynolds
+- @op-ct
+- @GeoffWilliams
+- @beergeek
+- @jairojunior
+- @natemccurdy
+- @aardvark
+- @Mandos
+- @Nekototori
+- @LMacchi
+- @tabakhase
+- @binford2k
+- @raphink
+- @tequeter
+- @alexjfisher
+- @smortex
+- @16c7x
+- @neomilium
+- @chlawren
+
+## Transfer Notice
+
+This project was originally authored by dylanratcliffe. The maintainer preferred that Vox Pupuli take ownership of the project for future improvement and maintenance. Existing pull requests and issues were transferred over, please fork and continue to contribute here instead of voxpupuli-onceover.

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems/tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
-require 'rubocop/rake_task'
 require 'puppet/version'
 Gem::Tasks.new
 
@@ -33,15 +32,13 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = "--tags \"#{skip_string}\"" # Any valid command line option can go here.
 end
 
-
 task default: :full_tests
 
-
 desc "Run unit tests"
-task rspec_unit_tests: [:syntax, :rubocop, :spec]
+task rspec_unit_tests: [:syntax, :spec]
 
 desc "Run acceptance cucumber tests"
-task cucumber_acceptance_tests: [:syntax, :rubocop, :fixtures, :cucumber]
+task cucumber_acceptance_tests: [:syntax, :fixtures, :cucumber]
 
 desc "Run full set of tests"
 task full_tests: [:rspec_unit_tests, :cucumber_acceptance_tests]
@@ -60,16 +57,28 @@ task :syntax do
   end
 end
 
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.options << '--display-cop-names'
-  task.formatters = ['simple']
-  task.patterns = [
-    "lib/**/*.rb",
-    "ext/**/*.rb",
-  ]
-end
-
 task :fixtures do
   system 'git submodule init && git submodule update --recursive'
   raise "Couldn't clone controlrepo to fixtures directory" unless $?.success?
 end
+
+begin
+  require 'voxpupuli/rubocop/rake'
+rescue LoadError
+  # the voxpupuli-rubocop gem is optional
+end
+
+begin
+  require 'rubygems'
+  require 'github_changelog_generator/task'
+rescue LoadError
+  # Do nothing if no required gem installed
+else
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog github_actions]
+    config.user = 'voxpupuli'
+    config.project = 'onceover'
+    gem_version = Gem::Specification.load("#{config.project}.gemspec").version
+    config.future_release = gem_version
+  end
+end

data/features/auto_vendored.feature

@@ -0,0 +1,27 @@
+@vendored @puppet6
+Feature: Automatically resolve modules vendored with puppet-agent package
+  Onceover should optionally attempt to resolve these vendored modules so that
+  users do not need to maintain these in their Puppetfile's unless they have a reason
+  to do so
+
+  Background:
+    Given onceover executable
+
+  Scenario: Auto resolve disabled and Puppetfile empty
+    Given initialized control repo "vendored"
+    When I run onceover command "run spec" with class "role::cron"
+    Then I should see error with message pattern "Evaluation Error: Error while evaluating a Resource Statement, Unknown resource type: 'cron'"
+
+  Scenario: Auto resolve enabled and Puppetfile empty
+    Given existing control repo "vendored"
+    When I run onceover command "run spec --auto_vendored=true" with class "role::cron"
+    Then the temporary Puppetfile should contain /mod 'puppetlabs-cron_core',\n.*git: 'https://github.com/puppetlabs\/puppetlabs-cron_core.git',\n.*ref: 'refs\/tags\/.*'/
+    And I should not see any errors
+
+  Scenario: Auto resolve enabled and cron_core specified in Puppetfile
+    Given existing control repo "vendored"
+    When I run onceover command "run spec --auto_vendored=true" with --puppetfile Puppetfile.cron
+    Then I should see message pattern "cron_core found in Puppetfile. Using the specified version"
+    Then the temporary Puppetfile should contain /mod 'puppetlabs\/cron_core'/
+    And I should not see any errors
+

data/features/step_definitions/common.rb

@@ -27,19 +27,19 @@ Given(/^control repo "([^"]*)" without "([^"]*)"$/) do |controlrepo_name, filena
   FileUtils.rm_rf "#{@repo.root_folder}/#{filename}"
 end
 
-When(/^I run onceover command "([^"]*)"$/)  do |command|
+When(/^I run onceover command "([^"]*)"$/) do |command|
   @cmd.command = "#{command} --debug"
   log(@cmd)
   @cmd.run
 end
 
-When(/^I run onceover command "([^"]*)" with class "([^"]*)"$/)  do |command, cls|
+When(/^I run onceover command "([^"]*)" with class "([^"]*)"$/) do |command, cls|
   @cmd.command = "#{command} --classes #{cls}"
   log(@cmd)
   @cmd.run
 end
 
-When(/^I run onceover command "([^"]*)" with class "([^"]*)" on nodes "([^"]*)"$/)  do |command, cls, nodes|
+When(/^I run onceover command "([^"]*)" with class "([^"]*)" on nodes "([^"]*)"$/) do |command, cls, nodes|
   @cmd.command = "#{command} --classes #{cls} --nodes #{nodes}"
   log(@cmd)
   @cmd.run
@@ -109,7 +109,7 @@ Then(/^I should (not )?see message pattern "([^"]*)"$/) do |notword, msg_regexp|
   end
 end
 
-When(/^I run onceover command "([^"]*)" with \-\-puppetfile ([^"]*)$/)  do |command, puppetfile|
+When(/^I run onceover command "([^"]*)" with \-\-puppetfile ([^"]*)$/) do |command, puppetfile|
   puppetfile_path = @repo.root_folder + puppetfile
   @cmd.command = "#{command} --puppetfile #{puppetfile_path} --debug"
   log(@cmd)
@@ -117,7 +117,7 @@ When(/^I run onceover command "([^"]*)" with \-\-puppetfile ([^"]*)$/)  do |comm
 end
 
 Then(/^([^"]*) should be copied to Puppetfile$/) do |puppetfile|
-  source =  @repo.root_folder + puppetfile
+  source = @repo.root_folder + puppetfile
   destination = @repo.onceover_temp_puppetfile
   expect(IO.read(source)).to eq(IO.read(destination))
 end

data/features/support/cache_helper.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 
 class Cache_Helper
-
   def cache_exists?
     File.directory?(dir + '/.onceover')
   end

data/features/support/command_helper.rb

@@ -1,7 +1,6 @@
 require "open3"
 
 class Command_Helper
-
   attr_reader(:output, :result)
 
   attr_writer(:command, :params, :controlrepo)
@@ -30,5 +29,4 @@ class Command_Helper
   def to_s
     return generate_command
   end
-
 end

data/features/support/controlrepo_helper.rb

@@ -1,5 +1,4 @@
 class ControlRepo_Helper
-
   attr_reader :tmp_folder
 
   def initialize( name )
@@ -34,5 +33,4 @@ class ControlRepo_Helper
   def add_line_to_puppetfile( line )
     open(puppetfile, 'a') { |f| f.puts line }
   end
-
 end

data/lib/onceover/beaker/spec_helper.rb

@@ -35,17 +35,17 @@ RSpec.configure do |c|
 
   #default option values
   defaults = {
-    :nodeset     => 'onceover-nodes',
+    :nodeset => 'onceover-nodes',
   }
   #read env vars
   env_vars = {
-    :color       => ENV['BEAKER_color'] || ENV.fetch('RS_COLOR', nil),
-    :nodeset     => ENV['BEAKER_set'] || ENV.fetch('RS_SET', nil),
+    :color => ENV['BEAKER_color'] || ENV.fetch('RS_COLOR', nil),
+    :nodeset => ENV['BEAKER_set'] || ENV.fetch('RS_SET', nil),
     :nodesetfile => ENV['BEAKER_setfile'] || ENV.fetch('RS_SETFILE', nil),
-    :provision   => ENV['BEAKER_provision'] || ENV.fetch('RS_PROVISION', nil),
-    :keyfile     => ENV['BEAKER_keyfile'] || ENV.fetch('RS_KEYFILE', nil),
-    :debug       => ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil),
-    :destroy     => ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil),
+    :provision => ENV['BEAKER_provision'] || ENV.fetch('RS_PROVISION', nil),
+    :keyfile => ENV['BEAKER_keyfile'] || ENV.fetch('RS_KEYFILE', nil),
+    :debug => ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil),
+    :destroy => ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil),
   }.compact
   #combine defaults and env_vars to determine overall options
   options = defaults.merge(env_vars)