abid 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22747c6ec011be62806ac2b1e0793b964e4c524b
-  data.tar.gz: f0273c75da4be50a6147142c4cdcdf87b4b9ae04
+  metadata.gz: 7c41573b12be68e4e74a00c7d8014e7f2d3cc435
+  data.tar.gz: b9e43e1b4d742c798972984090eab802245db56f
 SHA512:
-  metadata.gz: 289fba1f7416f23f89c3ab4e985516f9ffd605b8809695adbd2191a9d2141a7e6a0dd523a70dcf60b381b5cb28cc9b7450796cc18539ff125a39d40befaa9237
-  data.tar.gz: a965a6f57ec1052befe48240a7fc108be79a0c3e3fa6d183a70cf652bd6c869da39118e3f3a620a9446ad1eaa9e47e258a23700d1b4bd9d86b98e2db87a7ad5e
+  metadata.gz: 8ea210978f2e500611a2ccee925413d8e1e85dcb54cc770ca626622ca588c52650324925c00aa5a47178e732cdf0adaa88fe0a7c79436fd399785d888426ff38
+  data.tar.gz: f5fd045370053a9fd27e88d007a071bb888f4b658082ed331d1b81aff6ee303fa040705908f64be6d3af21b3ea2f2dfd9ee80dff2597e4c13d3084cc97a20cca

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 *.db
+/sample/out/

data/lib/abid.rb

@@ -13,13 +13,13 @@ require 'sqlite3'
 require 'sequel'
 
 require 'abid/rake_extensions'
-require 'abid/concurrent_extention'
 require 'abid/version'
 require 'abid/abid_module'
 require 'abid/waiter'
 require 'abid/worker'
 require 'abid/params_parser'
 require 'abid/play'
+require 'abid/session'
 require 'abid/state'
 require 'abid/task'
 require 'abid/task_manager'

data/lib/abid/play.rb

@@ -25,12 +25,7 @@ module Abid
       end
 
       def hooks
-        @hooks ||= {
-          setup: [],
-          before: [],
-          after: [],
-          around: []
-        }
+        @hooks ||= Hash.new { |h, k| h[k] = [] }
       end
 
       def set(name, value = nil, &block)
@@ -65,10 +60,6 @@ module Abid
         hooks[:after] << block
       end
 
-      def around(&block)
-        hooks[:around] << block
-      end
-
       def method_added(name)
         params_spec.delete(name) # undef param
       end

data/lib/abid/rake_extensions/task.rb

@@ -9,6 +9,16 @@ module Abid
         :default
       end
 
+      def session
+        @session ||= Session.new(self).tap do |session|
+          session.add_observer do |_, _, reason|
+            if session.successed? || session.failed?
+              call_hooks(:after_invoke, reason)
+            end
+          end
+        end
+      end
+
       def state
         State.find(self)
       end
@@ -17,102 +27,98 @@ module Abid
         name
       end
 
+      def concerned?
+        true
+      end
+
+      def top_level?
+        application.top_level_tasks.any? { |t| application[t] == self }
+      end
+
+      def hooks
+        @hooks ||= Hash.new { |h, k| h[k] = [] }
+      end
+
+      def call_hooks(tag, *args)
+        hooks[tag].each { |h| h.call(*args) }
+      end
+
       def async_invoke(*args)
         task_args = Rake::TaskArguments.new(arg_names, args)
         async_invoke_with_call_chain(task_args, Rake::InvocationChain::EMPTY)
       end
 
       def async_invoke_with_call_chain(task_args, invocation_chain)
-        state.reload
-
-        new_chain = Rake::InvocationChain.append(self, invocation_chain)
+        session.enter do
+          session.capture_exception do
+            new_chain = Rake::InvocationChain.append(self, invocation_chain)
 
-        state.only_once do
-          if !application.options.repair && state.successed?
-            # skip if successed
-            state.ivar.try_set(false)
-          elsif !application.options.repair && state.failed? && !invocation_chain.empty?
-            # fail if not top level
-            fail "#{name} -- task has been failed" rescue state.ivar.try_fail($ERROR_INFO)
-          else
-            async_invoke_with_prerequisites(task_args, new_chain)
-          end
-        end
-        state.ivar
-      ensure
-        state.ivar.try_fail($ERROR_INFO) if $ERROR_INFO
-      end
+            unless concerned?
+              session.skip
+              break
+            end
 
-      def async_invoke_with_prerequisites(task_args, invocation_chain)
-        application.trace "** Invoke #{name_with_params}" if application.options.trace
+            call_hooks(:before_invoke)
 
-        volatiles, non_volatiles = prerequisite_tasks.partition(&:volatile?)
+            async_invoke_prerequisites(task_args, new_chain)
 
-        async_invoke_tasks(non_volatiles, task_args, invocation_chain) do |updated|
-          if state.successed? && !updated
-            application.trace "** Skip #{name_with_params}" if application.options.trace
-            state.ivar.try_set(false)
-          else
-            async_invoke_tasks(volatiles, task_args, invocation_chain) do
-              async_execute_with_session(task_args)
-            end
+            async_execute_after_prerequisites(task_args)
           end
         end
       end
 
-      def async_invoke_tasks(tasks, task_args, invocation_chain, &block)
-        ivars = tasks.map do |t|
+      def async_invoke_prerequisites(task_args, invocation_chain)
+        prerequisite_tasks.each do |t|
           args = task_args.new_scope(t.arg_names)
           t.async_invoke_with_call_chain(args, invocation_chain)
         end
+      end
 
-        if ivars.empty?
-          block.call(false)
+      def async_execute_after_prerequisites(task_args)
+        if prerequisite_tasks.empty?
+          async_execute(task_args)
         else
-          counter = Concurrent::DependencyCounter.new(ivars.size) do
-            begin
-              if ivars.any?(&:rejected?)
-                state.ivar.try_fail(ivars.find(&:rejected?).reason)
-              else
-                updated = ivars.map(&:value).any?
-                block.call(updated)
-              end
-            rescue Exception => err
-              state.ivar.try_fail(err)
+          counter = Concurrent::DependencyCounter.new(prerequisite_tasks.size) do
+            session.capture_exception do
+              async_execute(task_args)
             end
           end
-          ivars.each { |i| i.add_observer counter }
+          prerequisite_tasks.each { |t| t.session.add_observer counter }
         end
       end
 
-      def async_execute_with_session(task_args)
-        async_execute_in_worker do
-          begin
-            state.session do
-              begin
-                execute(task_args) if needed?
-                finished = true
-              ensure
-                fail "#{name} -- thread killed" if $ERROR_INFO.nil? && !finished
-              end
-            end
+      def async_execute(task_args)
+        failed_task = prerequisite_tasks.find do |t|
+          t.session.failed? || t.session.canceled?
+        end
+        if failed_task
+          session.cancel(failed_task.session.error)
+          return
+        end
+
+        async_post(worker) do
+          if !needed?
+            session.skip
+          elsif session.lock
+            call_hooks(:before_execute)
+
+            execute(task_args)
 
-            state.ivar.try_set(true)
-          rescue AbidErrorTaskAlreadyRunning
-            async_wait_complete
+            session.success
+          else
+            async_wait_external
           end
         end
       end
 
-      def async_wait_complete
+      def async_wait_external
         unless application.options.wait_external_task
-          err = RuntimeError.new("task #{name_with_params} already running")
-          return state.ivar.try_fail(err)
+          fail "task #{name_with_params} already running"
         end
 
         application.trace "** Wait #{name_with_params}" if application.options.trace
 
-        async_execute_in_worker(:waiter) do
+        async_post(:waiter) do
           interval = application.options.wait_external_task_interval || 10
           timeout = application.options.wait_external_task_timeout || 3600
           timeout_tm = Time.now.to_f + timeout
@@ -120,11 +126,10 @@ module Abid
           loop do
             state.reload
             if !state.running?
-              state.ivar.try_set(true)
+              session.success
               break
             elsif Time.now.to_f >= timeout_tm
-              fail "#{name} -- timeout exceeded" rescue state.ivar.try_fail($ERROR_INFO)
-              break
+              fail "#{name} -- timeout exceeded"
             else
               sleep interval
             end
@@ -132,12 +137,15 @@ module Abid
         end
       end
 
-      def async_execute_in_worker(worker = nil, &block)
-        application.worker[worker || self.worker].post do
-          begin
-            block.call
-          rescue Exception => err
-            state.ivar.try_fail(err)
+      def async_post(worker_name, &block)
+        application.worker[worker_name].post do
+          session.capture_exception do
+            begin
+              block.call
+              finished = true
+            ensure
+              fail 'thread killed' if $ERROR_INFO.nil? && !finished
+            end
           end
         end
       end

data/lib/abid/session.rb

@@ -0,0 +1,92 @@
+module Abid
+  class Session
+    extend MonitorMixin
+
+    %w(successed skipped failed canceled).each do |result|
+      define_method(:"#{result}?") { @result == result.to_sym }
+    end
+    attr_reader :error
+
+    def initialize(task)
+      @task = task
+      @state = task.state
+
+      @entered = false
+      @locked = false
+      @result = nil
+      @error = nil
+      @ivar = Concurrent::IVar.new
+
+      @on_success = []
+      @on_fail = []
+    end
+
+    def synchronize(&block)
+      self.class.synchronize(&block)
+    end
+
+    def enter(&block)
+      synchronize do
+        return @ivar if @entered
+        @entered = true
+      end
+      block.call
+      @ivar
+    end
+
+    def capture_exception(&block)
+      block.call
+    rescue Exception => e
+      self.fail(e)
+    end
+
+    def add_observer(*args, &block)
+      @ivar.add_observer(*args, &block)
+    end
+
+    def lock
+      synchronize do
+        @state.start unless @locked
+        @locked = true
+        true
+      end
+    rescue AbidErrorTaskAlreadyRunning
+      false
+    end
+
+    def unlock(error = nil)
+      synchronize do
+        @state.finish(error) if @locked
+        @locked = false
+      end
+    end
+
+    def success
+      unlock
+      @result = :successed
+      @ivar.try_set(true)
+    end
+
+    def skip
+      unlock
+      @result = :skipped
+      @ivar.try_set(false)
+    end
+
+    def fail(error)
+      @result = :failed
+      @error = error
+      unlock(error)
+      @ivar.fail(error) rescue Concurrent::MultipleAssignmentError
+    rescue Exception => e
+      @ivar.fail(e) rescue Concurrent::MultipleAssignmentError
+    end
+
+    def cancel(error)
+      unlock(error)
+      @result = :canceled
+      @error = error
+      @ivar.fail(error) rescue Concurrent::MultipleAssignmentError
+    end
+  end
+end

data/lib/abid/state.rb

@@ -56,24 +56,14 @@ module Abid
     end
 
     def_delegators 'self.class', :serialize, :deserialize
-    attr_reader :ivar
 
     def initialize(task)
       @task = task
       @record = nil
-      @ivar = Concurrent::IVar.new
-      @already_invoked = false
+      @started = false
       reload
     end
 
-    def only_once(&block)
-      self.class.synchronize do
-        return if @already_invoked
-        @already_invoked = true
-      end
-      block.call
-    end
-
     def database
       Rake.application.database
     end
@@ -155,14 +145,7 @@ module Abid
       end
     end
 
-    def session(&block)
-      started = start_session
-      block.call
-    ensure
-      close_session($ERROR_INFO) if started
-    end
-
-    def start_session
+    def start
       return true if disabled? || preview?
 
       database.transaction do
@@ -189,13 +172,15 @@ module Abid
           @record = { id: id, **new_state }
         end
 
+        @started = true
         true
       end
     end
 
-    def close_session(error = nil)
+    def finish(error = nil)
       return if disabled? || preview?
       return unless @record
+      return unless @started
       state = error ? FAILED : SUCCESSED
       dataset.where(id: @record[:id]).update(state: state, end_time: Time.now)
       reload

data/lib/abid/task.rb

@@ -39,8 +39,10 @@ module Abid
           @prerequisites = []
           @params = sorted_params
           @play = play_class.new(t)
+          call_play_hooks(:setup)
+          bind_play_hooks(:before, :before_execute)
+          bind_play_hooks(:after, :after_invoke)
         end
-        play_class.hooks[:setup].each { |blk| t.play.instance_eval(&blk) }
       end
     end
 
@@ -97,22 +99,32 @@ module Abid
         application.trace "** Execute #{name_with_params}"
       end
 
-      play_class.hooks[:before].each { |blk| play.instance_eval(&blk) }
+      play.run
+    end
+
+    def concerned?
+      state.reload
 
-      call_around_hooks(play_class.hooks[:around]) { play.run }
+      if !application.options.repair && state.failed? && !top_level?
+        fail "#{name} -- task has been failed"
+      end
 
-      play_class.hooks[:after].each { |blk| play.instance_eval(&blk) }
+      application.options.repair || !state.successed?
     end
 
-    def call_around_hooks(hooks, &body)
-      if hooks.empty?
-        body.call
-      else
-        h, *rest = hooks
-        play.instance_exec(-> { call_around_hooks(rest, &body) }, &h)
-      end
+    def needed?
+      !state.successed? || prerequisite_tasks.any? { |t| t.session.successed? }
+    end
+
+    def bind_play_hooks(tag, to = nil)
+      to ||= tag
+      hooks[to] = [proc { |*args| call_play_hooks(tag, *args) }]
+    end
+
+    def call_play_hooks(tag, *args)
+      return unless bound?
+      play_class.hooks[tag].each { |blk| play.instance_exec(*args, &blk) }
     end
-    private :call_around_hooks
 
     class <<self
       def define_play(*args, &block) # :nodoc:

data/lib/abid/version.rb

@@ -1,3 +1,3 @@
 module Abid
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abid
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Hikaru Ojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,13 +159,12 @@ files:
 - lib/abid.rb
 - lib/abid/abid_module.rb
 - lib/abid/application.rb
-- lib/abid/concurrent_extention.rb
-- lib/abid/concurrent_extention/ivar.rb
 - lib/abid/dsl_definition.rb
 - lib/abid/params_parser.rb
 - lib/abid/play.rb
 - lib/abid/rake_extensions.rb
 - lib/abid/rake_extensions/task.rb
+- lib/abid/session.rb
 - lib/abid/state.rb
 - lib/abid/task.rb
 - lib/abid/task_manager.rb

data/lib/abid/concurrent_extention.rb

@@ -1,6 +0,0 @@
-module Abid
-  module ConcurrentExtention
-    require 'abid/concurrent_extention/ivar'
-    Concurrent::IVar.include IVar
-  end
-end

data/lib/abid/concurrent_extention/ivar.rb

@@ -1,12 +0,0 @@
-module Abid
-  module ConcurrentExtention
-    module IVar
-      def try_fail(reason = StandardError.new)
-        self.fail(reason)
-        true
-      rescue Concurrent::MultipleAssignmentError
-        false
-      end
-    end
-  end
-end