onceover 3.10.2 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d6e6f5065ebe49d6fd62bf085fd346207906e48
-  data.tar.gz: 5810a9fe7edb1cdc67bbfa129e860214afcfe9f5
+SHA256:
+  metadata.gz: 71d240d281209575819137b3b4a0d8128d049d8df9482bc679f2915107f74a40
+  data.tar.gz: add61e481be9978f6dc492eb351d0f3b43d248119d3b94b98132c7323495e52a
 SHA512:
-  metadata.gz: fa3d438c99aabc12a74d5dd9eef5a1ebb38c8ef8a3c8b4d03c32f0bca9b93d0f8d422df7a4e8abdcd4ecffc18f2a0e87c3fd42858b4a23a2eb56caffc55e2016
-  data.tar.gz: a1cd8202653fb82e359a9a754fa5bd0955505fcb2c247c50017c54ecadddec64f4afab564844d205defefa2f2871cab86066117724daf5aa95657bc64fefe918
+  metadata.gz: ea96a764d79607406e3c89fd0aea91b568c70902ba88b1d30cc7cf2619eb7a204a43764dd12abc74cca7cf25ad5d79dcd18e0dd02ad3a2689b6e9363b1db4d4e
+  data.tar.gz: d35d26e20dbc980b22775784e1a3945c0251cf2f554fc320ae3ce24ed113d39c21b25aec37353e5d177e29ea0c47a3d7ddf7af16e305e2a36f8e7295239e68bd

data/lib/onceover/cli/run.rb

@@ -41,6 +41,7 @@ This includes deploying using r10k and running all custom tests.
             summary 'Runs spec tests'
 
             optional :p, :parallel, 'Runs spec tests in parallel. This increases speed at the cost of poorly formatted logs and irrelevant junit output.'
+            optional nil, :format, 'Which RSpec formatter to use, valid options are: documentation, progress, FailureCollector. You also specify this multiple times', multiple: true, default: :defaults
 
             run do |opts, args, cmd|
               repo = Onceover::Controlrepo.new(opts)

data/lib/onceover/runner.rb

@@ -1,3 +1,5 @@
+require 'backticks'
+
 class Onceover
   class Runner
     attr_reader :repo
@@ -15,6 +17,9 @@ class Onceover
       # all the latest tests
       FileUtils.rm_rf("#{@repo.tempdir}/spec")
 
+      # Remove any previous failure log
+      FileUtils.rm_f("#{@repo.tempdir}/failures.out")
+
       # Create the other directories we need
       FileUtils.mkdir_p("#{@repo.tempdir}/spec/classes")
       FileUtils.mkdir_p("#{@repo.tempdir}/spec/acceptance/nodesets")
@@ -74,10 +79,20 @@ class Onceover
         #`bin/rake spec_standalone`
         if @config.opts[:parallel]
           logger.debug "Running #{@command_prefix}rake parallel_spec from #{@repo.tempdir}"
-          exec("#{@command_prefix}rake parallel_spec")
+          Backticks::Runner.new(interactive:true).run(@command_prefix.strip.split, 'rake', 'parallel_spec').join
         else
           logger.debug "Running #{@command_prefix}rake spec_standalone from #{@repo.tempdir}"
-          exec("#{@command_prefix}rake spec_standalone")
+          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
         end
       end
     end
@@ -89,7 +104,7 @@ class Onceover
         #`bundle install --binstubs`
         #`bin/rake spec_standalone`
         logger.debug "Running #{@command_prefix}rake acceptance from #{@repo.tempdir}"
-        exec("#{@command_prefix}rake acceptance")
+        Backticks::Runner.new(interactive:true).run(@command_prefix.strip.split, 'rake', 'acceptance').join
       end
     end
   end

data/lib/onceover/testconfig.rb

@@ -28,6 +28,7 @@ class Onceover
     attr_accessor :skip_r10k
     attr_accessor :force
     attr_accessor :strict_variables
+    attr_accessor :formatters
 
     def initialize(file, opts = {})
       begin
@@ -49,6 +50,13 @@ class Onceover
       @before_conditions = config['before']
       @after_conditions  = config['after']
       @strict_variables  = opts[:strict_variables] ? 'yes' : 'no'
+      
+      # Set dynamic defaults for format
+      if opts[:format] == [:defaults]
+        @formatters = opts[:parallel] ? ['documentation', 'FailureCollector'] : ['documentation']
+      else
+        @formatters = opts[:format]
+      end
 
       # Initialise all of the classes and nodes
       config['classes'].each { |clarse| Onceover::Class.new(clarse) } unless config['classes'] == nil

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.10.2"
+  s.version     = "3.11.0"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   # Runtime dependencies, but also probably dependencies of requiring projects
   s.add_runtime_dependency 'rake', '>= 10.0.0'
   s.add_runtime_dependency 'json', '>= 1.8.2'
+  s.add_runtime_dependency 'backticks', '>= 1.0.2'
   s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
   s.add_runtime_dependency 'parallel_tests', ">= 2.0.0"
   s.add_runtime_dependency 'puppetlabs_spec_helper', ">= 0.4.0"

data/templates/spec_helper.rb.erb

@@ -15,12 +15,36 @@ end
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec_junit_formatter'
 
+class FailureCollector
+  RSpec::Core::Formatters.register self, :dump_failures
+
+  def initialize(output)
+    @output = output
+    puts "Initializing FailureCollector"
+    FileUtils.touch(File.expand_path('<%= repo.tempdir %>/failures.out'))
+  end
+
+  def dump_failures(failures)
+    open(File.expand_path('<%= repo.tempdir %>/failures.out'), 'a') { |f|
+      failures.failed_examples.each do |fe|
+        f.puts
+        f.puts "#{fe.metadata[:description]}"
+        f.puts "#{fe.metadata[:execution_result].exception.to_s}"
+        f.puts "#{fe.metadata[:file_path]}:#{fe.metadata[:line_number]}"
+        f.puts "------------------------------------------------------"
+      end
+    }
+  end
+end
+
 RSpec.configure do |c|
   # Also add JUnit output in case people want to use that
   c.add_formatter('RSpecJUnitFormatter','<%= repo.tempdir %>/spec.xml')
 
   c.parser                = 'future'
-  c.formatter             = 'documentation'
+<% @formatters.each do |fm| -%>
+  c.formatter             = '<%= fm %>'
+<% end -%>
   c.trusted_server_facts  = true
   c.environmentpath       = '<%= environmentpath %>'
   c.module_path           = '<%= modulepath %>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.11.0
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: backticks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -434,8 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Testing tools for Puppet controlrepos