pork 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7cc07abd9d5e467ea5e229953b9bfd4ecc0978
-  data.tar.gz: adec072a9ef317b4f6baad7e38d14b96ee33aea2
+  metadata.gz: 66af2258263479b7c9b46d32d87dab94300c86c7
+  data.tar.gz: dd01950d9a7026886e35b48054c97c5f69f6e6fa
 SHA512:
-  metadata.gz: 9c181fef0d0491353d1034fb852f434c148eaaf6142f4d536320ee2c1f74a23e59a019340c8202399984ee75cebdee71bb545914558c895fd45dfbc675a0f7c6
-  data.tar.gz: c5e3d773b083eb21700a089a122cc577143a42e26c98c37ed8ed901b73d171b5b7717d8dd67a5fbecbdd67c030fe64057299698b212ece295421907f9e30f3b1
+  metadata.gz: '0584b1e173a3d0190b28ebfddba0475ff9e47e85d51081a8f5401f789f8ee1e7aa3cd1680efd58d0fd44d4e444fecc567fcec86ca13fa66eb6525baeeb29dd58'
+  data.tar.gz: 5705b43ac037712e230b6249f41f1ff12a1347e23a1bdf84632603878910ecf6f9d9a2e9c9e1c0400ea953453a232874caadb5694c8577b6b3a9220b3f45ee16

data/.travis.yml

@@ -1,9 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
   - rbx
   - jruby-9
 

data/CHANGES.md

@@ -1,5 +1,29 @@
 # CHANGES
 
+## Pork 2.0.0 -- 2016-09-10
+
+### Incompatible changes
+
+* `Pork::Executor` is now renamed to `Pork::Suite`, and the new
+  `Pork::Executor` would be served as the real executor who's responsible
+  for running the test suites!
+* `Pork::Executor.execute` would now take a hash as the argument.
+* `Pork::Suite.after` would now run in a reverse manner because that would
+  serve better as a destructor.
+
+### Enhancement
+
+* `Pork::Suite.desc` would now preserve the original argument being passed to
+  `Pork::Suite.describe`, rather than converting it to a string.
+* Major internal structure cleanup. Now we don't include everything into the
+  context, but use different objects to do different things. For example,
+  now we have `Pork::Isolator` to isolate the context.
+* Introduced `Pork.execute_extensions` which would be extending to
+  `Pork::Executor`. The only extension for it for now is `Pork::Should`.
+* Don't crash if `Pork.loaded` was never called.
+* Now you could also make assertions in `after` block without triggering
+  `Missing assertions` errors.
+
 ## Pork 1.5.0 -- 2016-03-10
 
 ### Enhancement

data/README.md

@@ -93,7 +93,7 @@ end
 
 describe 'C' do
   # Also, we're not forced to include something in all describe blocks.
-  # If we want, we could do this instead: `Pork::Executor.include(Module.new)`
+  # If we want, we could do this instead: `Pork::Suite.include(Module.new)`
   # That would be the same as including in `Bacon::Context`
   would 'not respond_to? in_module nor in_describe' do
     should.not.respond_to?(:in_module)
@@ -298,7 +298,7 @@ Pork.autorun
 
 Here it `require 'pork/should'`, and it would load the monkey patches for
 inserting `Kernel#should` shown in SYNOPSIS. This is actually optional,
-and could be replaced with `Pork::Executor#expect`. For example, we could
+and could be replaced with `Pork::Suite#expect`. For example, we could
 also write it this way:
 
 ``` ruby
@@ -580,16 +580,16 @@ So this creates a test suite which should be containing various test cases
 suite, which accepts anything could be converted to a string. The _default_
 description is `:default` (which would be converted to `'default: '`)
 
-Each `describe` block would create a new subclass of `Pork::Executor` for
+Each `describe` block would create a new subclass of `Pork::Suite` for
 isolating test suites. Each nested `describe` block would be a subclass of
-its parent `Pork::Executor`.
+its parent `Pork::Suite`.
 
 ``` ruby
 require 'pork/auto'
 
 describe do
   would 'be default: for the default description' do
-    self.class.desc.should.eq 'default: '
+    self.class.desc.should.eq :default
   end
 end
 ```
@@ -602,7 +602,7 @@ description of the test case, which accepts anything could be converted to
 a string. The _default_ description is also `:default`.
 
 Each `would` block would be run inside a new instance of the describing
-`Pork::Executor` to isolate instance variables.
+`Pork::Suite` to isolate instance variables.
 
 ### Pork::API.before
 
@@ -637,20 +637,21 @@ end
 Each `after` block would be called after each `would` block (test case).
 You would probably want to cleanup stuffs inside `after` blocks.
 
-Each nested `describe` would also run parents' `after` block as well.
+Note that each nested `describe` would also run parents' `after` block in a
+reverse manner as opposed to `before`.
 
 ``` ruby
 require 'pork/auto'
 
 describe do
   after do
-    @a.should.eq 1
-    @a += 1
+    @a.should.eq 2
   end
 
   describe do
     after do
-      @a.should.eq 2
+      @a.should.eq 1
+      @a += 1
     end
 
     would do
@@ -694,7 +695,7 @@ describe do
 end
 ```
 
-### Pork::Executor#expect
+### Pork::Suite#expect
 
 It is the core of `Kernel#should`. Think of:
 
@@ -720,7 +721,7 @@ is equivalent to:
 expect(object, 'message').eq(1)
 ```
 
-### Pork::Executor#skip
+### Pork::Suite#skip
 
 At times we might want to skip some tests while leave the codes there without
 removing them or commenting them out. This is where `skip` would be helpful.
@@ -735,7 +736,7 @@ describe do
 end
 ```
 
-### Pork::Executor#ok
+### Pork::Suite#ok
 
 Because Pork would complain if a test case does not have any assertions,
 sometimes we might want to tell Pork that it's ok because we've already
@@ -758,7 +759,7 @@ describe do
 end
 ```
 
-### Pork::Executor#flunk
+### Pork::Suite#flunk
 
 If we're writing program carefully, there are a few cases where a condition
 would never meet. We could `raise "IMPOSSIBLE"` or we could simply call

data/TODO.md

@@ -1,5 +1,3 @@
 
 * introduce configs
-* plugin: color/reverse backtrace, replicating command, inspect mode
 * executable
-* if it's executing from a copy block, run all pasted blocks

data/lib/pork.rb

@@ -1,17 +1,9 @@
 
+require 'pork/api'
+require 'pork/stat'
 require 'pork/executor'
 
 module Pork
-  module API
-    module_function
-    def before █ Executor.before(&block); end
-    def after  █ Executor.after( &block); end
-    def copy     desc=:default, █ Executor.copy(    desc, &block); end
-    def paste    desc=:default, *args ; Executor.paste(   desc, *args ); end
-    def describe desc=:default, &suite; Executor.describe(desc, &suite); end
-    def would    desc=:default, &test ; Executor.would(   desc, &test ); end
-  end
-
   # default to :shuffled while eliminating warnings for uninitialized ivar
   def self.execute_mode mode=nil
     @execute_mode = mode || @execute_mode ||= :shuffled
@@ -31,6 +23,10 @@ module Pork
     @report_extensions ||= []
   end
 
+  def self.execute_extensions
+    @execute_extensions ||= []
+  end
+
   def self.protected_exceptions
     @protected_exceptions ||= [Pork::Error, StandardError]
   end
@@ -87,13 +83,13 @@ module Pork
   def self.execute
     if ENV['PORK_TEST']
       if tests = Executor[ENV['PORK_TEST']]
-        @stat = Executor.execute(execute_mode, stat, tests)
+        @stat = Executor.execute(:paths => tests)
       else
         puts "Cannot find test: #{ENV['PORK_TEST']}"
         exit 254
       end
     else
-      @stat = Executor.execute(execute_mode, stat)
+      @stat = Executor.execute
     end
   end
 
@@ -102,7 +98,7 @@ module Pork
     execute_mode(ENV['PORK_MODE'])
     report_mode(ENV['PORK_REPORT'])
     trap
-    stat.loaded(@at, @files)
+    stat.loaded(@at, @files) if instance_variable_defined?(:@at)
     execute
     stat.report
   end

data/lib/pork/api.rb

@@ -0,0 +1,31 @@
+
+require 'pork/suite'
+
+module Pork
+  module API
+    module_function
+    def before &block
+      Suite.before(&block)
+    end
+
+    def after &block
+      Suite.after(&block)
+    end
+
+    def copy desc=:default, &block
+      Suite.copy(desc, &block)
+    end
+
+    def paste desc=:default, *args
+      Suite.paste(desc, *args)
+    end
+
+    def describe desc=:default, opts={}, &suite
+      Suite.describe(desc, opts, &suite)
+    end
+
+    def would desc=:default, opts={}, &test
+      Suite.would(desc, opts, &test)
+    end
+  end
+end

data/lib/pork/env.rb

@@ -11,8 +11,8 @@ module Pork
     end
 
     def run_after context
+      after.reverse_each{ |b| context.instance_eval(&b) }
       super_env && super_env.run_after(context)
-      after.each{ |b| context.instance_eval(&b) }
     end
   end
 end

data/lib/pork/executor.rb

@@ -1,16 +1,30 @@
 
-require 'pork/imp'
-require 'pork/isolate'
-require 'pork/context'
+require 'pork/suite'
+require 'pork/isolator'
 
 module Pork
-  class Executor < Struct.new(:pork_stat, :pork_description)
-    # we don't want this method from Struct.new, it's confusing when
-    # pork/isolate was not loaded. (i.e. isolate would override it anyway)
-    singleton_class.superclass.send(:remove_method, :[])
+  class Executor < Struct.new(:isolator)
+    def self.[] index
+      Isolator[][index]
+    end
 
-    extend Isolate, Imp
-    include Context
-    init
+    def self.execute mode: Pork.execute_mode,
+                     stat: Pork.stat,
+                     suite: Suite,
+                     isolator: Isolator[suite],
+                     paths: isolator.all_paths
+      require "pork/mode/#{mode}"
+      Pork.const_get(mode.capitalize).new(isolator).execute(stat, paths)
+    end
+
+    def initialize new_isolator
+      super(new_isolator)
+      extensions = Pork.execute_extensions
+      extend(*extensions.reverse) if extensions.any?
+    end
+
+    def execute stat=Stat.new, paths=isolator.all_paths
+      raise NotImplementedError
+    end
   end
 end

data/lib/pork/{isolate.rb → isolator.rb}

@@ -1,6 +1,14 @@
 
+require 'pork/env'
+require 'pork/suite'
+
 module Pork
-  module Isolate
+  class Isolator < Struct.new(:suite)
+    def self.[] suite=Suite
+      @map ||= {}
+      @map[suite] ||= new(suite)
+    end
+
     def all_tests
       @all_tests ||= build_all_tests
     end
@@ -39,7 +47,7 @@ module Pork
       env = Env.new(super_env)
       idx = path.first
 
-      @tests.first(idx).each do |(type, arg, _)|
+      suite.tests.first(idx).each do |(type, arg, _)|
         case type
         when :before
           env.before << arg
@@ -49,24 +57,23 @@ module Pork
       end
 
       if path.size == 1
-        _, desc, test = @tests[idx]
-        run(stat, desc, test, env)
+        _, desc, test = suite.tests[idx]
+        suite.run(stat, desc, test, env)
       else
-        @tests[idx][1].isolate(stat, path.drop(1), env)
+        Isolator[suite.tests[idx][1]].isolate(stat, path.drop(1), env)
       end
 
       stat
     end
 
     def build_all_tests result={}, path=[]
-      @tests.each_with_index.inject(result) do |r,
-                                                ((type, imp, test, opts),
-                                                  index)|
+      suite.tests.each_with_index.inject(result) do |
+        r, ((type, imp, test, opts), index)|
         current = path + [index]
 
         case type
         when :describe
-          imp.build_all_tests(r, current) do |nested|
+          Isolator[imp].build_all_tests(r, current) do |nested|
             store_path(r, nested, test, opts[:groups])
           end
         when :would

data/lib/pork/mode/parallel.rb

@@ -2,22 +2,21 @@
 require 'pork/mode/shuffled'
 
 module Pork
-  module Parallel
+  class Parallel < Struct.new(:isolator)
     def cores
       8
     end
 
-    def parallel stat=Stat.new, paths=all_paths
+    def execute stat=Stat.new, paths=isolator.all_paths
+      executor = Shuffled.new(isolator)
       stat.prepare(paths)
       paths.shuffle.each_slice(cores).map do |paths_slice|
         Thread.new do
-          execute(:shuffled,
-                  Stat.new(stat.reporter, stat.protected_exceptions),
-                  paths_slice)
+          executor.execute(
+            Stat.new(stat.reporter, stat.protected_exceptions),
+            paths_slice)
         end
       end.map(&:value).inject(stat, &:merge)
     end
   end
-
-  Executor.extend(Parallel)
 end

data/lib/pork/mode/sequential.rb

@@ -1,11 +1,11 @@
 
+require 'pork/executor'
+
 module Pork
-  module Sequential
-    def sequential stat=Stat.new, paths=all_paths
+  class Sequential < Executor
+    def execute stat=Stat.new, paths=isolator.all_paths
       stat.prepare(paths)
-      paths.inject(stat, &method(:isolate))
+      paths.inject(stat, &isolator.method(:isolate))
     end
   end
-
-  Executor.extend(Sequential)
 end

data/lib/pork/mode/shuffled.rb

@@ -1,11 +1,11 @@
 
+require 'pork/executor'
+
 module Pork
-  module Shuffled
-    def shuffled stat=Stat.new, paths=all_paths
+  class Shuffled < Executor
+    def execute stat=Stat.new, paths=isolator.all_paths
       stat.prepare(paths)
-      paths.shuffle.inject(stat, &method(:isolate))
+      paths.shuffle.inject(stat, &isolator.method(:isolate))
     end
   end
-
-  Executor.extend(Shuffled)
 end

data/lib/pork/more/bottomup_backtrace.rb

@@ -1,6 +1,4 @@
 
-require 'pork'
-
 module Pork
   module BottomupBacktrace
     private

data/lib/pork/more/color.rb

@@ -1,6 +1,4 @@
 
-require 'pork'
-
 module Pork
   module Color
     def msg_skip   ;  yellow(super); end

data/lib/pork/more/should.rb

@@ -1,6 +1,4 @@
 
-require 'pork/executor'
-
 module Kernel
   def should *args, &block
     stat = Thread.current.group.list.find{ |t| t[:pork_stat] }[:pork_stat]
@@ -10,18 +8,18 @@ end
 
 module Pork
   module Should
-    def execute mode, stat=Stat.new, *args
+    def execute stat=Stat.new, *args
       thread = Thread.current
       original_group, group = thread.group, ThreadGroup.new
       original_stat = thread[:pork_stat]
       group.add(thread)
       thread[:pork_stat] = stat
-      super(mode, stat, *args)
+      super(stat, *args)
     ensure
       thread[:pork_stat] = original_stat
       original_group.add(thread)
     end
   end
 
-  Executor.extend(Should)
+  execute_extensions << Should
 end

data/lib/pork/report.rb

@@ -5,7 +5,8 @@ module Pork
   module Report::Imp
     def initialize o=$stdout
       super
-      extend(*Pork.report_extensions.reverse) if Pork.report_extensions.any?
+      extensions = Pork.report_extensions
+      extend(*extensions.reverse) if extensions.any?
     end
 
     def case_start _; end
@@ -152,5 +153,5 @@ module Pork
     end
   end
 
-  Report.__send__(:include, Report::Imp)
+  Report.include(Report::Imp)
 end

data/lib/pork/report/description.rb

@@ -3,7 +3,7 @@ require 'pork/report/dot'
 
 module Pork
   class Description < Dot
-    attr_accessor :last_executor
+    attr_accessor :last_suite
 
     def msg_pass
       msg = "\ro"
@@ -19,17 +19,17 @@ module Pork
     def msg_errored; "\r#{super}"; end
 
     def case_start context
-      self.last_executor ||= Executor
-      executor = context.class
-      levels = executor.ancestors.drop(1).count{ |a| a <= Executor }
+      self.last_suite ||= Suite
+      suite = context.class
+      levels = suite.ancestors.drop(1).count{ |a| a <= Suite }
 
-      if executor != Executor && last_executor != executor
-        io.puts "#{'  ' * (levels - 1)}#{executor.desc}"
+      if suite != Suite && last_suite != suite
+        io.puts "#{'  ' * (levels - 1)}#{suite.desc}"
       end
 
       io.print "#{'  ' * levels}#{context.pork_description}"
 
-      self.last_executor = executor
+      self.last_suite = suite
     end
 
     def case_end

data/lib/pork/report/progressbar.rb

@@ -75,12 +75,11 @@ module Pork
       end
     end
 
-    def case_pass   ; end
     def case_skip   ; end
     def case_failed ; self.failed = true; end
     def case_errored; self.failed = true; end
 
-    def case_end
+    def case_pass
       bar.tick
     end
 

data/lib/pork/runner.rb

@@ -0,0 +1,54 @@
+
+require 'pork/error'
+
+module Pork
+  class Runner < Struct.new(:suite, :seed, :stat, :desc, :test, :env)
+    def run
+      assertions = stat.assertions
+      context = suite.new(stat, desc)
+
+      stat.reporter.case_start(context)
+
+      passed = protected do
+        env.run_before(context)
+        context.instance_eval(&test)
+      end
+
+      protected{ env.run_after(context) }
+
+      if passed
+        if assertions == stat.assertions
+          protected{ raise Error.new('Missing assertions') }
+        else
+          stat.reporter.case_pass
+        end
+      end
+
+      stat.incr_tests
+      stat.reporter.case_end
+    end
+
+    private
+    def protected
+      yield
+      true
+    rescue *stat.protected_exceptions => e
+      case e
+      when Skip
+        stat.incr_skips
+        stat.reporter.case_skip
+      else
+        err = [e, suite.description_for("would #{desc}"), test, seed]
+        case e
+        when Failure
+          stat.add_failure(err)
+          stat.reporter.case_failed
+        else
+          stat.add_error(err)
+          stat.reporter.case_errored
+        end
+      end
+      false
+    end
+  end
+end

data/lib/pork/stat.rb

@@ -63,5 +63,5 @@ module Pork
     end
   end
 
-  Stat.__send__(:include, Stat::Imp)
+  Stat.include(Stat::Imp)
 end

data/lib/pork/suite.rb

@@ -0,0 +1,59 @@
+
+require 'pork/runner'
+require 'pork/context'
+
+module Pork
+  class Suite < Struct.new(:pork_stat, :pork_description)
+    module Imp
+      attr_reader :desc, :tests
+
+      def before &block; @tests << [:before, block]; end
+      def after  &block; @tests << [:after , block]; end
+
+      def copy  desc=:default, &suite
+        @stash[desc] = suite
+      end
+      def paste desc=:default, *args
+        module_exec(*args, &search_stash(desc))
+      end
+
+      def describe desc=:default, opts={}, &suite
+        executor = Class.new(self){ init(desc) }
+        executor.module_eval(&suite)
+        @tests << [:describe, executor, suite, opts]
+      end
+
+      def would desc=:default, opts={}, &test
+        raise ArgumentError.new("no block given") unless test
+        @tests << [:would   , desc    , test, opts]
+      end
+
+      def description_for name=''
+        if @super_executor
+          "#{@super_executor.description_for}#{@desc}: #{name}"
+        else
+          name
+        end
+      end
+
+      def run *args
+        Runner.new(self, Pork.reseed, *args).run
+      end
+
+      private
+      def init desc=''
+        @desc, @tests, @stash = desc, [], {}
+        @super_executor = ancestors[1..-1].find{ |a| a <= Suite }
+      end
+
+      protected
+      def search_stash desc
+        @stash[desc] or @super_executor && @super_executor.search_stash(desc)
+      end
+    end
+
+    extend Imp
+    include Context
+    init
+  end
+end

data/lib/pork/version.rb

@@ -1,4 +1,4 @@
 
 module Pork
-  VERSION = '1.5.0'
+  VERSION = '2.0.0'
 end

data/pork.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: pork 1.5.0 ruby lib
+# stub: pork 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pork".freeze
-  s.version = "1.5.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2016-03-10"
+  s.date = "2016-09-10"
   s.description = "Pork -- Simple and clean and modular testing library.\n\nInspired by [Bacon][].\n\n[Bacon]: https://github.com/chneukirchen/bacon".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   "Rakefile".freeze,
   "TODO.md".freeze,
   "lib/pork.rb".freeze,
+  "lib/pork/api.rb".freeze,
   "lib/pork/auto.rb".freeze,
   "lib/pork/context.rb".freeze,
   "lib/pork/env.rb".freeze,
@@ -30,9 +31,8 @@ Gem::Specification.new do |s|
   "lib/pork/expect.rb".freeze,
   "lib/pork/extra/rainbows.rb".freeze,
   "lib/pork/extra/show_source.rb".freeze,
-  "lib/pork/imp.rb".freeze,
   "lib/pork/inspect.rb".freeze,
-  "lib/pork/isolate.rb".freeze,
+  "lib/pork/isolator.rb".freeze,
   "lib/pork/mode/parallel.rb".freeze,
   "lib/pork/mode/sequential.rb".freeze,
   "lib/pork/mode/shuffled.rb".freeze,
@@ -44,7 +44,9 @@ Gem::Specification.new do |s|
   "lib/pork/report/description.rb".freeze,
   "lib/pork/report/dot.rb".freeze,
   "lib/pork/report/progressbar.rb".freeze,
+  "lib/pork/runner.rb".freeze,
   "lib/pork/stat.rb".freeze,
+  "lib/pork/suite.rb".freeze,
   "lib/pork/test.rb".freeze,
   "lib/pork/version.rb".freeze,
   "pork.gemspec".freeze,
@@ -53,6 +55,7 @@ Gem::Specification.new do |s|
   "test/test_bacon.rb".freeze,
   "test/test_expect.rb".freeze,
   "test/test_inspect.rb".freeze,
+  "test/test_meta.rb".freeze,
   "test/test_nested.rb".freeze,
   "test/test_pork_test.rb".freeze,
   "test/test_readme.rb".freeze,
@@ -60,12 +63,13 @@ Gem::Specification.new do |s|
   "test/test_stat.rb".freeze]
   s.homepage = "https://github.com/godfat/pork".freeze
   s.licenses = ["Apache License 2.0".freeze]
-  s.rubygems_version = "2.6.1".freeze
+  s.rubygems_version = "2.6.6".freeze
   s.summary = "Pork -- Simple and clean and modular testing library.".freeze
   s.test_files = [
   "test/test_bacon.rb".freeze,
   "test/test_expect.rb".freeze,
   "test/test_inspect.rb".freeze,
+  "test/test_meta.rb".freeze,
   "test/test_nested.rb".freeze,
   "test/test_pork_test.rb".freeze,
   "test/test_readme.rb".freeze,

data/test/test_bacon.rb

@@ -236,13 +236,14 @@ describe "before/after" do
     @a = 2
   end
 
+  # after should run in reverse order
   after do
-    @a.should.eq 2
-    @a = 3
+    @a.should.eq 3
   end
 
   after do
-    @a.should.eq 3
+    @a.should.eq 2
+    @a = 3
   end
 
   would "run in the right order" do
@@ -343,7 +344,7 @@ end
 
 describe 'describe arguments' do
   check = lambda do |ctx, desc, name=nil|
-    ctx.should.lt Pork::Executor
+    ctx.should.lt Pork::Suite
     ctx.description_for(name).should.eq "#{desc}: #{name}"
   end
 
@@ -372,8 +373,8 @@ describe 'describe arguments' do
   end
 
   would 'work with namespaced modules' do
-    str = 'Pork::Executor'
-    Pork::API.describe(Pork::Executor) do
+    str = 'Pork::Suite'
+    Pork::API.describe(Pork::Suite) do
       check[self, str]
       would 'd' do check[self.class, str, 'd'] end
     end

data/test/test_meta.rb

@@ -0,0 +1,40 @@
+
+require 'pork/test'
+
+describe 'meta' do
+  before do
+    @stat = Pork::Stat.new(Pork.report_class.new(StringIO.new))
+    @suite = Class.new(Pork::Suite){init}
+  end
+
+  def execute
+    Pork::Executor.execute(:suite => @suite, :stat => @stat)
+  end
+
+  would 'raise missing assertion' do
+    @suite.would{}
+    @suite.after{ok} # defined after would so no run for that
+    stat = execute
+    err, _, _ = stat.exceptions.first
+
+    expect(err).kind_of?(Pork::Error)
+    expect(err.message).eq 'Missing assertions'
+  end
+
+  would 'not raise missing assertion if there is one in after block' do
+    @suite.after{ok}
+    @suite.would{}
+    stat = execute
+
+    expect(stat.exceptions).empty?
+  end
+
+  would 'run after block even if there is an error in test' do
+    called = false
+    @suite.after{ called = true }
+    @suite.would{ flunk }
+    execute
+
+    expect(called).eq true
+  end
+end

data/test/test_nested.rb

@@ -78,3 +78,26 @@ describe Pork::Context do
     expect(pork_description).eq desc
   end
 end
+
+describe 'assertion in after block' do
+  after do
+    ok
+  end
+
+  would do
+  end
+end
+
+describe 'no before/after after would' do
+  would do
+    ok
+  end
+
+  before do
+    flunk
+  end
+
+  after do
+    flunk
+  end
+end

data/test/test_pork_test.rb

@@ -2,21 +2,21 @@
 require 'pork/test'
 
 describe 'PORK_TEST=a' do
-  def verify line, executor, index
-    path = executor[index].first
-    type, desc, block, opts = extract(path, executor)
+  def verify line, suite, index
+    path = Pork::Isolator[suite][index].first
+    type, desc, block, opts = extract(path, suite)
     expect(type)                 .eq :would
     expect(desc)                 .eq 'find the corresponding test case'
     expect(block.source_location).eq [__FILE__, line]
     expect(opts)                 .eq :groups => [:a, :b]
   end
 
-  def extract path, executor
-    path.inject(executor.instance_variable_get(:@tests)) do |tests, idx|
+  def extract path, suite
+    path.inject(suite.tests) do |tests, idx|
       type, arg, = tests[idx]
       case type
       when :describe # we need to go deeper
-        arg.instance_variable_get(:@tests)
+        arg.tests
       else
         tests[idx] # should end here
       end
@@ -25,11 +25,11 @@ describe 'PORK_TEST=a' do
 
   would 'find the corresponding test case', :groups => [:a, :b] do
     line = __LINE__ - 1
-    [self.class, Pork::Executor].each do |executor|
-      verify(line, executor, "#{__FILE__}:#{__LINE__}") # line
-      verify(line, executor, 'a')                       # group
-      verify(line, executor, "#{__FILE__}:#{__LINE__}") # diff line
-      verify(line, executor, __FILE__)                  # file
+    [self.class, Pork::Suite].each do |suite|
+      verify(line, suite, "#{__FILE__}:#{__LINE__}") # line
+      verify(line, suite, 'a')                       # group
+      verify(line, suite, "#{__FILE__}:#{__LINE__}") # diff line
+      verify(line, suite, __FILE__)                  # file
       # for self.class, would is the 1st, for Pork::Executor, would is 2nd
     end
   end
@@ -37,16 +37,18 @@ describe 'PORK_TEST=a' do
   describe 'PORK_TEST=b' do
     would 'find both', :groups => [:b] do
       line = __LINE__ - 1
-      woulds = Pork::Executor[__FILE__]
-      woulds               .size.should.eq 4
-      Pork::Executor['a']  .size.should.eq 1
-      Pork::Executor['b']  .size.should.eq 2
-      Pork::Executor['b']       .should.eq woulds.first(2)
-      Pork::Executor['a,b']     .should.eq woulds.first(2)
-      self.class['a']           .should.nil?
-      self.class['b']      .size.should.eq 1
+      top = Pork::Isolator[]
+      woulds = top[__FILE__]
+      woulds    .size.should.eq 4
+      top['a']  .size.should.eq 1
+      top['b']  .size.should.eq 2
+      top['b']       .should.eq woulds.first(2)
+      top['a,b']     .should.eq woulds.first(2)
+      local = Pork::Isolator[self.class]
+      local['a']     .should.nil?
+      local['b'].size.should.eq 1
 
-      a, b = Pork::Executor['b'].map{ |path| extract(path, Pork::Executor) }
+      a, b = top['b'].map{ |path| extract(path, Pork::Suite) }
       expect(a[0])                .eq :would
       expect(a[1])                .eq 'find the corresponding test case'
       expect(a[3])                .eq :groups => [:a, :b]
@@ -60,12 +62,13 @@ describe 'PORK_TEST=a' do
   describe 'PORK_TEST=c', :groups => [:c] do
     would 'inherit groups from describe', :groups => [:d] do
       line = __LINE__ - 2
-      c = Pork::Executor['c']
-      d = Pork::Executor['d']
-      expect(c.size)                               .eq 2
-      expect(d.size)                               .eq 1
-      expect(c.first)                              .eq d.first
-      expect(Pork::Executor["#{__FILE__}:#{line}"]).eq c
+      isolator = Pork::Isolator[]
+      c = isolator['c']
+      d = isolator['d']
+      expect(c.size)                         .eq 2
+      expect(d.size)                         .eq 1
+      expect(c.first)                        .eq d.first
+      expect(isolator["#{__FILE__}:#{line}"]).eq c
     end
 
     would 'dummy' do

data/test/test_readme.rb

@@ -1,13 +1,17 @@
 
 require 'pork/test'
-require 'uri'
 
 describe 'README.md' do
   File.read("#{File.dirname(File.expand_path(__FILE__))}/../README.md").
     scan(%r{``` ruby\nrequire 'pork/auto'\n(.+?)\n```}m).
     each.with_index do |(code), index|
       would 'pass from README.md #%02d' % index do
-        Module.new{ extend Pork::API; instance_eval(code) }
+        suite = Class.new(Pork::Suite) do
+          init
+          instance_eval(code)
+        end
+
+        Pork::Executor.execute(:suite => suite)
         ok
       end
   end

data/test/test_stat.rb

@@ -4,7 +4,7 @@ require 'stringio'
 
 describe Pork::Stat do
   before do
-    @executor = Class.new(Pork::Executor){init}
+    @suite = Class.new(Pork::Suite){init}
   end
 
   def skip_if_backtrace_is_wrong
@@ -23,7 +23,7 @@ describe Pork::Stat do
   def run check=:expect_one_error
     stat = Pork::Stat.new(Pork.report_class.new(StringIO.new))
     stat.protected_exceptions = pork_stat.protected_exceptions
-    @stat = @executor.execute(Pork.execute_mode, stat)
+    @stat = Pork::Executor.execute(:suite => @suite, :stat => stat)
     send(check)
   end
 
@@ -42,17 +42,19 @@ describe Pork::Stat do
   end
 
   would 'rescue custom errors' do
-    @executor.would{ raise WebMockError }
+    @suite.would{ raise WebMockError }
     run
   end
 
   would 'always have backtrace' do
-    @executor.would
+    @suite.would{}
     run
 
     err, _, test = @stat.exceptions.first
     err.set_backtrace([])
 
+    expect(err).kind_of?(Pork::Error)
+    expect(err.message).eq 'Missing assertions'
     expect(@stat.reporter.send(:show_backtrace, test, err)).not.empty?
   end
 
@@ -65,28 +67,28 @@ describe Pork::Stat do
     end
 
     would 'one line' do
-      @executor.would{ flunk }
-      verify('=> @executor.would{ flunk }')
+      @suite.would{ flunk }
+      verify('=> @suite.would{ flunk }')
     end
 
     would 'more lines' do
-      @executor.would do
+      @suite.would do
         flunk
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   flunk\e[0m
      end
       SOURCE
     end
 
     would 'multiple lines' do
-      @executor.would do
+      @suite.would do
         raise \
           'error'
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   raise \\\e[0m
 \e[41m  =>     'error'\e[0m
      end
@@ -95,14 +97,14 @@ describe Pork::Stat do
 
     would 'multiple lines with == {}' do
       skip_if_backtrace_is_wrong
-      @executor.would do
+      @suite.would do
         0.should == {
 
 
         }
       end
       verify(<<-SOURCE.chomp, :expect_one_failure)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   0.should == {\e[0m
 \e[41m  => \e[0m
 \e[41m  => \e[0m
@@ -112,20 +114,20 @@ describe Pork::Stat do
     end
 
     would 'show the line in the test, not other methods' do
-      @executor.send(:define_method, :f){ flunk }
-      @executor.would do
+      @suite.send(:define_method, :f){ flunk }
+      @suite.would do
         f
       end
       verify(<<-SOURCE.chomp)
-     @executor.would do
+     @suite.would do
 \e[41m  =>   f\e[0m
      end
       SOURCE
     end
 
     would 'show the line in the test, even if it is from 3rd party' do
-      @executor.would{ flunk }
-      verify("=> @executor.would{ flunk }") do |err|
+      @suite.would{ flunk }
+      verify("=> @suite.would{ flunk }") do |err|
         err.set_backtrace(err.backtrace.unshift("bad.rb:#{__LINE__}"))
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pork
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -60,6 +60,7 @@ files:
 - Rakefile
 - TODO.md
 - lib/pork.rb
+- lib/pork/api.rb
 - lib/pork/auto.rb
 - lib/pork/context.rb
 - lib/pork/env.rb
@@ -68,9 +69,8 @@ files:
 - lib/pork/expect.rb
 - lib/pork/extra/rainbows.rb
 - lib/pork/extra/show_source.rb
-- lib/pork/imp.rb
 - lib/pork/inspect.rb
-- lib/pork/isolate.rb
+- lib/pork/isolator.rb
 - lib/pork/mode/parallel.rb
 - lib/pork/mode/sequential.rb
 - lib/pork/mode/shuffled.rb
@@ -82,7 +82,9 @@ files:
 - lib/pork/report/description.rb
 - lib/pork/report/dot.rb
 - lib/pork/report/progressbar.rb
+- lib/pork/runner.rb
 - lib/pork/stat.rb
+- lib/pork/suite.rb
 - lib/pork/test.rb
 - lib/pork/version.rb
 - pork.gemspec
@@ -91,6 +93,7 @@ files:
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Pork -- Simple and clean and modular testing library.
@@ -124,6 +127,7 @@ test_files:
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb

data/lib/pork/imp.rb

@@ -1,88 +0,0 @@
-
-require 'pork/env'
-require 'pork/stat'
-require 'pork/error'
-require 'pork/expect'
-
-module Pork
-  module Imp
-    attr_reader :desc, :tests
-
-    def before &block; @tests << [:before, block]; end
-    def after  &block; @tests << [:after , block]; end
-
-    def copy  desc=:default, &suite
-      @stash[desc] = suite
-    end
-    def paste desc=:default, *args
-      module_exec(*args, &search_stash(desc))
-    end
-
-    def describe desc=:default, opts={}, &suite
-      executor = Class.new(self){ init("#{desc}: ") }
-      executor.module_eval(&suite)
-      @tests << [:describe, executor, suite || lambda{}, opts]
-    end
-
-    def would desc=:default, opts={}, &test
-      @tests << [:would   , desc    , test  || lambda{}, opts]
-    end
-
-    def execute mode, *args
-      require "pork/mode/#{mode}"
-      public_send(mode, *args)
-    end
-
-    private
-    def init desc=''
-      @desc, @tests, @stash = desc, [], {}
-      @super_executor = ancestors[1..-1].find{ |a| a <= Executor }
-    end
-
-    def run stat, desc, test, env
-      assertions = stat.assertions
-      context = new(stat, desc)
-      seed = Pork.reseed
-      stat.reporter.case_start(context)
-      run_protected(stat, desc, test, seed) do
-        env.run_before(context)
-        context.instance_eval(&test)
-        raise Error.new('Missing assertions') if assertions == stat.assertions
-        stat.reporter.case_pass
-      end
-    ensure
-      stat.incr_tests
-      run_protected(stat, desc, test, seed){ env.run_after(context) }
-      stat.reporter.case_end
-    end
-
-    def run_protected stat, desc, test, seed
-      yield
-    rescue *stat.protected_exceptions => e
-      case e
-      when Skip
-        stat.incr_skips
-        stat.reporter.case_skip
-      else
-        err = [e, description_for("would #{desc}"), test, seed]
-        case e
-        when Failure
-          stat.add_failure(err)
-          stat.reporter.case_failed
-        else
-          stat.add_error(err)
-          stat.reporter.case_errored
-        end
-      end
-    end
-
-    protected
-    def search_stash desc
-      @stash[desc] or @super_executor && @super_executor.search_stash(desc)
-    end
-
-    def description_for name=''
-      "#{@super_executor && @super_executor.description_for}#{@desc}#{name}"
-    end
-  end
-end