abid 0.3.0.pre.alpha.3 → 0.3.0.pre.alpha.4

data/lib/abid/status.rb

@@ -0,0 +1,63 @@
+require 'concurrent/atomic/atomic_reference'
+require 'concurrent/ivar'
+
+module Abid
+  class Status
+    def initialize(initial_state)
+      @state = Concurrent::AtomicReference.new(initial_state)
+      @complete = Concurrent::IVar.new
+      @observers = []
+    end
+
+    def get
+      @state.get
+    end
+
+    def wait(timeout = nil)
+      @complete.wait(timeout)
+    end
+
+    def compare_and_set(old_state, new_state, complete = false)
+      return false unless @state.compare_and_set(old_state, new_state)
+      if complete
+        @complete.set([old_state, new_state])
+      else
+        notify_observers(old_state, new_state)
+      end
+      true
+    end
+
+    def try_set(new_state, complete = false)
+      old_state = @state.get_and_set(new_state)
+      if complete
+        @complete.try_set([old_state, new_state])
+      else
+        notify_observers(old_state, new_state)
+      end
+      new_state
+    end
+
+    def complete?
+      @complete.complete?
+    end
+
+    # @yieldparam old_state [Object]
+    # @yieldparam new_state [Object]
+    def on_complete
+      @complete.add_observer do |_time, (old_state, new_state), _reason|
+        yield(old_state, new_state)
+      end
+    end
+
+    # @yieldparam old_state [Object]
+    # @yieldparam new_state [Object]
+    def on_update(&block)
+      @observers << block
+      on_complete(&block)
+    end
+
+    def notify_observers(old_state, new_state)
+      @observers.each { |block| block.call(old_state, new_state) }
+    end
+  end
+end

data/lib/abid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abid
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha.3
+  version: 0.3.0.pre.alpha.4
 platform: ruby
 authors:
 - Hikaru Ojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,20 +68,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: concurrent-ruby-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbtree
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -172,7 +158,6 @@ files:
 - bin/setup
 - exe/abid
 - exe/abidsc
-- lib/Abidfile.rb
 - lib/abid.rb
 - lib/abid/application.rb
 - lib/abid/cli.rb
@@ -182,7 +167,17 @@ files:
 - lib/abid/cli/revoke.rb
 - lib/abid/cli/table_formatter.rb
 - lib/abid/config.rb
-- lib/abid/dsl_definition.rb
+- lib/abid/dsl/abid_job.rb
+- lib/abid/dsl/actions.rb
+- lib/abid/dsl/job.rb
+- lib/abid/dsl/job_manager.rb
+- lib/abid/dsl/mixin.rb
+- lib/abid/dsl/params_spec.rb
+- lib/abid/dsl/play.rb
+- lib/abid/dsl/play_core.rb
+- lib/abid/dsl/rake_job.rb
+- lib/abid/dsl/syntax.rb
+- lib/abid/dsl/task.rb
 - lib/abid/engine.rb
 - lib/abid/engine/executor.rb
 - lib/abid/engine/process.rb
@@ -192,20 +187,12 @@ files:
 - 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
-- lib/abid/play.rb
-- lib/abid/play_core.rb
 - lib/abid/rake_extensions.rb
-- lib/abid/rake_extensions/task.rb
-- lib/abid/state_manager/database.rb
+- lib/abid/state_manager.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/state_manager/state_service.rb
+- lib/abid/status.rb
 - lib/abid/version.rb
 - migrations/01_create_state_table.rb
 homepage: https://github.com/ojima-h/abid

data/lib/Abidfile.rb

@@ -1 +0,0 @@
-# allows the built-in tasks to load without a abidfile

data/lib/abid/dsl_definition.rb

@@ -1,29 +0,0 @@
-module Abid
-  module DSL
-    def play(*args, &block)
-      Abid::Task.define_play(*args, &block)
-    end
-
-    def define_worker(name, thread_count)
-      Abid.global.worker_manager.define(name, thread_count)
-    end
-
-    def play_base(&block)
-      Abid.application.play_base(&block)
-    end
-
-    def helpers(*extensions, &block)
-      Abid::Play.helpers(*extensions, &block)
-    end
-
-    def invoke(task, *args, **params)
-      Job.find_by_task(Abid.application[task, **params]).invoke(*args)
-    end
-
-    def mixin(*args, &block)
-      Abid::MixinTask.define_mixin(*args, &block)
-    end
-  end
-end
-
-extend Abid::DSL

data/lib/abid/job.rb

@@ -1,67 +0,0 @@
-require 'forwardable'
-require 'monitor'
-
-module Abid
-  # Job is an aggregation object of components around the task.
-  class Job
-    attr_reader :name, :params, :env
-
-    class << self
-      extend Forwardable
-      def_delegators 'Abid.global.job_manager', :[], :find_by_task
-    end
-
-    # @!visibility private
-    def initialize(env, name, params)
-      @env = env
-      @name = name
-      @params = params.sort.to_h.freeze
-      @mon = Monitor.new
-    end
-
-    def invoke(*args)
-      Engine::Scheduler.invoke(self, *args)
-      process.wait
-    end
-
-    def params_str
-      @params_str ||= YAML.dump(params)
-    end
-
-    def digest
-      @digest ||= Digest::MD5.hexdigest(name + "\n" + params_str)
-    end
-
-    def task
-      @task ||= Abid.application[name, nil, params]
-    end
-
-    def state
-      @state ||= StateManager::StateProxy.new(self)
-    end
-
-    def prerequisites
-      task.prerequisite_tasks.map do |preq_task|
-        env.job_manager.find_by_task(preq_task)
-      end
-    end
-
-    def process
-      @mon.synchronize do
-        @process ||= env.process_manager.create
-      end
-    end
-
-    def worker
-      env.worker_manager[task.worker]
-    end
-
-    def volatile?
-      task.volatile? || env.options.disable_state
-    end
-
-    def dryrun?
-      env.options.dryrun || env.options.preview
-    end
-  end
-end

data/lib/abid/job_manager.rb

@@ -1,22 +0,0 @@
-require 'monitor'
-
-module Abid
-  class JobManager
-    def initialize(env)
-      @env = env
-      @cache = {}
-      @mon = Monitor.new
-    end
-
-    def [](name, params = {})
-      @mon.synchronize do
-        key = [name, params.sort.freeze].freeze
-        @cache[key] ||= Job.new(@env, name, params)
-      end
-    end
-
-    def find_by_task(task)
-      self[task.name, task.params]
-    end
-  end
-end

data/lib/abid/mixin_task.rb

@@ -1,29 +0,0 @@
-module Abid
-  class MixinTask < Rake::Task
-    class Mixin < Module
-      include PlayCore
-      attr_reader :task
-
-      def initialize(task, *args, &block)
-        @task = task
-        super(*args, &block)
-      end
-    end
-
-    attr_accessor :mixin_definition
-
-    def mixin
-      @mixin ||= Mixin.new(self, &mixin_definition)
-    end
-
-    def execute(_args = nil)
-      raise 'mixin is not executable'
-    end
-
-    class <<self
-      def define_mixin(*args, &block) # :nodoc:
-        Abid.application.define_mixin(self, *args, &block)
-      end
-    end
-  end
-end

data/lib/abid/params_parser.rb

@@ -1,50 +0,0 @@
-module Abid
-  module ParamsParser
-    class <<self
-      def parse(params, specs)
-        specs.map do |name, spec|
-          if params.include?(name)
-            value = type_cast(params[name], spec[:type])
-          elsif ENV.include?(name.to_s)
-            value = type_cast(ENV[name.to_s], spec[:type])
-          elsif spec.key?(:default)
-            value = spec[:default]
-          else
-            fail "param #{name} is not specified"
-          end
-
-          [name, value]
-        end.to_h
-      end
-
-      def type_cast(value, type)
-        case type
-        when :boolean then value == true || value == 'true'
-        when :int then value.to_i
-        when :float then value.to_f
-        when :string then value.to_s
-        when :date then type_cast_date(value)
-        when :datetime, :time then type_cast_time(value)
-        when nil then value
-        else fail "invalid type: #{type}"
-        end
-      end
-
-      def type_cast_date(value)
-        case value
-        when Date then value
-        when Time, DateTime then value.to_date
-        else Date.parse(value.to_s)
-        end
-      end
-
-      def type_cast_time(value)
-        case value
-        when Date then value.to_time
-        when Time, DateTime then value
-        else Time.parse(value.to_s)
-        end
-      end
-    end
-  end
-end

data/lib/abid/play.rb

@@ -1,66 +0,0 @@
-require 'forwardable'
-
-module Abid
-  class Play
-    extend PlayCore
-
-    class << self
-      attr_accessor :task
-
-      def inherited(child)
-        params_spec.each { |k, v| child.params_spec[k] = v.dup }
-        hooks.each { |k, v| child.hooks[k] = v.dup }
-      end
-
-      def hooks
-        @hooks ||= Hash.new { |h, k| h[k] = [] }
-      end
-
-      def helpers(*extensions, &block)
-        class_eval(&block) if block_given?
-        include(*extensions) if extensions.any?
-      end
-
-      def setup(&block)
-        hooks[:setup] << block
-      end
-
-      def before(&block)
-        hooks[:before] << block
-      end
-
-      def after(&block)
-        hooks[:after] << block
-      end
-
-      def method_added(name)
-        params_spec.delete(name) # undef param
-      end
-    end
-
-    set :worker, :default
-    set :volatile, false
-
-    attr_reader :task
-
-    def initialize(task)
-      @task = task
-    end
-
-    def run
-      # noop
-    end
-
-    def needs(task_name, **params)
-      task.enhance([[task_name, params]])
-    end
-
-    def volatile?
-      volatile
-    end
-
-    def preview?
-      task.application.options.preview
-    end
-  end
-end