promise_pool 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d935d5301e4c9b26509720e19768c6c041f17daff13f3a2253e1e568062018
-  data.tar.gz: 3fe5c84f8a1b85779e8f43486f8b54b4c1705cdaa1400c170e5aaa298b2a7a05
+  metadata.gz: d72f3c8230b78d9d0a71cf5c3e6d40afc13d47d45fa298c2d62ba7213fa6794d
+  data.tar.gz: f08eda0aac764cba80db426bea6dc3422ab9a1c6fa77d9901d7600740321a3a2
 SHA512:
-  metadata.gz: 2a271da072dd2dcd6819b2e0ca3a70e264e469c6ff140ef1de0a3a9bfe4fdee64893ac1ca2036d75662228a1b3cb3641dd55450633b2a6a653e6779069cf4a31
-  data.tar.gz: 1d8921ad67593e9ebb48eea281eef11d4fea098b70cd0c68de70552126b91fc32f28eb018a81d0ae1ae7f5ebe0578ba54e699d40e3416d72510e9f8fe4e19436
+  metadata.gz: 2a15b87acc00a537d50c9c37ef78dbb6197bd9717abdd61799c984943fa9bbf778175f16f837620516dfe80a0a09e9323c7c584a54ab55763c0a6c3472c1ba2c
+  data.tar.gz: a918d00de8bea336034b597c5bd64d8de37135e85e0f3df9b8327c653c3b1869cafd07a8232b10ceab85243dab0132a85dde41bc7828a80f4f73e9760afe1867

data/.travis.yml

@@ -2,17 +2,16 @@ sudo: false
 language: ruby
 
 install: 'gem install bundler; bundle install --retry=3'
+before_script: unset CI
 script: 'ruby -vr bundler/setup -S rake test'
 
 matrix:
   include:
-    - rvm: 2.2
-    - rvm: 2.3
     - rvm: 2.4
+      env: RUBYOPT=--enable-frozen-string-literal
+    - rvm: 2.5
+      env: RUBYOPT=--enable-frozen-string-literal
     - rvm: ruby-head
+      env: RUBYOPT=--enable-frozen-string-literal
     - rvm: jruby
       env: JRUBY_OPTS=--debug
-    - rvm: rbx
-
-  allow_failures:
-    - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,12 @@
 # CHANGES
 
+## promise_pool 0.9.2 -- 2018-07-21
+
+* Added `Promise#started?` so we could pick the promise is starting or not.
+* Potentially fixed an exception when the promise is not scheduled yet timed
+  out. It's unlikely to happen but it should be fine now.
+* Added `ThreadPool#queue_size` to peek the size of the queue.
+
 ## promise_pool 0.9.1 -- 2018-03-20
 
 * Introduced PromisePool::Future.resolve to convert nested futures

data/Gemfile

@@ -9,7 +9,3 @@ gem 'muack'
 
 gem 'simplecov', :require => false if ENV['COV']
 gem 'coveralls', :require => false if ENV['CI']
-
-platforms :rbx do
-  gem 'rubysl-singleton'  # used in rake
-end

data/README.md

@@ -29,7 +29,7 @@ and improve modularity for both rest-core and promise_pool.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 * gem [timers][]
 
 [timers]: https://github.com/celluloid/timers

data/lib/promise_pool/promise.rb

@@ -99,6 +99,10 @@ module PromisePool
       resolved
     end
 
+    def started?
+      !!working_thread
+    end
+
     protected
     attr_accessor :value, :error, :result, :resolved, :callbacks,
                   :timer, :condv, :mutex, :task, :thread
@@ -152,7 +156,7 @@ module PromisePool
       mutex.synchronize do
         if resolved?
           # do nothing if it's already done
-        elsif t = thread || task.thread
+        elsif t = working_thread
           t.raise(timer.error) # raise Timeout::Error to working thread
         else
           # task was queued and never started, just cancel it and
@@ -163,6 +167,10 @@ module PromisePool
       end
     end
 
+    def working_thread
+      thread || (task && task.thread)
+    end
+
     # log user callback error, should never raise
     def log_callback_error err
       warn "#{self.class}: ERROR: #{err}\n  from #{err.backtrace.inspect}"

data/lib/promise_pool/thread_pool.rb

@@ -24,11 +24,15 @@ module PromisePool
       workers.size
     end
 
+    def queue_size
+      queue.size
+    end
+
     def defer promise_mutex, &job
       mutex.synchronize do
         task = Task.new(job, promise_mutex)
         queue << task
-        spawn_worker if waiting < queue.size && workers.size < max_size
+        spawn_worker if waiting < queue_size && workers.size < max_size
         task
       end
     end

data/lib/promise_pool/version.rb

@@ -1,4 +1,4 @@
 
 module PromisePool
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/promise_pool.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: promise_pool 0.9.1 ruby lib
+# stub: promise_pool 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "promise_pool".freeze
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2018-03-20"
+  s.date = "2018-07-21"
   s.description = "promise_pool is a promise implementation backed by threads or threads pool.".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   "test/test_timer.rb".freeze]
   s.homepage = "https://github.com/godfat/promise_pool".freeze
   s.licenses = ["Apache-2.0".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "promise_pool is a promise implementation backed by threads or threads pool.".freeze
   s.test_files = [
   "test/test_future.rb".freeze,

data/test/test_promise.rb

@@ -95,11 +95,14 @@ describe PromisePool::Promise do
     would 'work, fulfill, yield' do
       value = 'body'
       flag = 0
-      promise = Promise.new.defer do
+      promise = Promise.new
+      promise.should.not.started?
+      promise.defer do
         flag.should.eq 0
         flag += 1
         value
       end
+      promise.should.started?
       promise.yield.should.eq value
       promise.send(:value).should.eq value
       promise.send(:result).should.eq value

data/test/test_thread_pool.rb

@@ -26,18 +26,27 @@ describe PromisePool::ThreadPool do
   would 'call in thread pool if pool_size > 0' do
     flag = 0
     rd, wr = IO.pipe
+    @promise.should.not.started?
+    @pool.queue_size.should.eq 0
     defer do
+      @promise.should.started?
+      @pool.queue_size.should.eq 1
       rd.gets
       flag.should.eq 0
       flag += 1
       raise 'nnf'
     end
+    @pool.queue_size.should.eq 1
     p1 = Promise.new
     p1.defer(@pool) do # block until promise #0 is done because max_size == 1
+      p1.should.started?
+      @pool.queue_size.should.eq 0
       flag.should.eq 1
       flag += 1
       raise 'boom'
     end
+    @pool.queue_size.should.eq 2
+    p1.should.not.started?
     wr.puts # start promise #0
 
     # even if we're not yielding, the block should still be resolved,
@@ -46,5 +55,6 @@ describe PromisePool::ThreadPool do
     expect.raise(RuntimeError){ @promise.yield }.message.should.eq 'nnf'
 
     flag.should.eq 2
+    @pool.queue_size.should.eq 0
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promise_pool
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: promise_pool is a promise implementation backed by threads or threads pool.