tumugi 0.5.3 → 0.6.0

data/lib/tumugi/mixin/parameterizable.rb

@@ -1,4 +1,5 @@
 require 'tumugi/error'
+require 'tumugi/logger'
 require 'tumugi/parameter/parameter_proxy'
 
 module Tumugi
@@ -56,6 +57,9 @@ module Tumugi
         end
 
         def param(name, opts={})
+          if instance_methods.include?(name)
+            raise Tumugi::ParameterError.new("Parameter '#{name}' cannot use, because it is already defined or override instance method.")
+          end
           parameter_proxy(proxy_id).param(name, opts)
           attr_writer name
           define_method(name) do
@@ -70,8 +74,13 @@ module Tumugi
           end
         end
 
+        def set(name, value)
+          parameter_proxy(proxy_id).set(name, value)
+        end
+
         def param_set(name, value)
-          parameter_proxy(proxy_id).param_set(name, value)
+          Tumugi::Logger.instance.warn("'param_set' is deprecated and will be removed in a future release. Use 'set' instead.")
+          set(name, value)
         end
 
         def param_auto_bind_enabled(v)
@@ -84,7 +93,7 @@ module Tumugi
         end
 
         def dump
-          parameter_proxy_map[proxy_id].dump
+          parameter_proxy(proxy_id).dump
         end
 
         def proxy_id

data/lib/tumugi/parameter/parameter.rb

@@ -14,7 +14,7 @@ module Tumugi
 
       def get
         if auto_bind?
-          value = search_from_application_parameters
+          value = search_from_workflow_parameters
         end
         value.nil? ? default_value : value
       end
@@ -45,9 +45,9 @@ module Tumugi
 
       private
 
-      def search_from_application_parameters
+      def search_from_workflow_parameters
         key = @name.to_s
-        value = Tumugi.application.params[key]
+        value = Tumugi.workflow.params[key]
         value ? Converter.convert(type, value) : nil
       end
 

data/lib/tumugi/parameter/parameter_proxy.rb

@@ -22,7 +22,7 @@ module Tumugi
         @params[name] = Tumugi::Parameter::Parameter.new(name, opts)
       end
 
-      def param_set(name, value)
+      def set(name, value)
         @param_defaults[name] = value
       end
 

data/lib/tumugi/task.rb

@@ -8,11 +8,25 @@ module Tumugi
     include Tumugi::Mixin::Listable
     include Tumugi::Mixin::TaskHelper
 
-    attr_accessor :state # :pending, :running, :completed, :skipped
+    attr_reader :visible_at, :tries, :max_retry, :retry_interval
+
+    AVAILABLE_STATES = [
+      :pending,
+      :running,
+      :completed,
+      :skipped,
+      :failed,
+      :requires_failed,
+    ]
 
     def initialize
       super()
+      @visible_at = Time.now
+      @tries = 0
+      @max_retry = Tumugi.config.max_retry
+      @retry_interval = Tumugi.config.retry_interval
       @state = :pending
+      @lock = Mutex.new
     end
 
     def id
@@ -69,20 +83,79 @@ module Tumugi
     def completed?
       outputs = list(output)
       if outputs.empty?
-        @state == :completed || @state == :skipped
+        success?
       else
         outputs.all?(&:exist?)
       end
     end
 
     def requires_failed?
-      list(_requires).any? { |t| t.instance.state == :failed || t.instance.state == :requires_failed }
+      list(_requires).any? { |t| t.instance.finished? && !t.instance.success? }
+    end
+
+    def runnable?(now)
+      ready? && visible?(now)
+    end
+
+    def success?
+      case state
+      when :completed, :skipped
+        true
+      else
+        false
+      end
+    end
+
+    def finished?
+      case state
+      when :completed, :skipped, :failed, :requires_failed
+        true
+      else
+        false
+      end
     end
 
     def timeout
       nil # meaning use default timeout
     end
 
+    def retry
+      @tries += 1
+      @visible_at += @retry_interval
+      retriable?
+    end
+
+    def state
+      @lock.synchronize { @state }
+    end
+
+    def trigger!(event)
+      @lock.synchronize do
+        s = case event
+            when :skip
+              :skipped
+            when :start
+              :running
+            when :pend
+              :pending
+            when :complete
+              :completed
+            when :fail
+              :failed
+            when :requires_fail
+              :requires_failed
+            else
+              raise Tumugi::TumugiError.new("Invalid event: #{event}")
+            end
+
+        if not AVAILABLE_STATES.include?(s)
+          raise Tumugi::TumugiError.new("Invalid state: #{s}")
+        end
+
+        @state = s
+      end
+    end
+
     # Following methods are internal use only
 
     def _requires
@@ -106,5 +179,13 @@ module Tumugi
         _requires.instance._output
       end
     end
+
+    def visible?(now)
+      now >= @visible_at
+    end
+
+    def retriable?
+      @tries <= @max_retry
+    end
   end
 end

data/lib/tumugi/task_definition.rb

@@ -1,5 +1,6 @@
-require 'tumugi/task'
+require 'tumugi/logger'
 require 'tumugi/plugin'
+require 'tumugi/task'
 require 'tumugi/mixin/listable'
 require 'tumugi/mixin/task_helper'
 
@@ -11,7 +12,7 @@ module Tumugi
     def self.define(id, opts={}, &block)
       td = Tumugi::TaskDefinition.new(id, opts)
       td.instance_eval(&block) if block_given?
-      Tumugi.application.add_task(id, td)
+      Tumugi.workflow.add_task(id, td)
       td
     end
 
@@ -22,10 +23,7 @@ module Tumugi
       @opts = { type: Tumugi::Task }.merge(opts)
       @params = {}
       @param_defaults = {}
-
-      unless @opts[:type].is_a?(Class)
-        @opts[:type] = Tumugi::Plugin.lookup_task(@opts[:type])
-      end
+      define_parent_parameter_methods
     end
 
     def instance
@@ -33,11 +31,21 @@ module Tumugi
     end
 
     def param(name, opts={})
+      define_parameter_method(name)
       @params[name] = opts
     end
 
-    def param_set(name, value)
-      @param_defaults[name] = value
+    def set(name, value=nil, &block)
+      if block_given?
+        @param_defaults[name] = block
+      else
+        @param_defaults[name] = value
+      end
+    end
+
+    def param_set(name, value=nil, &block)
+      Tumugi::Logger.instance.warn("'param_set' is deprecated and will be removed in a future release. Use 'set' instead.")
+      set(name, value, &block)
     end
 
     def param_auto_bind_enabled(v)
@@ -68,6 +76,14 @@ module Tumugi
       task.instance_eval(&@run)
     end
 
+    def parent_task_class
+      if @opts[:type].is_a?(Class)
+        @opts[:type]
+      else
+        Tumugi::Plugin.lookup_task(@opts[:type])
+      end
+    end
+
     private
 
     def create_task
@@ -78,7 +94,7 @@ module Tumugi
     end
 
     def define_task
-      task_class = Class.new(lookup_parent_task_class)
+      task_class = Class.new(parent_task_class)
       define_requires_method(task_class)
       define_output_method(task_class)
       define_run_method(task_class)
@@ -94,11 +110,11 @@ module Tumugi
           if reqs.nil?
             []
           elsif reqs.is_a?(Array)
-            reqs.map { |t| Tumugi.application.find_task(t) }
+            reqs.map { |t| Tumugi.workflow.find_task(t) }
           elsif reqs.is_a?(Hash)
-            Hash[reqs.map { |k, t| [k, Tumugi.application.find_task(t)] }]
+            Hash[reqs.map { |k, t| [k, Tumugi.workflow.find_task(t)] }]
           else
-            Tumugi.application.find_task(reqs)
+            Tumugi.workflow.find_task(reqs)
           end
         end
       end
@@ -127,18 +143,21 @@ module Tumugi
         task_class.param(name, opts)
       end
       @param_defaults.each do |name, value|
-        task_class.param_set(name, value)
+        task_class.set(name, value)
       end
       unless @param_auto_bind_enabled.nil?
         task_class.param_auto_bind_enabled(@param_auto_bind_enabled)
       end
     end
 
-    def lookup_parent_task_class
-      if @opts[:type].is_a?(Class)
-        @opts[:type]
-      else
-        Tumugi::Plugin.lookup_task(@opts[:type])
+    def define_parameter_method(name)
+      instance_eval("def self.#{name}(value=nil, &block); set(:#{name}, value, &block); end")
+    end
+
+    def define_parent_parameter_methods
+      proxy = parent_task_class.merged_parameter_proxy
+      proxy.params.each do |name, _|
+        define_parameter_method(name)
       end
     end
   end

data/lib/tumugi/test/helper.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'test/unit/rr'
+
+require 'tumugi'
+require 'tumugi/cli'
+
+module Tumugi
+  module Test
+    module Helpers
+      def capture_stdout
+        out = StringIO.new
+        $stdout = out
+        yield
+        return out.string
+      ensure
+        $stdout = STDOUT
+      end
+    end
+
+    class TumugiTestCase < ::Test::Unit::TestCase
+      def invoke(command, workflow_file, task, options)
+        Tumugi::CLI.new.invoke(command, [task], { file: workflow_file, quiet: true }.merge(options))
+      end
+
+      def assert_run_success(workflow_file, task, options={})
+        assert_true(invoke(:run_, workflow_file, task, { workers: 2 }.merge(options)))
+      end
+
+      def assert_run_fail(workflow_file, task, options={})
+        assert_raise(Thor::Error) do
+          invoke(:run_, workflow_file, task, options)
+        end
+      end
+
+      def assert_show_success(workflow_file, task, options={})
+        assert_true(invoke(:show, workflow_file, task, options))
+      end
+
+      def assert_show_fail(workflow_file, task, options={})
+        assert_raise(Thor::Error) do
+          invoke(:show, workflow_file, task, options)
+        end
+      end
+    end
+  end
+end

data/lib/tumugi/version.rb

@@ -1,3 +1,3 @@
 module Tumugi
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/lib/tumugi/{application.rb → workflow.rb}

@@ -6,11 +6,15 @@ require 'tumugi/target'
 require 'tumugi/command/run'
 require 'tumugi/command/show'
 
+require 'securerandom'
+
 module Tumugi
-  class Application
+  class Workflow
+    attr_reader :id
     attr_accessor :params
 
     def initialize
+      @id = SecureRandom.uuid
       @tasks = {}
       @params = {}
     end
@@ -42,6 +46,7 @@ module Tumugi
       end
 
       begin
+        logger.info "Load workflow from #{file}"
         load(file, true)
       rescue LoadError => e
         raise Tumugi::TumugiError.new("Workflow file load error: #{file}", e)
@@ -66,18 +71,20 @@ module Tumugi
     end
 
     def setup_logger(command, options)
+      log_format = (options[:log_format] || :text).to_sym
       if command == :run && !options[:out].nil?
-        Tumugi::Logger.instance.init(options[:out])
+        logger.init(output: options[:out], format: log_format)
       else
-        Tumugi::Logger.instance.init
+        logger.init(format: log_format)
       end
       logger.verbose! if options[:verbose]
       logger.quiet! if options[:quiet]
+      logger.workflow_id = id
     end
 
     def load_config(options)
       config_file = options[:config]
-      if config_file && File.exists?(config_file) && File.extname(config_file) == '.rb'
+      if config_file && File.exist?(config_file) && File.extname(config_file) == '.rb'
         logger.info "Load config from #{config_file}"
         load(config_file)
       end

data/tumugi.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency 'parallel', '~> 1.8.0'
-  spec.add_runtime_dependency 'retriable', '~> 2.1'
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0.2'
+  spec.add_runtime_dependency 'erubis', '~> 2.7.0'
+  spec.add_runtime_dependency 'much-timeout', '~> 0.1.1'
   spec.add_runtime_dependency 'ruby-graphviz', '~> 1.2.2'
   spec.add_runtime_dependency 'terminal-table', '~> 1.5.2'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
@@ -31,5 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit', '~> 3.1'
   spec.add_development_dependency 'test-unit-rr'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'github_changelog_generator'
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: tumugi
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Kazuyuki Honda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: retriable
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: much-timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - hakobera@gmail.com
@@ -195,15 +195,29 @@ files:
 - examples/tumugi_config_with_section.rb
 - exe/tumugi
 - lib/tumugi.rb
-- lib/tumugi/application.rb
 - lib/tumugi/atomic_file.rb
 - lib/tumugi/cli.rb
+- lib/tumugi/command/new.rb
 - lib/tumugi/command/run.rb
 - lib/tumugi/command/show.rb
 - lib/tumugi/config.rb
 - lib/tumugi/dag.rb
+- lib/tumugi/dag_result_reporter.rb
+- lib/tumugi/data/new/Gemfile.erb
+- lib/tumugi/data/new/README.md.erb
+- lib/tumugi/data/new/Rakefile.erb
+- lib/tumugi/data/new/examples/example.rb.erb
+- lib/tumugi/data/new/gemspec.erb
+- lib/tumugi/data/new/gitignore.erb
+- lib/tumugi/data/new/lib/tumugi/plugin/target/target.rb.erb
+- lib/tumugi/data/new/lib/tumugi/plugin/task/task.rb.erb
+- lib/tumugi/data/new/test/plugin/target/target_test.rb.erb
+- lib/tumugi/data/new/test/plugin/task/task_test.rb.erb
+- lib/tumugi/data/new/test/test.rb.erb
+- lib/tumugi/data/new/test/test_helper.rb.erb
 - lib/tumugi/dsl.rb
 - lib/tumugi/error.rb
+- lib/tumugi/executor/local_executor.rb
 - lib/tumugi/file_system.rb
 - lib/tumugi/logger.rb
 - lib/tumugi/mixin/listable.rb
@@ -222,7 +236,9 @@ files:
 - lib/tumugi/target.rb
 - lib/tumugi/task.rb
 - lib/tumugi/task_definition.rb
+- lib/tumugi/test/helper.rb
 - lib/tumugi/version.rb
+- lib/tumugi/workflow.rb
 - tumugi.gemspec
 homepage: https://github.com/tumugi/tumugi
 licenses: