pork 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66af2258263479b7c9b46d32d87dab94300c86c7
-  data.tar.gz: dd01950d9a7026886e35b48054c97c5f69f6e6fa
+SHA256:
+  metadata.gz: 6ef62f89f8c80fddee9ebd8e670cfa8de340a312531d022a3e49510dc7dd218f
+  data.tar.gz: 1f3af07cdc623ec24ba294fc41409f958a7fb8c89961388d98915bc648dfb142
 SHA512:
-  metadata.gz: '0584b1e173a3d0190b28ebfddba0475ff9e47e85d51081a8f5401f789f8ee1e7aa3cd1680efd58d0fd44d4e444fecc567fcec86ca13fa66eb6525baeeb29dd58'
-  data.tar.gz: 5705b43ac037712e230b6249f41f1ff12a1347e23a1bdf84632603878910ecf6f9d9a2e9c9e1c0400ea953453a232874caadb5694c8577b6b3a9220b3f45ee16
+  metadata.gz: e8c95acab07773aa0fd2f629c41c7a08d50b747c44649a3981021c5f64d0bc08f58a1b2de3ac78c317c3519c692dff2c6f473f32fcf37d806f367e65bb5fac28
+  data.tar.gz: 7b24bb5ec0792941b51ed0b2f69b90f17465fd68401db9835b42ac17b8719ed3c2936a683c6aa22f6165f9d9b01c94d5f5e90329c55c83868d051f4883004910

data/.gitlab-ci.yml

@@ -0,0 +1,40 @@
+
+stages:
+  - test
+
+.test:
+  stage: test
+  image: ruby:${RUBY_VERSION}-bullseye
+  variables:
+    GIT_DEPTH: "1"
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_PATHS: task
+    RUBYOPT: --enable-frozen-string-literal
+  before_script:
+    - bundle install --retry=3
+    - unset CI # Coverage doesn't work well with frozen literal
+  script:
+    - ruby -vr bundler/setup -S rake test
+
+ruby:3.0:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.0'
+
+ruby:3.1:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.1'
+
+ruby:3.2:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.2'
+
+jruby:latest:
+  extends:
+    - .test
+  image: jruby:latest

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "task"]
 	path = task
-	url = git://github.com/godfat/gemgem.git
+	url = https://github.com/godfat/gemgem.git

data/CHANGES.md

@@ -1,5 +1,22 @@
 # CHANGES
 
+## Pork 2.1.0 -- 2022-12-28
+
+### Bugs fixed
+
+* `Pork.show_source` can work under frozen literal string mode now.
+* Fix picking the right test for the file line number from `ENV['PORK_TEST']`
+  (I totally forgot the details for this from 2017, but I think it should
+  make it more accurate anyway)
+* Ruby 3.2 compatibility fix. (Removed the use of `Random::DEFAULT`)
+
+### Enhancement
+
+* Introduced `Pork::API.around` which will pass the test object to the block,
+  and whenever the object is called with `call` it'll run the test. Note that
+  if `call` was never called, it'll act like `Pork::API.before` and the test
+  will still run unlike RSpec. To skip the test, call `skip` directly.
+
 ## Pork 2.0.0 -- 2016-09-10
 
 ### Incompatible changes

data/Gemfile

@@ -7,7 +7,3 @@ gem 'rake'
 
 gem 'simplecov', :require => false if ENV['COV']
 gem 'coveralls', :require => false if ENV['CI']
-
-platform :rbx do
-  gem 'rubysl-singleton' # used in rake
-end

data/README.md

@@ -1,4 +1,4 @@
-# Pork [![Build Status](https://secure.travis-ci.org/godfat/pork.png?branch=master)](http://travis-ci.org/godfat/pork) [![Coverage Status](https://coveralls.io/repos/godfat/pork/badge.png)](https://coveralls.io/r/godfat/pork) [![Join the chat at https://gitter.im/godfat/pork](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/pork)
+# Pork [![Pipeline status](https://gitlab.com/godfat/pork/badges/master/pipeline.svg)](https://gitlab.com/godfat/pork/-/pipelines)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -7,6 +7,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 * [github](https://github.com/godfat/pork)
 * [rubygems](https://rubygems.org/gems/pork)
 * [rdoc](http://rdoc.info/github/godfat/pork)
+* [issues](https://github.com/godfat/pork/issues) (feel free to ask for support)
 
 ## DESCRIPTION:
 
@@ -147,7 +148,7 @@ end
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 * (Optional) [method_source][] if you would like to print the source for the
   failing tests.
 * (Optional) [ruby-progressbar][] if you like porgressbar for showing
@@ -662,6 +663,49 @@ describe do
 end
 ```
 
+### Pork::API.around
+
+Each `around` block would be called before each `would` block (test case),
+and whenever it's called, it can take an argument representing the `would`
+block (test case). Whenever `call` is called on the test case, it will run.
+Essentially it's wrapping around the `would` block.
+
+Note that each nested `describe` would also run parents' `around` block,
+following the same order of `before` (in order) and `after` (reverse order).
+
+``` ruby
+require 'pork/auto'
+
+describe do
+  around do |test|
+    @a = 0
+
+    test.call
+
+    @a.should.eq 2
+  end
+
+  describe do
+    around do |test|
+      @a.should.eq 0
+      @a += 1
+
+      test.call
+
+      @a.should.eq 1
+      @a += 1
+    end
+
+    would do
+      @a.should.eq 1
+    end
+  end
+end
+```
+
+Note that if `test.call` was never called, it'll just act like a `before`
+block. All the tests will still run unlike RSpec.
+
 ### Pork::API.copy and Pork::API.paste
 
 It could be a bit confusing at first, but just think of `copy` as a way to
@@ -1068,9 +1112,9 @@ Have you seen Rainbows!?
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2014-2016, Lin Jen-Shin (godfat)
+Copyright (c) 2014-2022, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,16 +1,17 @@
 
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__) do |s|
   require 'pork/version'
   s.name    = 'pork'
   s.version = Pork::VERSION
+  s.files.delete('screenshot.png')
+
   %w[method_source ruby-progressbar].
     each(&s.method(:add_development_dependency))
-  s.files.delete('screenshot.png')
 end

data/lib/pork/api.rb

@@ -12,6 +12,10 @@ module Pork
       Suite.after(&block)
     end
 
+    def around &block
+      Suite.around(&block)
+    end
+
     def copy desc=:default, &block
       Suite.copy(desc, &block)
     end

data/lib/pork/extra/show_source.rb

@@ -3,12 +3,31 @@ require 'method_source'
 
 module Pork
   module ShowSource
+    module FrozenStringFix
+      def extract_first_expression(lines, consume=0, &block)
+        code = consume.zero? ? [] : lines.slice!(0..(consume - 1))
+
+        lines.each do |v|
+          code << v
+
+          result = block ? block.call(code.join) : code.join
+
+          if complete_expression?(result)
+            return result
+          end
+        end
+        raise SyntaxError, "unexpected $end"
+      end
+    end
+
+    MethodSource.extend(FrozenStringFix)
+
     def show_source test, err
       source = test.source
       sopath = "#{test.source_location.first}:"
       lowers = test.source_location.last
       uppers = lowers + source.size
-      lineno = reject_pork(test, err).find do |backtrace|
+      lineno = reject_pork(test, err.backtrace).find do |backtrace|
         # find the line from the test source, exclude everything else
         next unless backtrace.start_with?(sopath)
         number = backtrace[/(?<=\.rb:)\d+/].to_i
@@ -28,7 +47,7 @@ module Pork
         end
       end.join
       "\n#{result.chomp}"
-    rescue SyntaxError => e
+    rescue SyntaxError, MethodSource::SourceNotFoundError => e
       "\nPork bug: Cannot parse the source. Please report: #{e}"
     end
   end

data/lib/pork/isolator.rb

@@ -68,38 +68,78 @@ module Pork
 
     def build_all_tests result={}, path=[]
       suite.tests.each_with_index.inject(result) do |
-        r, ((type, imp, test, opts), index)|
+        tests, ((type, imp, block, opts), index)|
         current = path + [index]
 
+        case type
+        when :describe, :would
+          source_location = expand_source_location(block)
+          init_source_store_path(tests, source_location)
+        end
+
         case type
         when :describe
-          Isolator[imp].build_all_tests(r, current) do |nested|
-            store_path(r, nested, test, opts[:groups])
+          Isolator[imp].build_all_tests(tests, current) do |nested|
+            store_path(tests, nested, source_location, opts[:groups])
           end
         when :would
           yield(current) if block_given?
-          store_path(r, current, test, opts[:groups])
+          store_path(tests, current, source_location, opts[:groups])
         end
 
-        r
+        tests
       end
     end
 
-    def store_path tests, path, test, groups
+    def expand_source_location block
+      file, line = block.source_location
+      [File.expand_path(file), line]
+    end
+
+    def init_source_store_path tests, source_location
+      source, line = source_location
+
+      root = tests[:files] ||= {}
+      map = root[source] ||= {}
+
+      # Most of the time, line is always getting larger because we're
+      # scanning from top to bottom, and we really need to make sure
+      # that the map is sorted because whenever we're looking up which
+      # test we want from a particular line, we want to find the closest
+      # block rounding up. See Isolator#by_source
+      # However, it's not always appending from top to bottom, because
+      # we might be adding more tests from Suite#paste, and the original
+      # test could be defined in the same file, on previous lines!
+      # Because of this, we really need to make sure the map is balanced.
+      # If we ever have ordered map in Ruby, we don't have to do this...
+      # See the test for Isolator.all_tests (test/test_isolator.rb)
+      balanced_append(map, line, [])
+    end
+
+    def store_path tests, path, source_location, groups
       store_for_groups(tests, path, groups) if groups
-      store_for_source(tests, path, *test.source_location)
+      store_for_source(tests, path, source_location)
     end
 
     def store_for_groups tests, path, groups
-      r = tests[:groups] ||= {}
+      map = tests[:groups] ||= {}
       groups.each do |g|
-        (r[g.to_s] ||= []) << path
+        (map[g.to_s] ||= []) << path
       end
     end
 
-    def store_for_source tests, path, file, line
-      r = tests[:files] ||= {}
-      ((r[File.expand_path(file)] ||= {})[line] ||= []) << path
+    def store_for_source tests, path, source_location
+      source, line = source_location
+
+      tests[:files][source][line] << path
+    end
+
+    def balanced_append map, key, value
+      last_key = map.reverse_each.first.first unless map.empty?
+
+      map[key] ||= []
+
+      map.replace(Hash[map.sort]) if last_key && key < last_key
     end
   end
 end

data/lib/pork/more/should.rb

@@ -1,7 +1,9 @@
 
 module Kernel
   def should *args, &block
-    stat = Thread.current.group.list.find{ |t| t[:pork_stat] }[:pork_stat]
+    stat = Thread.current.group.list.find do |t|
+      t.thread_variable_get(:pork_stat)
+    end.thread_variable_get(:pork_stat)
     Pork::Expect.new(stat, self, *args, &block)
   end
 end
@@ -11,12 +13,12 @@ module Pork
     def execute stat=Stat.new, *args
       thread = Thread.current
       original_group, group = thread.group, ThreadGroup.new
-      original_stat = thread[:pork_stat]
+      original_stat = thread.thread_variable_get(:pork_stat)
       group.add(thread)
-      thread[:pork_stat] = stat
+      thread.thread_variable_set(:pork_stat, stat)
       super(stat, *args)
     ensure
-      thread[:pork_stat] = original_stat
+      thread.thread_variable_set(:pork_stat, original_stat)
       original_group.add(thread)
     end
   end

data/lib/pork/report.rb

@@ -86,10 +86,16 @@ module Pork
     end
 
     def backtrace test, err
-      if $VERBOSE
+      bt = if $VERBOSE
         err.backtrace
       else
-        strip(reject_pork(test, err))
+        strip(reject_pork(test, err.backtrace))
+      end
+
+      if bt.empty?
+        ["#{test.source_location.join(':')}:in `block in would'"]
+      else
+        bt
       end
     end
 
@@ -113,13 +119,8 @@ module Pork
       "#{err.class}: #{err.message}"
     end
 
-    def reject_pork test, err
-      bt = err.backtrace.reject{ |l| l =~ %r{/lib/pork(/\w+)*\.rb:\d+} }
-      if bt.empty?
-        ["#{test.source_location.join(':')}:in `block in would'"]
-      else
-        bt
-      end
+    def reject_pork test, bt
+      bt.reject{ |l| l =~ %r{/lib/pork(/\w+)*\.rb:\d+} }
     end
 
     def strip bt
@@ -127,11 +128,13 @@ module Pork
     end
 
     def strip_home bt
-      bt.map{ |path| path.sub(ENV['HOME'], '~') }
+      home = ENV['HOME']
+      bt.map{ |path| path.sub(home, '~') }
     end
 
     def strip_cwd bt
-      bt.map{ |path| path.sub("#{Dir.pwd}/", '') }
+      cwd = Dir.pwd
+      bt.map{ |path| path.sub("#{cwd}/", '') }
     end
 
     def pork_test source_location

data/lib/pork/runner.rb

@@ -5,7 +5,7 @@ module Pork
   class Runner < Struct.new(:suite, :seed, :stat, :desc, :test, :env)
     def run
       assertions = stat.assertions
-      context = suite.new(stat, desc)
+      context = suite.new(stat, desc, [])
 
       stat.reporter.case_start(context)
 

data/lib/pork/suite.rb

@@ -1,15 +1,30 @@
 
+require 'fiber'
+
 require 'pork/runner'
 require 'pork/context'
 
 module Pork
-  class Suite < Struct.new(:pork_stat, :pork_description)
+  class Suite < Struct.new(:pork_stat, :pork_description, :pork_fibers)
     module Imp
       attr_reader :desc, :tests
 
       def before &block; @tests << [:before, block]; end
       def after  &block; @tests << [:after , block]; end
 
+      def around &block
+        before do
+          fiber = Fiber.new{ instance_exec(Fiber.method(:yield), &block) }
+          pork_fibers << fiber
+          fiber.resume
+        end
+
+        after do
+          fiber = pork_fibers.pop
+          fiber.resume if fiber.alive?
+        end
+      end
+
       def copy  desc=:default, &suite
         @stash[desc] = suite
       end

data/lib/pork/version.rb

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

data/lib/pork.rb

@@ -46,11 +46,7 @@ module Pork
   end
 
   def self.seed
-    @seed ||= if Random.const_defined?(:DEFAULT)
-                Random::DEFAULT.seed
-              else
-                Thread.current.randomizer.seed # Rubinius (rbx)
-              end
+    @seed ||= Random.seed
   end
 
   def self.reseed

data/pork.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: pork 2.0.0 ruby lib
+# stub: pork 2.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pork".freeze
-  s.version = "2.0.0"
+  s.version = "2.1.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-09-10"
+  s.date = "2022-12-28"
   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 = [
   ".gitignore".freeze,
+  ".gitlab-ci.yml".freeze,
   ".gitmodules".freeze,
-  ".travis.yml".freeze,
   "CHANGES.md".freeze,
   "Gemfile".freeze,
   "LICENSE".freeze,
@@ -52,42 +52,38 @@ Gem::Specification.new do |s|
   "pork.gemspec".freeze,
   "task/README.md".freeze,
   "task/gemgem.rb".freeze,
+  "test/test_around.rb".freeze,
   "test/test_bacon.rb".freeze,
   "test/test_expect.rb".freeze,
   "test/test_inspect.rb".freeze,
+  "test/test_isolator.rb".freeze,
   "test/test_meta.rb".freeze,
   "test/test_nested.rb".freeze,
   "test/test_pork_test.rb".freeze,
   "test/test_readme.rb".freeze,
   "test/test_should.rb".freeze,
-  "test/test_stat.rb".freeze]
+  "test/test_stat.rb".freeze,
+  "test/test_suite.rb".freeze]
   s.homepage = "https://github.com/godfat/pork".freeze
-  s.licenses = ["Apache License 2.0".freeze]
-  s.rubygems_version = "2.6.6".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "3.4.1".freeze
   s.summary = "Pork -- Simple and clean and modular testing library.".freeze
   s.test_files = [
+  "test/test_around.rb".freeze,
   "test/test_bacon.rb".freeze,
   "test/test_expect.rb".freeze,
   "test/test_inspect.rb".freeze,
+  "test/test_isolator.rb".freeze,
   "test/test_meta.rb".freeze,
   "test/test_nested.rb".freeze,
   "test/test_pork_test.rb".freeze,
   "test/test_readme.rb".freeze,
   "test/test_should.rb".freeze,
-  "test/test_stat.rb".freeze]
+  "test/test_stat.rb".freeze,
+  "test/test_suite.rb".freeze]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<method_source>.freeze, [">= 0"])
-      s.add_development_dependency(%q<ruby-progressbar>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<method_source>.freeze, [">= 0"])
-      s.add_dependency(%q<ruby-progressbar>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<method_source>.freeze, [">= 0"])
-    s.add_dependency(%q<ruby-progressbar>.freeze, [">= 0"])
-  end
+  s.add_development_dependency(%q<method_source>.freeze, [">= 0"])
+  s.add_development_dependency(%q<ruby-progressbar>.freeze, [">= 0"])
 end

data/task/README.md

@@ -4,16 +4,16 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -23,13 +23,13 @@ And in Rakefile:
 
 ``` ruby
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
   s.name    = 'your-gem'
   s.version = '0.1.0'
 end
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2021, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/task/gemgem.rb

@@ -1,7 +1,7 @@
 
 module Gemgem
   class << self
-    attr_accessor :dir, :spec, :spec_create
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
@@ -11,12 +11,14 @@ module Gemgem
   def pkg_dir    ; "#{dir}/pkg"                       ; end
   def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
 
-  def init dir, &block
+  def init dir, options={}, &block
     self.dir = dir
-    $LOAD_PATH.unshift("#{dir}/lib")
     ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
     ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
     self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
   end
 
   def create
@@ -26,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -40,6 +42,7 @@ module Gemgem
 
   def gem_install
     require 'rubygems/commands/install_command'
+    require 'rubygems/package'
     # read ~/.gemrc
     Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
     Gem::Command.extra_args = Gem.configuration[:gem]
@@ -49,7 +52,8 @@ module Gemgem
     cmd.handle_options([])
 
     # install
-    install = Gem::Installer.new(gem_path, cmd.options)
+    gem_package = Gem::Package.new(gem_path)
+    install = Gem::Installer.new(gem_package, cmd.options)
     install.install
     puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end
@@ -115,6 +119,7 @@ module Gemgem
       SimpleCov.start do
         add_filter('test/')
         add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
       end
     end
 
@@ -159,11 +164,15 @@ module Gemgem
   end
 
   def strip_home_path path
-    path.sub(ENV['HOME'], '~')
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
   end
 
   def strip_cwd_path path
-    path.sub(Dir.pwd, '.')
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
   end
 
   def git *args
@@ -201,6 +210,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end
@@ -221,7 +235,8 @@ module Gemgem
 
   def gem_files
     @gem_files ||= all_files.reject{ |f|
-      f =~ ignored_pattern && !git_files.include?(f)
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
     }
   end
 
@@ -253,6 +268,15 @@ module Gemgem
                          end
   end
 
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
+  end
+
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|

data/test/test_around.rb

@@ -0,0 +1,64 @@
+
+require 'pork/test'
+
+describe 'using fibers to simulate around' do
+  def a
+    @a ||= []
+  end
+
+  def around_me i
+    a << "around before #{i}"
+    yield
+    a << "around after #{i}"
+  end
+
+  before do
+    a << :before
+  end
+
+  after do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+      :would, :after, "around after 1", "around after 0"]
+  end
+
+  around do |test|
+    expect(a).eq [:before]
+
+    around_me(0) do
+      test.call
+
+      expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+        :would, :after, "around after 1"]
+    end
+  end
+
+  around do
+    expect(a).eq [:before, "around before 0"]
+
+    a << :nocall
+  end
+
+  around do |test|
+    expect(a).eq [:before, "around before 0", :nocall]
+
+    around_me(1) do
+      test.call
+
+      expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+        :would, :after]
+    end
+  end
+
+  after do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1",
+      :would]
+
+    a << :after
+  end
+
+  would 'wrap around around' do
+    expect(a).eq [:before, "around before 0", :nocall, "around before 1"]
+
+    a << :would
+  end
+end

data/test/test_isolator.rb

@@ -0,0 +1,29 @@
+
+require 'pork/test'
+
+describe Pork::Isolator do
+  before do
+    @suite = Class.new(Pork::Suite){init}
+  end
+
+  describe '.all_tests' do
+    would 'have the correct source order' do
+      @suite.copy :append do
+        would{}
+      end
+
+      @suite.describe do
+        describe do
+          would{}
+        end
+
+        paste :append
+      end
+
+      Pork::Isolator[@suite].
+        all_tests[:files].values.map(&:keys).each do |lines|
+          expect(lines).eq lines.sort
+        end
+    end
+  end
+end

data/test/test_nested.rb

@@ -14,7 +14,7 @@ describe 'A' do
 
   would 'f' do
     f.should.eq m
-    f.should.kind_of? Fixnum
+    f.should.kind_of? Integer
     lambda{ f.should.eq '' }.should.raise Pork::Failure
   end
 

data/test/test_suite.rb

@@ -0,0 +1,10 @@
+
+require 'pork/test'
+
+describe Pork::Suite do
+  def self.suite_method
+    would{ ok }
+  end
+
+  suite_method
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pork
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -51,8 +51,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -90,20 +90,23 @@ files:
 - pork.gemspec
 - task/README.md
 - task/gemgem.rb
+- test/test_around.rb
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_isolator.rb
 - test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb
 - test/test_should.rb
 - test/test_stat.rb
+- test/test_suite.rb
 homepage: https://github.com/godfat/pork
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,18 +121,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Pork -- Simple and clean and modular testing library.
 test_files:
+- test/test_around.rb
 - test/test_bacon.rb
 - test/test_expect.rb
 - test/test_inspect.rb
+- test/test_isolator.rb
 - test/test_meta.rb
 - test/test_nested.rb
 - test/test_pork_test.rb
 - test/test_readme.rb
 - test/test_should.rb
 - test/test_stat.rb
+- test/test_suite.rb

data/.travis.yml

@@ -1,14 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2.5
-  - 2.3.1
-  - rbx
-  - jruby-9
-
-before_install:
-  - rvm get head
-  - rvm reload
-  - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
-install: 'gem install bundler; bundle install --retry=3'
-script: 'ruby -r bundler/setup -S rake test'