Implement Task::DSL#evaluate:

So that the env is available from the task DSL.
This commit is contained in:
Thibault Jouan 2013-07-30 23:24:28 +00:00
parent a45a340b64
commit ace6a4ad2b
6 changed files with 28 additions and 12 deletions

View File

@ -16,7 +16,7 @@ module Producer
def evaluate(env) def evaluate(env)
dsl = DSL.new(@code).evaluate(env) dsl = DSL.new(@code).evaluate(env)
dsl.tasks.map(&:evaluate) dsl.tasks.map { |e| e.evaluate env }
end end
end end
end end

View File

@ -8,8 +8,8 @@ module Producer
@block = block @block = block
end end
def evaluate def evaluate(env)
DSL.new &@block DSL.new(&@block).evaluate(env)
end end
end end
end end

View File

@ -5,7 +5,11 @@ module Producer
ConditionNotMetError = Class.new(StandardError) ConditionNotMetError = Class.new(StandardError)
def initialize(&block) def initialize(&block)
instance_eval &block @block = block
end
def evaluate(env)
instance_eval &@block
rescue ConditionNotMetError rescue ConditionNotMetError
end end

View File

@ -52,7 +52,7 @@ module Producer::Core
allow(Task).to receive(:new) { task } allow(Task).to receive(:new) { task }
dsl = Recipe::DSL.new { task(:some_task) } dsl = Recipe::DSL.new { task(:some_task) }
allow(Recipe::DSL).to receive(:new) { dsl } allow(Recipe::DSL).to receive(:new) { dsl }
expect(task).to receive(:evaluate) expect(task).to receive(:evaluate).with(env)
recipe.evaluate(env) recipe.evaluate(env)
end end
end end

View File

@ -2,13 +2,15 @@ require 'spec_helper'
module Producer::Core module Producer::Core
describe Task::DSL do describe Task::DSL do
let(:env) { double('env') }
subject(:dsl) { Task::DSL.new &block } subject(:dsl) { Task::DSL.new &block }
describe '#initialize' do describe '#evaluate' do
let(:block) { Proc.new { raise 'error from task' } } let(:block) { Proc.new { raise 'error from task' } }
it 'evaluates its block' do it 'evaluates its code' do
expect { dsl }.to raise_error(RuntimeError, 'error from task') expect { dsl.evaluate(env) }
.to raise_error(RuntimeError, 'error from task')
end end
end end
@ -20,7 +22,8 @@ module Producer::Core
} } } }
it 'evaluates all the block' do it 'evaluates all the block' do
expect { dsl }.to raise_error(RuntimeError, 'error after condition') expect { dsl.evaluate(env) }
.to raise_error(RuntimeError, 'error after condition')
end end
end end
@ -31,7 +34,7 @@ module Producer::Core
} } } }
it 'stops block evaluation' do it 'stops block evaluation' do
expect { dsl }.not_to raise_error expect { dsl.evaluate(env) }.not_to raise_error
end end
end end
end end

View File

@ -13,9 +13,18 @@ module Producer::Core
end end
describe '#evaluate' do describe '#evaluate' do
let(:env) { double('env') }
it 'builds a task DSL sandbox' do it 'builds a task DSL sandbox' do
expect(Task::DSL).to receive(:new).with(&block) expect(Task::DSL).to receive(:new).with(&block).and_call_original
task.evaluate task.evaluate(env)
end
it 'evaluates the task DSL sandbox' do
dsl = double('task dsl')
allow(Task::DSL).to receive(:new) { dsl }
expect(dsl).to receive(:evaluate).with(env)
task.evaluate(env)
end end
end end
end end