onceover 3.17.3 → 3.19.2

data/factsets/windows-10-64.json

@@ -1,104 +1,104 @@
-{
-  "name": "vagrant-hb9g3rd.lan.asio",
-  "values": {
-    "puppetversion": "6.0.2",
-    "puppet_inventory_metadata": {
-      "packages": {
-        "collection_enabled": false,
-        "last_collection_time": "0.0s"
-      }
-    },
-    "package_provider": "windows",
-    "pe_concat_basedir": "C:/ProgramData/PuppetLabs/puppet/cache/pe_concat",
-    "is_pe": false,
-    "platform_symlink_writable": false,
-    "puppet_files_dir_present": false,
-    "puppet_vardir": "C:/ProgramData/PuppetLabs/puppet/cache",
-    "puppet_environmentpath": "C:/ProgramData/PuppetLabs/code/environments",
-    "puppet_server": "pe-puppet.localdomain",
-    "service_provider": "windows",
-    "staging_http_get": "curl",
-    "common_appdata": "C:\\ProgramData",
-    "architecture": "x64",
-    "kernel": "windows",
-    "virtual": "vmware",
-    "is_virtual": true,
-    "hardwaremodel": "x64",
-    "operatingsystem": "windows",
-    "os": {
-      "name": "windows",
-      "family": "windows",
-      "release": {
-        "major": "10",
-        "full": "10"
-      }
-    },
-    "facterversion": "2.5.1",
-    "fqdn": "VAGRANT-HB9G3RD",
-    "hostname": "VAGRANT-HB9G3RD",
-    "id": "vagrant-hb9g3rd\\vagrant",
-    "interfaces": "Ethernet0_2",
-    "ipaddress_ethernet0_2": "192.168.43.174",
-    "ipaddress6_ethernet0_2": "fd72:b3ab:b8dd:0:f563:fac2:928c:6aa",
-    "macaddress_ethernet0_2": "00:0C:29:A3:53:54",
-    "netmask_ethernet0_2": "255.255.255.0",
-    "mtu_ethernet0_2": 0,
-    "ipaddress": "192.168.43.174",
-    "ipaddress6": "fd72:b3ab:b8dd:0:f563:fac2:928c:6aa",
-    "kernelmajversion": "10.0",
-    "kernelrelease": "10.0.17134",
-    "kernelversion": "10.0.17134",
-    "macaddress": "00:0C:29:A3:53:54",
-    "manufacturer": "Phoenix Technologies LTD",
-    "serialnumber": "VMware-56 4d 36 2e 2e a4 81 f9-0d 05 ae d0 e5 a3 53 54",
-    "productname": "VMware Virtual Platform",
-    "memorysize": "4.00 GB",
-    "memoryfree": "2.30 GB",
-    "memorysize_mb": "4095.49",
-    "memoryfree_mb": "2360.00",
-    "netmask": "255.255.255.0",
-    "network_ethernet0_2": "192.168.43.0",
-    "operatingsystemmajrelease": "10",
-    "operatingsystemrelease": "10",
-    "osfamily": "windows",
-    "path": "C:\\tools\\ruby24\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\ProgramData\\chocolatey\\bin;C:\\Program Files (x86)\\vim\\vim80;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Users\\vagrant\\AppData\\Local\\Microsoft\\WindowsApps;",
-    "physicalprocessorcount": 4,
-    "processors": {
-      "models": [
-        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz"
-      ],
-      "count": 4,
-      "physicalcount": 4
-    },
-    "processor0": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-    "processor1": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-    "processor2": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-    "processor3": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
-    "processorcount": 4,
-    "ps": "tasklist.exe",
-    "rubyplatform": "x64-mingw32",
-    "rubysitedir": "C:/tools/ruby24/lib/ruby/site_ruby/2.4.0",
-    "rubyversion": "2.4.3",
-    "system32": "C:\\Windows\\system32",
-    "choco_install_path": "C:\\ProgramData\\chocolatey",
-    "system_uptime": {
-      "seconds": 1113359,
-      "hours": 309,
-      "days": 12,
-      "uptime": "12 days"
-    },
-    "timezone": "GMT Standard Time",
-    "uptime": "12 days",
-    "uptime_days": 12,
-    "uptime_hours": 309,
-    "uptime_seconds": 1113359,
-    "clientcert": "vagrant-hb9g3rd.lan.asio",
-    "clientversion": "6.0.2",
-    "clientnoop": false
-  },
-  "timestamp": "2018-12-10T21:43:07.468533000+00:00",
-  "expiration": "2018-12-10T22:13:07.468533000+00:00"
-}
+{
+  "name": "vagrant-hb9g3rd.lan.asio",
+  "values": {
+    "puppetversion": "6.0.2",
+    "puppet_inventory_metadata": {
+      "packages": {
+        "collection_enabled": false,
+        "last_collection_time": "0.0s"
+      }
+    },
+    "package_provider": "windows",
+    "pe_concat_basedir": "C:/ProgramData/PuppetLabs/puppet/cache/pe_concat",
+    "is_pe": false,
+    "platform_symlink_writable": false,
+    "puppet_files_dir_present": false,
+    "puppet_vardir": "C:/ProgramData/PuppetLabs/puppet/cache",
+    "puppet_environmentpath": "C:/ProgramData/PuppetLabs/code/environments",
+    "puppet_server": "pe-puppet.localdomain",
+    "service_provider": "windows",
+    "staging_http_get": "curl",
+    "common_appdata": "C:\\ProgramData",
+    "architecture": "x64",
+    "kernel": "windows",
+    "virtual": "vmware",
+    "is_virtual": true,
+    "hardwaremodel": "x64",
+    "operatingsystem": "windows",
+    "os": {
+      "name": "windows",
+      "family": "windows",
+      "release": {
+        "major": "10",
+        "full": "10"
+      }
+    },
+    "facterversion": "2.5.1",
+    "fqdn": "VAGRANT-HB9G3RD",
+    "hostname": "VAGRANT-HB9G3RD",
+    "id": "vagrant-hb9g3rd\\vagrant",
+    "interfaces": "Ethernet0_2",
+    "ipaddress_ethernet0_2": "192.168.43.174",
+    "ipaddress6_ethernet0_2": "fd72:b3ab:b8dd:0:f563:fac2:928c:6aa",
+    "macaddress_ethernet0_2": "00:0C:29:A3:53:54",
+    "netmask_ethernet0_2": "255.255.255.0",
+    "mtu_ethernet0_2": 0,
+    "ipaddress": "192.168.43.174",
+    "ipaddress6": "fd72:b3ab:b8dd:0:f563:fac2:928c:6aa",
+    "kernelmajversion": "10.0",
+    "kernelrelease": "10.0.17134",
+    "kernelversion": "10.0.17134",
+    "macaddress": "00:0C:29:A3:53:54",
+    "manufacturer": "Phoenix Technologies LTD",
+    "serialnumber": "VMware-56 4d 36 2e 2e a4 81 f9-0d 05 ae d0 e5 a3 53 54",
+    "productname": "VMware Virtual Platform",
+    "memorysize": "4.00 GB",
+    "memoryfree": "2.30 GB",
+    "memorysize_mb": "4095.49",
+    "memoryfree_mb": "2360.00",
+    "netmask": "255.255.255.0",
+    "network_ethernet0_2": "192.168.43.0",
+    "operatingsystemmajrelease": "10",
+    "operatingsystemrelease": "10",
+    "osfamily": "windows",
+    "path": "C:\\tools\\ruby24\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\ProgramData\\chocolatey\\bin;C:\\Program Files (x86)\\vim\\vim80;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Users\\vagrant\\AppData\\Local\\Microsoft\\WindowsApps;",
+    "physicalprocessorcount": 4,
+    "processors": {
+      "models": [
+        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+        "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz"
+      ],
+      "count": 4,
+      "physicalcount": 4
+    },
+    "processor0": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+    "processor1": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+    "processor2": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+    "processor3": "Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz",
+    "processorcount": 4,
+    "ps": "tasklist.exe",
+    "rubyplatform": "x64-mingw32",
+    "rubysitedir": "C:/tools/ruby24/lib/ruby/site_ruby/2.4.0",
+    "rubyversion": "2.4.3",
+    "system32": "C:\\Windows\\system32",
+    "choco_install_path": "C:\\ProgramData\\chocolatey",
+    "system_uptime": {
+      "seconds": 1113359,
+      "hours": 309,
+      "days": 12,
+      "uptime": "12 days"
+    },
+    "timezone": "GMT Standard Time",
+    "uptime": "12 days",
+    "uptime_days": 12,
+    "uptime_hours": 309,
+    "uptime_seconds": 1113359,
+    "clientcert": "vagrant-hb9g3rd.lan.asio",
+    "clientversion": "6.0.2",
+    "clientnoop": false
+  },
+  "timestamp": "2018-12-10T21:43:07.468533000+00:00",
+  "expiration": "2018-12-10T22:13:07.468533000+00:00"
+}

data/features/cache.feature

@@ -14,7 +14,7 @@ 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
+  Scenario: Run onceover 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

data/features/step_definitions/cache.rb

@@ -5,12 +5,12 @@ end
 
 Then(/^the cache should contain all controlrepo files/) do
   # Get all root files
-  puts "Calculating MD5 hashes in repo"
+  log("Calculating MD5 hashes in repo")
   repo_digest = Cache_Helper.digest(@repo.root_folder)
-  puts "#{repo_digest.count} MD5 hashes calculated"
-  puts "Calculating MD5 hashes in cache"
+  log("#{repo_digest.count} MD5 hashes calculated")
+  log("Calculating MD5 hashes in cache")
   cache_digest = Cache_Helper.digest(File.join(@repo.root_folder,'.onceover/etc/puppetlabs/code/environments/production/'))
-  puts "#{cache_digest.count} MD5 hashes calculated"
+  log("#{cache_digest.count} MD5 hashes calculated")
   expect(cache_digest).to include(repo_digest)
 end
 

data/features/step_definitions/common.rb

@@ -7,6 +7,8 @@ Given(/^control repo "([^"]*)"$/) do |controlrepo_name|
   @cmd.controlrepo = @repo
   FileUtils.rm_rf @repo.root_folder
   FileUtils.mkdir_p @repo.tmp_folder
+
+  FileUtils.rm_rf "#{@repo.tmp_folder}#{controlrepo_name}"
   FileUtils.cp_r "spec/fixtures/controlrepos/#{controlrepo_name}", @repo.tmp_folder
 end
 
@@ -27,13 +29,13 @@ end
 
 When(/^I run onceover command "([^"]*)"$/)  do |command|
   @cmd.command = "#{command} --debug"
-  puts @cmd
+  log(@cmd)
   @cmd.run
 end
 
 When(/^I run onceover command "([^"]*)" with class "([^"]*)"$/)  do |command, cls|
   @cmd.command = "#{command} --classes #{cls}"
-  puts @cmd
+  log(@cmd)
   @cmd.run
 end
 
@@ -53,12 +55,12 @@ Then(/^I see help for commands: "([^"]*)"$/) do |commands|
   commands_help = @cmd.output[/COMMANDS(.*)OPTIONS/m, 1]
   commands.split(',').each do |command|
     result = commands_help.match(/^\s+#{command.strip}.+\n/)
-    puts result.to_s if expect(result).not_to be nil
+    log(result.to_s) if expect(result).not_to be nil
   end
 end
 
 Then(/^I should not see any errors$/) do
-  puts @cmd.output unless @cmd.success?
+  log(@cmd.output) unless @cmd.success?
   expect(@cmd.success?).to be true
 end
 
@@ -73,17 +75,43 @@ end
 
 Then(/^I should see error with message pattern "([^"]*)"$/) do |err_msg_regexp|
   expect(@cmd.success?).to be false
-  puts @cmd.output
+  log(@cmd.output)
   expect(@cmd.output.match err_msg_regexp).to_not be nil
 end
 
-Then(/^I should see message pattern "([^"]*)"$/) do |msg_regexp|
+Then(/^I should (not )?see message pattern "([^"]*)"$/) do |notword, msg_regexp|
   output_surround = 30
   match = Regexp.new(msg_regexp).match(@cmd.output)
-  expect(@cmd.output).to match(msg_regexp)
-  if match
-    puts match.pre_match[-output_surround..-1] + match.to_s + match.post_match[0..output_surround]
+  
+  # Expect it to match unless we said it shouldn't match
+  expected_match = notword.nil?
+  does_match = !match.nil?
+
+  if expected_match
+    expect(@cmd.output).to match(msg_regexp)
+  else
+    expect(@cmd.output).not_to match(msg_regexp)
+  end
+
+  # If the regex matches and that's what we expected then just print a summary
+  if does_match == expected_match
+    if match
+      log(match.pre_match[-output_surround..-1] + match.to_s + match.post_match[0..output_surround])
+    end
   else
-    puts @cmd.output
+    log(@cmd.output)
   end
 end
+
+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)
+  @cmd.run
+end
+
+Then(/^([^"]*) should be copied to Puppetfile$/) do |puppetfile|
+  source =  @repo.root_folder + puppetfile
+  destination = @repo.onceover_temp_puppetfile
+  expect(IO.read(source)).to eq(IO.read(destination))
+end

data/features/step_definitions/init.rb

@@ -7,11 +7,11 @@ Then(/^I should see generated all necessary files and folders$/) do
   folders = [ 'spec/factsets', 'spec/pre_conditions'].map! { |x| @repo.root_folder + x}
 
   files.each do |file|
-    puts file
+    log(file)
     expect( File.exist? file ).to be true
   end
   folders.each do |folder|
-    puts folder
+    log(folder)
     expect( Dir.exist? folder ).to be true
   end
 end

data/features/windows.feature

@@ -28,3 +28,8 @@ Feature: Run onceover with windows
     When I run onceover command "run spec" with class "role::users"
     Then I should not see any errors
   
+  Scenario: Compiling a windows role with chocolatey that is valid should compile
+    Given control repo "windows"
+    When I run onceover command "run spec" with class "role::choco"
+    Then I should not see any errors
+  

data/features/zzz_run.feature

@@ -1,6 +1,6 @@
 @run
 Feature: Run rspec and acceptance test suites
-  Onceover should allow to run rspec and acceptance test for all profvile and role classes
+  Onceover should allow to run rspec and acceptance test for all profile and role classes
   or for any part of them. Use should set if he wants to see only summary of tests or full
   log info.
 
@@ -52,6 +52,11 @@ Feature: Run rspec and acceptance test suites
     And I run onceover command "run spec --force"
     Then I should see message pattern "Overwriting local modifications"
 
+  Scenario: When using an alternate manifests directory
+    Given initialized control repo "basic"
+    When I run onceover command "run spec --manifest manifests_alternate"
+    Then I should see error with message pattern "Using alternate site.pp"
+
   Scenario: Check that control_branch functionality works
     Given initialized control repo "control_branch"
     When I run onceover command "run spec"
@@ -73,8 +78,22 @@ Feature: Run rspec and acceptance test suites
     Then I should see message pattern "failed"
     And Onceover should exit 1
 
+  Scenario: Run with a custom Puppetfile
+    Given initialized control repo "custom_puppetfile"
+    When I run onceover command "run spec" with --puppetfile Puppetfile.custom
+    Then Puppetfile.custom should be copied to Puppetfile
+    And I should see message pattern "Using Puppetfile .*Puppetfile"
+    And I should see message pattern "Updating module .*extlib"
+
+  Scenario: Testing that --tags works with native rspec tags
+    Given control repo "puppet_controlrepo"
+    When I run onceover command "run spec --tags syntax"
+    Then I should not see any errors
+    And I should see message pattern "When checking Puppet syntax"
+    And I should not see message pattern "role::"
+
   # 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 -p"
-    Then I should not see any errors
+    When I run onceover command "run spec -p --force"
+    Then I should not see any errors

data/lib/onceover/controlrepo.rb

@@ -123,10 +123,16 @@ class Onceover
       @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
       @opts             = opts
       logger.level = :debug if @opts[:debug]
       @@existing_controlrepo = self
+
+      # Set the manifest option to the fully expanded path if it's used,
+      # default to nil
+      manifest = opts[:manifest] || config['manifest'] || nil
+      if manifest
+        @manifest = File.expand_path(manifest, @root)
+      end
     end
 
 
@@ -184,7 +190,14 @@ class Onceover
       all_facts = []
       logger.debug "Reading factsets"
       @facts_files.each do |file|
-        all_facts << read_facts(file)[key]
+        facts_from_file = read_facts(file)
+        # Facter 4 removed the top level key 'values' and, instead, puts facts
+        # at the top level. The conditional below accounts for this.
+        if (key.eql?('values') and facts_from_file.has_key?('values')) or !key.eql?('values')
+          all_facts << facts_from_file[key]
+        else
+          all_facts << facts_from_file
+        end
       end
       if filter
         # Allow us to pass a hash of facts to filter by
@@ -195,11 +208,7 @@ class Onceover
           filter.each do |filter_fact,value|
             matches << keypair_is_in_hash(hash,filter_fact,value)
           end
-          if matches.include? false
-            false
-          else
-            true
-          end
+          !matches.include? false
         end
       end
       return all_facts
@@ -420,7 +429,7 @@ class Onceover
       rescue StandardError
         raise "modulepath was not found in environment.conf, don't know where to look for roles & profiles"
       end
-      
+
       environment_config
     end
 
@@ -444,7 +453,7 @@ class Onceover
     end
 
     def temp_manifest
-      config['manifest'] ? File.expand_path(config['manifest'], @tempdir) : nil
+      @manifest
     end
 
     def self.init(repo)
@@ -620,11 +629,7 @@ class Onceover
       else
         matches << false
       end
-      if matches.include? false
-        false
-      else
-        true
-      end
+      !matches.include? false
     end
 
     def get_classes(dir)
@@ -642,7 +647,7 @@ class Onceover
     def find_classname(filename)
       file = File.new(filename, "r")
       while (line = file.gets)
-        begin      
+        begin
           if line =~ /^class (\w+(?:::\w+)*)/
             return $1
           end