producer-core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f4fa779cf02e6e7082cb3ab5d3243f40f21228
-  data.tar.gz: c453810ddc78867a9b54e985028c823113ffed51
+  metadata.gz: 48c7af413fbd8bac4796f6789db5e1fe2ebc1717
+  data.tar.gz: 41c1543b1d8c4f7e529191a91c974a18d660e488
 SHA512:
-  metadata.gz: 47986a1c3029cd9a2aeb0802effefcb30b83c5ea63113a027151cc7f699cfebbc07cc7d4b43f99490e6e8b2680b02e329ed534697e2dea3ced753d68298d0749
-  data.tar.gz: fc68bd2f2f62402b15478a232b82ebdf1fa54925f027d32cdf32da70691b2a20c0c9656a23d2c61290eea12b28b03a6528f727a0df1470e47351ba4ba6786c0d
+  metadata.gz: d8d9d8a3b36801b7fe46f4655bdf3eab4a61bcd090ba40806911463ae704d4a8fd7a01951fb18545ab82913d63c71dd1ecb5151cad63880d0f9c145f0ba6372c
+  data.tar.gz: f52db474d584f3c6f23e7f6f9cbc88d21e400515ba624d092862190146d33bc062eb791637fb6105d8fb5e25d6bfb3282e510f57b582a529f3bb2df0ec6261f8

data/features/task_nested_tasks.feature

@@ -0,0 +1,15 @@
+Feature: nested tasks
+
+  Background:
+    Given a recipe with:
+      """
+      task :outer_task do
+        task :inner_task do
+          echo 'OK'
+        end
+      end
+      """
+
+    Scenario: applies nested tasks
+      When I successfully execute the recipe
+      Then the output must match /\AOK/

data/lib/producer/core/task.rb

@@ -43,6 +43,10 @@ module Producer
         @condition
       end
 
+      def task(name, *args, &block)
+        @actions << self.class.evaluate(@env, name, *args, &block)
+      end
+
       def ask(question, choices, prompter: Prompter.new(@env.input, @env.output))
         prompter.prompt(question, choices)
       end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

data/lib/producer/core/worker.rb

@@ -18,8 +18,12 @@ module Producer
         if task.condition_met?
           @env.log "Task: `#{task}' applying..."
           task.actions.each do |e|
-            @env.log " action: #{e}"
-            e.apply unless @env.dry_run?
+            case e
+            when Task then process_task e
+            else
+              @env.log " action: #{e}"
+              e.apply unless @env.dry_run?
+            end
           end
         else
           @env.log "Task: `#{task}' skipped"

data/spec/producer/core/task_spec.rb

@@ -126,6 +126,15 @@ module Producer::Core
       end
     end
 
+    describe '#task' do
+      before { described_class.define_action(:some_action, SomeAction) }
+
+      it 'registers a nested task as an action' do
+        task.task(:nested_task) { some_action }
+        expect(task.actions).to match [an_instance_of(Task)]
+      end
+    end
+
     describe '#ask' do
       let(:question)  { 'Which letter?' }
       let(:choices)   { [[:a, ?A], [:b, ?B]] }

data/spec/producer/core/worker_spec.rb

@@ -25,9 +25,9 @@ module Producer::Core
     end
 
     describe '#process_task' do
-      let(:env)       { instance_spy Env, dry_run?: false }
-      let(:action)    { double('action', to_s: 'echo').as_null_object }
-      let(:task)      { Task.new(env, :some_task, [action]) }
+      let(:env)     { instance_spy Env, dry_run?: false }
+      let(:action)  { double('action', to_s: 'echo').as_null_object }
+      let(:task)    { Task.new(env, :some_task, [action]) }
 
       it 'logs task info' do
         expect(env).to receive(:log).with /\ATask: `some_task'/
@@ -68,11 +68,21 @@ module Producer::Core
           worker.process_task task
         end
 
-        it 'logs the task as beeing skipped' do
+        it 'logs the task as being skipped' do
           expect(env).to receive(:log).with /some_task.+skipped\z/
           worker.process_task task
         end
       end
+
+      context 'when a task contains nested tasks' do
+        let(:inner_task)  { Task.new(env, :inner, [action]) }
+        let(:outer_task)  { Task.new(env, :outer, [inner_task]) }
+
+        it 'processes nested tasks' do
+          expect(action).to receive :apply
+          worker.process [outer_task]
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -152,6 +152,7 @@ files:
 - features/support/env_fake_home.rb
 - features/task_ask.feature
 - features/task_condition.feature
+- features/task_nested_tasks.feature
 - features/test_dir.feature
 - features/test_env.feature
 - features/test_executable.feature
@@ -287,6 +288,7 @@ test_files:
 - features/support/env_fake_home.rb
 - features/task_ask.feature
 - features/task_condition.feature
+- features/task_nested_tasks.feature
 - features/test_dir.feature
 - features/test_env.feature
 - features/test_executable.feature