onceover 3.13.2 → 3.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb80a3ae1c246c61dbb585847893f12ddf29b63123d634f654a9b3df8db555f
-  data.tar.gz: c70f9119d78af24e7b9f21c6332d042b4b9fd846ea86a3cb8c02771b0b4c1d10
+  metadata.gz: 1e7b37b37e3704c6ec2183c6670efbda0bf9bcb24ddf948c88e44acd686d23c7
+  data.tar.gz: ebfb0a52ccbd684d41898a93469b12832f9e6efca792d7df47e76e6ff7c644fa
 SHA512:
-  metadata.gz: 95384f8c9daeaf51f3ef2fe97b373735fdc82e285f54dddfb59faad31ed0b9a6d0436c17f9b0db2d48686b26eced32cdeac737d1f32eb39818e7cf03644c54ce
-  data.tar.gz: c9a81d7b58e4a4651834863ee967b74be5d07f268c8c8d96619b3e42e95c8816043164b4d060174e06fa1a97ab557c4aeca9be4951e6784880c3ac302af32c20
+  metadata.gz: a70412dcdd03ccbdf4bd0bef27a5ac732e9edda51e3e6872a37df79c4ab64d86d64f4b6052542a46ea5b135dd9649b9f47a9b5781aa29316996223cc03daf77e
+  data.tar.gz: c8841bef52586a8b460d1410449bbbbd3ff26d94d4df5399027458bebdf836cd6e1b14d8e5b6b3855fd5b8342c28a0396be4f1381597b119253b591cb6c250a1

data/README.md

@@ -635,3 +635,5 @@ Cheers to all of those who helped out:
   - @binford2k
   - @raphink
   - @tequeter
+  - @alexjfisher
+

data/features/cache.feature

@@ -14,6 +14,11 @@ Feature: Create and maintain a .onceover cache
     Then the cache should exist
     And the cache should contain all controlrepo files
 
+  Scenario: Runnone onnceover in the caching repo
+    Given control repo "caching"
+    When I run onceover command "run spec --classes role::webserver"
+    Then I should not see any errors
+
   Scenario: Creating a new file
     Given existing control repo "caching"
     When I create a file "example.txt"

data/features/factsets.feature

@@ -0,0 +1,19 @@
+@factsets
+Feature: Handle factsets properly
+  Onceover should allow users to add their own factsets and should handle these well
+
+  Background:
+    Given onceover executable
+
+  Scenario: Setecting existing factsets
+    Given control repo "factsets"
+    When I run onceover command "init"
+    Then the config should contain "centos_with_env"
+
+  # This needs to be tested because an environment fact, if not handled, makes
+  # compilation fail becaiuse it breaks all of the workarounds that have been
+  # put in place within rspec-puppet for the environment
+  Scenario: Run with a factsent containing an environment facts
+    Given existing control repo "factsets"
+    When I run onceover command "run spec"
+    Then I should not see any errors

data/features/run.feature

@@ -7,6 +7,11 @@ Feature: Run rspec and acceptance test suites
   Background:
     Given onceover executable
 
+  Scenario: Run without a Puppetfile
+    Given initialized control repo "minimal"
+    When I run onceover command "run spec"
+    Then I should not see any errors
+
   Scenario: Run correct spec tests
     Given initialized control repo "basic"
     When I run onceover command "run spec"
@@ -66,5 +71,5 @@ Feature: Run rspec and acceptance test suites
   # This test is a full test using my controlrepo. It should remain at the end because it takes ages
   Scenario: Run advanced spec tests
     Given control repo "puppet_controlrepo"
-    When I run onceover command "run spec"
+    When I run onceover command "run spec -p"
     Then I should not see any errors

data/features/step_definitions/common.rb

@@ -51,6 +51,11 @@ Then(/^I should not see any errors$/) do
   expect(@cmd.success?).to be true
 end
 
+Then(/^the config should contain "([^"]*)"$/) do |pattern|
+  pattern = Regexp.new(pattern)
+  expect(@repo.config_file_contents).to match(pattern)
+end
+
 Then(/^Onceover should exit (\d+)$/) do |code|
   expect(@cmd.exit_code).to eq code.to_i
 end

data/features/support/controlrepo_helper.rb

@@ -8,19 +8,27 @@ class ControlRepo_Helper
   end
 
   def root_folder
-    return @tmp_folder + @name + '/'
+    @tmp_folder + @name + '/'
   end
 
   def puppetfile
-    return root_folder + "Puppetfile"
+    root_folder + "Puppetfile"
   end
 
   def onceover_temp_root_folder
-    return root_folder + '.onceover/etc/puppetlabs/code/environments/production/'
+    root_folder + '.onceover/etc/puppetlabs/code/environments/production/'
   end
 
   def onceover_temp_puppetfile
-    return onceover_temp_root_folder + "Puppetfile"
+    onceover_temp_root_folder + "Puppetfile"
+  end
+
+  def config_file
+    root_folder + 'spec/onceover.yaml'
+  end
+
+  def config_file_contents
+    File.read(config_file)
   end
 
   def add_line_to_puppetfile( line )

data/lib/onceover/deploy.rb

@@ -9,7 +9,9 @@ class Onceover
 
       logger.debug 'Deploying locally (R10K)...'
 
-      skip_r10k = opts[:skip_r10k] || false
+      # Only default to running r10k if there is a Puppetfile
+      skip_r10k_default = !(File.file?(repo.puppetfile))
+      skip_r10k = opts[:skip_r10k] || skip_r10k_default
       force     = opts[:force] || false
 
       if repo.tempdir == nil
@@ -32,6 +34,7 @@ class Onceover
         File.join(repo.root, ".onceover"),
         File.join(repo.root, ".git"),
         File.join(repo.root, ".modules"),
+        File.join(repo.root, "vendor"),
       ]
       excluded_dirs << ENV['GEM_HOME'] if ENV['GEM_HOME']
 
@@ -78,11 +81,14 @@ class Onceover
       git_branch = `git rev-parse --abbrev-ref HEAD`.chomp
 
       logger.debug "found #{git_branch} as current working branch"
-      puppetfile_contents = File.read("#{temp_controlrepo}/Puppetfile")
+      # Only try to modify Puppetfile if it exists
+      unless skip_r10k
+        puppetfile_contents = File.read("#{temp_controlrepo}/Puppetfile")
 
-      logger.debug "replacing :control_branch mentions in the Puppetfile with #{git_branch}"
-      new_puppetfile_contents = puppetfile_contents.gsub(/:control_branch/, "'#{git_branch}'")
-      File.write("#{temp_controlrepo}/Puppetfile", new_puppetfile_contents)
+        logger.debug "replacing :control_branch mentions in the Puppetfile with #{git_branch}"
+        new_puppetfile_contents = puppetfile_contents.gsub(/:control_branch/, "'#{git_branch}'")
+        File.write("#{temp_controlrepo}/Puppetfile", new_puppetfile_contents)
+      end
 
       # Remove all files written by the last onceover run, but not the ones
       # added by r10k, because that's what we are trying to cache but we don't
@@ -128,4 +134,4 @@ class Onceover
       repo.tempdir
     end
   end
-end
+end

data/lib/onceover/node.rb

@@ -18,8 +18,8 @@ class Onceover
       begin
         facts_file_index = Onceover::Controlrepo.facts_files.index {|facts_file|
           File.basename(facts_file, '.json') == name
-        }
-        @fact_set = Onceover::Controlrepo.facts[facts_file_index]
+        }  
+        @fact_set = Onceover::Node.clean_facts(Onceover::Controlrepo.facts[facts_file_index])
         @trusted_set = Onceover::Controlrepo.trusted_facts[facts_file_index]
       rescue TypeError
         @fact_set = nil
@@ -47,5 +47,11 @@ class Onceover
     def self.all
       @@all
     end
+
+    # This method ensures that all facts are valid and clean anoything that we can't handle
+    def self.clean_facts(factset)
+      factset.delete('environment')
+      factset
+    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.13.2"
+  s.version     = "3.13.3"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/spec/fixtures/controlrepos/caching/spec/pre_conditions/escaping.pp

@@ -0,0 +1,7 @@
+# This should end up exactly the same in the test, backslashes should be
+# preserved
+$backslashes = '\2'
+
+# Cheak that things haven't been escaped
+unless $backslashes[0] == "\\" { fail() }
+unless $backslashes[1] == '2' { fail() }

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

@@ -0,0 +1 @@
+modulepath          = site:modules:$basemodulepath

data/spec/fixtures/controlrepos/factsets/site/profile/manifests/base.pp

@@ -0,0 +1,6 @@
+#
+class profile::base {
+
+  #the base profile should include component modules that will be on all nodes
+
+}

data/spec/fixtures/controlrepos/factsets/site/role/manifests/example.pp

@@ -0,0 +1,4 @@
+#
+class role::example {
+
+}

data/spec/fixtures/controlrepos/factsets/spec/factsets/centos_with_env.json

@@ -0,0 +1,353 @@
+{
+  "name": "centos7b.syd.puppetlabs.demo",
+  "values": {
+    "aio_agent_build": "1.2.2",
+    "aio_agent_version": "1.2.2",
+    "architecture": "x86_64",
+    "augeas": {
+      "version": "1.4.0"
+    },
+    "augeasversion": "1.4.0",
+    "bios_release_date": "12/01/2006",
+    "bios_vendor": "innotek GmbH",
+    "bios_version": "VirtualBox",
+    "blockdevice_sda_model": "VBOX HARDDISK",
+    "blockdevice_sda_size": 21474836480,
+    "blockdevice_sda_vendor": "ATA",
+    "blockdevices": "sda",
+    "boardmanufacturer": "Oracle Corporation",
+    "boardproductname": "VirtualBox",
+    "boardserialnumber": "0",
+    "chassistype": "Other",
+    "concat_basedir": "/opt/puppetlabs/puppet/cache/concat",
+    "custom_auth_conf": "false",
+    "datacenter": "sydney",
+    "dhcp_servers": {
+      "enp0s3": "10.0.2.2",
+      "enp0s8": "192.168.56.100",
+      "system": "10.0.2.2"
+    },
+    "disks": {
+      "sda": {
+        "model": "VBOX HARDDISK",
+        "size": "20.00 GiB",
+        "size_bytes": 21474836480,
+        "vendor": "ATA"
+      }
+    },
+    "dmi": {
+      "bios": {
+        "release_date": "12/01/2006",
+        "vendor": "innotek GmbH",
+        "version": "VirtualBox"
+      },
+      "board": {
+        "manufacturer": "Oracle Corporation",
+        "product": "VirtualBox",
+        "serial_number": "0"
+      },
+      "chassis": {
+        "type": "Other"
+      },
+      "manufacturer": "innotek GmbH",
+      "product": {
+        "name": "VirtualBox",
+        "serial_number": "0",
+        "uuid": "9D7BE471-F3DA-47EE-B023-F659129270EF"
+      }
+    },
+    "domain": "syd.puppetlabs.demo",
+    "environment": "production",
+    "facterversion": "3.0.2",
+    "filesystems": "xfs",
+    "fqdn": "centos7b.syd.puppetlabs.demo",
+    "gid": "root",
+    "hardwareisa": "x86_64",
+    "hardwaremodel": "x86_64",
+    "homedir": "/root",
+    "hostname": "centos7b",
+    "id": "root",
+    "identity": {
+      "gid": 0,
+      "group": "root",
+      "uid": 0,
+      "user": "root"
+    },
+    "interfaces": "enp0s3,enp0s8,lo",
+    "ip6tables_version": "1.4.21",
+    "ipaddress": "10.0.2.15",
+    "ipaddress6": "fe80::a00:27ff:fe39:183c",
+    "ipaddress6_enp0s3": "fe80::a00:27ff:fe39:183c",
+    "ipaddress6_enp0s8": "fe80::a00:27ff:fe39:832c",
+    "ipaddress6_lo": "::1",
+    "ipaddress_enp0s3": "10.0.2.15",
+    "ipaddress_enp0s8": "10.20.1.92",
+    "ipaddress_lo": "127.0.0.1",
+    "iptables_version": "1.4.21",
+    "is_admin": true,
+    "is_pe": false,
+    "is_virtual": true,
+    "kernel": "Linux",
+    "kernelmajversion": "3.10",
+    "kernelrelease": "3.10.0-123.el7.x86_64",
+    "kernelversion": "3.10.0",
+    "load_averages": {
+      "15m": 0.05,
+      "1m": 0.26,
+      "5m": 0.12
+    },
+    "macaddress": "08:00:27:39:18:3c",
+    "macaddress_enp0s3": "08:00:27:39:18:3c",
+    "macaddress_enp0s8": "08:00:27:39:83:2c",
+    "manufacturer": "innotek GmbH",
+    "memory": {
+      "swap": {
+        "available": "1.03 GiB",
+        "available_bytes": 1107292160,
+        "capacity": "0%",
+        "total": "1.03 GiB",
+        "total_bytes": 1107292160,
+        "used": "0 bytes",
+        "used_bytes": 0
+      },
+      "system": {
+        "available": "297.76 MiB",
+        "available_bytes": 312225792,
+        "capacity": "39.28%",
+        "total": "490.41 MiB",
+        "total_bytes": 514228224,
+        "used": "192.64 MiB",
+        "used_bytes": 202002432
+      }
+    },
+    "memoryfree": "297.76 MiB",
+    "memoryfree_mb": 297.76171875,
+    "memorysize": "490.41 MiB",
+    "memorysize_mb": 490.40625,
+    "mountpoints": {
+      "/": {
+        "available": "17.30 GiB",
+        "available_bytes": 18574749696,
+        "capacity": "6.32%",
+        "device": "/dev/mapper/centos-root",
+        "filesystem": "xfs",
+        "options": [
+          "rw",
+          "relatime",
+          "attr2",
+          "inode64",
+          "noquota"
+        ],
+        "size": "18.47 GiB",
+        "size_bytes": 19828572160,
+        "used": "1.17 GiB",
+        "used_bytes": 1253822464
+      },
+      "/boot": {
+        "available": "393.11 MiB",
+        "available_bytes": 412209152,
+        "capacity": "20.85%",
+        "device": "/dev/sda1",
+        "filesystem": "xfs",
+        "options": [
+          "rw",
+          "relatime",
+          "attr2",
+          "inode64",
+          "noquota"
+        ],
+        "size": "496.67 MiB",
+        "size_bytes": 520794112,
+        "used": "103.55 MiB",
+        "used_bytes": 108584960
+      }
+    },
+    "mtu_enp0s3": 1500,
+    "mtu_enp0s8": 1500,
+    "mtu_lo": 65536,
+    "mysql_server_id": 8563388,
+    "netmask": "255.255.255.0",
+    "netmask6": "ffff:ffff:ffff:ffff::",
+    "netmask6_enp0s3": "ffff:ffff:ffff:ffff::",
+    "netmask6_enp0s8": "ffff:ffff:ffff:ffff::",
+    "netmask6_lo": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+    "netmask_enp0s3": "255.255.255.0",
+    "netmask_enp0s8": "255.255.255.0",
+    "netmask_lo": "255.0.0.0",
+    "network": "10.0.2.0",
+    "network6": "fe80::",
+    "network6_enp0s3": "fe80::",
+    "network6_enp0s8": "fe80::",
+    "network6_lo": "::1",
+    "network_enp0s3": "10.0.2.0",
+    "network_enp0s8": "10.20.1.0",
+    "network_lo": "127.0.0.0",
+    "networking": {
+      "dhcp": "10.0.2.2",
+      "domain": "syd.puppetlabs.demo",
+      "fqdn": "centos7b.syd.puppetlabs.demo",
+      "hostname": "centos7b",
+      "interfaces": {
+        "enp0s3": {
+          "dhcp": "10.0.2.2",
+          "ip": "10.0.2.15",
+          "ip6": "fe80::a00:27ff:fe39:183c",
+          "mac": "08:00:27:39:18:3c",
+          "mtu": 1500,
+          "netmask": "255.255.255.0",
+          "netmask6": "ffff:ffff:ffff:ffff::",
+          "network": "10.0.2.0",
+          "network6": "fe80::"
+        },
+        "enp0s8": {
+          "dhcp": "192.168.56.100",
+          "ip": "10.20.1.92",
+          "ip6": "fe80::a00:27ff:fe39:832c",
+          "mac": "08:00:27:39:83:2c",
+          "mtu": 1500,
+          "netmask": "255.255.255.0",
+          "netmask6": "ffff:ffff:ffff:ffff::",
+          "network": "10.20.1.0",
+          "network6": "fe80::"
+        },
+        "lo": {
+          "ip": "127.0.0.1",
+          "ip6": "::1",
+          "mtu": 65536,
+          "netmask": "255.0.0.0",
+          "netmask6": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+          "network": "127.0.0.0",
+          "network6": "::1"
+        }
+      },
+      "ip": "10.0.2.15",
+      "ip6": "fe80::a00:27ff:fe39:183c",
+      "mac": "08:00:27:39:18:3c",
+      "mtu": 1500,
+      "netmask": "255.255.255.0",
+      "netmask6": "ffff:ffff:ffff:ffff::",
+      "network": "10.0.2.0",
+      "network6": "fe80::"
+    },
+    "operatingsystem": "CentOS",
+    "operatingsystemmajrelease": "7",
+    "operatingsystemrelease": "7.0.1406",
+    "os": {
+      "architecture": "x86_64",
+      "family": "RedHat",
+      "hardware": "x86_64",
+      "name": "CentOS",
+      "release": {
+        "full": "7.0.1406",
+        "major": "7",
+        "minor": "0"
+      },
+      "selinux": {
+        "enabled": false
+      }
+    },
+    "osfamily": "RedHat",
+    "partitions": {
+      "/dev/mapper/centos-root": {
+        "filesystem": "xfs",
+        "mount": "/",
+        "size": "0 bytes",
+        "size_bytes": 0,
+        "uuid": "db651e5f-a2c2-4236-9570-6226f63e1fcd"
+      },
+      "/dev/mapper/centos-swap": {
+        "filesystem": "swap",
+        "size": "0 bytes",
+        "size_bytes": 0,
+        "uuid": "ff4ec16c-28c0-4715-846d-11e7c9b4e53b"
+      },
+      "/dev/sda1": {
+        "filesystem": "xfs",
+        "mount": "/boot",
+        "size": "500.00 MiB",
+        "size_bytes": 524288000,
+        "uuid": "39ce4ad1-4e9d-49a4-bce0-8a30b459490a"
+      },
+      "/dev/sda2": {
+        "filesystem": "LVM2_member",
+        "size": "19.51 GiB",
+        "size_bytes": 20949499904,
+        "uuid": "pg7zVv-M3hI-zpjY-eYlZ-06aD-ZRO2-J30GLd"
+      }
+    },
+    "path": "/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin",
+    "pe_concat_basedir": "/opt/puppetlabs/puppet/cache/pe_concat",
+    "pe_razor_server_version": "package pe-razor-server is not installed",
+    "physicalprocessorcount": 1,
+    "platform_symlink_writable": true,
+    "platform_tag": "el-7-x86_64",
+    "processor0": "Intel(R) Core(TM) i7-4850HQ CPU @ 2.30GHz",
+    "processorcount": 1,
+    "processors": {
+      "count": 1,
+      "isa": "x86_64",
+      "models": [
+        "Intel(R) Core(TM) i7-4850HQ CPU @ 2.30GHz"
+      ],
+      "physicalcount": 1
+    },
+    "productname": "VirtualBox",
+    "puppet_files_dir_present": false,
+    "puppet_vardir": "/opt/puppetlabs/puppet/cache",
+    "puppetversion": "4.2.1",
+    "root_home": "/root",
+    "ruby": {
+      "platform": "x86_64-linux",
+      "sitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.1.0",
+      "version": "2.1.6"
+    },
+    "rubyplatform": "x86_64-linux",
+    "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.1.0",
+    "rubyversion": "2.1.6",
+    "selinux": false,
+    "serialnumber": "0",
+    "ssh": {
+      "ecdsa": {
+        "fingerprints": {
+          "sha1": "SSHFP 3 1 91edfdf5e7e098f4392606865c017dabc26804bb",
+          "sha256": "SSHFP 3 2 f00c65a1884bfec52db11de89254f0bfd46baf9e759546654c94371a05ee0dba"
+        },
+        "key": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBcSUcHQOfBDZElr6PBmxc/4ZDaIhsugXM7OE2SQj35iOMCN/I3XfINMo8SvBIQ6CsBqPnzgbKRBs7e1FPFnsT4="
+      },
+      "rsa": {
+        "fingerprints": {
+          "sha1": "SSHFP 1 1 f25e9ad2faddbe75263cfee4fa97dc965bc1d581",
+          "sha256": "SSHFP 1 2 0173e386031a134e4cbfb7f6971788761a5aa3d9e39dafcf163f003de2537199"
+        },
+        "key": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDLMo35gwbuqQvRq1gy6L8vddeyMNBYr5WPVcftMKSJR1jmwzxcZ+h0AEb3KPfoMHkqe9Xy+3oN981qe5ZCE780HO884AaXzXry9zdWQjGysrI+zHQbqbpOkYAGsVbJiQ7VnH7lMVZo2jCbABj4OdsbeCOeP3oDXTNCTaWWdQChzqvYgNBvb0mg/na1l0naQ1nsJYD85O8ZRQ9U/JOADMaOjummfOb2z7MgskZ9abm5eFCCQl+wUUNXKqQx+uyVM4lyyoTHpW3M2IV0P9wxhWJF6eovwyREGuMgJCs6kbHCFty7HtAYbzziabgQav8pMe68aBqjshbpU6ll/+aXWhD1"
+      }
+    },
+    "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBcSUcHQOfBDZElr6PBmxc/4ZDaIhsugXM7OE2SQj35iOMCN/I3XfINMo8SvBIQ6CsBqPnzgbKRBs7e1FPFnsT4=",
+    "sshfp_ecdsa": "SSHFP 3 1 91edfdf5e7e098f4392606865c017dabc26804bb\nSSHFP 3 2 f00c65a1884bfec52db11de89254f0bfd46baf9e759546654c94371a05ee0dba",
+    "sshfp_rsa": "SSHFP 1 1 f25e9ad2faddbe75263cfee4fa97dc965bc1d581\nSSHFP 1 2 0173e386031a134e4cbfb7f6971788761a5aa3d9e39dafcf163f003de2537199",
+    "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDLMo35gwbuqQvRq1gy6L8vddeyMNBYr5WPVcftMKSJR1jmwzxcZ+h0AEb3KPfoMHkqe9Xy+3oN981qe5ZCE780HO884AaXzXry9zdWQjGysrI+zHQbqbpOkYAGsVbJiQ7VnH7lMVZo2jCbABj4OdsbeCOeP3oDXTNCTaWWdQChzqvYgNBvb0mg/na1l0naQ1nsJYD85O8ZRQ9U/JOADMaOjummfOb2z7MgskZ9abm5eFCCQl+wUUNXKqQx+uyVM4lyyoTHpW3M2IV0P9wxhWJF6eovwyREGuMgJCs6kbHCFty7HtAYbzziabgQav8pMe68aBqjshbpU6ll/+aXWhD1",
+    "staging_http_get": "curl",
+    "swapfree": "1.03 GiB",
+    "swapfree_mb": 1055.99609375,
+    "swapsize": "1.03 GiB",
+    "swapsize_mb": 1055.99609375,
+    "system_uptime": {
+      "days": 0,
+      "hours": 0,
+      "seconds": 78,
+      "uptime": "0:01 hours"
+    },
+    "timezone": "UTC",
+    "uptime": "0:01 hours",
+    "uptime_days": 0,
+    "uptime_hours": 0,
+    "uptime_seconds": 78,
+    "uuid": "9D7BE471-F3DA-47EE-B023-F659129270EF",
+    "virtual": "virtualbox",
+    "clientcert": "centos7b.syd.puppetlabs.demo",
+    "clientversion": "4.2.1",
+    "clientnoop": false
+  },
+  "timestamp": "2015-09-23T23:50:15.484459763+00:00",
+  "expiration": "2015-09-24T00:20:15.484744482+00:00"
+}

data/templates/test_spec.rb.erb

@@ -37,7 +37,7 @@ describe "<%= cls.name %>" do
     end
 <% end -%>
     let(:pre_condition) {
-      pp = <%= '<<' %>-END
+      pp = <%= '<<' %>-'END'
 $onceover_class = '<%= cls.name %>'
 $onceover_node  = '<%= node.name %>'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.13.2
+  version: 3.13.3
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -347,6 +347,7 @@ files:
 - factsets/solaris-11.2-sparc-64.json
 - factsets/windows-10-64.json
 - features/cache.feature
+- features/factsets.feature
 - features/formatting.feature
 - features/help.feature
 - features/init.feature
@@ -409,8 +410,13 @@ files:
 - spec/fixtures/controlrepos/caching/spec/factsets/README.md
 - spec/fixtures/controlrepos/caching/spec/onceover.yaml
 - spec/fixtures/controlrepos/caching/spec/pre_conditions/README.md
+- spec/fixtures/controlrepos/caching/spec/pre_conditions/escaping.pp
 - spec/fixtures/controlrepos/control_branch/Puppetfile
 - spec/fixtures/controlrepos/control_branch/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
+- spec/fixtures/controlrepos/factsets/spec/factsets/centos_with_env.json
 - spec/fixtures/controlrepos/function_mocking/.gitignore
 - spec/fixtures/controlrepos/function_mocking/Puppetfile
 - spec/fixtures/controlrepos/function_mocking/Rakefile