pork 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ff53eb058bf9490356aab97ec7e4df4d381197
-  data.tar.gz: c0c795be8a249d408bd5e0ae7d4b07aefa293386
+  metadata.gz: b3309a4342d94a048959287afbbc330bfbcffdd6
+  data.tar.gz: 90549fc74cc0d7ed04c47d09b7c011001acc5b01
 SHA512:
-  metadata.gz: 30626f3c05d102b2aa1156c75819545c430d0e06c64e8bb9a564aa41c01bbfa88b08355b089b232b31325f448345b77f5221da9ccb13c71d97f3bcf9d1992353
-  data.tar.gz: 3dd03c8d7bf872dc3a7374715a0a812d0031f825148cdeeaa7f6893a9da3f9b1e029c4001ddfb27a3fe35bfc126c983dcafe4c4343ceebc2af49eafde05f0083
+  metadata.gz: 7c2c045065fec739b79b34e07f47eb0826123226d08e5b7b5845f9a490be0dfdeaa450468a0c268ed6bce38353e288d30993efcfba58f94b13a98d4d338e325d
+  data.tar.gz: 5c9d5b7aaa8125292a92183cf524d44dc6328f3f44c23f9991273163fdf178fadf62a626d213c587f0bb30b38977814fa9beb711f83d88f62247e98353b863dc

data/CHANGES.md

@@ -1,5 +1,12 @@
 # CHANGES
 
+## Pork 1.0.4 -- 2014-12-29
+
+* Make backtrace easier to read by using `.` and `~`.
+* Fix parallels mode to detect missing assertions properly.
+* Slightly changed `Pork::Stat`. A kinda incompatible change,
+  but using `Pork::Stat` should be considered private.
+
 ## Pork 1.0.3 -- 2014-12-26
 
 * Fix `Kernel#should` compatibility for JRuby 1.7.18- and Ruby 2.2.0 by

data/lib/pork/mode/parallel.rb

@@ -6,9 +6,12 @@ module Pork
   module Parallel
     def parallel cores=8, stat=Stat.new
       all_tests.keys.shuffle.each_slice(cores).map do |names|
-        Thread.new{ names.each{ |n| isolate(n, stat) } }
-      end.each(&:join)
-      stat
+        Thread.new do
+          s = Stat.new
+          names.each{ |n| isolate(n, s) }
+          s
+        end
+      end.map(&:value).inject(stat, &:merge)
     end
   end
 

data/lib/pork/stat.rb

@@ -2,18 +2,17 @@
 require 'thread'
 
 module Pork
-  class Stat < Struct.new(:tests, :assertions, :skips,
-                          :failures, :errors, :start, :io)
-    def initialize io=$stdout
-      @mutex = Mutex.new
-      super(0, 0, 0, [], [], Time.now, io)
+  class Stat < Struct.new(:io, :start, :mutex,
+                          :tests, :assertions, :skips, :failures, :errors)
+    def initialize io=$stdout, st=Time.now, mu=Mutex.new,
+                   t=0, a=0, s=0, f=[], e=[]
+      super
     end
-
-    def incr_assertions; @mutex.synchronize{ self.assertions += 1 }; end
-    def incr_tests     ; @mutex.synchronize{ self.tests      += 1 }; end
-    def incr_skips     ; @mutex.synchronize{ self.skips      += 1 }; end
-    def add_failure *e ; @mutex.synchronize{ failures        << e }; end
-    def add_error   *e ; @mutex.synchronize{ errors          << e }; end
+    def incr_assertions; mutex.synchronize{ self.assertions += 1 }; end
+    def incr_tests     ; mutex.synchronize{ self.tests      += 1 }; end
+    def incr_skips     ; mutex.synchronize{ self.skips      += 1 }; end
+    def add_failure *e ; mutex.synchronize{ failures        << e }; end
+    def add_error   *e ; mutex.synchronize{ errors          << e }; end
     def passed?; failures.size + errors.size == 0                      ; end
     def numbers; [tests, assertions, failures.size, errors.size, skips]; end
     def report
@@ -25,14 +24,30 @@ module Pork
       io.printf("%d tests, %d assertions, %d failures, %d errors, %d skips\n",
                 *numbers)
     end
+    def merge stat
+      self.class.new(io, start, nil,
+        *to_a.drop(3).zip(stat.to_a.drop(3)).map{ |(a, b)| a + b })
+    end
 
     private
     def backtrace e
       if $VERBOSE
         e.backtrace
       else
-        e.backtrace.reject{ |line| line =~ %r{/pork(/\w+)?\.rb:\d+} }
+        strip(e.backtrace.reject{ |line| line =~ %r{/pork(/\w+)?\.rb:\d+} })
       end.join("\n  ")
     end
+
+    def strip backtrace
+      strip_home(strip_cwd(backtrace))
+    end
+
+    def strip_home backtrace
+      backtrace.map{ |path| path.sub(ENV['HOME'], '~') }
+    end
+
+    def strip_cwd backtrace
+      backtrace.map{ |path| path.sub(Dir.pwd, '.') }
+    end
   end
 end

data/lib/pork/test.rb

@@ -6,7 +6,7 @@ copy do
   before do
     Muack::API.stub(Pork::Executor.all_tests).keys.peek_return do |names|
       names.reject do |n|
-        n =~ /^Pork::(Isolate|Shuffle|Parallel|Should) /
+        n =~ /^Pork::(Isolate|Shuffle|Parallel) /
       end
     end
   end

data/lib/pork/version.rb

@@ -1,4 +1,4 @@
 
 module Pork
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/pork.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: pork 1.0.3 ruby lib
+# stub: pork 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pork"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-12-26"
+  s.date = "2014-12-29"
   s.description = "Pork -- Simple and clean and modular testing library.\n\nInspired by [Bacon][].\n\n[Bacon]: https://github.com/chneukirchen/bacon"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pork
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: muack