cutest 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODJmODdlMjVmNTZhZTU5Y2FhMDVlNDUxOWViMGIyZWE5YmM4MDIzYQ==
-  data.tar.gz: !binary |-
-    MGQ4MzFkMzA4MTY3MDZkNTA0NjEyYzlkNWFkNGFkNzMxYjUzNTFiMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDU3ZjczMzczOGVjMGYxN2YzMDA0NjVmNWNlMWFlMWQ0OGZkMjM2OGM3N2Mz
-    ZTMzOTc0OWFlZWZkZmEwOTg5YTdhZTMyYjhjZDhmN2NmNDUwOGM0N2Y2MjJi
-    YWY3ZTVlMTQyMDgzYWRkMDBlNjAxMjljMjU5YWExNTRlNWI1ZDI=
-  data.tar.gz: !binary |-
-    YTY4NDQxMmJiYTg2Y2QyOTc3MGQ3MGNiMWRkN2JkYzc0NTNmMWIwM2E2ZWY2
-    ZjhiZDhjZTJlYTk4MTRkOWZkNTdkY2E4NmZkOTI1ZGQ4NjE0NTdhNmY3ZmMy
-    ZTA0MzlhYjAyYmQxZDdlYWYwYTZjN2MzYTIwMGZlYzRiM2JhYzQ=
+SHA1:
+  metadata.gz: 9bc022132fb8435fd081485e6649717148b2907f
+  data.tar.gz: 51720cbf6e686d549bcb0db4b93aa427be3d1acc
+SHA512:
+  metadata.gz: 030a88a3567dba1ac8d88e74c4121c921bc64ea1a0f9086764bc479ddd65ed7157dfe9026ca9bac7465546e57392866e3a1e8c9ec81f1d7c05f73425fb3bbc6c
+  data.tar.gz: 355faf07ae61e2bac11b81943ce3953d4ac8a59eb0a043e4695f1afb7475ef0fa2f0c6c5f4708b517ca03a7e222f2aa4cac0ed64e24952d443971d590c265337

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+1.2.2 - 2014-11-05
+==================
+
+* `assert_raise` now returns the raised exception.
+
+* Use `-s` to run a single scope.
+
 1.2.1 - 2013-08-14
 ==================
 

data/bin/cutest

@@ -1,16 +1,17 @@
 #!/usr/bin/env ruby
 
 if ARGV.empty?
-  puts "usage: cutest [-r lib] [-v] file ..."
+  puts "usage: cutest [-v] [-r lib] [-o test] [-s scope] file ..."
   exit
 end
 
 require_relative "../lib/cutest"
-require_relative "../lib/cutest/vendor/clap"
+require "clap"
 
 files = Clap.run ARGV,
   "-r"      => lambda { |file| require file },
   "-o"      => lambda { |name| cutest[:only] = name },
+  "-s"      => lambda { |name| cutest[:scope] = name },
   "-v"      => lambda { puts Cutest::VERSION }
 
 if files.any?

data/cutest.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   s.executables.push "cutest"
+
+  s.add_dependency "clap"
 end

data/lib/cutest.rb

@@ -1,6 +1,6 @@
 class Cutest
   unless defined?(VERSION)
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
     FILTER = %r[/(ruby|jruby|rbx)[-/]([0-9\.])+]
     CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
   end
@@ -9,9 +9,7 @@ class Cutest
     status = files.all? do |file|
       run_file(file)
 
-      Process.wait
-
-      $?.success?
+      Process.wait2.last.success?
     end
 
     puts
@@ -96,8 +94,10 @@ private
 
   # Create a class where the block will be evaluated. Recommended to improve
   # isolation between tests.
-  def scope(&block)
-    Cutest::Scope.new(&block).call
+  def scope(name = nil, &block)
+    if !cutest[:scope] || cutest[:scope] == name
+      Cutest::Scope.new(&block).call
+    end
   end
 
   # Prepare the environment in order to run the tests. This method can be
@@ -144,6 +144,8 @@ private
       prepare.each { |blk| blk.call }
       block.call(setup && setup.call)
     end
+
+    cutest[:test] = nil
   end
 
   # Assert that value is not nil or false.
@@ -163,6 +165,7 @@ private
     begin
       yield
     rescue => exception
+      exception
     ensure
       flunk("got #{exception.inspect} instead") unless exception.kind_of?(expected)
       success

data/test/assert_raise.rb

@@ -11,3 +11,12 @@ test "raises if the expectation is not met" do
     end
   end
 end
+
+test "returns the exception" do
+  exception = assert_raise(RuntimeError) do
+    raise RuntimeError, "error"
+  end
+
+  assert_equal "error", exception.message
+end
+

data/test/fixtures/only_run_given_scope_name.rb

@@ -0,0 +1,15 @@
+scope "another scope" do
+  test do
+    raise "This is not raised"
+  end
+end
+
+scope "scope" do
+  test "test" do
+    assert true
+  end
+
+  test do
+    raise "This is raised"
+  end
+end

data/test/fixtures/outside_block.rb

@@ -0,0 +1,5 @@
+test "named success" do
+  assert true
+end
+
+assert false

data/test/run.rb

@@ -64,3 +64,27 @@ test "output of failure in nested file" do
 
   assert_equal(expected, out)
 end
+
+test "output of failure outside block" do
+  expected = ".\n" +
+  "  test: \n" +
+  "  line: assert false\n" +
+  "  file: test/fixtures/outside_block.rb +5\n\n" +
+  "Cutest::AssertionFailed: expression returned false\n\n"
+
+  out = %x{./bin/cutest test/fixtures/outside_block.rb}
+
+  assert_equal(expected, out)
+end
+
+test "only runs given scope name" do
+  out = %x{./bin/cutest test/fixtures/only_run_given_scope_name.rb -s scope}
+
+  assert out =~ /This is raised/
+end
+
+test "runs by given scope and test names" do
+  %x{./bin/cutest test/fixtures/only_run_given_scope_name.rb -s scope -o test}
+
+  assert_equal 0, $?.to_i
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cutest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Damian Janowski
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
-dependencies: []
+date: 2014-11-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: clap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run tests in separate processes to avoid shared state.
 email:
 - djanowski@dimaion.com
@@ -22,7 +36,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - LICENSE
 - README.markdown
@@ -30,7 +44,6 @@ files:
 - bin/cutest
 - cutest.gemspec
 - lib/cutest.rb
-- lib/cutest/vendor/clap.rb
 - test/assert.rb
 - test/assert_equal.rb
 - test/assert_raise.rb
@@ -38,6 +51,8 @@ files:
 - test/fixtures/fail_custom_assertion.rb
 - test/fixtures/failure.rb
 - test/fixtures/failure_in_loaded_file.rb
+- test/fixtures/only_run_given_scope_name.rb
+- test/fixtures/outside_block.rb
 - test/fixtures/success.rb
 - test/prepare.rb
 - test/run.rb
@@ -53,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Forking tests.

data/lib/cutest/vendor/clap.rb

@@ -1,46 +0,0 @@
-class Clap
-  attr :argv
-  attr :opts
-
-  def self.run(args, opts)
-    new(args, opts).run
-  end
-
-  def initialize(argv, opts)
-    @argv = argv.dup
-    @opts = opts
-  end
-
-  def run
-    args = []
-
-    while argv.any?
-
-      item = argv.shift
-      flag = opts[item]
-
-      if flag
-
-        # Work around lambda semantics in 1.8.7.
-        arity = [flag.arity, 0].max
-
-        # Raise if there are not enough parameters
-        # available for the flag.
-        if argv.size < arity
-          raise ArgumentError
-        end
-
-        # Call the lambda with N items from argv,
-        # where N is the lambda's arity.
-        flag.call(*argv.shift(arity))
-      else
-
-        # Collect the items that don't correspond to
-        # flags.
-        args << item
-      end
-    end
-
-    args
-  end
-end