onceover 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff59bf1f83e427cce7214bce17bb465c91d7f44
-  data.tar.gz: 2e297d36639571c1f41b04c8c76a7c2c664455bc
+  metadata.gz: 4b0094b1e1122cb55139f0d0a4357deb58388ab6
+  data.tar.gz: efe48aca14a7ddaa6838f6a4c13c19bc82e2f53f
 SHA512:
-  metadata.gz: 6a0f437ece3e1d045d8650e49e2d0566ea4146f6249297667b9af9fd4f554da230a6e14348a898bf502046986d26d3c45d4f0c3e4b11828951fc38b69756064e
-  data.tar.gz: 106802f9adc91a447be750339e51540cb44a65d63ac17c23f2041c80f857e46151c26a0ebb1de14d70212929dca20a837405b978067e13bd88a1105a4090babf
+  metadata.gz: b8b58914063953bdf9a4705f718e5db287990bc12d6f37208d881d26726a185c735a8713583510de1a536ffa36f3f5049cccba6cb7a318303d7aa8e15cbb6bb7
+  data.tar.gz: 6cdf239e35493e7391b51e7bea4e01be6bdb384b22a3510c93e6f211d17b0e584a282fb1521d1cbe6ea7d00e123dcd76644c3ba6209abc506c7b1d72253d8fb0

data/README.md

@@ -85,7 +85,7 @@ If we are doing acceptance testing then we need information about how to spin up
 
 ### onceover.yaml
 
-`spec/onceover.yaml`
+`spec/onceover.yaml` _(override with environment variable: `ONCEOVER_YAML`)_
 
 Hopefully this config file will be fairly self explanatory once you see it, but basically this is the place where we define what classes we want to test and the [factsets](#factsets)/[nodesets](#nodesets) that we want to test them against. The config file must contain the following sections:
 
@@ -114,6 +114,25 @@ In the example below we have referred to `centos6a` and `centos7b` in all of our
   - **type** *statement or rvalue*
   - **returns** *Optional: A value to return*
 
+**opts** The `opts` section overrides defaults for the `Onceover::Controlrepo` class' `opts` hash.
+
+```yaml
+opts:
+  :facts_dirs:        # Remember: `opts` keys are symbols!
+    - 'spec/factsets' # Limit factsets to files in this repository
+  :debug: true        # set the `logger.level` to debug
+```
+
+```yaml
+opts:
+  # profiles include a legacy module named `site::`
+  :profile_regex: '^(profile|site)::'
+
+  # factset filenames use the extension`.facts` instead of `.json`
+  :facts_files:
+    - 'spec/factsets/*.facts'
+```
+
 A full example:
 
 ```yaml
@@ -166,6 +185,10 @@ functions:
   query_resources:
     type: rvalue
     returns: []
+
+opts:
+  :facts_dirs:
+    - spec/factsets
 ```
 
 **Include/Exclude syntax:** This can be used with either `node_groups` or `class_groups` and allows us to save some time by using existing groups to create new ones e.g.

data/lib/onceover/controlrepo.rb

@@ -98,24 +98,35 @@ class Onceover
         end
       end
 
+      @onceover_yaml    = ENV['ONCEOVER_YAML'] || opts[:onceover_yaml] || File.expand_path("#{@root}/spec/onceover.yaml")
+
+      if File.exists?(@onceover_yaml) && _data = YAML.load_file(@onceover_yaml)
+        opts.merge!(_data.fetch('opts',{})||{})
+      end
+      opts.fetch(:facts_dir,'').sub!(%r{^[^/.].+} ){|path| File.expand_path(path,@root)}
+      opts.fetch(:facts_files,[]).map!{|path| path =~ %r{^[/.]} ? path : File.expand_path(path, @root)}
+
       @environmentpath  = opts[:environmentpath] || 'etc/puppetlabs/code/environments'
       @puppetfile       = opts[:puppetfile] || File.expand_path('./Puppetfile',@root)
       @environment_conf = opts[:environment_conf] || File.expand_path('./environment.conf',@root)
-      @facts_dir        = opts[:facts_dir] || File.expand_path('./spec/factsets',@root)
       @spec_dir         = opts[:spec_dir] || File.expand_path('./spec',@root)
-      @facts_files      = opts[:facts_files] || [Dir["#{@facts_dir}/*.json"],Dir["#{File.expand_path('../../../factsets',__FILE__)}/*.json"]].flatten
+      @facts_dir        = opts[:facts_dir] || File.expand_path('factsets',@spec_dir)
+      _facts_dirs       = [@facts_dir, File.expand_path('../../../factsets',__FILE__)]
+      _facts_files      = opts[:facts_files] || _facts_dirs.map{|d| File.join(d,'*.json')}
+      @facts_files      = _facts_files.map{|_path| Dir[_path]}.flatten
+
       @nodeset_file     = opts[:nodeset_file] || File.expand_path('./spec/acceptance/nodesets/onceover-nodes.yml',@root)
-      @role_regex       = /role[s]?:{2}/
-      @profile_regex    = /profile[s]?:{2}/
+      @role_regex       = opts[:role_regex] ?  Regexp.new(opts[:role_regex]) : /role[s]?:{2}/
+      @profile_regex    = opts[:profile_regex] ? Regexp.new(opts[:profile_regex]) : /profile[s]?:{2}/
       @tempdir          = opts[:tempdir] || File.expand_path('./.onceover',@root)
       $temp_modulepath  = nil
       @manifest         = opts[:manifest] || config['manifest'] ? File.expand_path(config['manifest'],@root) : nil
-      @onceover_yaml    = opts[:onceover_yaml] || "#{@spec_dir}/onceover.yaml"
       @opts             = opts
       logger.level = :debug if @opts[:debug]
       @@existing_controlrepo = self
     end
 
+
     def to_s
       require 'colored'
 

data/onceover.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.2.2"
+  s.version     = "3.2.3"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake