minitest-tagz 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca8af3e5975bf72802bf77b3035cbb6dc12741c21193883bf77824784ae9131
-  data.tar.gz: ffa715e56d089c17d3e00e5f5945af3e0aecc562ef6fcf0a93a4c4f538f14b0c
+  metadata.gz: 347d2a3aa8e7d5e66ee59e3372e69d78901ca244c6504cbbf2bdfe52e6e11b1e
+  data.tar.gz: e56b65e7fc29a800855af0e267faa14104c19b2d846f002469411740a3c47ef6
 SHA512:
-  metadata.gz: 2152ffb3c3a9f2f4ac98dea7ffbf6c546c140d90675975ee0de93d27f8a432c33193ede136420f0af9f47a6e1df242e3d9cda77f34f3852905fb1607bfc398d7
-  data.tar.gz: 5832cb6ea3d5213eb654093850fb70cc8df1669cd1eb170d98f76d26cc7cd3001431ef00c94fa7621982a32fc77bfcfd7b2a3508b3d040da0bea9e96a80d8ca9
+  metadata.gz: 6d7067bf81f5f82a8d9693779e6ab60c482e528082bad305103473e1ce81c7b9c11d0b0602f298fa441601d497294b19d08c2bf9854ef485c5ce6def3df86afc
+  data.tar.gz: 6ca7806d80a96c8dbfa2409e84e5161d74d51bad13faa10c4e4c696982b9ac34f6f268cc1941aacfbb4d5ec8ee61b2508ab3af0efe461b8da5c1e8dc300b54b5

data/lib/minitest/tagz.rb

@@ -1,6 +1,5 @@
 require 'minitest'
 require 'minitest/tagz/version'
-require 'state_machines'
 
 module Minitest
   module Tagz
@@ -100,21 +99,9 @@ module Minitest
     # It is essentially a state machine that works with the
     # patcher to patch and unpatch Minitest properly
     class Tagger
-      state_machine :state, initial: :awaiting_tag_declaration do
-        after_transition any => :awaiting_test_definition, do: :patch_test_definitions
-        after_transition any => :finished, do: :unpatch_test_definitions
-
-        event :tags_declared do
-          transition :awaiting_tag_declaration => :awaiting_test_definition
-        end
-
-        event :initial_test_definition_encountered do
-          transition :awaiting_test_definition => :applying_tags
-        end
-
-        event :finished_applying_tags do
-          transition :applying_tags => :finished
-        end
+      def tags_declared
+        patch_test_definitions
+        @awaiting_initial_test_definition = true
       end
 
       attr_reader :patchers, :owner, :pending_tags
@@ -135,10 +122,10 @@ module Minitest
       end
 
       def handle_initial_test_definition
-        is_initial = awaiting_test_definition?
-        initial_test_definition_encountered if is_initial
+        is_initial = @awaiting_initial_test_definition
+        @awaiting_initial_test_definition = false if is_initial
         res = yield
-        finished_applying_tags if is_initial
+        unpatch_test_definitions if is_initial
         res
       end
     end
@@ -165,42 +152,51 @@ module Minitest
         end
 
         def patch_minitest_test(state_machine)
-          @old_method_added = old_method_added = Minitest::Test.method(:method_added)
           Minitest::Test.class_eval do
-            define_singleton_method(:method_added) do |name|
-              if name[/^test_/]
-                state_machine.handle_initial_test_definition do
-                  Tagz::RunnerStrategy.tag_map ||= {}
-                  Tagz::RunnerStrategy.tag_map[Tagz::RunnerStrategy.serialize(self, name)] ||= []
-                  Tagz::RunnerStrategy.tag_map[Tagz::RunnerStrategy.serialize(self, name)] += state_machine.pending_tags
-                  old_method_added.call(name)
+            self.singleton_class.class_eval do
+              alias :old_method_added :method_added
+
+              define_method(:method_added) do |name|
+                if name[/^test_/]
+                  state_machine.handle_initial_test_definition do
+                    Tagz::RunnerStrategy.tag_map ||= {}
+                    Tagz::RunnerStrategy.tag_map[Tagz::RunnerStrategy.serialize(self, name)] ||= []
+                    Tagz::RunnerStrategy.tag_map[Tagz::RunnerStrategy.serialize(self, name)] += state_machine.pending_tags
+                    old_method_added(name)
+                  end
+                else
+                  old_method_added(name)
                 end
-              else
-                old_method_added.call(name)
               end
             end
           end
         end
 
         def unpatch_minitest_test
-          Minitest::Test.define_singleton_method(:method_added, @old_method_added)
+          Minitest::Test.class_eval do
+            self.singleton_class.class_eval do
+              undef_method :method_added
+              alias :method_added :old_method_added
+            end
+          end
         end
 
         def patch_minitest_spec(state_machine)
-          @old_describe = old_describe = Kernel.instance_method(:describe)
           Kernel.module_eval do
+            alias :old_describe :describe
+
             define_method(:describe) do |*args, &block|
               state_machine.handle_initial_test_definition do
-                old_describe.bind(self).call(*args, &block)
+                old_describe(*args, &block)
               end
             end
           end
         end
 
         def unpatch_minitest_spec
-          old_describe = @old_describe
           Kernel.module_eval do
-            define_method(:describe, old_describe)
+            undef_method :describe
+            alias :describe :old_describe
           end
         end
       end
@@ -208,7 +204,7 @@ module Minitest
 
     # Main extensions to Minitest
     class << self
-      attr_accessor :chosen_tags, :run_all_if_no_match, :log_if_no_match
+      attr_accessor :run_all_if_no_match, :log_if_no_match
 
       alias :run_all_if_no_match? :run_all_if_no_match
       alias :log_if_no_match? :log_if_no_match
@@ -225,7 +221,7 @@ module Minitest
       end
 
       def chosen_tags
-        @chosen_tags || []
+        @chosen_tags ||= []
       end
 
       def positive_tags
@@ -239,7 +235,6 @@ module Minitest
       def declare_tag_assignment(owner, pending_tags)
         tag_machine = TaggerFactory.create_tagger(owner, pending_tags)
         tag_machine.tags_declared
-        # TODO add debugging tip about this
         tag_machine
       end
     end

data/lib/minitest/tagz/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Tagz
-    VERSION = "1.5.3"
+    VERSION = "1.6.0"
   end
 end

data/minitest-tagz.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "minitest", "~> 5"
-  spec.add_dependency 'state_machines'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-tagz
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Josh Bodah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: state_machines
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: yet another tags implementation for Minitest