minitest-around 0.1.0.pre2 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf2caee1ef50c01ab6f46cbc01adc8b1dde4f2e
-  data.tar.gz: 4634b4d4d16c34ce197cd959d1c15288783ce93b
+  metadata.gz: b8b6c586cacf0c22de37cbfcad9787667212d43d
+  data.tar.gz: 9f45e41f76cd08e01ce39c69167aa20c174d0d9a
 SHA512:
-  metadata.gz: 4f6ceb34a1d7bd1044fd01e1c6be9de438282516242ebcdc74f394dd9829662f0ad7c9c29ebb0c23153e9ce71b288e4f5e7535eaa2a9135bf19d448bbb9bbcd1
-  data.tar.gz: fafcdfbb46f67f25e4d9ba9e7b0d3e99b1b99c8a19abc515db2e3b06ff858256e35091816223d68a13e1cf6136d411ed76d6917e9def5ca81d8d9277438d2603
+  metadata.gz: a0875c6e0dbfa057708be548c4694bcd9a8598d97dd5ff9c31a15dd4297e431f4f5c24bac7dab9b412447169f7505d1e76eee0dd7d748ba26d885a6d6589dca8
+  data.tar.gz: 9ab900ca329d49d4ee3d124767b94edc0f52984c775e91a58e0de3efae6f3839fe2099bbdcb03c09db0c0ade9dac8d56d9c6b5ad64b4235c6c6c6badb31f034a

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg
 rdoc
+.rvmrc

data/.travis.yml

@@ -2,5 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.1.0
+  - jruby
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx
+  fast_finish: true

data/Gemfile

@@ -1,6 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'rake'
-
-# Specify your gem's dependencies in minitest-around.gemspec
-gemspec
+gemspec # Specify dependencies in minitest-around.gemspec

data/README.rdoc

@@ -2,7 +2,7 @@
 
 {<img src="https://secure.travis-ci.org/splattael/minitest-around.png?branch=master" alt="Build Status" />}[http://travis-ci.org/splattael/minitest-around] {<img src="https://badge.fury.io/rb/minitest-around.png" alt="Gem Version" />}[http://badge.fury.io/rb/minitest-around] {<img src="https://codeclimate.com/github/splattael/minitest-around.png" />}[https://codeclimate.com/github/splattael/minitest-around]
 
-Around block for minitest 5.
+Around block for minitest 5.X.
 
 Alternative for setup/teardown dance.
 
@@ -16,6 +16,8 @@ RDoc[http://rubydoc.info/github/splattael/minitest-around/master/file/README.rdo
 
 == Usage
 
+See examples[https://github.com/splattael/minitest-around/tree/master/examples] directory for some example usage..
+
 === Unit tests
 
   require 'minitest/autorun'
@@ -32,40 +34,24 @@ RDoc[http://rubydoc.info/github/splattael/minitest-around/master/file/README.rdo
     end
   end
 
-  class PassArgsTest < Minitest::Test
-    def around
-      yield 1, 2
-    end
-
-    def test_passes_args(a, b)
-      assert_equal 3, a + b
-    end
-  end
-
 === Spec
 
   require 'minitest/autorun'
   require 'minitest/around/spec'
-  require 'thread'
+  require 'tmpdir'
 
-  describe "Mutex" do
+  describe "inside new directory" do
     around do |test|
-      Mutex.new.synchronize(&test)
-    end
-
-    it "synchronized" do
-      # ...
-    end
-
-    describe "pass args" do
-      around do
-        # No block arg "test",
-        [ 1, 2 ]
+      Dir.mktmpdir do |dir|
+        $dir = dir
+        Dir.chdir(dir) do
+          test.call
+        end
       end
+    end
 
-      it "passes args" do |a, b|
-        (a + b).must_equal 3
-      end
+    it "is in new directory" do
+      assert_equal $dir, Dir.pwd
     end
   end
 
@@ -77,14 +63,24 @@ Test bodies won't be run if you don't *yield* inside +around+.
 
 +minitest-around+ currently supports only +minitest+ 5.X.
 
-=== Nesting
+Please see the mt4[https://github.com/splattael/minitest-around/tree/mt4] branch
+for +minitest+ 4.7.X support.
 
-Around block don't nest correctly. Please see GH issue[https://github.com/splattael/minitest-around/issues/2] for more info and workaround[https://github.com/splattael/minitest-around/issues/2#issuecomment-15769151].
 
 == License
 
 MIT License[http://www.opensource.org/licenses/mit-license.php]
 
+== Authors
+
+* Peter Suschlik (https://github.com/splattael)
+
+== Contributors[https://github.com/splattael/minitest-around/graphs/contributors]
+
+* Michael Grosser (https://github.com/grosser)
+* Rick Martínez (https://github.com/rickmzp)
+* Philip Nelson (https://github.com/pnelson)
+
 == Contributing
 
 1. Fork it

data/Rakefile

@@ -28,3 +28,12 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.main     = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'LICENSE', 'lib/**/*.rb')
 end
+
+# Examples
+EXAMPLES = FileList["examples/*.rb"]
+desc "Run all examples"
+task :"test:examples" do
+  EXAMPLES.each do |example|
+    sh "bundle", "exec", "ruby", example
+  end
+end

data/examples/chdir_spec.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'minitest/around/spec'
+require 'tmpdir'
+
+describe "inside new directory" do
+  around do |test|
+    Dir.mktmpdir do |dir|
+      $dir = dir
+      Dir.chdir(dir) do
+        test.call
+      end
+    end
+  end
+
+  it "is in new directory" do
+    assert_equal $dir, Dir.pwd
+  end
+end

data/lib/minitest/around/spec.rb

@@ -1,16 +1,29 @@
-require 'minitest/spec'
+require 'minitest'
 
 require 'minitest/around/version'
 require 'minitest/around/unit'
 
-module Minitest::Spec::DSL
-  def around(&outer)
-    define_method(:around) do |&inner|
-      if outer.arity == 1
-        outer.call(inner)
-      else
-        inner.call *outer.call
+class Minitest::Spec
+  module DSL
+    # - resume to call first part
+    # - execute test
+    # - resume fiber to execute last part
+    def around(&block)
+      fib = nil
+      before do
+        fib = Fiber.new { |context, resume| context.instance_exec(resume, &block) }
+        fib.resume(self, lambda { Fiber.yield })
       end
+      after  { fib.resume }
+    end
+
+    # Minitest does not support multiple before/after blocks
+    def before(type=nil, &block)
+      include Module.new { define_method(:setup) { super(); instance_exec(&block) } }
+    end
+
+    def after(type=nil, &block)
+      include Module.new { define_method(:after) { super(); instance_exec(&block) } }
     end
   end
 end

data/lib/minitest/around/unit.rb

@@ -1,12 +1,14 @@
-require 'minitest/unit'
+require 'minitest'
 require 'minitest/around/version'
 
 class Minitest::Test
-  def send(name)
-    if defined?(around) && name.start_with?('test')
-      around { |*args| super(name, *args) }
+  alias_method :run_without_around, :run
+  def run(*args)
+    if defined?(around)
+      around { run_without_around(*args) }
     else
-      super(name)
+      run_without_around(*args)
     end
+    self
   end
 end

data/lib/minitest/around/version.rb

@@ -1,5 +1,5 @@
-module MiniTest
+module Minitest
   module Around
-    VERSION = '0.1.0.pre2'
+    VERSION = '0.2.0.pre'
   end
 end

data/minitest-around.gemspec

@@ -1,25 +1,16 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require 'minitest/around/version'
+require './lib/minitest/around/version'
 
-Gem::Specification.new do |s|
-  s.name        = "minitest-around"
-  s.version     = MiniTest::Around::VERSION
+Gem::Specification.new "minitest-around", Minitest::Around::VERSION do |s|
   s.authors     = ["Peter Suschlik"]
   s.email       = ["peter-minitest-around@suschlik.de"]
   s.homepage    = "https://github.com/splattael/minitest-around"
-  s.summary     = %q{Around block for minitest.}
-  s.description = %q{Alternative for setup/teardown dance.}
+  s.summary     = "Around block for minitest."
+  s.description = "Alternative for setup/teardown dance."
   s.license     = 'MIT'
+  s.files       = `git ls-files`.split("\n")
 
-  s.rubyforge_project = "minitest-around"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency 'minitest', '~> 5.0.8'
+  s.add_dependency 'minitest', '~> 5.0'
 
   s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'rake'
 end

data/test/around_spec.rb

@@ -1,14 +1,14 @@
 require 'minitest/autorun'
 require 'minitest/around/spec'
 
-describe "MiniTest Around" do
+describe "Minitest Around" do
   describe "without around" do
     it "works w/o defining parameters" do
       assert true
     end
   end
 
-  describe "without args" do
+  describe "simple" do
     around do |test|
       $before = true
       test.call
@@ -20,25 +20,50 @@ describe "MiniTest Around" do
     end
   end
 
-  describe "with single arg" do
-    around { "string" }
+  describe "context" do
+    before { @x = 1 }
 
-    it "passes string argument" do |name|
-      name.must_equal "string"
+    around do |test|
+      @x = 2
+      test.call
+      assert_equal 2, @x
     end
 
-    describe "nested" do
-      it "string is still around" do |name|
-        name.must_equal "string"
+    it "stays in context" do
+      @x.must_equal 2
+    end
+  end
+
+  describe "nested fun" do
+    let(:list) { [] }
+    before { list << 1 }
+    before { list << 2 }
+    after { list << 6 }
+    around { |t| list << 3; t.call; list << 7 }
+    before { list << 4 }
+    around { |t| list << 5; t.call; list << 8 }
+    after { list << 9 }
+    after do
+      if @xxx == 1
+        list.must_equal [1, 2, 3, 4, 5, 6, 7, 8, 9]
+      elsif @xxx == 2
+        list.must_equal [1, 2, 3, 4, 5, 51, 6, 7, 8, 9]
+      else
+        raise
       end
     end
 
-    describe "with multiple args" do
-      around { [ 1, 2 ] }
+    it "orders" do
+      @xxx = 1
+      list.must_equal [1, 2, 3, 4, 5]
+    end
+
+    describe "more nesting fun" do
+      before { list << 51 }
 
-      it "passes multiple args" do |a, b|
-        a.must_equal 1
-        b.must_equal 2
+      it "orders" do
+        @xxx = 2
+        list.must_equal [1, 2, 3, 4, 5, 51]
       end
     end
   end

data/test/around_test.rb

@@ -18,24 +18,3 @@ class TestWithoutArgs < Minitest::Test
     assert_equal true, $before
   end
 end
-
-class TestWithSingleArg < Minitest::Test
-  def around
-    yield "string"
-  end
-
-  def test_around_passes_string(string)
-    assert_equal "string", string
-  end
-end
-
-class TestWithMultipleArgs < Minitest::Test
-  def around
-    yield 1, 2
-  end
-
-  def test_passes_multiple_args(a, b)
-    assert_equal 1, a
-    assert_equal 2, b
-  end
-end

data/test/nested_spec.rb

@@ -0,0 +1,36 @@
+require 'minitest/autorun'
+require 'minitest/around'
+
+$var = []
+
+describe 'Outer' do
+  before do
+    $var << :before
+  end
+  after do
+    $var << :after
+    $var.must_equal [:before, :ibefore, :begin, :ibegin, :during, :iend, :end, :iafter, :after]
+  end
+  around do |test|
+    $var << :begin
+    test.call
+    $var << :end
+  end
+
+  describe 'Inner' do
+    before do
+      $var << :ibefore
+    end
+    after do
+      $var << :iafter
+    end
+    around do |test|
+      $var << :ibegin
+      test.call
+      $var << :iend
+    end
+    it 'testing' do
+      $var << :during
+    end
+  end
+end

data/test/nested_test.rb

@@ -0,0 +1,36 @@
+require 'minitest/autorun'
+require 'minitest/around/unit'
+
+$var = []
+
+class OuterNestedTest < Minitest::Test
+  def setup
+    $var << :before
+  end
+  def teardown
+    $var << :after
+    $var.must_equal [:before, :ibefore, :begin, :ibegin, :during, :iend, :end, :iafter, :after]
+  end
+  def around
+    $var << :begin
+    yield
+    $var << :end
+  end
+end
+
+class InnerNestedTest < OuterNestedTest
+  def setup
+    $var << :ibefore
+  end
+  def teardown
+    $var << :iafter
+  end
+  def around
+    $var << :ibegin
+    yield
+    $var << :iend
+  end
+  def test_nesting
+    $var << :during
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-around
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alternative for setup/teardown dance.
 email:
 - peter-minitest-around@suschlik.de
@@ -46,14 +60,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- examples/mutex_spec.rb
-- examples/mutex_test.rb
+- examples/chdir_spec.rb
 - lib/minitest/around.rb
 - lib/minitest/around/spec.rb
 - lib/minitest/around/unit.rb
@@ -61,6 +73,8 @@ files:
 - minitest-around.gemspec
 - test/around_spec.rb
 - test/around_test.rb
+- test/nested_spec.rb
+- test/nested_test.rb
 homepage: https://github.com/splattael/minitest-around
 licenses:
 - MIT
@@ -80,10 +94,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: minitest-around
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Around block for minitest.
 test_files: []
-has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm @minitest-around --create

data/examples/mutex_spec.rb

@@ -1,24 +0,0 @@
-require 'minitest/autorun'
-require 'minitest/around'
-require 'thread'
-
-describe "Mutex" do
-  around do |test|
-    Mutex.new.synchronize(&test)
-  end
-
-  it "synchronized" do
-    # ...
-  end
-
-  describe "pass args" do
-    around do
-      # No block arg "test",
-      [ 1, 2 ]
-    end
-
-    it "passes args" do |a, b|
-      (a + b).must_equal 3
-    end
-  end
-end

data/examples/mutex_test.rb

@@ -1,23 +0,0 @@
-require 'minitest/autorun'
-require 'minitest/around'
-require 'thread'
-
-class MutexTest < Minitest::Test
-  def around(&block)
-    Mutex.new.synchronize(&block)
-  end
-
-  def test_synchronized
-    # ...
-  end
-end
-
-class PassArgsTest < Minitest::Test
-  def around
-    yield 1, 2
-  end
-
-  def test_passes_args(a, b)
-    assert_equal 3, a + b
-  end
-end