minitest-focus 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42c6ba3ea527eeb7756c50f08f6f123acdfbbe5f00ee68e7543fec395512554
-  data.tar.gz: aa656bdcf5ae92d25558e9822387491a1fcca43f89297d060a52716eea6fd4e5
+  metadata.gz: d34869b02e75ef676d3e431756fc9da15e2ff8ca21f22103f00ac5ebe69f3d2c
+  data.tar.gz: 6baf632e87f65bc46c46e4acfda4d48bb1871a3b240f132bdd2b85221c119302
 SHA512:
-  metadata.gz: 45532069fcd74b655e5fa65721f3e2f3793b513c8da19c8b8ff7eaeca593b36f1293d6cc345ddaf21ecae2b8ecabdd6988caec6b21b3b89e4b784809e6c0fbcb
-  data.tar.gz: 5fc346666e60b5eba021293f05110c4332bc81a41b68ee6a09cdcb492925b8585b03fcf97dd1a6c8ffa79a2fd1bab853ebb77ee7218b4c0945667fe5c7319dfa
+  metadata.gz: d988af4b0b1959a4caf4200d484713bbbc9e809282b2f72aee822e8bb89dd9fe20fde2c6e3fbe01be4bc39f5d9cc1573349d1f5bef5a98ec4a043a88266f7b26
+  data.tar.gz: d661a7db8d5e6906957b8481d7f59a9f0882b97f44f2d52af0937acdbfd208167e2fbf5015dd0515794e7cf4f324d735b8145486d877c75ae38aac6fdfa48eb4

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.3.0 / 2021-05-22
+
+* 1 major enhancement:
+
+  * Removed minitest4 support.
+
+* 2 minor enhancements:
+
+  * Added support for `focus def test_method`.
+  * Improved documentation for both test- and spec-style.
+
 === 1.2.1 / 2020-06-14
 
 * 1 bug fix:

data/Manifest.txt

@@ -4,7 +4,5 @@ Manifest.txt
 README.txt
 Rakefile
 lib/minitest/focus.rb
-lib/minitest/focus4.rb
-lib/minitest/focus5.rb
 lib/minitest/focus_plugin.rb
 test/minitest/test_focus.rb

data/README.txt

@@ -23,17 +23,26 @@ Inspired by https://github.com/seattlerb/minitest/issues/213
     require "minitest/focus"
 
     class MyTest < MiniTest::Unit::TestCase
-      def test_unrelated; ...; end
+      def test_unrelated; ...; end       # will NOT run
+
+      focus def test_method2; ...;  end  # will run (direct--preferred)
 
       focus
-      def test_method; ...;  end # only this one will run
+      def test_method; ...;  end         # will run (indirect)
+
+      def test_method_edgecase; ...; end # will NOT run
+    end
+
+    # or, with spec-style:
 
-      def test_method_edgecase; ...; end
+    describe "MyTest2" do
+      focus; it "does something"       do pass end
+      focus  it("does something else") {  pass   } # block precedence needs {}
     end
 
 == REQUIREMENTS:
 
-* minitest 4.3.4+
+* minitest 5+
 
 == INSTALL:
 

data/lib/minitest/focus.rb

@@ -1,7 +1,59 @@
-begin
-  require "minitest/test"
-  require "minitest/focus5.rb"
-rescue LoadError
-  require "minitest/unit"
-  require "minitest/focus4.rb"
+class Minitest::Test    # :nodoc:
+  class Focus           # :nodoc:
+    VERSION = "1.3.0"   # :nodoc:
+  end
+
+  @@filtered_names = [] # :nodoc:
+
+  def self.add_to_filter name
+    @@filtered_names << "#{self}##{name}"
+  end
+
+  def self.filtered_names
+    @@filtered_names
+  end
+
+  ##
+  # Focus on the next test defined. Cumulative. Equivalent to
+  # running with command line arg: -n /test_name|.../
+  #
+  #   class MyTest < Minitest::Test
+  #
+  #     # direct approach
+  #     focus def test_method1 # will run
+  #       ...
+  #     end
+  #
+  #     # indirect approach
+  #     focus
+  #     def test_method2       # will run
+  #       ...
+  #     end
+  #
+  #     def test_method3       # will NOT run
+  #       ...
+  #     end
+  #   end
+
+  def self.focus name = nil
+    if name then
+      add_to_filter name
+    else
+      set_focus_trap
+    end
+  end
+
+  ##
+  # Sets a one-off method_added callback to set focus on the method
+  # defined next.
+
+  def self.set_focus_trap
+    meta = class << self; self; end
+
+    meta.send :define_method, :method_added do |name|
+      add_to_filter name
+
+      meta.send :remove_method, :method_added
+    end
+  end
 end

data/lib/minitest/focus_plugin.rb

@@ -11,6 +11,8 @@ module Minitest
       ARGV.delete_at index
     end
 
-    options[:filter] = "/^(#{Regexp.union(Minitest::Test.filtered_names).source})$/"
+    re = "/^(#{Regexp.union(Minitest::Test.filtered_names).source})$/"
+
+    options[:filter] = re
   end
 end

data/test/minitest/test_focus.rb

@@ -1,17 +1,19 @@
 require "minitest/autorun"
 require "minitest/focus"
 
-test_cls = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
-
-class MyTest1 < test_cls
+class MyTest1 < Minitest::Test
          def test_fail;            flunk; end
   focus; def test_method;          pass;  end
+  focus  def test_method2;         pass;  end
+         focus \
+         def test_method3;         pass;  end
          def test_method_edgecase; flunk; end
 end
 
 describe "MyTest2" do
          it "is ignored"            do flunk end
   focus; it "does something"        do pass  end
+  focus  it("does something else")  { pass } # stupid block precedence needs {}
          it "bombs"                 do flunk end
   focus; it "has non-word ['chars'" do pass  end # Will raise invalid RegExp unless correctly escaped
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: minitest-focus
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIwMTIyMjIwMzgzMFoXDTIxMTIyMjIwMzgzMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
-  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
-  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
-  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
-  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
-  h7iEjga8iM1LbZUfiISZ+WrB
+  AQAE3XRm1YZcCVjAJy5yMZvTOFrS7B2SYErc+0QwmKYbHztTTDY2m5Bii+jhpuxh
+  H+ETcU1z8TUKLpsBUP4kUpIRowkVN1p/jKapV8T3Rbwq+VuYFe+GMKsf8wGZSecG
+  oMQ8DzzauZfbvhe2kDg7G9BBPU0wLQlY25rDcCy9bLnD7R0UK3ONqpwvsI5I7x5X
+  ZIMXR0a9/DG+55mawwdGzCQobDKiSNLK89KK7OcNTALKU0DfgdTkktdgKchzKHqZ
+  d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
+  KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -107,8 +107,6 @@ files:
 - README.txt
 - Rakefile
 - lib/minitest/focus.rb
-- lib/minitest/focus4.rb
-- lib/minitest/focus5.rb
 - lib/minitest/focus_plugin.rb
 - test/minitest/test_focus.rb
 homepage: https://github.com/seattlerb/minitest-focus
@@ -116,7 +114,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/seattlerb/minitest-focus
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.txt
@@ -133,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: Allows you to focus on a few tests with ease without having to use command-line
   arguments

data/lib/minitest/focus4.rb

@@ -1,26 +0,0 @@
-class MiniTest::Unit::TestCase # :nodoc:
-  ##
-  # Focus on the next test defined. Cumulative. Equivalent to
-  # running with command line arg: -n /test_name|.../
-  #
-  #   class MyTest < MiniTest::Unit::TestCase
-  #     ...
-  #     focus
-  #     def test_pass; ... end # this one will run
-  #     ...
-  #   end
-
-  def self.focus
-    opts = MiniTest::Unit.runner.options
-    meta = class << self; self; end
-
-    opts[:names] ||= []
-
-    meta.send :define_method, :method_added do |name|
-      opts[:names] << name.to_s
-      opts[:filter] = "/^(#{Regexp.union(opts[:names]).source})$/"
-
-      meta.send :remove_method, :method_added
-    end
-  end
-end

data/lib/minitest/focus5.rb

@@ -1,36 +0,0 @@
-class Minitest::Test    # :nodoc:
-  class Focus           # :nodoc:
-    VERSION = "1.2.1"   # :nodoc:
-  end
-
-  @@filtered_names = [] # :nodoc:
-
-  def self.add_to_filter name
-    @@filtered_names << "#{self}##{name}"
-  end
-
-  def self.filtered_names
-    @@filtered_names
-  end
-
-  ##
-  # Focus on the next test defined. Cumulative. Equivalent to
-  # running with command line arg: -n /test_name|.../
-  #
-  #   class MyTest < MiniTest::Unit::TestCase
-  #     ...
-  #     focus
-  #     def test_pass; ... end # this one will run
-  #     ...
-  #   end
-
-  def self.focus
-    meta = class << self; self; end
-
-    meta.send :define_method, :method_added do |name|
-      add_to_filter name
-
-      meta.send :remove_method, :method_added
-    end
-  end
-end