moto 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 128985359cd630b7058bb7bba1d96ea7517c74b9
-  data.tar.gz: ecd946cb9026ec99ae1190e61b188fe988640a72
+  metadata.gz: 3e65386856ade15e4eae651e3cab0c53ecfffe6e
+  data.tar.gz: 7f2b839cc1e8cee8f4c4115a6904133379eff395
 SHA512:
-  metadata.gz: cd9e3d39235d08eec0a9cd073597c4e403040f7eb916731d99dad86bf076001bbab960b281fd1bebb986fe1bcc062b3add724cadface33734a397b1683219b9b
-  data.tar.gz: ebd6ae97dbcddcb200cc773555d170e652ce68136024a1c24c4fce02b54d002335b2a3becb743e7bd5a5e420590418ba009f5d11168c56bb831ef4005c404e2c
+  metadata.gz: e5b8bfc2a6ec600a3c71bc93c0f4415072d239e92c0553a449fc524add7e8662dda586d87546b43700114c7830a683b12d5c2e51e6249de36b1618e96a839d7f
+  data.tar.gz: ce2dd0e518627bbd7ce5714f36c29c1f7cec99a73f8d1699e6cf226ae645dd88828a7dfb36faab8ef5696c8197c6a3b571d624b1589af61519ce18bb044e0110

data/lib/cli.rb

@@ -34,34 +34,69 @@ module Moto
 
   class Cli
     def self.run(argv)
+
       test_paths_absolute = []
+      directories   = argv[:tests]
+      tags          = argv[:tags]
+      filters       = argv[:filters]
 
-      #TODO Remove providing an array ?
-      unless argv[ :tests ].nil?
-        argv[ :tests ].each do |dir_name|
-          test_paths = Dir.glob("#{MotoApp::DIR}/tests/#{dir_name}/**/*.rb")
-          test_paths -= test_paths_absolute
-          test_paths_absolute += test_paths
+      if directories
+        directories.each do |directory|
+          test_paths_absolute += Dir.glob("#{MotoApp::DIR}/tests/#{directory}/**/*.rb")
         end
       end
 
-      # TODO Optimization for files without #MOTO_TAGS - add support for tags in params (not here)
-      unless argv[:tags].nil?
+      if tags
         tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
         tests_total.each do |test_path|
+
           test_body = File.read(test_path)
-          matches = test_body.match(/^#(\s*)MOTO_TAGS:([^\n\r]+)$/m)
+          matches = test_body.match(/^#(\s*)MOTO_TAGS:(.*?)$/)
+
           if matches
             test_tags = matches.to_a[2].gsub(/\s*/, '').split(',')
-            test_paths_absolute << test_path unless (argv[:tags]&test_tags).empty?
+            test_paths_absolute << test_path unless (tags & test_tags).empty?
           end
+
         end
       end
 
+      # Make sure there are no repetitions in gathered set
+      test_paths_absolute.uniq!
+
+      # Tests to be removed due to filtering will be gathered in this array
+      # [].delete(item) cannot be used since it interferes with [].each
+      filtered_test_paths = []
+
+      # Filter tests by provied tags
+      if filters
+        test_paths_absolute.each do |test_path|
+          test_body = File.read(test_path)
+
+          matches = test_body.match(/^#(\s*)MOTO_TAGS:(.*?)$/)
+
+          if matches
+
+            test_tags = matches.to_a[2].gsub(/\s*/, '').split(',')
+            if (filters & test_tags).empty?
+              # Test doesn't contain any tags to be filtered upon
+              filtered_test_paths << test_path
+            end
+
+          else
+            # Test has no tags at all
+            filtered_test_paths << test_path
+          end
+
+        end
+      end
+
+      test_paths_absolute -= filtered_test_paths
+
       #TODO Display criteria used
       if test_paths_absolute.empty?
         puts 'No tests found for given arguments.'
-        Kernel.exit!(-1)
+        Kernel.exit(-1)
       end
 
       # Requires custom initializer if provided by application that uses Moto

data/lib/parser.rb

@@ -20,7 +20,8 @@ module Moto
         else
           show_help
         end
-
+      rescue SystemExit
+        nil
       rescue Exception => e
         puts e.message + "\n\n"
         puts e.backtrace.join("\n")
@@ -38,16 +39,17 @@ 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('-l', '--listeners Listeners', Array)      { |v| options[:listeners] = v }
-        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('-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('-n', '--name Name')                       { |v| options[:name]         = v }
+        opts.on('-c', '--config Config')                   { |v| options[:config_name]  = v }
       end.parse!
 
       if options[:name].empty?
-        options[:name] = evaluate_name(options[:tags], options[:tests])
+        options[:name] = evaluate_name(options[:tags], options[:tests], options[:filters])
       end
 
       if options[:environment]
@@ -55,23 +57,29 @@ module Moto
         Moto::Lib::Config.load_configuration(options[:config_name] ? options[:config_name] : 'moto')
       else
         puts 'ERROR: Environment is mandatory.'
-        exit 1
+        Kernel.exit(-1)
       end
 
-
       return options
     end
 
-    def self.evaluate_name(tags, tests)
-      tags ||= ''
-      tests ||= ''
-      if !tags.empty? && !tests.empty?
-        return "#{tags.count} tags + #{tests.count} tests"
-      elsif tags.empty?
-        return tests.count == 1 ? "Test: #{tests.first}" : "#{tests.count} tests"
-      elsif tests.empty?
-        return tags.count == 1 ? "Tag: #{tags.first}" : "#{tags.count} tags"
+    # Generate default name based on input parameters
+    def self.evaluate_name(tests, tags, filters)
+      name = ''
+
+      if tests
+        name << "Tests: #{tests.join(',')}  "
+      end
+
+      if tags
+        name << "Tags: #{tags.join(',')}  "
       end
+
+      if filters
+        name << "Filters: #{filters.join(',')}  "
+      end
+
+      return name
     end
 
     # Parses attributes passed to the application when run by 'moto generate'
@@ -103,8 +111,12 @@ module Moto
        -t, --tests       Tests to be executed.
        -g, --tags        Tags of tests to be executed.
                          Use # MOTO_TAGS: TAGNAME in test to assign tag.
+       -f, --filters     Tags that filter tests passed via -t parameter.
+                         Only tests in appropriate directory, having appropriate tag will be executed.
+                         Use # MOTO_TAGS: TAGNAME in test to assign tag.
        -l, --listeners   Reporters to be used.
-                         Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
+                         Defaults are Moto::Reporting::Listeners::ConsoleDots, Moto::Reporting::Listeners::JunitXml
+                         One reporter that is always used: Moto::Reporting::Listeners::KernelCode
        -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)

data/lib/runner/test_runner.rb

@@ -52,7 +52,7 @@ module Moto
         @test_reporter.report_end_run
 
         # Exit application with appropriate code generated by KernelCode listener
-        Kernel.exit!(Moto::Reporting::Listeners::KernelCode.code)
+        Kernel.exit(Moto::Reporting::Listeners::KernelCode.code)
       end
 
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport