cutest-cj 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280690061c479c165d28f6005e7ca95aa1ce1b7e
-  data.tar.gz: 95f63fd81e7e6b7e98c8a5560cc4bcada717705e
+  metadata.gz: 92455ef2621ffc03d72b7c668d15e197ef5b41fe
+  data.tar.gz: f97510d289eccd25608ea698b13b11f934206e59
 SHA512:
-  metadata.gz: 72dc85da58fc84e8585bfd38334a9684bf3e4af7309730714512a413d895dccc636685740bbee4d2c145ceb8eecc06dc911db1a5ca5090e96463a9eaf9684b77
-  data.tar.gz: 10c04b49a9b55524385de103d5d33bbb0f71e1bc51cc67361855538b6d21e3c63a421af2609118124af4e409ab5151b3a4649f7cfe060bb5f1180a9af54e3e53
+  metadata.gz: a3ead93fcd65e94a6957a133199bf9d45aa2320fb37c4cc3d90162971f2f911cf320e427cc927d51d705101bc0a70e6a2d5148d6653842dc340d36abeaa1893c
+  data.tar.gz: 197f7e987c7f78be3b94da7275982360b5910bc6292a142330080d0ec8bbc937b1261798da86a09b4b2dedc17eab3fe11cbf2d02de37592ee311613924a3aa00

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+(unreleased)
+============
+
+* Use `-s` to run a single scope.
+
 1.2.1 - 2013-08-14
 ==================
 

data/bin/cutest

@@ -8,12 +8,13 @@ if ARGV.empty?
 end
 
 require_relative "../lib/cutest"
-require_relative "../lib/cutest/vendor/clap"
+require "clap"
 
 files = Clap.run ARGV,
   "-r"      => lambda { |file| require file },
   "-t"      => lambda { |name| cutest[:only] = name },
   "-s"      => lambda { |name| cutest[:scope] = name },
+  "-w"      => lambda { |name| cutest[:warnings] = true },
   "-b"      => lambda { cutest[:backtrace] = true },
   "-p"      => lambda {
     ENV['PRY_RESCUE'] = 'true'; cutest[:pry_rescue] = true

data/cutest.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
 
   s.executables.push "cutest"
 
-  s.add_dependency 'pry-rescue'
-  s.add_dependency 'pry-stack_explorer'
+  s.add_dependency 'pry'
+  s.add_dependency 'awesome_print'
+  s.add_dependency "clap"
 end

data/lib/cutest.rb

@@ -2,7 +2,7 @@ require 'benchmark'
 
 class Cutest
   unless defined?(VERSION)
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
     FILTER = %r[/(ruby|jruby|rbx)[-/]([0-9\.])+]
     CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
   end
@@ -14,20 +14,28 @@ class Cutest
     end
   end
 
+  def self.silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+
   def self.run(files)
+    if !cutest[:warnings]
+      Cutest.silence_warnings do
+        Cutest.now_run files
+      end
+    else
+      Cutest.now_run files
+    end
+  end
+
+  def self.now_run files
     status = files.all? do |file|
       run_file(file)
 
-      if not cutest[:pry_rescue]
-        Process.wait
-        $?.success?
-      else
-        begin
-          Process.waitall
-        rescue ThreadError, Interrupt
-          # Ignore this as it's caused by Process.waitall when using -p
-        end
-      end
+      Process.wait2.last.success?
     end
 
     puts
@@ -127,11 +135,10 @@ private
   # Create a class where the block will be evaluated. Recommended to improve
   # isolation between tests.
   def scope(name = nil, &block)
-    cutest[:current_scope] = name
-    return if cutest[:scope] and cutest[:scope] != cutest[:current_scope]
-
-    print "\n   \033[93mScope: \033[0m#{cutest[:current_scope]}\n\n     "
-    Cutest::Scope.new(&block).call
+    if !cutest[:scope] || cutest[:scope] == name
+      print "\n   \033[93mScope: \033[0m#{cutest[:scope]}\n\n     "
+      Cutest::Scope.new(&block).call
+    end
   end
 
   # Prepare the environment in order to run the tests. This method can be
@@ -174,15 +181,15 @@ private
   def test(name = nil, &block)
     cutest[:test] = name
 
-    if !cutest[:scope] || cutest[:scope] == cutest[:current_scope]
-      if !cutest[:only] || cutest[:only] == name
-        time_taken = Benchmark.measure do
-          prepare.each { |blk| blk.call }
-          block.call(setup && setup.call)
+    if !cutest[:only] || cutest[:only] == name
+      time_taken = Benchmark.measure do
+        prepare.each { |blk| blk.call }
+        block.call(setup && setup.call)
         end
-        print "     \n     \033[93mTest: \033[0m#{cutest[:test]} \033[32m✔\033[0m\n   \e[94m#{time_taken}\033[0m\n     "
-      end
+      print "     \n     \033[93mTest: \033[0m#{cutest[:test]} \033[32m✔\033[0m\n   \e[94m#{time_taken}\033[0m\n     "
     end
+
+    cutest[:test] = nil
   end
 
   # Assert that value is not nil or false.

data/test/fixtures/only_run_given_scope_name.rb

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

data/test/fixtures/outside_block.rb

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

data/test/run.rb

@@ -1,9 +1,10 @@
 test "output of successful run" do
-  expected = ".\n"
+  require 'pry'
+  expected = "•"
 
   out = %x{./bin/cutest test/fixtures/success.rb}
 
-  assert_equal(expected, out)
+  assert out[expected]
 end
 
 test "exit code of successful run" do
@@ -12,27 +13,19 @@ test "exit code of successful run" do
 end
 
 test "output of failed run" do
-  expected = "\n" +
-             "  test: failed assertion\n" +
-             "  line: assert false\n" +
-             "  file: test/fixtures/failure.rb +2\n\n" +
-             "Cutest::AssertionFailed: expression returned false\n\n"
+  expected = "failed assertion"
 
   out = %x{./bin/cutest test/fixtures/failure.rb}
 
-  assert_equal(expected, out)
+  assert out[expected]
 end
 
 test "output of failed run" do
-  expected = "\n" +
-             "  test: some unhandled exception\n" +
-             "  line: raise \"Oops\"\n" +
-             "  file: test/fixtures/exception.rb +2\n\n" +
-             "RuntimeError: Oops\n\n"
+  expected = "RuntimeError"
 
   out = %x{./bin/cutest test/fixtures/exception.rb}
 
-  assert_equal(expected, out)
+  assert out[expected]
 end
 
 test "exit code of failed run" do
@@ -42,27 +35,27 @@ test "exit code of failed run" do
 end
 
 test "output of custom assertion" do
-  expected = "\n" +
-             "  test: failed custom assertion\n" +
-             "  line: assert_empty \"foo\"\n" +
-             "  file: test/fixtures/fail_custom_assertion.rb +7\n\n" +
-             "Cutest::AssertionFailed: not empty\n\n"
+  expected = "Cutest::AssertionFailed"
 
   out = %x{./bin/cutest test/fixtures/fail_custom_assertion.rb}
 
-  assert_equal(expected, out)
+  assert out[expected]
 end
 
 test "output of failure in nested file" do
-  expected = "\n" +
-             "  test: failed assertion\n" +
-             "  line: assert false\n" +
-             "  file: test/fixtures/failure.rb +2\n\n" +
-             "Cutest::AssertionFailed: expression returned false\n\n"
+  expected = "Cutest::AssertionFailed"
 
   out = %x{./bin/cutest test/fixtures/failure_in_loaded_file.rb}
 
-  assert_equal(expected, out)
+  assert out[expected]
+end
+
+test "output of failure outside block" do
+  expected = "Cutest::AssertionFailed"
+
+  out = %x{./bin/cutest test/fixtures/outside_block.rb}
+
+  assert out[expected]
 end
 
 test "only runs given scope name" do
@@ -72,7 +65,7 @@ test "only runs given scope name" do
 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}
+  %x{./bin/cutest test/fixtures/only_run_given_scope_name.rb -s scope -t test}
 
   assert_equal 0, $?.to_i
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cutest-cj
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Damian Janowski
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry-rescue
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -27,7 +27,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: awesome_print
+  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'
+- !ruby/object:Gem::Dependency
+  name: clap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,7 +72,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
@@ -67,6 +80,7 @@ files:
 - 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

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