moto 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2216e77b4bfad6cd5598a147586ed6567887fa0
-  data.tar.gz: d8fc5dc3f9cbc7d86c6798ddf0d38225ed556cd9
+  metadata.gz: 6b4ceb470385c95d1e34d5907d3c055eb0e82d01
+  data.tar.gz: 9787f8dd894e7c2b00ac240646c019594d336a20
 SHA512:
-  metadata.gz: 70c8d3fe2876552c6d14f8bdb8c547f68cde88c42fa791b184cbc72136d838adfb570899d2f39b3ba3ea81905acfcc25d1d519a72df7ac25613e8b99e5163b92
-  data.tar.gz: c2fd5dbd5e26d38b14f608d64ddc7cfea677d6990f7f46781db86ce88369368b90f214e0ea2d8c1296383a20cb3075a9f19dced7be6c1fb818bfb69a7f6d6479
+  metadata.gz: 57029064fc0aac2f0cfb0a234268aac0916330bc1fae83727f08ed95349c0098113092453a93d29021b300a8c7cd968a3867b96be75df1c546adc77ab3c946e3
+  data.tar.gz: 9a0acf25d4ea66d626c48fefdb07abc121120c7c55b0ad697dba57882cdeed506f6d6938ccfc2d4edbf398b11640a3d4c5db7dc5596f702c46e8b03f57ba8bad

data/lib/modes/run/thread_context.rb

@@ -1,4 +1,3 @@
-require 'erb'
 require 'fileutils'
 require_relative '../../config'
 
@@ -82,7 +81,7 @@ module Moto
           file.chmod(0o666)
 
           Thread.current['logger'] = Logger.new(file)
-          logger.level = config[:test_log_level] || Logger::DEBUG
+          logger.level = config[:log_level]
         end
 
         def logger

data/lib/parameter_parser.rb

@@ -7,7 +7,7 @@ end
 
 
 require 'optparse'
-
+require 'logger'
 require_relative 'config'
 require_relative 'modes/mode_selector'
 
@@ -65,7 +65,10 @@ module Moto
         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('-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!
 
       if options[:tests]
@@ -87,11 +90,39 @@ module Moto
 
       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]
       Moto::Lib::Config.moto[:test_runner][:test_attempt_max] = options[:attempts] if options[:attempts]
       Moto::Lib::Config.moto[:test_runner][:dry_run] = options[:dry_run] if options[:dry_run]
       Moto::Lib::Config.moto[:test_runner][:explicit_errors] = options[:explicit_errors] if options[:explicit_errors]
 
+      # Test log level parsing
+
+      if options[:log_level]
+        Moto::Lib::Config.moto[:test_runner][:log_level] = case options[:log_level].downcase
+        when 'info'   then Logger::INFO
+        when 'warn'   then Logger::WARN
+        when 'error'  then  Logger::ERROR
+        when 'fatal'  then Logger::FATAL
+        else Logger::DEBUG
+        end
+      else
+        Moto::Lib::Config.moto[:test_runner][:log_level] = Logger::DEBUG
+      end
+
+      # Generator configuration
+
+      Moto::Lib::Config.moto[:test_generator][:param_name] = options[:param_name] if options[:param_name]
+
       return options
     end
 
@@ -220,13 +251,18 @@ module Moto
        --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
+
        --dry-run         Moto will list all test cases which would be run with provided arguments
 
-       --x, explicit_errors   Use for development of tests - each code error in test will be caught,
+       --x, explicit-errors   Use for development of tests - each code error in test will be caught,
                               logged as would normally do but will be also additionaly re-thrown.
                               This will obviously stop execution of selected set of tests but will provide
                               full stack and error message to the developer.
 
+       --log-level       Defines level at which Logger works. Use one of following: debug, info, warn, error, fatal.
+
+       --param-name      Only parameters that contain provided string will be executed.
+
 
 
       ==============

data/lib/test/generator.rb

@@ -39,9 +39,24 @@ module Moto
 
         # TODO CHANGED TEMPORARY
         #params_path = test_path_absolute.sub(/\.rb\z/, '')
-        params_directory = File.dirname(test_metadata.test_path).to_s + '/params/**'
+        params_directory = File.dirname(test_metadata.test_path).to_s + '/params/'
+
+        # Depending on param_name being provided or not filter files in param directory in appropriate way
+        if config[:param_name]
+          params_directory << "*#{config[:param_name]}*.param"
+        else
+          params_directory << '*.param'
+        end
+
         param_files_paths = Dir.glob(params_directory)
-        param_files_paths = [nil] if param_files_paths.empty?
+
+        # If param name is not specified then it's possible to run a test without params - they might not be there at all,
+        # but when param name is provided only matching ones need to be executed.
+        if config[:param_name]
+          param_files_paths = [] if param_files_paths.empty?
+        else
+          param_files_paths = [nil] if param_files_paths.empty?
+        end
 
         param_files_paths.each do |params_path|
 
@@ -61,7 +76,6 @@ module Moto
 
         variants
       end
-
       private :variantize
 
       # Generates test instances
@@ -106,6 +120,12 @@ module Moto
         test.injected_error_message = error_message
       end
 
+      # @return [Hash] Hash with config for test generator
+      def config
+        Moto::Lib::Config.moto[:test_generator]
+      end
+      private :config
+
     end
   end
 end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport