onceover 3.19.0 → 3.19.1

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,7 +75,7 @@ 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
 
@@ -94,17 +96,17 @@ Then(/^I should (not )?see message pattern "([^"]*)"$/) do |notword, msg_regexp|
   # If the regex matches and that's what we expected then just print a summary
   if does_match == expected_match
     if match
-      puts match.pre_match[-output_surround..-1] + match.to_s + match.post_match[0..output_surround]
+      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"
-  puts @cmd
+  log(@cmd)
   @cmd.run
 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/zzz_run.feature

@@ -95,5 +95,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 -p"
+    When I run onceover command "run spec -p --force"
     Then I should not see any errors

data/lib/onceover/controlrepo.rb

@@ -123,11 +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'] || 'manifests'
-      @manifest         = File.expand_path(manifest, @root)
       @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
 
 

data/lib/onceover/deploy.rb

@@ -123,6 +123,7 @@ class Onceover
             install_cmd << "--force" if force
             install_cmd << "--config #{repo.r10k_config_file}" if repo.r10k_config_file
             install_cmd << (logger.level > 0 ? "--verbose" : "--verbose debug") # Enable debugging if we're debugging
+            install_cmd << "--trace" if opts[:trace]
             install_cmd = install_cmd.join(' ')
             logger.debug "Running #{install_cmd} from #{prod_dir}"
             system(install_cmd)

data/lib/onceover/group.rb

@@ -60,6 +60,7 @@ class Onceover
       @@all
     end
 
+    # rubocop:disable Lint/DuplicateBranch
     def self.valid_members?(members)
       # Check that they are all the same type
       # Also catch any errors to assume it's invalid
@@ -75,5 +76,6 @@ class Onceover
         return false
       end
     end
+    # rubocop:enable Lint/DuplicateBranch
   end
 end

data/lib/onceover/rspec/formatters.rb

@@ -12,7 +12,9 @@ class OnceoverFormatter
   )
 
   COMPILATION_ERROR      = %r{error during compilation: (?<error>.*)}
+  # rubocop:disable Lint/MixedRegexpCaptureTypes
   ERROR_WITH_LOCATION    = %r{(?<error>.*?)\s(at )?(\((file: (?<file>.*?), )?line: (?<line>\d+)(, column: (?<column>\d+))?\))(; )?}
+  # rubocop:enable Lint/MixedRegexpCaptureTypes
   ERROR_WITHOUT_LOCATION = %r{(?<error>.*?)\son node}
 
   def initialize output
@@ -72,6 +74,8 @@ class OnceoverFormatter
     @output << "\n"
   end
 
+  # rubocop:disable Style/CombinableLoops
+  #
   # This method takes a notification and formats it into a hash that can be
   # printed easily
   def extract_failures notification
@@ -90,6 +94,7 @@ class OnceoverFormatter
 
     grouped
   end
+  # rubocop:enable Style/CombinableLoops
 
   # Extaracts data out of RSpec failres
   def extract_failure_data(fails)
@@ -309,4 +314,4 @@ class FailureCollector
       end
     }
   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.19.0"
+  s.version     = "3.19.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'colored', '~> 1.2'
   s.add_runtime_dependency 'cri', '>= 2.6'
   s.add_runtime_dependency 'deep_merge', '>= 1.0.0'
-  s.add_runtime_dependency 'facter', '< 4.0.0'
   s.add_runtime_dependency 'git'
   s.add_runtime_dependency 'logging', '>= 2.0.0'
   s.add_runtime_dependency 'multi_json', '~> 1.10'
@@ -37,4 +36,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'terminal-table', '>= 1.8.0'
   s.add_runtime_dependency 'versionomy', '>= 0.5.0'
 
+  s.add_development_dependency 'cucumber', '~> 4.1'
+  s.add_development_dependency 'pry', '~> 0.13.1'
+  s.add_development_dependency 'rubocop', '~> 1.6', '>= 1.6.1'
+  s.add_development_dependency 'rubygems-tasks', '~> 0.2.5'
 end

data/spec/fixtures/controlrepos/caching/Puppetfile

@@ -1,17 +1,17 @@
-forge "http://forge.puppetlabs.com"
-#
-# I want to download some modules to check if r10k feature in Onceover works correctly.
-#
-
-# Versions should be updated to be the latest at the time you start
-mod "puppetlabs/stdlib",      '4.11.0'
-
-# Modules from Git
-# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
-mod 'apache',
- :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
- :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
-
-#mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :branch => 'docs_experiment'
+forge "http://forge.puppetlabs.com"
+#
+# I want to download some modules to check if r10k feature in Onceover works correctly.
+#
+
+# Versions should be updated to be the latest at the time you start
+mod "puppetlabs/stdlib",      '4.11.0'
+
+# Modules from Git
+# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+mod 'apache',
+ :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+ :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :branch => 'docs_experiment'