From 9bc5c2aeec2a8f515935adbea5e0db54fe2746c1 Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Thu, 2 Oct 2014 03:20:12 +0000
Subject: [PATCH] Implement `composed_macro' recipe keyword

---
 features/recipe_compose_macro.feature | 18 ++++++++++++++++--
 features/steps/recipe_steps.rb        |  4 ++++
 lib/producer/core/recipe.rb           |  8 ++++++--
 spec/producer/core/recipe_spec.rb     | 19 +++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/features/recipe_compose_macro.feature b/features/recipe_compose_macro.feature
index 8c4fefc..c72151f 100644
--- a/features/recipe_compose_macro.feature
+++ b/features/recipe_compose_macro.feature
@@ -1,15 +1,29 @@
 Feature: `compose_macro' recipe keyword
 
-  Scenario: allows macro composition
-    Given a recipe with:
+  Background:
+    Given a recipe named "composed_macro.rb" with:
       """
       macro :hello do |prefix, *args|
         echo 'hello %s %s' % [prefix, args.join(', ')]
       end
 
       compose_macro :hello_composed, :hello, 'composed'
+      """
 
+  Scenario: declares a composed macro as recipe keyword
+    Given a recipe with:
+      """
+      source 'composed_macro'
       hello_composed :foo, :bar
       """
     When I successfully execute the recipe
     Then the output must contain "hello composed foo, bar"
+
+  Scenario: declares a composed macro as task keyword
+    Given a recipe with:
+      """
+      source 'composed_macro'
+      task(:some_task) { hello_composed :foo, :bar }
+      """
+    When I successfully execute the recipe
+    Then the output must contain "hello composed foo, bar"
diff --git a/features/steps/recipe_steps.rb b/features/steps/recipe_steps.rb
index a0fcdf8..66f55ba 100644
--- a/features/steps/recipe_steps.rb
+++ b/features/steps/recipe_steps.rb
@@ -2,6 +2,10 @@ Given /^a recipe with:$/ do |recipe_body|
   write_file 'recipe.rb', recipe_body
 end
 
+Given /^a recipe named "([^"]+)" with:$/ do |recipe_path, recipe_body|
+  write_file recipe_path, recipe_body
+end
+
 When /^I execute the recipe$/ do
   run_simple 'producer recipe.rb', false
 end
diff --git a/lib/producer/core/recipe.rb b/lib/producer/core/recipe.rb
index 35e06a2..ebb1599 100644
--- a/lib/producer/core/recipe.rb
+++ b/lib/producer/core/recipe.rb
@@ -11,7 +11,11 @@ module Producer
         end
 
         def compose_macro(name, macro, *base_args)
-          define_method(name) { |*args| send macro, *(base_args + args) }
+          [self, Task].each do |klass|
+            klass.class_eval do
+              define_method(name) { |*args| send macro, *(base_args + args) }
+            end
+          end
         end
       end
 
@@ -31,7 +35,7 @@ module Producer
       end
 
       def task(name, *args, &block)
-        @tasks << Task.evaluate(env, name, *args, &block)
+        Task.evaluate(env, name, *args, &block).tap { |o| @tasks << o }
       end
 
       def macro(name, &block)
diff --git a/spec/producer/core/recipe_spec.rb b/spec/producer/core/recipe_spec.rb
index 5b50d0a..ec7e144 100644
--- a/spec/producer/core/recipe_spec.rb
+++ b/spec/producer/core/recipe_spec.rb
@@ -52,6 +52,10 @@ module Producer::Core
         expect { recipe.task(:some_task) { :some_task_code } }
           .to change { recipe.tasks.count }.by 1
       end
+
+      it 'returns the task' do
+        expect(recipe.task(:some_task) { }).to be_a Task
+      end
     end
 
     describe '#macro' do
@@ -83,6 +87,21 @@ module Producer::Core
       end
     end
 
+    describe '#compose_macro' do
+      before do
+        recipe.macro(:hello) { }
+        recipe.compose_macro :hello_composed, :some_arg
+      end
+
+      it 'defines the new recipe keyword' do
+        expect(recipe).to respond_to(:hello_composed)
+      end
+
+      it 'defines the new task keyword' do
+        expect(recipe.task(:some_task) { }).to respond_to(:hello_composed)
+      end
+    end
+
     describe '#test_macro' do
       it 'defines the new test' do
         recipe.test_macro(:some_test) { }