yard-doctest 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396c212a7f20383346628549f84472faa0bb150b
-  data.tar.gz: abb37e7c096350ef190fef1084d448f117f0ab75
+  metadata.gz: 4023ce3acc9d083c21073b13aa9e38aa70106ed0
+  data.tar.gz: 4e839b3a471e0639ca5e217557e176abe5a6d2ff
 SHA512:
-  metadata.gz: ee6657e890518cd8f8f72c164c3802f7db7f61e2ac4b8dcb5d283ea056cba27af3cf55e22e08471bd31e5475bdf90ef9a5d455788446937856927b2762a1445c
-  data.tar.gz: 2831f3ed0dad1391fcfb5a700792ccaefade4ca27e3d744b0735f8486b2cf9673066440c2fae126b9cd44988bbdfae92cd919f49f2985177b450679487cac545
+  metadata.gz: 9ca5d6326dfab02d4bc4d2c391f23aeb7f8d92f56d29d26269a3784ebdfc123b33edfd1b1ab68a1d64da0e84cad1b42be90353c09cff9bdc9117d8330b2350ff
+  data.tar.gz: 6c62c7630f36fb14dd7b834fec7a75cde72b0c13131c6c9702aabb679e2058e1f4585310dfa2ed554d5c6bc216b349a4a7c171807bd4eb17c4bf706332bca068

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.7
+
+* Fix a bug when only one of global and test-name hooks is executed for matching test
+
 ## 0.1.6
 
 * Support per-example hooks [#3](https://github.com/p0deje/yard-doctest/pull/3)

data/features/yard-doctest.feature

@@ -498,6 +498,27 @@ Feature: yard doctest
     When I run `bundle exec yard doctest`
     Then the output should contain "2 runs, 2 assertions, 0 failures, 0 errors, 0 skips"
 
+  Scenario: supports global and test-name hooks
+    Given a file named "doctest_helper.rb" with:
+      """
+      require 'app/app'
+
+      YARD::Doctest.configure do |doctest|
+        doctest.before { @one = true  }
+        doctest.before('#foo') { @two = true  }
+      end
+      """
+    And a file named "app/app.rb" with:
+      """
+      # @example
+      #   foo #=> true
+      def foo
+        @one && @two
+      end
+      """
+    When I run `bundle exec yard doctest`
+    Then the output should contain "1 runs, 1 assertions, 0 failures, 0 errors, 0 skips"
+
   Scenario: supports test-name hooks for multiple examples on the same code object
     Given a file named "doctest_helper.rb" with:
       """

data/lib/yard/doctest/example.rb

@@ -29,10 +29,10 @@ module YARD
             # Append this.name to this.definition if YARD's @example tag is followed by
             # descriptive text, to support hooks for multiple examples per code object.
             example_name = if this.name.empty?
-              this.definition
-            else
-              "#{this.definition}@#{this.name}"
-            end
+                             this.definition
+                           else
+                             "#{this.definition}@#{this.name}"
+                           end
 
             register_hooks(example_name, YARD::Doctest.hooks)
 
@@ -73,18 +73,12 @@ module YARD
         exception.set_backtrace backtrace
       end
 
-
-
       def self.register_hooks(example_name, all_hooks)
         all_hooks.each do |type, hooks|
-          hooks.each do |hook|
-            if hook[:test]
-              # test-name hooks
-              send(type, &hook[:block]) if example_name.include?(hook[:test])
-            else
-              # global hooks
-              send(type, &hook[:block])
-            end
+          global_hooks = hooks.select { |hook| !hook[:test] }
+          test_hooks = hooks.select { |hook| hook[:test] && example_name.include?(hook[:test]) }
+          __send__(type) do
+            (global_hooks + test_hooks).each { |hook| instance_exec(&hook[:block]) }
           end
         end
       end

data/lib/yard/doctest/version.rb

@@ -1,5 +1,5 @@
 module YARD
   module Doctest
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard-doctest
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard