producer-core 0.3.9 → 0.3.10

data/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"

data/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

data/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)

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.3.9'.freeze
+    VERSION = '0.3.10'.freeze
   end
 end

data/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) { }

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
+  prerelease: 
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-sshd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -242,26 +257,27 @@ files:
 - spec/support/test_env_helpers.rb
 homepage: https://rubygems.org/gems/producer-core
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provisioning tool
 test_files:
 - features/action_echo.feature
@@ -347,4 +363,3 @@ test_files:
 - spec/support/shared_action.rb
 - spec/support/shared_test.rb
 - spec/support/test_env_helpers.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fba0f36e7a80a2897a17831da23ae1e9a7510ab3
-  data.tar.gz: 53ec1accae1569022521804498ea3eb379e6d6d8
-SHA512:
-  metadata.gz: 024a23110ed45ca7ed46d78a4ca77e403de5283482aedc549b34f63b3aa14ab38d70f9defbab90e8b8ed935e28e1a116a0307cfc35d4b577dee77934a2364a3a
-  data.tar.gz: 8a5c854adfa2ae0d8bec10abe38995d9aaf7ce312013081a7b4b226c0a58519419457f33be3cd52142864e0be0317fc1e0527f09881a73308cd843a81b5fbd89