utilrb 2.1.0.rc2 → 2.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9bfb8e1175b1ffa405bea9fc06055b153364249
-  data.tar.gz: 0ff0ff328a8cdcef8337856285f52c81ef9a5381
+  metadata.gz: 6100c171a6de15632948260b64f0a620d7900649
+  data.tar.gz: c9134cfae24bccca6e0d9d1ecd5f5e591ff08493
 SHA512:
-  metadata.gz: ae7c8b3f0ce2f1d0b61449e90b28694ab0063d6e5015b1404f0b66f9fb698098f71c8abc3438d1e9eadcdf4ff8c4f70d3ca7a3390d67e1a3b50717e3ee884cc5
-  data.tar.gz: d76cbb7814fc402e8f8c52d807fa0691685fb58e14f1d4706195eba7c59853faa0e3df7cf5cc472f0b323d161882e2dd651b4d65434169c4c37f0b0e06432aba
+  metadata.gz: 6dea0d5179e097046ceeba40bcde4be3224281e787e950686aeb6450eec44bf91066ed8b39b08aec8a78b6e8459e56dafff00954a3021053326372cf0effd120
+  data.tar.gz: 3b851d311ecddfe1f30ef87f06bf5b71ea3d0d0f3aac4eecb7408868e8b472f8430edc83fadbf9658d2c9614e26bc8f8bbdc9d8ac6dce27b7e996fb5491f688f

data/.travis.yml

@@ -1,5 +1,9 @@
+sudo: false
 language: ruby
 rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.2
+script:
+    - bundle exec rake
+    - bundle exec rake test

data/lib/utilrb/module/singleton_class_p.rb

@@ -7,7 +7,7 @@ class Module
             if instance_variable_defined?(:@__utilrb_singleton_class)
                 @__utilrb_singleton_class
             else
-                @__utilrb_singleton_class = (ancestors.first == self)
+                @__utilrb_singleton_class = (ancestors.first != self)
             end
         end
     end

data/lib/utilrb/thread_pool.rb

@@ -241,10 +241,10 @@ module Utilrb
             # @return[Float]
             def time_elapsed(time = Time.now)
                 #no need to synchronize here
-                if running?
-                    (time-@started_at).to_f
-                elsif finished?
+                if @stopped_at
                     (@stopped_at-@started_at).to_f
+                elsif @started_at
+                    (time-@started_at).to_f
                 else
                     0
                 end
@@ -361,8 +361,8 @@ module Utilrb
             @mutex.synchronize do
                 @min = min
                 @max = max || min
-                count = [@tasks_waiting.size,@max].min
-                0.upto(count) do 
+                count = [@tasks_waiting.size,@max - @spawned].min
+                count.times do
                     spawn_thread
                 end
             end
@@ -373,7 +373,7 @@ module Utilrb
         # 
         # @return [Fixnum] the number of tasks
         def backlog
-           @mutex.synchronize do 
+            @mutex.synchronize do 
                 @tasks_waiting.length
             end
         end
@@ -514,12 +514,12 @@ module Utilrb
 
         # Shuts down all threads.
         #
-        def shutdown()
+        def shutdown
             tasks = nil
             @mutex.synchronize do
                 @shutdown = true
+                @cond.broadcast
             end
-            @cond.broadcast
         end
 
 
@@ -527,7 +527,13 @@ module Utilrb
         # This does not terminate any thread by itself and will block for ever
         # if shutdown was not called.
         def join
-            @workers.first.join until @workers.empty?
+            while true
+                if w = @mutex.synchronize { @workers.first }
+                    w.join
+                else
+                    break
+                end
+            end
             self
         end
 

data/lib/utilrb/version.rb

@@ -1,4 +1,4 @@
 module Utilrb
-    VERSION = "2.1.0.rc2"
+    VERSION = "2.1.0.rc3"
 end
 

data/lib/utilrb/weakref.rb

@@ -4,7 +4,7 @@ module Utilrb
     class WeakRef < ::WeakRef
         def initialize(obj)
             if obj.kind_of?(::WeakRef)
-                raise ArgumentError, "cannot create a weakref of a weakref"
+                Kernel.raise ::ArgumentError, "cannot create a weakref of a weakref"
             end
             super
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utilrb
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc2
+  version: 2.1.0.rc3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets