moto 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6c20b7f4e8e0cee81b903f30b6fe27e2d6c7e3
-  data.tar.gz: be348dc99ec4679540a44c0600df952bc3cf28d7
+  metadata.gz: e7d75bfa8620395beba5bd52ac893556c9662519
+  data.tar.gz: f47066f906dc8b4e8edc6ad3581ff57f49425113
 SHA512:
-  metadata.gz: 4c212aec57badffad322784d3bbd76d38d9293f8614f7c0426e3811dff2ce1802aa35cb104a896648b4350b9b4cca032bef88bacf52542cd9934cbc40636ccb4
-  data.tar.gz: 70d924d0dd98158e4720055151c339ae7bb35594e5e7fdae978d6b76bf5b726d315313bfb4769447e511d67ed5b059eb78e3fcd6a3d998bec88ebb5e3ce712f5
+  metadata.gz: 7bf1de8ba4eea78865dd1c64323f069ddf9f61602bbc44b0e7e48a30bccabbbc9e0eeeb54a19f9e935d680ee7a6c08cb4e3201bd271fa8d37ef2e91c99030c77
+  data.tar.gz: ac99006b16ea7f86f00651a24a7a4186970f99aeb6df0d4f2306e0e921d3c23b850a95a1d8afb0f3d5bc3a5f714b0e980b5229e6b6cdb45c88eb189b0329b8d9

data/lib/cli.rb

@@ -63,29 +63,20 @@ module Moto
       # Make sure there are no repetitions in gathered set
       tests_metadata.uniq! { |metadata| metadata.test_path }
 
-      # Tests to be removed due to filtering will be gathered in this array
-      # [].delete(item) cannot be used since it interferes with [].each
-      unfit_metadata = []
-
       # Filter tests by provied tags
       # - test must contain ALL tags specified with -f param
+      # - use ~ for negation
       # - test may contain other tags
       if filters
-        tests_metadata.each do |metadata|
-
-          # If test has no tags at all and filters are set it should be automatically removed
-          if metadata.tags.empty?
-            unfit_metadata << metadata
-          # Otherwise check provided tags and filters for compatibility
-          elsif (metadata.tags & filters).length != filters.length
-            unfit_metadata << metadata
+        filters.each do |filter|
+          filtered = tests_metadata.select do |metadata|
+            next if metadata.tags.empty?
+            filter_matches_any_tag?(filter, metadata.tags) || filter_negation_matches_none_tag?(filter, metadata.tags)
           end
-
+          tests_metadata &= filtered
         end
       end
 
-      tests_metadata -= unfit_metadata
-
       #TODO Display criteria used
       if tests_metadata.empty?
         puts 'No tests found for given arguments.'
@@ -115,5 +106,15 @@ module Moto
       runner.run
     end
 
+    def self.filter_matches_any_tag?(filter, tags)
+      !filter.start_with?('~') && tags.any? { |tag| filter == tag }
+    end
+    private_class_method :filter_matches_any_tag?
+
+    def self.filter_negation_matches_none_tag?(filter, tags)
+      filter.start_with?('~') && tags.none? { |tag| filter[1..-1] == tag }
+    end
+    private_class_method :filter_negation_matches_none_tag?
+
   end
 end

data/lib/empty_listener.rb

@@ -1,17 +1,17 @@
-module Moto
-  module EmptyListener
-
-    def start_run
-    end
-    
-    def end_run
-    end
-    
-    def start_test(test)
-    end
-
-    def end_test(test)
-    end    
-
-  end
+module Moto
+  module EmptyListener
+
+    def start_run
+    end
+    
+    def end_run
+    end
+    
+    def start_test(test)
+    end
+
+    def end_test(test)
+    end    
+
+  end
 end

data/lib/exceptions/moto.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class MotoException < RuntimeError
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class MotoException < RuntimeError
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_failure.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedFailure  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedFailure  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_passed.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedPassed  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedPassed  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_skipped.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestSkipped  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestSkipped  < MotoException
+      
+    end
+  end
 end

data/lib/parser.rb

@@ -135,6 +135,7 @@ module Moto
        -f, --filters     Tags that filter tests passed via -t parameter.
                          Only tests in appropriate directory, having all of the specified tags will be executed.
                          Use # MOTO_TAGS: TAGNAME1 in test to assign tag.
+                         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.

data/lib/test/metadata.rb

@@ -1,95 +1,95 @@
-module Moto
-  module Test
-    # Provides tools for accessing metadata embedded in test files
-    class Metadata
-
-      # Absolute test path
-      attr_reader :test_path
-
-      # @param [String] test_path Absolute path to file with test
-      def initialize(test_path)
-        @test_path = test_path
-      end
-
-      # Text of the file with test
-      def text
-        if @text.nil?
-          @text = ''
-
-          File.foreach(@test_path) do |line|
-
-            # Read lines of file until class specification begins
-            if line.match(/^\s*(class|module)/)
-              break
-            end
-
-            @text += line
-          end
-
-        end
-
-        @text
-      end
-      private :text
-
-      # @return [Array] of [String] which represent contents of #MOTO_TAGS
-      def tags
-        if @tags.nil?
-          matches = text.match(/^#(\s*)MOTO_TAGS:(.*?)$/)
-
-          if matches
-            @tags = matches.to_a[2].gsub(/\s*/, '').split(',')
-          else
-            @tags = []
-          end
-        end
-
-        @tags
-      end
-
-      # @return [Array] of [String] which represent contents of #TICKET_URL
-      def ticket_urls
-        if @ticket_urls.nil?
-          matches = text.match(/^#(\s*)TICKET_URLS:(.*?)$/)
-
-          if matches
-            @ticket_urls = matches.to_a[2].gsub(/\s*/, '').split(',')
-          else
-            @ticket_urls = []
-          end
-        end
-
-        @ticket_urls
-      end
-
-      # @return [Array] of [String] which represent contents of #TICKET_URL
-      def description
-        if @description.nil?
-          matches = text.scan(/^#(\s*)DESC:(.*?)$/)
-
-          @description = ''
-
-          if !matches.empty?
-            matches.each do |match|
-              @description += match[1] + "\n"
-            end
-          end
-        end
-
-        @description
-      end
-
-
-      # Overriden eql? so various comparisons, array substractions etc. can be perfromed on
-      # Metadata objects with them being represented by test's location
-      def eql?(other)
-        if self.class == other.class
-          return self.test_path == other.test_path
-        end
-
-        false
-      end
-
-    end
-  end
+module Moto
+  module Test
+    # Provides tools for accessing metadata embedded in test files
+    class Metadata
+
+      # Absolute test path
+      attr_reader :test_path
+
+      # @param [String] test_path Absolute path to file with test
+      def initialize(test_path)
+        @test_path = test_path
+      end
+
+      # Text of the file with test
+      def text
+        if @text.nil?
+          @text = ''
+
+          File.foreach(@test_path) do |line|
+
+            # Read lines of file until class specification begins
+            if line.match(/^\s*(class|module)/)
+              break
+            end
+
+            @text += line
+          end
+
+        end
+
+        @text
+      end
+      private :text
+
+      # @return [Array] of [String] which represent contents of #MOTO_TAGS
+      def tags
+        if @tags.nil?
+          matches = text.match(/^#(\s*)MOTO_TAGS:(.*?)$/)
+
+          if matches
+            @tags = matches.to_a[2].gsub(/\s*/, '').split(',')
+          else
+            @tags = []
+          end
+        end
+
+        @tags
+      end
+
+      # @return [Array] of [String] which represent contents of #TICKET_URL
+      def ticket_urls
+        if @ticket_urls.nil?
+          matches = text.match(/^#(\s*)TICKET_URLS:(.*?)$/)
+
+          if matches
+            @ticket_urls = matches.to_a[2].gsub(/\s*/, '').split(',')
+          else
+            @ticket_urls = []
+          end
+        end
+
+        @ticket_urls
+      end
+
+      # @return [Array] of [String] which represent contents of #TICKET_URL
+      def description
+        if @description.nil?
+          matches = text.scan(/^#(\s*)DESC:(.*?)$/)
+
+          @description = ''
+
+          if !matches.empty?
+            matches.each do |match|
+              @description += match[1] + "\n"
+            end
+          end
+        end
+
+        @description
+      end
+
+
+      # Overriden eql? so various comparisons, array substractions etc. can be perfromed on
+      # Metadata objects with them being represented by test's location
+      def eql?(other)
+        if self.class == other.class
+          return self.test_path == other.test_path
+        end
+
+        false
+      end
+
+    end
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework