onceover 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c2ba12fedb743733c215c2b933a3d1aef1febeb
-  data.tar.gz: 17431981ceab3f6da956ac12cde1a4181efbb14d
+  metadata.gz: b526c91a6430b4a442c6c7d905325c0c8e66b980
+  data.tar.gz: 69bb0524345dcd1b155cc845e9fa5d2d206f3de3
 SHA512:
-  metadata.gz: 170d38c14abf8bcef5c26ea1ca824c8b696c9a87af7719930854a3fab808eae2de46e0be44822cded0fab298883bd98454dc1cc3d3ed26a74c4d86def7d17034
-  data.tar.gz: e3c3fc3e7daa590ef91794d5cc244d0d32350f313de1f96702b250d7ae011d80f630cf1ca60a78ebe4bc6b3a195c39acca3b08eded9b3946dfd33b14c2f896e1
+  metadata.gz: 06ba5f38361ec3eafed75cf81b9d902b8bc9e646c3c4f3da9a9bd66024738af70c1692fb1e7493a2c1321b10bdf9178457c156cadf38503aa529f2ce9da1eed8
+  data.tar.gz: 0cea3f35c36f7b99a345bfc8b17b15108adb3bd3e3ddc5e6a9ca9af08a458273191be6b8a22ffe217ad51e3f9c7873d3e41ffb718613e7d233c343dfe2714d88

data/README.md

@@ -115,7 +115,7 @@ 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*
 
-**before and after conditions** We can set `before` and `after` blocks before each spec test. These are usually used when the functions to stub are conditional: stub functionx if the OS is windows, stub functiony if the fact java_installed is true. The facts are available through the `node_facts` hash.
+**before and after conditions** We can set `before` and `after` blocks before each spec test. These are usually used when the functions to stub are conditional: stub functionx if the OS is windows, stub functiony if the fact java_installed is true. The facts are available through the `node_facts` hash and the trusted facts as `trusted_facts`.
 
 ```yaml
 before:
@@ -250,6 +250,26 @@ Once we have our factset all we need to do is copy it into `spec/factsets/` insi
 
 Would map to a node named `server2008r2` in `onceover.yaml`
 
+#### Trusted Facts
+
+You can add trusted facts to the nodesets by creating a new section called trusted:
+
+```
+{
+  "name": "node.puppetlabs.net",
+  "trusted": {
+    "pp_role": "agent",
+    "pp_datacenter": "puppet",
+  },
+  "values": {
+    "aio_agent_build": "1.10.4",
+    "aio_agent_version": "1.10.4",
+    "architecture": "x86_64",
+
+```
+
+Notice that the `extensions` part is implied. The first fact in that example translates to `$trusted['extensions']['pp_role']` in Puppet code.
+
 ### nodesets
 
 `spec/acceptance/nodesets/onceover-nodes.yml`

data/lib/onceover/controlrepo.rb

@@ -70,7 +70,11 @@ class Onceover
     end
 
     def self.facts(filter = nil)
-      @@existing_controlrepo.facts(filter)
+      @@existing_controlrepo.facts(filter, 'values')
+    end
+
+    def self.trusted_facts(filter = nil)
+      @@existing_controlrepo.facts(filter, 'trusted')
     end
 
     def self.hiera_config_file
@@ -170,12 +174,12 @@ class Onceover
       classes.flatten
     end
 
-    def facts(filter = nil)
+    def facts(filter = nil, key = 'values')
       # Returns an array facts hashes
       all_facts = []
       logger.debug "Reading factsets"
       @facts_files.each do |file|
-        all_facts << read_facts(file)['values']
+        all_facts << read_facts(file)[key]
       end
       if filter
         # Allow us to pass a hash of facts to filter by
@@ -579,7 +583,7 @@ class Onceover
       begin
         result = JSON.parse(file)
       rescue JSON::ParserError
-        raise "Could not parse the JSON file, check that it is valid JSON and that the encoding is correct"
+        raise "Could not parse the file #{facts_file}, check that it is valid JSON and that the encoding is correct"
       end
       result
     end

data/lib/onceover/node.rb

@@ -8,6 +8,7 @@ class Onceover
     attr_accessor :name
     attr_accessor :beaker_node
     attr_accessor :fact_set
+    attr_accessor :trusted_set
 
     def initialize(name)
       @name = name
@@ -19,9 +20,12 @@ class Onceover
           File.basename(facts_file, '.json') == name
         }
         @fact_set = Onceover::Controlrepo.facts[facts_file_index]
+        @trusted_set = Onceover::Controlrepo.trusted_facts[facts_file_index]
       rescue TypeError
         @fact_set = nil
+        @trusted_set = nil
       end
+
       @@all << self
 
     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.5.2"
+  s.version     = "3.6.0"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/templates/test_spec.rb.erb

@@ -20,6 +20,10 @@ let!(:<%= function %>) { MockFunction.new('<%= function %>') { |f|
   context "using fact set <%= node.name %>" do
     node_facts = <%= node.fact_set %>
     let(:facts) { node_facts }
+<% if node.trusted_set -%>
+    trusted_facts = <%= node.trusted_set %>
+    let(:trusted_facts) { trusted_facts }
+<% end -%>
 <% if @before_conditions -%>
     before :each do
 <% @before_conditions.each do |function| -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake