moto 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bed5f3e97e0b71665d36998dc9398cd93709a1
-  data.tar.gz: 901dfb04c8ed8b0a652c68345709439c672b46a6
+  metadata.gz: 27cd6f4b74db2d52a13daae5accff2c8ced922c8
+  data.tar.gz: 7663285aa8ed492aca2f6b68d84945ba99f08c97
 SHA512:
-  metadata.gz: 32d5858cd9b538e114d1041750e6e378d5444d3c057ebb186a0505cd01381184879e5e7eb2644c9309aa95deebdd2469380dceb6b2d15088254179f3ce850b5e
-  data.tar.gz: 674b28b79b55ca89d25e2bddee8f7fc59cfad7b49abac35410296ef94ab4622858471869081aa511573f70e732732bd448dbd92869f5ca344970d8c54caa7820
+  metadata.gz: 5a3b7fc313e549842ed32512f3561ca1139c46afa354f114347ba898331fabd97bdaf73547b373eb23ffcc51d14fa8b8a406cf8f45cc351cb55a0e7a13502e68
+  data.tar.gz: 8aa3f30d4153fddd5cf10beb930d385607fba3b27167afe502620f8981743c4bee7db2acdec48899e125dbaaccedd630273b9d29edda4791cbd81f9206543b60

data/lib/cli.rb

@@ -109,7 +109,7 @@ module Moto
 
       test_reporter = Moto::Reporting::TestReporter.new(argv[:listeners], argv[:name])
 
-      runner = Moto::Runner::TestRunner.new(test_paths_absolute, test_reporter)
+      runner = Moto::Runner::TestRunner.new(test_paths_absolute, test_reporter, argv[:stop_on])
       runner.run
     end
 

data/lib/parser.rb

@@ -36,6 +36,7 @@ module Moto
       options = {}
       options[:listeners] = []
       options[:name] = ''
+      options[:stop_on] = {error: false, fail: false, skip: false}
 
       # Parse arguments
       OptionParser.new do |opts|
@@ -46,6 +47,9 @@ module Moto
         opts.on('-e', '--environment Environment')         { |v| options[:environment]  = v }
         opts.on('-n', '--name Name')                       { |v| options[:name]         = v }
         opts.on('-c', '--config Config')                   { |v| options[:config_name]  = v }
+        opts.on('--stop-on-error')                         { options[:stop_on][:error] = true }
+        opts.on('--stop-on-fail')                          { options[:stop_on][:fail]  = true }
+        opts.on('--stop-on-skip')                          { options[:stop_on][:skip]  = true }
       end.parse!
 
       if options[:name].empty?
@@ -120,6 +124,9 @@ module Moto
        -e, --environment Mandatory environment. Environment constants and tests parametrized in certain way depend on this.
        -c, --config      Name of the config, without extension, to be loaded from MotoApp/config/CONFIG_NAME.rb
                          Default: moto (which loads: MotoApp/config/moto.rb)
+       --stop-on-error   Moto will stop test execution when an error is encountered in test results
+       --stop-on-fail    Moto will stop test execution when a failure is encountered in test results
+       --stop-on-skip    Moto will stop test execution when a skip is encountered in test results
 
 
       moto generate:

data/lib/reporting/run_status.rb

@@ -93,6 +93,31 @@ module Moto
           when Moto::Test::Result::SKIPPED  then return 'SKIPPED'
         end
       end
+
+
+      # Inform about presence o errors/failures/skipped tests in current test run as a bitmap
+      # errors present: 0b100 & status_as_bitmap
+      # fails present:  0b010 & status_as_bitmap
+      # skips present:  0b001 & status_as_bitmap
+      # all passed:     status_as_bitmap == 0
+      def bitmap
+        status = 0
+
+        if tests_error.length > 0
+          status += 0b100
+        end
+
+        if tests_failed.length > 0
+          status += 0b010
+        end
+
+        if tests_skipped.length > 0
+          status += 0b001
+        end
+
+        status
+      end
+
     end
   end
 end

data/lib/reporting/test_reporter.rb

@@ -1,12 +1,14 @@
 require_relative 'run_status'
 require_relative 'listeners/base'
-require_relative 'listeners/kernel_code'
 
 module Moto
   module Reporting
 
     # Manages reporting test and run status' to attached listeners
     class TestReporter
+
+      attr_reader :run_status
+
       # @param [Array] listeners An array of strings, which represent qualified names of classes (listeners) that will be instantiated.
       #                empty array is passed then :default_listeners will be taken from config
       # @param [String] custom_run_name Optional, to be passed to listeners during creation
@@ -25,9 +27,6 @@ module Moto
         @listeners = []
         @custom_run_name = custom_run_name
         listeners.each { |l| add_listener(l) }
-
-        # Special listener used to generate code for Kernel.exit(code)
-        add_listener(Moto::Reporting::Listeners::KernelCode)
       end
 
       # Adds a listener to the list.

data/lib/runner/test_runner.rb

@@ -1,5 +1,4 @@
 require_relative '../reporting/test_reporter'
-require_relative '../reporting/listeners/kernel_code'
 require_relative './test_provider'
 
 module Moto
@@ -8,9 +7,16 @@ module Moto
 
       attr_reader :test_reporter
 
-      def initialize(test_paths_absolute, test_reporter)
+      # @param [Array] test_paths_absolute Absolute paths to files with tests
+      # @param [Moto::Reporting::TestReporter] test_reporter Reporter of test/run statuses that communicates with external status listeners
+      # @param [Hash] stop_conditions Describe when TestRunner should abnormally stop its execution
+      #   :error  [Boolean]
+      #   :fail   [Boolean]
+      #   :skip   [Boolean]
+      def initialize(test_paths_absolute, test_reporter, stop_conditions)
         @test_paths_absolute = test_paths_absolute
         @test_reporter = test_reporter
+        @stop_conditions = stop_conditions
       end
 
       def run
@@ -41,18 +47,23 @@ module Moto
         end
 
         # Waiting for all threads to run out of work so we can end the application
+        # or abonormal termination to be triggered based on options provided by the user
         loop do
-          if test_provider.num_waiting == threads_max
+          run_status = @test_reporter.run_status
+          if (test_provider.num_waiting == threads_max) ||
+             (@stop_conditions[:error] && run_status.tests_error.length   > 0) ||
+             (@stop_conditions[:fail]  && run_status.tests_failed.length  > 0) ||
+             (@stop_conditions[:skip]  && run_status.tests_skipped.length > 0)
             break
           end
 
-          sleep 1
+          sleep 2
         end
 
         @test_reporter.report_end_run
 
-        # Exit application with appropriate code generated by KernelCode listener
-        Kernel.exit(Moto::Reporting::Listeners::KernelCode.code)
+        # Exit application with code that represents status of test run
+        Kernel.exit(@test_reporter.run_status.bitmap)
       end
 
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.8.6'
+  VERSION = '0.8.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,7 +98,6 @@ files:
 - lib/reporting/listeners/console.rb
 - lib/reporting/listeners/console_dots.rb
 - lib/reporting/listeners/junit_xml.rb
-- lib/reporting/listeners/kernel_code.rb
 - lib/reporting/listeners/webui.rb
 - lib/reporting/run_status.rb
 - lib/reporting/test_reporter.rb

data/lib/reporting/listeners/kernel_code.rb

@@ -1,33 +0,0 @@
-module Moto
-  module Reporting
-    module Listeners
-      class KernelCode < Base
-
-        def self.code
-          @@code
-        end
-
-        # Invoked when whole batch of tests ends
-        def end_run(run_status)
-
-          code = 0
-
-          if run_status.tests_error.length > 0
-            code += 0b100
-          end
-
-          if run_status.tests_failed.length > 0
-            code += 0b010
-          end
-
-          if run_status.tests_skipped.length > 0
-            code += 0b001
-          end
-
-          @@code = code
-        end
-
-      end
-    end
-  end
-end