onceover 3.12.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2b22d1ea208cdaeeeb71b5a99e2f55f6056cb2
-  data.tar.gz: d29bad7de9cfd34c55ece9b69bbb73b5b48cb182
+  metadata.gz: bf7fd944c3bc26e87d6fb637545e2a79f7913e88
+  data.tar.gz: af6d22e661957cae9092b623c9d337e949c4f219
 SHA512:
-  metadata.gz: add796e1d03519fb411c5b2bc5a27b5ff0f00e52b9cea682aeb06b21ec31d36ddfcbbf5209a88fe9eda2a26650d49be47d611096f264b21e97302134faa7b8f0
-  data.tar.gz: 73ec3b013c0c02598fa04d99dee1721b91c40d40ec2bd174e24393177f3052ee084d222afbf8791bbaeda8ae0263679e2a88e5c53b78e31ad3728c934b142d55
+  metadata.gz: aaab1848deba4d517a93debf8ed6d1ccf7d6251afc5974bb1240dcf341fbcfb096c2a88af5182578732bb817eaf78c638f0096073b6beb1193ce365c3af81100
+  data.tar.gz: ba295a61c754e4fd8c62a75ebacfc68b6fb724a90bc9484277065f1afbe542e3ce3fc50983be58c3adb34c4f1a9ae3629cabc0a9fcda4c1d38a7a311cae88595

data/features/run.feature

@@ -12,6 +12,11 @@ Feature: Run rspec and acceptance test suites
     When I run onceover command "run spec"
     Then I should not see any errors
 
+  Scenario: Run correct spec tests in parallel
+    Given initialized control repo "basic"
+    When I run onceover command "run spec --parallel"
+    Then I should not see any errors
+
   Scenario: Using regexes to define tests
     Given initialized control repo "caching"
     When I run onceover command "run spec"

data/lib/onceover/rspec/formatters.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'pathname'
 
 class OnceoverFormatter
@@ -53,6 +54,21 @@ class OnceoverFormatter
   def dump_failures notification
     require 'onceover/controlrepo'
 
+    failures = extract_failures(notification)
+
+    # Put some spacing before the results
+    @output << "\n\n\n"
+
+    failures.each do |_name, role|
+      @output << Onceover::Controlrepo.evaluate_template('error_summary.yaml.erb', binding)
+    end
+
+    @output << "\n"
+  end
+
+  # This method takes a notification and formats it into a hash that can be
+  # printed easily
+  def extract_failures notification
     # Group by role
     grouped = notification.failed_examples.group_by { |e| e.metadata[:example_group][:parent_example_group][:description]}
 
@@ -61,17 +77,15 @@ class OnceoverFormatter
       grouped[role] = failures.uniq { |f| f.metadata[:execution_result].exception.to_s }
     end
 
-    # Put some spacing before the results
-    @output << "\n\n\n"
-
+    # Extract the errors and remove all RSpec objects
     grouped.each do |role, failures|
-      role = {
+      grouped[role] = {
         name: role,
         errors: failures.map { |f| parse_errors(f.metadata[:execution_result].exception.to_s)}.flatten,
       }
-
-      @output << Onceover::Controlrepo.evaluate_template('error_summary.yaml.erb', binding)
     end
+
+    grouped
   end
 
   def parse_errors(raw_error)
@@ -140,8 +154,6 @@ class OnceoverFormatter
     file.relative_path_from(tempdir + environmentpath + "production").to_s
   end
 
-  private
-
   # Below are defined the styles for the output
   def class_name(text)
     RSpec::Core::Formatters::ConsoleCodes.wrap(text, :bold)
@@ -189,34 +201,69 @@ class OnceoverFormatter
 
 end
 
-# class OnceoverFormatterParallel < OnceoverFormatter
-#   require 'yaml'
+class OnceoverFormatterParallel < OnceoverFormatter
+  require 'yaml'
+
+  RSpec::Core::Formatters.register self, :example_group_started,
+  :example_passed, :example_failed, :example_pending, :dump_failures
+
+  def example_group_started notification
+    # Do nothing
+  end
+
+  def example_passed notification
+    @output << green('P')
+    @output.flush
+  end
+
+  def example_failed notification
+    @output << red('F')
+    @output.flush
+  end
+
+  def example_pending notification
+    @output << yellow('?')
+    @output.flush
+  end
+
+  def dump_failures notification
+    # Create a random string
+    require 'securerandom'
+    random_string = SecureRandom.hex
 
-#   def example_group_started notification
-#     # Do nothing
-#   end
+    # Ensure that the folder exists
+    FileUtils.mkdir_p "#{RSpec.configuration.onceover_tempdir}/parallel"
 
-#   def example_passed notification
-#     @output << green('P')
-#   end
+    # Dump the notification to a unique file
+    File.open("#{RSpec.configuration.onceover_tempdir}/parallel/results-#{random_string}.yaml", "w") do |file|
+      file.write(extract_failures(notification).to_yaml)
+    end
+  end
 
-#   def example_failed notification
-#     @output << red('F')
-#   end
+  def output_results(directory)
+    require 'rspec/core/example'
+    # Read all yaml files
+    results = {}
+    files   = Dir["#{directory}/*.yaml"]
 
-#   def example_pending notification
-#     @output << yellow('?')
-#   end
+    # Merge data
+    errors = files.reduce({}) do |errs, file|
+      # Read all files and merge them
+      errs.merge(YAML.load(File.read(file))) # rubocop:disable Security/YAMLLoad
+    end
+  
+    # Delete files from the disk
+    files.each { |f| File.delete(f) }
 
-#   def dump_failures
-#     # TODO: This should write to a file and then get picked up and formatted by onceover itself
-#     # might need to use a module for the formatting
-#     require 'pry'
-#     binding.pry
-#     RSpec.configuration.onceover_tempdir
-#   end
+    @output << "\n\n\n"
 
-# end
+    # Output errors
+    errors.each do |_name, role|
+      @output << Onceover::Controlrepo.evaluate_template('error_summary.yaml.erb', binding)
+    end
+    @output << "\n"
+  end
+end
 
 class FailureCollector
   RSpec::Core::Formatters.register self, :dump_failures

data/lib/onceover/runner.rb

@@ -84,15 +84,12 @@ class Onceover
           logger.debug "Running #{@command_prefix}rake spec_standalone from #{@repo.tempdir}"
           result = Backticks::Runner.new(interactive:true).run(@command_prefix.strip.split, 'rake', 'spec_standalone').join
         end
-        # TODO: Refactor this to be much nicer
-        if @config.formatters.include? 'FailureCollector'
-          puts '----------- Summary of failures -----------'
-          if File.exist?("#{@repo.tempdir}/failures.out") and ! File.zero?("#{@repo.tempdir}/failures.out")
-            logger.debug "Reading failures from #{@repo.tempdir}/failures.out"
-            puts File.read("#{@repo.tempdir}/failures.out")
-          else
-            puts 'No failures detected'
-          end
+
+        # Print a summary if we were running ion parallel
+        if @config.formatters.include? 'OnceoverFormatterParallel'
+          require 'onceover/rspec/formatters'
+          formatter = OnceoverFormatterParallel.new(STDOUT)
+          formatter.output_results("#{repo.tempdir}/parallel")
         end
 
         # Finally exit and preserve the exit code

data/lib/onceover/testconfig.rb

@@ -53,7 +53,7 @@ class Onceover
       
       # Set dynamic defaults for format
       if opts[:format] == [:defaults]
-        @formatters = opts[:parallel] ? ['documentation', 'FailureCollector'] : ['OnceoverFormatter']
+        @formatters = opts[:parallel] ? ['OnceoverFormatterParallel'] : ['OnceoverFormatter']
       else
         @formatters = opts[:format]
       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.12.0"
+  s.version     = "3.12.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake