asynchronic 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e125dac6480974894d48275d0015bb85410a9f4
-  data.tar.gz: 07b4801fd659a5c0735ccac5dc24c5340363afa8
+  metadata.gz: fe064d93526974fae713afcd2d5fc4730cb65b94
+  data.tar.gz: f6ca2831a8d78323370116397d1cbb9d48c66837
 SHA512:
-  metadata.gz: d68006d635184823ac8bcdc4669690b4778b295b4eb98c5b8b4375c0284be30db220ee87bf3f6f7fc932365adb26a3196116b6549ef3432fa2391ec1395f7363
-  data.tar.gz: 630f880110f71041ab2bc18f5ad5258298b8f3d18560315569aa18ed8459986af20c3768cc3dc77992c82db3d2dce496125ad4931902cddd6ad11d4aaa8fe09e
+  metadata.gz: a6668033166027a2d54aca7b094f8f90642f4b180f01299e99099a62b47f3dffd871799773248c3ad0bb3a4127885029234cda953265782926b685a5596743b3
+  data.tar.gz: 86da5ba9d7207fae1d6f01f77f433f8ed7e3b6d6e64e3bec177755088ee0c844f5c8a768f942c905ce730d9ea1d6dfcf5caee4db1a83b20bbf4a7727a721ed04

data/asynchronic.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'ost', '~> 1.0'
+  spec.add_dependency 'broadcaster', '~> 1.0'
   spec.add_dependency 'class_config', '~> 0.0'
   spec.add_dependency 'transparent_proxy', '~> 0.0'
   spec.add_dependency 'multi_require', '~> 1.0'
@@ -27,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
   spec.add_development_dependency 'minitest-great_expectations', '~> 0.0'
+  spec.add_development_dependency 'minitest-stub_any_instance', '~> 1.0'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'
   spec.add_development_dependency 'minitest-line', '~> 0.6'
   spec.add_development_dependency 'simplecov', '~> 0.12'

data/lib/asynchronic.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'securerandom'
 require 'ost'
 require 'redic'
+require 'broadcaster'
 require 'class_config'
 require 'transparent_proxy'
 require 'logger'
@@ -18,6 +19,7 @@ module Asynchronic
   attr_config :default_queue, :asynchronic
   attr_config :queue_engine, QueueEngine::InMemory.new
   attr_config :data_store, DataStore::InMemory.new
+  attr_config :notifier, Notifier::InMemory.new
   attr_config :logger, Logger.new($stdout)
   attr_config :retry_timeout, 30
   attr_config :garbage_collector_timeout, 30
@@ -26,7 +28,7 @@ module Asynchronic
   attr_config :connection_name, "HOST=#{Socket.gethostname},PID=#{::Process.pid}"
 
   def self.environment
-    Environment.new queue_engine, data_store
+    Environment.new queue_engine, data_store, notifier
   end
 
   def self.[](pid)

data/lib/asynchronic/environment.rb

@@ -1,12 +1,12 @@
 module Asynchronic
   class Environment
 
-    attr_reader :queue_engine
-    attr_reader :data_store
+    attr_reader :queue_engine, :data_store, :notifier
     
-    def initialize(queue_engine, data_store)
+    def initialize(queue_engine, data_store, notifier)
       @queue_engine = queue_engine
       @data_store = data_store
+      @notifier = notifier
     end
 
     def queue(name)

data/lib/asynchronic/garbage_collector.rb

@@ -18,6 +18,8 @@ module Asynchronic
       while @running
         processes = environment.processes
 
+        processes.each(&:abort_if_dead)
+
         conditions.each do |name, condition|
           Asynchronic.logger.info('Asynchronic') { "Running GC - #{name}" }
           begin

data/lib/asynchronic/notifier/broadcaster.rb

@@ -0,0 +1,30 @@
+module Asynchronic
+  module Notifier
+    class Broadcaster
+
+      def initialize(options={})
+        options[:logger] ||= Asynchronic.logger
+        @broadcaster = ::Broadcaster.new options
+      end
+
+      def publish(pid, event, data=nil)
+        @broadcaster.publish DataStore::Key[pid][event], data
+      end
+
+      def subscribe(pid, event, &block)
+        @broadcaster.subscribe DataStore::Key[pid][event] do |data|
+          block.call data
+        end
+      end
+
+      def unsubscribe(subscription_id)
+        @broadcaster.unsubscribe subscription_id
+      end
+
+      def unsubscribe_all
+        @broadcaster.unsubscribe_all
+      end
+
+    end
+  end
+end

data/lib/asynchronic/notifier/in_memory.rb

@@ -0,0 +1,33 @@
+module Asynchronic
+  module Notifier
+    class InMemory
+
+      def publish(pid, event, data=nil)
+        subscriptions[DataStore::Key[pid][event]].each_value do |block|
+          block.call data
+        end
+      end
+
+      def subscribe(pid, event, &block)
+        SecureRandom.uuid.tap do |subscription_id|
+          subscriptions[DataStore::Key[pid][event]][subscription_id] = block
+        end
+      end
+
+      def unsubscribe(subscription_id)
+        subscriptions.each_value { |s| s.delete subscription_id }
+      end
+
+      def unsubscribe_all
+        subscriptions.clear
+      end
+
+      private
+
+      def subscriptions
+        @subscriptions ||= Hash.new { |h,k| h[k] = {} }
+      end
+
+    end
+  end
+end

data/lib/asynchronic/process.rb

@@ -14,6 +14,7 @@ module Asynchronic
     ATTRIBUTE_NAMES = [:type, :name, :queue, :status, :dependencies, :data, :result, :error, :connection_name] | TIME_TRACKING_MAP.values.uniq
 
     CANCELED_ERROR_MESSAGE = 'Canceled'
+    DEAD_ERROR_MESSAGE = 'Process connection broken'
 
     attr_reader :id
 
@@ -51,6 +52,10 @@ module Asynchronic
       (running? && !connected?) || processes.any?(&:dead?)
     end
 
+    def abort_if_dead
+      abort! DEAD_ERROR_MESSAGE if dead?
+    end
+
     def destroy
       data_store.delete_cascade
     end
@@ -190,8 +195,12 @@ module Asynchronic
 
     def status=(status)
       Asynchronic.logger.info('Asynchronic') { "#{status.to_s.capitalize} #{type} (#{id})" }
+      
       data_store[:status] = status
       data_store[TIME_TRACKING_MAP[status]] = Time.now if TIME_TRACKING_MAP.key? status
+      
+      environment.notifier.publish id, :status_changed, status
+      environment.notifier.publish id, :finalized if finalized?
     end
 
     STATUSES.each do |status|

data/lib/asynchronic/version.rb

@@ -1,3 +1,3 @@
 module Asynchronic
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

data/spec/data_store/lazy_value_examples.rb

@@ -26,7 +26,6 @@ module LazyValueExamples
   it 'Transparent proxy' do
     value = lazy_value :key
     data_store[:key] =  1
-    value.must_be_instance_of Fixnum
     value.must_equal 1
   end
 

data/spec/jobs.rb

@@ -326,7 +326,7 @@ class NestedJobWithErrorInChildJob < Asynchronic::Job
 end
 
 
-class AbortQueuedAfertErrorJob < Asynchronic::Job
+class AbortQueuedAfterErrorJob < Asynchronic::Job
   def call
     async Child_1
     async Child_2

data/spec/minitest_helper.rb

@@ -3,6 +3,7 @@ require 'asynchronic'
 require 'minitest/autorun'
 require 'minitest/colorin'
 require 'minitest/great_expectations'
+require 'minitest/stub_any_instance'
 require 'jobs'
 require 'expectations'
 require 'timeout'

data/spec/process/life_cycle_examples.rb

@@ -1,12 +1,13 @@
 module LifeCycleExamples
   
-  let(:env) { Asynchronic::Environment.new queue_engine, data_store }
+  let(:env) { Asynchronic::Environment.new queue_engine, data_store, notifier }
 
   let(:queue) { env.default_queue }
 
   after do
     data_store.clear
     queue_engine.clear
+    notifier.unsubscribe_all
   end
 
   def create(type, params={})
@@ -17,10 +18,41 @@ module LifeCycleExamples
 
   def execute(queue)
     process = env.load_process(queue.pop)
+
+    events = []
+    status_changed_id = notifier.subscribe(process.id, :status_changed) { |status| events << status }
+
+    is_finalized = false
+    finalized_id = notifier.subscribe(process.id, :finalized) { is_finalized = true }
+
     process.execute
+
     process.must_have_connection_name
     process.wont_be :dead?
     process.send(:connected?).must_be_true
+
+    with_retries do
+      events.last.must_equal process.status
+      process.finalized?.must_equal is_finalized
+    end
+
+    notifier.unsubscribe status_changed_id
+    notifier.unsubscribe finalized_id
+
+    status = process.status
+    process.abort_if_dead
+    process.status.must_equal status
+  end
+
+  def with_retries(&block)
+    Timeout.timeout(3) do
+      begin
+        block.call
+      rescue Minitest::Assertion
+        sleep 0.001
+        retry
+      end
+    end
   end
 
   it 'Basic' do
@@ -481,78 +513,78 @@ module LifeCycleExamples
     process.real_error.must_equal "Error in parent"
   end
 
-  it 'Abort queued afert error' do
-    process = create AbortQueuedAfertErrorJob
+  it 'Abort queued After error' do
+    process = create AbortQueuedAfterErrorJob
 
     process.enqueue 
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :waiting,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :queued
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :waiting,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_2' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :waiting,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :waiting,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :waiting,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :waiting,
                                    'Child_1_1'                         => :queued,
                                    'Child_1_2'                         => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :queued
+                                   'AbortQueuedAfterErrorJob::Child_2' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :waiting,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :waiting,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :waiting,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :waiting,
                                    'Child_1_1'                         => :queued,
                                    'Child_1_2'                         => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :completed,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :queued
+                                   'AbortQueuedAfterErrorJob::Child_2' => :completed,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :queued,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :waiting,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :waiting,
                                    'Child_1_1'                         => :queued,
                                    'Child_1_2'                         => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :completed,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :queued
+                                   'AbortQueuedAfterErrorJob::Child_2' => :completed,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :queued
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :waiting,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :waiting,
                                    'Child_1_1'                         => :queued,
                                    'Child_1_2'                         => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :completed,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :aborted
+                                   'AbortQueuedAfterErrorJob::Child_2' => :completed,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :aborted
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :aborted,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :aborted,
                                    'Child_1_1'                         => :aborted,
                                    'Child_1_2'                         => :queued,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :completed,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :aborted
+                                   'AbortQueuedAfterErrorJob::Child_2' => :completed,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :aborted
 
     execute queue
 
-    process.full_status.must_equal 'AbortQueuedAfertErrorJob'          => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_1' => :aborted,
+    process.full_status.must_equal 'AbortQueuedAfterErrorJob'          => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_1' => :aborted,
                                    'Child_1_1'                         => :aborted,
                                    'Child_1_2'                         => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_2' => :completed,
-                                   'AbortQueuedAfertErrorJob::Child_3' => :aborted,
-                                   'AbortQueuedAfertErrorJob::Child_4' => :aborted
+                                   'AbortQueuedAfterErrorJob::Child_2' => :completed,
+                                   'AbortQueuedAfterErrorJob::Child_3' => :aborted,
+                                   'AbortQueuedAfterErrorJob::Child_4' => :aborted
 
     process.real_error.must_equal 'Forced error'
   end
@@ -617,36 +649,44 @@ module LifeCycleExamples
     process_2.enqueue
     execute queue
 
+    process_3 = create BasicJob
+
     pid_1 = process_1.id
     pid_2 = process_2.id
+    pid_3 = process_3.id
 
     process_1.must_be_completed
     process_2.must_be_waiting
+    process_3.must_be_pending
 
     data_store.keys.select { |k| k.start_with? pid_1 }.count.must_equal 53
     data_store.keys.select { |k| k.start_with? pid_2 }.count.must_equal 38
+    data_store.keys.select { |k| k.start_with? pid_3 }.count.must_equal 7
 
     gc = Asynchronic::GarbageCollector.new env, 0.001
     
-    gc.add_condition('Completed', &:completed?)
+    gc.add_condition('Finalized', &:finalized?)
     gc.add_condition('Waiting', &:waiting?)
     gc.add_condition('Exception') { raise 'Invalid condition' }
 
-    gc.conditions_names.must_equal ['Completed', 'Waiting', 'Exception']
+    gc.conditions_names.must_equal ['Finalized', 'Waiting', 'Exception']
 
     gc.remove_condition 'Waiting'
     
-    gc.conditions_names.must_equal ['Completed', 'Exception']
+    gc.conditions_names.must_equal ['Finalized', 'Exception']
 
     Thread.new do
       sleep 0.01
       gc.stop
     end
 
-    gc.start
+    Asynchronic::Process.stub_any_instance(:dead?, -> { id == pid_3 }) do
+      gc.start
+    end
 
     data_store.keys.select { |k| k.start_with? pid_1 }.count.must_equal 0
     data_store.keys.select { |k| k.start_with? pid_2 }.count.must_equal 38
+    data_store.keys.select { |k| k.start_with? pid_3 }.count.must_equal 0
   end
 
   it 'Before finalize hook when completed' do

data/spec/process/life_cycle_in_memory_spec.rb

@@ -5,6 +5,7 @@ describe Asynchronic::Process, 'Life cycle - InMemory' do
 
   let(:queue_engine) { Asynchronic::QueueEngine::InMemory.new }
   let(:data_store) { Asynchronic::DataStore::InMemory.new }
+  let(:notifier) { Asynchronic::Notifier::InMemory.new }
 
   include LifeCycleExamples
 

data/spec/process/life_cycle_redis_spec.rb

@@ -5,6 +5,7 @@ describe Asynchronic::Process, 'Life cycle - Redis' do
 
   let(:queue_engine) { Asynchronic::QueueEngine::Ost.new }
   let(:data_store) { Asynchronic::DataStore::Redis.new :asynchronic_test }
+  let(:notifier) { Asynchronic::Notifier::Broadcaster.new }
 
   include LifeCycleExamples
 

data/spec/worker/in_memory_spec.rb

@@ -5,6 +5,7 @@ describe Asynchronic::Worker, 'InMemory' do
 
   let(:queue_engine) { Asynchronic::QueueEngine::InMemory.new }
   let(:data_store) { Asynchronic::DataStore::InMemory.new }
+  let(:notifier) { Asynchronic::Notifier::InMemory.new }
 
   include WorkerExamples
   

data/spec/worker/redis_spec.rb

@@ -5,6 +5,7 @@ describe Asynchronic::Worker, 'Redis' do
 
   let(:queue_engine) { Asynchronic::QueueEngine::Ost.new }
   let(:data_store) { Asynchronic::DataStore::Redis.new :asynchronic_test}
+  let(:notifier) { Asynchronic::Notifier::Broadcaster.new }
 
   after do
     data_store.clear

data/spec/worker/worker_examples.rb

@@ -1,6 +1,6 @@
 module WorkerExamples
 
-  let(:env) { Asynchronic::Environment.new queue_engine, data_store }
+  let(:env) { Asynchronic::Environment.new queue_engine, data_store, notifier }
   let(:queue_name) { :test_worker }
   let(:queue) { env.queue queue_name }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asynchronic
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ost
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: broadcaster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub_any_instance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest-colorin
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +257,8 @@ files:
 - lib/asynchronic/error.rb
 - lib/asynchronic/garbage_collector.rb
 - lib/asynchronic/job.rb
+- lib/asynchronic/notifier/broadcaster.rb
+- lib/asynchronic/notifier/in_memory.rb
 - lib/asynchronic/process.rb
 - lib/asynchronic/queue_engine/in_memory.rb
 - lib/asynchronic/queue_engine/ost.rb