moto 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4ceb470385c95d1e34d5907d3c055eb0e82d01
-  data.tar.gz: 9787f8dd894e7c2b00ac240646c019594d336a20
+  metadata.gz: 58cc88ecb6791a74c19ba8f415ab37392a7189f2
+  data.tar.gz: b7206e4a0a7312fb01a7d40971d9119e2ee2ed5b
 SHA512:
-  metadata.gz: 57029064fc0aac2f0cfb0a234268aac0916330bc1fae83727f08ed95349c0098113092453a93d29021b300a8c7cd968a3867b96be75df1c546adc77ab3c946e3
-  data.tar.gz: 9a0acf25d4ea66d626c48fefdb07abc121120c7c55b0ad697dba57882cdeed506f6d6938ccfc2d4edbf398b11640a3d4c5db7dc5596f702c46e8b03f57ba8bad
+  metadata.gz: f20a9ea1cf5fac91e261c9bc046155a0b1a6d8f98c2f6fc8ffa3f45457b079cfe99cc7c30f265f1281aa69f2f60b8f9dfb79cc15765b79b072126f3f1a87e414
+  data.tar.gz: 2dcd7abbcfb2da1ff31ae97bd8ddb0c934e94dda2c900a45c47923d3bac27a167fa698f3441e8f72d1994d0e20bf9027f09576c8934204ed97765921cc090e55

data/bin/moto

@@ -3,8 +3,11 @@
 require_relative '../lib/test/base'
 
 require_relative '../lib/reporting/listeners/base'
-require_relative '../lib/reporting/listeners/console'
 require_relative '../lib/reporting/listeners/console_dots'
+require_relative '../lib/reporting/listeners/silent'
+require_relative '../lib/reporting/listeners/summary_short'
+require_relative '../lib/reporting/listeners/summary_only'
+require_relative '../lib/reporting/listeners/attempts'
 require_relative '../lib/reporting/listeners/junit_xml'
 require_relative '../lib/reporting/listeners/webui'
 

data/lib/config.rb

@@ -17,8 +17,14 @@ module Moto
 
       # Loads configuration for whole test run and files responsible for environmental constants.
       # @param [String] config_name Name of the main Moto/MotoApp config to be loaded. Without extension.
-      def self.load_configuration(config_name)
-        config_path = "#{MotoApp::DIR}/config/#{config_name}.rb"
+      # @param [String] env Name of the env config to be loaded in addition to /config/environments/common. Without extension.
+      def self.load_configuration(config_name, env)
+
+        if config_name
+          config_path = "#{MotoApp::DIR}/config/#{config_name}.rb"
+        else
+          config_path = "#{MotoApp::DIR}/config/moto.rb"
+        end
 
         if File.exists?(config_path)
           @@moto = eval(File.read(config_path))
@@ -31,13 +37,20 @@ module Moto
           end
 
           # Try reading constants specific to current environment
-          begin
-            environment_constants = eval(File.read("config/environments/#{@@environment}.rb"))
-          rescue
-            environment_constants = {}
+          if env
+            self.environment = env
+
+            begin
+              environment_constants = eval(File.read("config/environments/#{@@environment}.rb"))
+            rescue
+              environment_constants = {}
+            end
+          end
+
+          if environment_constants
+            @@env_consts = common_constants.deep_merge(environment_constants)
           end
 
-          @@env_consts = common_constants.deep_merge(environment_constants)
         else
           raise "Config file: #{config_path} does not exist.\nDoes current working directory contain Moto application?"
         end

data/lib/modes/generate/test_template_generator.rb

@@ -26,7 +26,13 @@ module Moto
           if options[:base_class].nil?
             base_class_qualified_name = 'Moto::Test::Base'
           else
-            base_class_qualified_name = "#{options[:app_name]}::Lib::Test::#{options[:base_class].split('/').join('::').camelize}"
+            name_parts = options[:base_class].split('/')
+
+            name_parts.each_with_index do |part,index|
+              name_parts[index] = part.camelize
+            end
+
+            base_class_qualified_name = "#{options[:app_name]}::Lib::Test::#{name_parts.join('::')}"
           end
 
           # Where to put finished template
@@ -43,9 +49,11 @@ module Moto
 
               indent = 0
 
-              if options[:base_class].nil?
-                file << "\n"
-              else
+              file << "# MOTO_TAGS: \n"
+              file << "# DESC: Template genereated by 'moto generate'\n"
+              file << "# DESC: line2\n\n"
+
+              if options[:base_class]
                 file << "require './lib/test/#{options[:base_class]}.rb'\n\n"
               end
 
@@ -54,7 +62,6 @@ module Moto
                 indent += 2
               end
 
-              file << (' ' * indent) + "# Class template genereated by 'moto generate'\n"
               file << (' ' * indent) + "class #{class_name} < #{base_class_qualified_name}\n\n"
               indent += 2
               file << (' ' * indent) + "def run\n"

data/lib/parameter_parser.rb

@@ -5,7 +5,6 @@ rescue
   nil
 end
 
-
 require 'optparse'
 require 'logger'
 require_relative 'config'
@@ -19,6 +18,11 @@ module Moto
 
         mode_selector = Moto::Modes::ModeSelector.new
 
+        # TODO: IMPORTANT ISSUE
+        # xxx_parse functions should not return parsed arguments and pass them to functions
+        # but instead all should inject proper values into Moto::Lib::Config.moto[:xxx][:yyy]
+        # on which all further components should relay
+
         if argv[0] == '--version'
           mode_selector.version
         elsif argv[0] == 'run' && argv.length > 1
@@ -39,6 +43,27 @@ module Moto
       end
     end
 
+    def self.prepare_config(options)
+      Moto::Lib::Config.load_configuration(options[:config_name], options[:environment])
+
+      if !config_test_runner
+        Moto::Lib::Config.moto[:test_runner] = {}
+      end
+
+      if !config_test_generator
+        Moto::Lib::Config.moto[:test_generator] = {}
+      end
+
+    end
+
+    def self.config_test_runner
+      Moto::Lib::Config.moto[:test_runner]
+    end
+
+    def self.config_test_generator
+      Moto::Lib::Config.moto[:test_generator]
+    end
+
     def self.run_parse(argv)
       # Default options
       options = {}
@@ -50,27 +75,29 @@ module Moto
 
       # Parse arguments
       OptionParser.new do |opts|
-        opts.on('-t', '--tests Tests', Array) {|v| options[:tests] = v}
-        opts.on('-g', '--tags Tags', Array) {|v| options[:tags] = v}
-        opts.on('-f', '--filters Filters', Array) {|v| options[:filters] = v}
+        opts.on('-c', '--config Config')              {|v| options[:config_name] = v}
+        opts.on('-e', '--environment Environment')    {|v| options[:environment] = v}
+        opts.on('-t', '--tests Tests', Array)         {|v| options[:tests] = v}
+        opts.on('-g', '--tags Tags', Array)           {|v| options[:tags] = v}
+        opts.on('-f', '--filters Filters', Array)     {|v| options[:filters] = v}
         opts.on('-l', '--listeners Listeners', Array) {|v| options[:listeners] = v}
-        opts.on('-e', '--environment Environment') {|v| options[:environment] = v}
-        opts.on('-r', '--runname RunName') {|v| options[:run_name] = v}
-        opts.on('-s', '--suitename SuiteName') {|v| options[:suite_name] = v}
-        opts.on('-a', '--assignee Assignee') {|v| options[:assignee] = v}
-        opts.on('-c', '--config Config') {|v| options[:config_name] = v}
-        opts.on('--threads ThreadCount', Integer) {|v| options[:threads] = v}
-        opts.on('--attempts AttemptCount', Integer) {|v| options[:attempts] = 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}
-        opts.on('--dry-run') {options[:dry_run] = true}
-        opts.on('-x', '--explicit-errors') {options[:explicit_errors] = true}
-        opts.on('--log-level LogLevel') {|v| options[:log_level] = v}
-        opts.on('--param-name ParamName') {|v| options[:param_name] = v}
-
+        opts.on('-r', '--runname RunName')            {|v| options[:run_name] = v}
+        opts.on('-s', '--suitename SuiteName')        {|v| options[:suite_name] = v}
+        opts.on('-a', '--assignee Assignee')          {|v| options[:assignee] = v}
+        opts.on('-c', '--config Config')              {|v| options[:config_name] = v}
+        opts.on('--threads ThreadCount', Integer)     {|v| options[:threads] = v}
+        opts.on('--attempts AttemptCount', Integer)   {|v| options[:attempts] = 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}
+        opts.on('--dry-run')                          {options[:dry_run] = true}
+        opts.on('-x', '--explicit-errors')            {options[:explicit_errors] = true}
+        opts.on('--log-level LogLevel')               {|v| options[:log_level] = v}
+        opts.on('--param-name ParamName')             {|v| options[:param_name] = v}
       end.parse!
 
+      self.prepare_config(options)
+
       if options[:tests]
         options[:tests].each do |path|
           path.sub!(%r{\/$}, '') # remove trailing "/"
@@ -81,23 +108,6 @@ module Moto
         options[:run_name] = evaluate_name(options[:tests], options[:tags], options[:filters])
       end
 
-      if options[:environment]
-        Moto::Lib::Config.environment = options[:environment]
-      else
-        puts 'ERROR: Environment is mandatory.'
-        Kernel.exit(-1)
-      end
-
-      Moto::Lib::Config.load_configuration(options[:config_name] ? options[:config_name] : 'moto')
-
-      if !Moto::Lib::Config.moto[:test_runner]
-        Moto::Lib::Config.moto[:test_runner] = {}
-      end
-
-      if !Moto::Lib::Config.moto[:test_generator]
-        Moto::Lib::Config.moto[:test_generator] = {}
-      end
-
       # Runner configuration
 
       Moto::Lib::Config.moto[:test_runner][:thread_count] = options[:threads] if options[:threads]
@@ -120,7 +130,6 @@ module Moto
       end
 
       # Generator configuration
-
       Moto::Lib::Config.moto[:test_generator][:param_name] = options[:param_name] if options[:param_name]
 
       return options
@@ -136,6 +145,7 @@ module Moto
 
       # Parse arguments
       OptionParser.new do |opts|
+        opts.on('-c', '--config Config') {|v| options[:config_name] = v}
         opts.on('-t', '--tests Tests', Array) {|v| options[:tests] = v}
         opts.on('-g', '--tags Tags', Array) {|v| options[:tags] = v}
         opts.on('-f', '--filters Filters', Array) {|v| options[:filters] = v}
@@ -143,7 +153,6 @@ module Moto
         opts.on('-r', '--runname RunName') {|v| options[:run_name] = v}
         opts.on('-s', '--suitename SuiteName') {|v| options[:suite_name] = v}
         opts.on('-a', '--assignee Assignee') {|v| options[:assignee] = v}
-        opts.on('-c', '--config Config') {|v| options[:config_name] = v}
         opts.on('-p', '--tagregexpos RegexPositive') {|v| options[:validator_regex_positive] = v}
         opts.on('-n', '--tagregexneg RegexNegative') {|v| options[:validator_regex_negative] = v}
         opts.on('-h', '--hastags') {|v| options[:validate_has_tags] = v}
@@ -151,6 +160,8 @@ module Moto
         opts.on('-w', '--tagwhitelist TagWhitelist', Array) {|v| options[:tag_whitelist] = v}
       end.parse!
 
+      self.prepare_config(options)
+
       if options[:tests]
         options[:tests].each do |path|
           path.sub!(%r{\/$}, '') # remove trailing "/"
@@ -161,8 +172,6 @@ module Moto
         options[:run_name] = evaluate_name(options[:tests], options[:tags], options[:filters])
       end
 
-      Moto::Lib::Config.load_configuration(options[:config_name] ? options[:config_name] : 'moto')
-
       return options
     end
 
@@ -196,6 +205,8 @@ module Moto
         opts.on('-f', '--force') {options[:force] = true}
       end.parse!
 
+      self.prepare_config(options)
+
       options[:dir] = options[:dir].underscore
 
       if options[:app_name].nil?
@@ -231,7 +242,10 @@ module Moto
                          Use ~ to filter tests that do not contain specific tag, e.g. ~tag
 
 
-       -e, --environment Mandatory environment. Environment constants and tests parametrized in certain way depend on this.
+       -e, --environment Environment constants and tests parametrized in certain way depend on this.
+                         Without this param only `config/environment/common.rb` will be loaded.
+                         If provided moto will try to load additionally `config/environment/NAME.rb` and apply changes
+                         on top of already loaded common configuration.
        -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)
 

data/lib/reporting/listeners/attempts.rb

@@ -0,0 +1,46 @@
+module Moto
+  module Reporting
+    module Listeners
+      class Attempts < Base
+
+        def initialize(run_params)
+          @displayed_results = 0
+          @semaphore = Mutex.new
+        end
+
+        def end_run(run_status)
+          puts ''
+          puts "FINISHED: #{run_status.to_s}, duration: #{Time.at(run_status.duration).utc.strftime("%H:%M:%S")}"
+          puts "Tests executed: #{run_status.tests_all.length}"
+          puts "  Passed:       #{run_status.tests_passed.length}"
+          puts "  Failure:      #{run_status.tests_failed.length}"
+          puts "  Error:        #{run_status.tests_error.length}"
+          puts "  Skipped:      #{run_status.tests_skipped.length}"
+        end
+
+        def start_test(test_status, test_metadata)
+        end
+
+        def end_test(test_status)
+          @semaphore.synchronize do
+
+            @displayed_results += 1
+
+            representation =
+                case test_status.results.last.code
+                  when Moto::Test::Result::PASSED   then 'Pass'
+                  when Moto::Test::Result::FAILURE  then 'Fail'
+                  when Moto::Test::Result::ERROR    then 'Error'
+                  when Moto::Test::Result::SKIPPED  then 'Skip'
+                end
+
+            if test_status.attempts > 1
+              puts "#{test_status.display_name} :: #{test_status.attempts} :: #{representation}"
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/reporting/listeners/silent.rb

@@ -0,0 +1,21 @@
+module Moto
+  module Reporting
+    module Listeners
+      class Silent < Base
+
+        def start_run
+        end
+
+        def end_run(run_status)
+        end
+
+        def start_test(test_status, test_metadata)
+        end
+
+        def end_test(test_status)
+        end
+
+      end
+    end
+  end
+end

data/lib/reporting/listeners/{console.rb → summary_only.rb}

@@ -1,10 +1,9 @@
 module Moto
   module Reporting
     module Listeners
-      class Console < Base
+      class SummaryOnly < Base
 
         def start_run
-         # puts 'START'
         end
 
         def end_run(run_status)
@@ -17,8 +16,10 @@ module Moto
           puts "  Skipped:      #{run_status.tests_skipped.length}"
         end
 
+        def start_test(test_status, test_metadata)
+        end
+
         def end_test(test_status)
-          puts "\n#{test_status.name}\n\t#{test_status.results.last.message}"
         end
 
       end

data/lib/reporting/listeners/summary_short.rb

@@ -0,0 +1,48 @@
+module Moto
+  module Reporting
+    module Listeners
+      class SummaryShort < Base
+
+        def initialize(run_params)
+          @displayed_results = 0
+          @semaphore = Mutex.new
+        end
+
+        def end_run(run_status)
+          puts ''
+          puts "FINISHED: #{run_status.to_s}, duration: #{Time.at(run_status.duration).utc.strftime("%H:%M:%S")}"
+          puts "Tests executed: #{run_status.tests_all.length}"
+          puts "  Passed:       #{run_status.tests_passed.length}"
+          puts "  Failure:      #{run_status.tests_failed.length}"
+          puts "  Error:        #{run_status.tests_error.length}"
+          puts "  Skipped:      #{run_status.tests_skipped.length}"
+        end
+
+        def start_test(test_status, test_metadata)
+        end
+
+        def end_test(test_status)
+          @semaphore.synchronize do
+            @displayed_results += 1
+
+            representation =
+                case test_status.results.last.code
+                  when Moto::Test::Result::PASSED   then '.'
+                  when Moto::Test::Result::FAILURE  then 'F'
+                  when Moto::Test::Result::ERROR    then 'E'
+                  when Moto::Test::Result::SKIPPED  then 's'
+                end
+
+            if @displayed_results%50 != 0
+              print representation
+            else
+              puts representation
+            end
+
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/test/status.rb

@@ -36,8 +36,12 @@ module Moto
       # Path to test's log, for purpose of making test logs accessible via listeners
       attr_accessor :log_path
 
+      # Amount of attempts that have been made to successfuly complete a test
+      attr_accessor :attempts
+
       def initialize
         @results = []
+        @attempts = 0
       end
 
       def initialize_run
@@ -45,6 +49,8 @@ module Moto
           @time_start = Time.now.to_f
         end
 
+        @attempts += 1
+
         result = Moto::Test::Result.new
         result.code = Moto::Test::Result::RUNNING
         @results.push(result)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '1.0.1'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,10 +97,13 @@ files:
 - lib/modes/run/thread_context.rb
 - lib/modes/validate/test_validator.rb
 - lib/parameter_parser.rb
+- lib/reporting/listeners/attempts.rb
 - lib/reporting/listeners/base.rb
-- lib/reporting/listeners/console.rb
 - lib/reporting/listeners/console_dots.rb
 - lib/reporting/listeners/junit_xml.rb
+- lib/reporting/listeners/silent.rb
+- lib/reporting/listeners/summary_only.rb
+- lib/reporting/listeners/summary_short.rb
 - lib/reporting/listeners/webui.rb
 - lib/reporting/run_status.rb
 - lib/reporting/test_reporter.rb