onceover 3.13.3 → 3.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7b37b37e3704c6ec2183c6670efbda0bf9bcb24ddf948c88e44acd686d23c7
-  data.tar.gz: ebfb0a52ccbd684d41898a93469b12832f9e6efca792d7df47e76e6ff7c644fa
+  metadata.gz: 6449e2a04348ed1fa97a08d0e452a7bd612eb45bf807aaddd4c32b2a22a6b1c6
+  data.tar.gz: 7d93dcf1e360f4a43aa36ace53db60009a7aa0062a734f9472ca14825c59db49
 SHA512:
-  metadata.gz: a70412dcdd03ccbdf4bd0bef27a5ac732e9edda51e3e6872a37df79c4ab64d86d64f4b6052542a46ea5b135dd9649b9f47a9b5781aa29316996223cc03daf77e
-  data.tar.gz: c8841bef52586a8b460d1410449bbbbd3ff26d94d4df5399027458bebdf836cd6e1b14d8e5b6b3855fd5b8342c28a0396be4f1381597b119253b591cb6c250a1
+  metadata.gz: '038b4af7edbfd3cf592c425c3de222a3166be32d301999948cb93e2fc62555b3a349cfd412a918aa4a4457d819bc47b80eebb3e1eb007c14f0424352783ec95f'
+  data.tar.gz: 727fb90aec81e72997768799dabd11860423413b176de03e94fdf1d01e0d4451efd7e68aeb61b13d9c60ca8d1c7372ed013b1e34eeb5ffd70f907ceaaf5971f1

data/lib/onceover/controlrepo.rb

@@ -104,7 +104,7 @@ class Onceover
 
       @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)
+      if File.exist?(@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)}
@@ -475,7 +475,7 @@ class Onceover
 
       # Add .onceover to Gitignore
       gitignore_path = File.expand_path('.gitignore', repo.root)
-      if File.exists? gitignore_path
+      if File.exist? gitignore_path
         gitignore_content = (File.open(gitignore_path, 'r') {|f| f.read }).split("\n")
         message = "#{'changed'.green}"
       else
@@ -567,7 +567,7 @@ class Onceover
 
     def self.init_write_file(contents, out_file)
       create_dirs_and_log(File.dirname(out_file))
-      if File.exists?(out_file)
+      if File.exist?(out_file)
         puts "#{'skipped'.yellow} #{Pathname.new(out_file).relative_path_from(Pathname.new(Dir.pwd)).to_s} #{'(exists)'.yellow}"
       else
         File.open(out_file,'w') {|f| f.write(contents)}

data/lib/onceover/rspec/formatters.rb

@@ -59,7 +59,7 @@ class OnceoverFormatter
     # Put some spacing before the results
     @output << "\n\n\n"
 
-    failures.each do |_name, role|
+    failures.each do |name, errors|
       @output << Onceover::Controlrepo.evaluate_template('error_summary.yaml.erb', binding)
     end
 
@@ -74,20 +74,34 @@ class OnceoverFormatter
 
     # Further group by error
     grouped.each do |role, failures|
-      grouped[role] = failures.uniq { |f| f.metadata[:execution_result].exception.to_s }
+      grouped[role] = failures.group_by { |f| f.metadata[:execution_result].exception.to_s }
     end
 
     # Extract the errors and remove all RSpec objects
     grouped.each do |role, failures|
-      grouped[role] = {
-        name: role,
-        errors: failures.map { |f| parse_errors(f.metadata[:execution_result].exception.to_s)}.flatten,
-      }
+      grouped[role] = failures.map { |_description, fails| extract_failure_data(fails)}.flatten
     end
 
     grouped
   end
 
+  # Extaracts data out of RSpec failres
+  def extract_failure_data(fails)
+    # The only difference between these failures should be the factsets that it
+    # failed on. Extract that list then just use the first failure for the rest
+    # of the data as it should be the same
+    metadata          = fails[0].metadata
+    raw_error         = metadata[:execution_result].exception.to_s
+    factsets          = fails.map { |f| f.metadata[:example_group][:description].gsub('using fact set ','') }
+    results           = parse_errors(raw_error)
+    # Add the details of the factsets tio each result
+    results.map do |r|
+      r[:factsets] = factsets
+      r
+    end
+  end
+
+  # Parses information out of a string error
   def parse_errors(raw_error)
     # Check if the error is a compilation error
     match = COMPILATION_ERROR.match(raw_error)
@@ -247,9 +261,9 @@ class OnceoverFormatterParallel < OnceoverFormatter
     files   = Dir["#{directory}/*.yaml"]
 
     # Merge data
-    errors = files.reduce({}) do |errs, file|
+    roles = files.reduce({}) do |errs, file|
       # Read all files and merge them
-      errs.merge(YAML.load(File.read(file))) # rubocop:disable Security/YAMLLoad
+      errs.merge(YAML.load(File.read(file))) {|key, oldval, newval| [oldval, newval].flatten }# rubocop:disable Security/YAMLLoad
     end
   
     # Delete files from the disk
@@ -258,7 +272,7 @@ class OnceoverFormatterParallel < OnceoverFormatter
     @output << "\n\n\n"
 
     # Output errors
-    errors.each do |_name, role|
+    roles.each do |name, errors|
       @output << Onceover::Controlrepo.evaluate_template('error_summary.yaml.erb', binding)
     end
     @output << "\n"

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.3"
+  s.version     = "3.13.4"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/templates/error_summary.yaml.erb

@@ -1,6 +1,6 @@
-<%= bold(role[:name]) %>: <%= red('failed') %>
+<%= bold(name) %>: <%= red('failed') %>
   errors:
-<% role[:errors].each do |error| -%>
+<% errors.each do |error| -%>
     <%= red(error[:text]) %>
 <% if error[:file] -%>
       file: <%= bold(error[:file]) %>
@@ -11,4 +11,7 @@
 <% if error[:column] -%>
       column: <%= bold(error[:column]) %>
 <% end -%>
+<% if error[:factsets] -%>
+      factsets: <%= bold(error[:factsets].join(', ')) %>
+<% end -%>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.13.3
+  version: 3.13.4
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake