producer-core 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3bdbb4562dc3fe33ca9a8c061fe3f66024e62d3
-  data.tar.gz: e2c52ab359c244621fe8cd2e84aeb1dbbab4f282
+  metadata.gz: 673005f434315f9a24f55976aaac79c42a2a58df
+  data.tar.gz: 9856330c2e39915260cfe7186ec684c6e363262c
 SHA512:
-  metadata.gz: cf04f1f9375497ec688db6bf0e74ace0b7d678805b32d14a20bb92bd743bbeab2e470f5f06052761c958c7d80326b71cca338a8a21abca457f33764549d2aef5
-  data.tar.gz: e561bf5bdc15b4f3603c2c3a1e6f4c51d68063b564ec937738c9980cc96f0ac40e5aeff4e58de9c182038bd2a606515028c9becc3dab849b0db4e6c5919cdb75
+  metadata.gz: ae738019692289d5bcd5b76269051dfdc4faca9e4fe342308f93ab5cc901d9399b0129e9b51a48110406393886918c62a346dc71c1c2fb9b8f2a62cc1482a796
+  data.tar.gz: 328fc0a31d1e60aebe86747e9042510e4788dfbe98f14a0f0f7172002cfc80f21c8f9c8d05f9abffb49a60dc23a3da2ebe0999de394c8d11ab9776090b7be366

data/features/recipe_macro.feature

@@ -1,6 +1,6 @@
 Feature: `macro' recipe keyword
 
-  Scenario: declares a new keyword accepting task code
+  Scenario: declares a new recipe keyword accepting task code
     Given a recipe with:
       """
       macro :hello do
@@ -12,6 +12,16 @@ Feature: `macro' recipe keyword
     When I successfully execute the recipe
     Then the output must contain "hello macro"
 
+  Scenario: declares a new task keyword
+    Given a recipe with:
+      """
+      macro(:hello) { echo 'hello macro' }
+
+      task(:some_task) { hello }
+      """
+    When I successfully execute the recipe
+    Then the output must contain "hello macro"
+
   Scenario: supports arguments
     Given a recipe with:
       """

data/lib/producer/core/recipe.rb

@@ -3,11 +3,15 @@ module Producer
     class Recipe
       class << self
         def define_macro(name, block)
-          define_method(name) { |*args| task name, *args, &block }
+          [self, Task].each do |klass|
+            klass.class_eval do
+              define_method(name) { |*args| task name, *args, &block }
+            end
+          end
         end
 
-        def compose_macro(name, meth, *base_args)
-          define_method(name) { |*args| send meth, *(base_args + args) }
+        def compose_macro(name, macro, *base_args)
+          define_method(name) { |*args| send macro, *(base_args + args) }
         end
       end
 
@@ -31,15 +35,11 @@ module Producer
       end
 
       def macro(name, &block)
-        define_singleton_method name do |*args|
-          task "#{name}", *args, &block
-        end
+        self.class.class_eval { define_macro name, block }
       end
 
-      def compose_macro(name, meth, *base_args)
-        define_singleton_method name do |*args|
-          send meth, *(base_args + args)
-        end
+      def compose_macro(name, macro, *base_args)
+        self.class.class_eval { compose_macro name, macro, *base_args}
       end
 
       def test_macro(name, &block)

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.3.4'.freeze
+    VERSION = '0.3.5'.freeze
   end
 end

data/spec/producer/core/recipe_spec.rb

@@ -49,10 +49,15 @@ module Producer::Core
 
     describe '#macro' do
       it 'defines the new recipe keyword' do
-        recipe.macro :hello
+        recipe.macro(:hello) { }
         expect(recipe).to respond_to(:hello)
       end
 
+      it 'defines the new task keyword' do
+        recipe.macro(:hello) { }
+        expect { recipe.task(:some_task) { hello } }.not_to raise_error
+      end
+
       context 'when a defined macro is called' do
         before { recipe.macro(:hello) { :some_macro_code } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Thibault Jouan