Refactor task DSL usages:

Remove most of task evaluation code from Task class, rely on
Task::DSL.evaluate to get an evaluated task.

* Task: remove #evaluate, change constructor prototype to accept actions
  instead of a block, implement .evaluate(name, env &block);
* Implement Task::DSL.evaluate method;
* Recipe::DSL: remove tasks evaluation from#evaluate, modify #task to
  use Task.evaluate to return the new task to be rigstered.
This commit is contained in:
Thibault Jouan
2013-08-15 21:03:06 +00:00
parent 000c21e094
commit d4d5222261
6 changed files with 83 additions and 52 deletions

View File

@@ -22,7 +22,6 @@ module Producer
else
instance_eval &@block
end
@tasks.each { |e| e.evaluate env }
self
end
@@ -41,7 +40,7 @@ module Producer
end
def task(name, &block)
@tasks << Task.new(name, &block)
@tasks << Task.evaluate(name, env, &block)
end
end
end

View File

@@ -3,16 +3,13 @@ module Producer
class Task
attr_reader :name, :actions
def initialize(name, &block)
@name = name
@block = block
@actions = []
def self.evaluate(name, env, &block)
DSL::evaluate(name, env, &block)
end
def evaluate(env)
dsl = DSL.new(&@block)
dsl.evaluate(env)
@actions = dsl.actions
def initialize(name, actions = [])
@name = name
@actions = actions
end
end
end

View File

@@ -3,6 +3,12 @@ module Producer
class Task
class DSL
class << self
def evaluate(name, env, &block)
dsl = new(&block)
dsl.evaluate(env)
Task.new(name, dsl.actions)
end
def define_action(keyword, klass)
define_method(keyword) do |*args|
@actions << klass.new(@env, *args)