abid 0.3.0.pre.alpha.2 → 0.3.0.pre.alpha.3

data/lib/abid/state_manager/state_proxy.rb

@@ -0,0 +1,65 @@
+require 'forwardable'
+
+module Abid
+  module StateManager
+    # StateProxy provides accessor methods to State for Job#state.
+    #
+    # StateProxy holds a reference to the job, and find corresponding state
+    # every time when needed.
+    #
+    # Use StateProxy#find if you have to access the undergrounding State object
+    # many times.
+    class StateProxy
+      def initialize(job)
+        @job = job
+        @states = job.env.db.states
+      end
+
+      # Find underlying State object
+      #
+      # @return [State] state corresponding the job.
+      def find
+        if @job.volatile?
+          @states.init_by_job(@job).tap(&:freeze)
+        else
+          @states.find_or_init_by_job(@job).tap(&:freeze)
+        end
+      end
+      alias instance find
+
+      # Update the state to started unless volatile.
+      # @see State.start
+      def start
+        return if @job.dryrun? || @job.volatile?
+        @states.start(@job)
+      end
+
+      # Try to update the state to started unless volatile.
+      # @see State.start
+      # @return [Boolean] false if already running
+      def try_start
+        start
+        true
+      rescue AlreadyRunningError
+        false
+      end
+
+      # Update the state to SUCCESSED / FAILED unless volatile.
+      # @see State.finish
+      def finish(error = nil)
+        return if @job.dryrun? || @job.volatile?
+        @states.finish(@job, error)
+      end
+
+      def assume(force: false)
+        @states.assume(@job, force: force)
+      end
+
+      # for testing
+      def mock_fail(error)
+        start
+        finish(error)
+      end
+    end
+  end
+end

data/lib/abid/task.rb

@@ -104,20 +104,6 @@ module Abid
       play.run
     end
 
-    def concerned?
-      state.reload
-
-      if !application.options.repair && state.failed? && !top_level?
-        fail "#{name} -- task has been failed"
-      end
-
-      application.options.repair || !state.successed?
-    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) }]
@@ -130,7 +116,7 @@ module Abid
 
     class <<self
       def define_play(*args, &block) # :nodoc:
-        Rake.application.define_play(self, *args, &block)
+        Abid.application.define_play(self, *args, &block)
       end
     end
   end

data/lib/abid/version.rb

@@ -1,3 +1,3 @@
 module Abid
-  VERSION = '0.3.0-alpha.2'
+  VERSION = '0.3.0-alpha.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abid
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha.2
+  version: 0.3.0.pre.alpha.3
 platform: ruby
 authors:
 - Hikaru Ojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,7 +174,6 @@ files:
 - exe/abidsc
 - lib/Abidfile.rb
 - lib/abid.rb
-- lib/abid/abid_module.rb
 - lib/abid/application.rb
 - lib/abid/cli.rb
 - lib/abid/cli/assume.rb
@@ -184,8 +183,17 @@ files:
 - lib/abid/cli/table_formatter.rb
 - lib/abid/config.rb
 - lib/abid/dsl_definition.rb
+- lib/abid/engine.rb
+- lib/abid/engine/executor.rb
+- lib/abid/engine/process.rb
+- lib/abid/engine/process_manager.rb
+- lib/abid/engine/scheduler.rb
+- lib/abid/engine/waiter.rb
+- lib/abid/engine/worker_manager.rb
+- lib/abid/environment.rb
 - lib/abid/error.rb
 - lib/abid/job.rb
+- lib/abid/job_manager.rb
 - lib/abid/mixin_task.rb
 - lib/abid/params_format.rb
 - lib/abid/params_parser.rb
@@ -193,16 +201,12 @@ files:
 - lib/abid/play_core.rb
 - lib/abid/rake_extensions.rb
 - lib/abid/rake_extensions/task.rb
-- lib/abid/session.rb
-- lib/abid/state.rb
-- lib/abid/state_manager.rb
 - lib/abid/state_manager/database.rb
 - lib/abid/state_manager/state.rb
+- lib/abid/state_manager/state_proxy.rb
 - lib/abid/task.rb
 - lib/abid/task_manager.rb
 - lib/abid/version.rb
-- lib/abid/waiter.rb
-- lib/abid/worker.rb
 - migrations/01_create_state_table.rb
 homepage: https://github.com/ojima-h/abid
 licenses:

data/lib/abid/abid_module.rb

@@ -1,19 +0,0 @@
-module Abid
-  extend Rake
-
-  class << self
-    def application
-      return @application if @application
-      self.application = Abid::Application.new
-    end
-
-    def application=(app)
-      @application = app
-      Rake.application = app
-    end
-
-    def config
-      @config ||= Config.new
-    end
-  end
-end

data/lib/abid/session.rb

@@ -1,92 +0,0 @@
-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

@@ -1,193 +0,0 @@
-module Abid
-  class AbidErrorTaskAlreadyRunning < StandardError; end
-
-  class State
-    extend Forwardable
-    extend MonitorMixin
-
-    RUNNING = 1
-    SUCCESSED = 2
-    FAILED = 3
-
-    STATES = constants.map { |c| [const_get(c), c] }.to_h
-
-    @cache = {}
-    class <<self
-      def find(task)
-        synchronize { @cache[task.object_id] ||= new(task) }
-      end
-
-      def list(pattern: nil, started_before: nil, started_after: nil)
-        dataset = StateManager.database[:states]
-
-        dataset = dataset.where { start_time < started_before } if started_before
-        dataset = dataset.where { start_time > started_after } if started_after
-        dataset = dataset.order(:start_time)
-
-        dataset.map do |record|
-          next if pattern && record[:name] !~ pattern
-          {
-            id: record[:id],
-            name: record[:name],
-            params: deserialize(record[:params]),
-            state: STATES[record[:state]],
-            start_time: record[:start_time],
-            end_time: record[:end_time]
-          }
-        end.compact
-      end
-
-      def revoke(id)
-        db = StateManager.database
-        db.transaction do
-          running = db[:states].where(id: id, state: RUNNING).count > 0
-          fail 'task is now running' if running
-          db[:states].where(id: id).delete
-        end
-      end
-
-      def serialize(params)
-        YAML.dump(params)
-      end
-
-      def deserialize(bytes)
-        YAML.load(bytes)
-      end
-    end
-
-    def_delegators 'self.class', :serialize, :deserialize
-
-    def initialize(task)
-      @task = task
-      @record = nil
-      @started = false
-      reload
-    end
-
-    def database
-      StateManager.database
-    end
-
-    def dataset
-      database[:states]
-    end
-
-    def disabled?
-      @task.volatile? || Rake.application.options.disable_state
-    end
-
-    def preview?
-      Rake.application.options.dryrun || Rake.application.options.preview
-    end
-
-    def reload
-      return if disabled?
-
-      if @record
-        id = @record[:id]
-        @record = dataset.where(id: id).first
-      else
-        @record = dataset.where(digest: digest).to_a.find do |r|
-          [@task.name, @task.params].eql? [r[:name], deserialize(r[:params])]
-        end
-      end
-    end
-
-    def id
-      @record[:id] if @record
-    end
-
-    def state
-      @record[:state] if @record
-    end
-
-    def running?
-      state == RUNNING
-    end
-
-    def successed?
-      state == SUCCESSED
-    end
-
-    def failed?
-      state == FAILED
-    end
-
-    def not_found?
-      !disabled? && @record.nil?
-    end
-
-    def assume
-      fail 'cannot revoke volatile task' if disabled?
-
-      database.transaction do
-        reload
-        fail 'task is now running' if running?
-
-        new_state = {
-          state: SUCCESSED,
-          start_time: Time.now,
-          end_time: Time.now
-        }
-
-        if @record
-          dataset.where(id: @record[:id]).update(new_state)
-          @record = @record.merge(new_state)
-        else
-          id = dataset.insert(
-            digest: digest,
-            name: @task.name,
-            params: serialize(@task.params),
-            **new_state
-          )
-          @record = { id: id, **new_state }
-        end
-      end
-    end
-
-    def start
-      return true if disabled? || preview?
-
-      database.transaction do
-        reload
-
-        fail AbidErrorTaskAlreadyRunning if running?
-
-        new_state = {
-          state: RUNNING,
-          start_time: Time.now,
-          end_time: nil
-        }
-
-        if @record
-          dataset.where(id: @record[:id]).update(new_state)
-          @record = @record.merge(new_state)
-        else
-          id = dataset.insert(
-            digest: digest,
-            name: @task.name,
-            params: serialize(@task.params),
-            **new_state
-          )
-          @record = { id: id, **new_state }
-        end
-
-        @started = true
-        true
-      end
-    end
-
-    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
-    end
-
-    def digest
-      Digest::MD5.hexdigest(@task.name + "\n" + serialize(@task.params))
-    end
-  end
-end