gb_dispatch 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b18fe6f1341ebf198e8ba506e103840bc1078690
-  data.tar.gz: 5cb4c58bd07f1b2cdeaa4962043f64782cd0f47d
+  metadata.gz: fd041feeb927183160d8026c38344e6613eb2732
+  data.tar.gz: 64288309c1cace61a076ab1adee82d2a9ef41912
 SHA512:
-  metadata.gz: 35fb353e35bed0ad9ad9f39a7310aae05c10b7c6e98a9e7a7099ae6dcbfc47038105306d13d8fcf658ba88e073248cc875f136fd9e7839ff363d571605f871a8
-  data.tar.gz: aa4eb0cb361cb763811a33bec54c019204f9c409419805d0ab8a740ace9757388fe685c88973b04afc478c19f8396dddf5759a9c94594bc5c2160a0e725393a3
+  metadata.gz: 768ca64392814c1b0a72a9bef66e0114242f4fcb08d5b412e8665aa8bc8e26771d299909bcaf388e8e1717e36a92afb6025f667cd6728010713e117d2ed68554
+  data.tar.gz: 5f412a4ae3d9cdd91f3c3cf50130b206049adf6e426736700ec58ab6cfe0c79b3867008d905bc24fb7e93fb349f1babeafb72af4b3a7ddf074c69fe42dbcf4f5

data/CHANGELOG.txt

@@ -1,3 +1,5 @@
+v0.0.4
+    - Compatible with celluloid version 17.3
 v0.0.3
     - Change celluloid dependency beck to 0.15.2 - newer versions are unstable
 v0.0.2

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in gb_dispatch.gemspec
 gemspec
 
-gem 'celluloid', '~>0.15.2'
+
 group :test do
   gem 'rspec'
   gem 'simplecov', :require => false

data/Gemfile.lock

@@ -1,16 +1,32 @@
 PATH
   remote: .
   specs:
-    gb_dispatch (0.0.3)
-      celluloid (~> 0.15.2)
+    gb_dispatch (0.0.4)
+      celluloid (~> 0.17.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.17.3)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.5)
+      timers (>= 4.1.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    hitimes (1.2.3)
     json (1.8.3)
     rake (10.5.0)
     rspec (3.4.0)
@@ -31,14 +47,14 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    timers (1.1.0)
+    timers (4.1.1)
+      hitimes
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.6)
-  celluloid (~> 0.15.2)
   gb_dispatch!
   rake (~> 10.0)
   rspec

data/gb_dispatch.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'celluloid', '~> 0.15.2'
+  spec.add_dependency 'celluloid', '~> 0.17.3'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

data/lib/gb_dispatch/manager.rb

@@ -14,12 +14,12 @@ module GBDispatch
     # Remember that for each allocated queue, there is new thread allocated.
     # @param name [String, Symbol] if not passed, default queue will be returned.
     # @return [GBDispatch::Queue]
-    def get_queue(name=:default)
+    def get_queue(name=:default_queue)
       name = name.to_sym
       queue = Celluloid::Actor[name]
       unless queue
-        supervisor = Queue.supervise_as name, name, @pool
-        queue = supervisor.actors.first
+        Queue.supervise as: name, args: [name, @pool]
+        queue = Celluloid::Actor[name]
       end
       queue
     end
@@ -36,6 +36,7 @@ module GBDispatch
     #     puts 'Delayed Hello World!'
     #   end
     def run_async_on_queue(queue)
+      raise ArgumentError.new 'Queue must be GBDispatch::Queue' unless queue.is_a? GBDispatch::Queue
       queue.async.perform ->() { yield }
     end
 
@@ -52,6 +53,7 @@ module GBDispatch
     #     42
     #   end
     def run_sync_on_queue(queue)
+      raise ArgumentError.new 'Queue must be GBDispatch::Queue' unless queue.is_a? GBDispatch::Queue
       future = queue.future.perform ->() { yield }
       future.value
     end
@@ -67,6 +69,7 @@ module GBDispatch
     #   end
     #
     def run_after_on_queue(time, queue)
+      raise ArgumentError.new 'Queue must be GBDispatch::Queue' unless queue.is_a? GBDispatch::Queue
       queue.perform_after time, ->(){ yield }
     end
 

data/lib/gb_dispatch/queue.rb

@@ -1,4 +1,4 @@
-require 'celluloid'
+require 'celluloid/current'
 module GBDispatch
   class Queue
     include Celluloid
@@ -11,6 +11,7 @@ module GBDispatch
     def initialize(name, thread_pool)
       @name = name
       @thread_pool = thread_pool
+      @executing = false
     end
 
     # Perform given block
@@ -34,13 +35,19 @@ module GBDispatch
       else
         thread_block = block ? block : ->() { yield }
       end
-      exclusive do
+      while @executing
+        sleep(0.0001)
+      end
+      #exclusive do
         begin
+          @executing = true
           @thread_pool.execute thread_block, name: name
         rescue Exception => e
           return e
+        ensure
+          @executing = false
         end
-      end
+      #end
     end
 
     # Perform block after given period
@@ -53,5 +60,9 @@ module GBDispatch
         self.async.perform block
       end
     end
+
+    def to_s
+      self.name.to_s
+    end
   end
 end

data/lib/gb_dispatch/runner.rb

@@ -1,4 +1,4 @@
-require 'celluloid'
+require 'celluloid/current'
 module GBDispatch
   class Runner
     include Celluloid

data/lib/gb_dispatch/version.rb

@@ -1,3 +1,3 @@
 module GBDispatch
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/gb_dispatch.rb

@@ -1,6 +1,6 @@
 require 'gb_dispatch/version'
 require 'gb_dispatch/manager'
-require 'celluloid'
+
 
 # Library to dispatch block on queues.
 # It is inspired by GCD but implementation is based on Celluloid.
@@ -24,7 +24,7 @@ module GBDispatch
   # @param queue [Symbol, GBDispatch::Queue] queue object or name
   # @yield block to execute
   def self.dispatch_async(queue)
-    queue = GBDispatch::Manager.instance.get_queue(queue) unless queue.is_a? GBDispatch::Queue
+    queue = get_queue(queue) unless queue.is_a? GBDispatch::Queue
     GBDispatch::Manager.instance.run_async_on_queue queue do
       yield
     end
@@ -34,7 +34,7 @@ module GBDispatch
   # @param queue [Symbol, GBDispatch::Queue] queue object or name
   # @yield block to execute
   def self.dispatch_sync(queue)
-    queue = GBDispatch::Manager.instance.get_queue(queue) unless queue.is_a? GBDispatch::Queue
+    queue = get_queue(queue) unless queue.is_a? GBDispatch::Queue
     GBDispatch::Manager.instance.run_sync_on_queue queue do
       yield
     end
@@ -46,8 +46,8 @@ module GBDispatch
   # @param queue [Symbol, GBDispatch::Queue] queue object or name
   # @yield block to execute
   def self.dispatch_after(delay, queue)
-    queue = GBDispatch::Manager.instance.get_queue(queue) unless queue.is_a? GBDispatch::Queue
-    GBDispatch::Manager.instance.run_async_on_queue queue do
+    queue = get_queue(queue) unless queue.is_a? GBDispatch::Queue
+    GBDispatch::Manager.instance.run_after_on_queue delay, queue do
       yield
     end
   end
@@ -64,8 +64,4 @@ module GBDispatch
     alias_method :dispatch_async_on_queue, :dispatch_async
     alias_method :dispatch_after_on_queue, :dispatch_after
   end
-
-  at_exit do
-    GBDispatch::Manager.instance.exit
-  end
 end

data/spec/dispatch_spec.rb

@@ -13,7 +13,7 @@ describe GBDispatch do
       a << 2
     end
     expect(a.empty?).to be_truthy
-    sleep(0.02)
+    sleep(0.03)
     expect(a).to eq [1, 2]
   end
 
@@ -73,13 +73,13 @@ describe GBDispatch do
       a << 1
     end
     expect(a.empty?).to be_truthy
-    sleep(0.15)
+    sleep(0.2)
     expect(a).to eq [1]
   end
 
   it 'should return proper queue' do
     queue = GBDispatch.get_queue :test
-    expect(queue.name).to eq :test
     expect(queue).to be_a GBDispatch::Queue
+    expect(queue.name).to eq :test
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: GCD emulation for ruby