wrapper_pipeline.rb in rudder-0.2.0

- old
+ new

@@ -9,12 +9,11 @@
 # Add a timer to the first job
 get_timer_task = { get: :timer, trigger: true }
 start_plan = common.jobs.values.first.plan
 start_plan << get_timer_task
 
-resources.merge! common.resources
-jobs     .merge! common.jobs
+merge_components common
 
 job 'An extra job that the wrapper pipeline requires' do
   plan << get_timer_task
   date = {
     task: 'print the date', config: {
@@ -32,10 +31,10 @@
   # Get the last job defined in the previous pipeline
   # so that we can depend on it in this job
   last_job = common.jobs.values.last
   last_job.plan.select { |task| task.key? :get }.each do |task|
     task = task.dup
-    task[:passed] = [last_job.name]
+    task[:passed] = [last_job]
     plan << task
   end
   task = {
     task: 'print_outer', config: {
       platform: 'linux',