rundock 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718bf71616360d5ef7fcd4f101327d27c5b93338
-  data.tar.gz: 8a7988875fe45b1f7ae288dd7663e0179d203019
+  metadata.gz: f14472ccefd47f2343c17934f3a59c1942b19554
+  data.tar.gz: e76b60e727665179ef6f25f6852d3855041d31f2
 SHA512:
-  metadata.gz: a73393c18bbe1cd693464cd209e070bbb8d690b28f2aaf2008b0d6355757f483f490bc3ddcce4ffdc6acb5211ec4a53c523442da1afdd51fe5247375f86a6870
-  data.tar.gz: 3f07d87fef9fe10c50a279feee52da7d15a4c65ee4fd225154fa3e8dd19098f45198abe3012d4da6a7377ba6db53c58b798759d103fcb069d69e370b6a14f6a4
+  metadata.gz: 07c04ad61de0ca22ec4119523e98aee2533da4dba31fb3f5f2217e41906e331167b437b15361e13d6ff3e82ea9136f7e5d87522c769e27799d26c8df08001fae
+  data.tar.gz: 587f5eb7be9c3d8a2234fd37ab82db2ff6cb6df3b839d95e108c31b8f79547445d69f99de3bb4b09bb4d51960eaa0b39ab84e50c5eec711ddab4981c9573dbc8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## v1.1.4
+## v1.1.5
 
 Update
 

data/lib/rundock/builder/operation_builder.rb

@@ -58,6 +58,8 @@ module Rundock
         node = Node.new(node_attribute.nodename, backend)
         scen = Scenario.new
 
+        node_attribute.define_attr(:parrent_task_args, node_attribute.task_args) if node_attribute.respond_to?(:task_args)
+
         tasks.each do |k, v|
           ope = build_operations(k, Array(v), node_attribute, nil, true)
           node.add_operation(ope) if ope

data/lib/rundock/operation/task.rb

@@ -3,13 +3,12 @@ module Rundock
     class Task < Base
       def run(backend, attributes = {})
         @instruction.each do |i|
-          previous_args = attributes[:task_args]
           task_set = i.split(' ')
           task_name = task_set.first
 
           if task_set.length > 1
             attributes[:task_args] = task_set.slice(1..-1).map do |arg|
-              assign_args(arg, previous_args)
+              assign_args(arg, attributes[:parrent_task_args])
             end
           end
 

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/spec/integration/platforms/localhost/scenarios/task_with_recursive_args_scenario.yml

@@ -0,0 +1,15 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_task_with_recursive_a_b_1_2_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_task_with_recursive_1_2_c_d_scenario"
+  task:
+    - task_1 1 2
+---
+---
+task_1:
+  task:
+    - task_2 a  b  $1 $2
+    - task_2 $1 $2 c  d
+task_2:
+  command:
+    - "echo 'Hello Rundock from task with recursive Scenario.' > /var/tmp/hello_rundock_from_task_with_recursive_$1_$2_$3_$4_scenario"

data/spec/integration/recipes/task_with_recursive_args_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_task_with_recursive_a_b_1_2_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with recursive Scenario./) }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_recursive_1_2_c_d_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with recursive Scenario./) }
+end

data/spec/integration/scenarios/task_with_recursive_args_scenario.yml

@@ -0,0 +1,21 @@
+- target: anyhost-01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_task_with_recursive_a_b_1_2_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_task_with_recursive_1_2_c_d_scenario"
+  task:
+    - task_1 1 2
+---
+anyhost-01:
+  host: <replaced_by_platforms_host>
+  ssh_opts:
+    port: <replaced_by_platforms_port>
+    user: tester
+    key: "<replaced_by_platforms_key>"
+---
+task_1:
+  task:
+    - task_2 a  b  $1 $2
+    - task_2 $1 $2 c  d
+task_2:
+  command:
+    - "echo 'Hello Rundock from task with recursive Scenario.' > /var/tmp/hello_rundock_from_task_with_recursive_$1_$2_$3_$4_scenario"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,6 +223,7 @@ files:
 - spec/integration/platforms/localhost/scenarios/target_group_scenario.yml
 - spec/integration/platforms/localhost/scenarios/task_by_option_scenario.yml
 - spec/integration/platforms/localhost/scenarios/task_with_args_scenario.yml
+- spec/integration/platforms/localhost/scenarios/task_with_recursive_args_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
 - spec/integration/platforms/localhost/targets/target_by_option.yml
 - spec/integration/recipes/cwd_spec.rb
@@ -240,6 +241,7 @@ files:
 - spec/integration/recipes/target_by_option_spec.rb
 - spec/integration/recipes/task_by_option_spec.rb
 - spec/integration/recipes/task_with_args_spec.rb
+- spec/integration/recipes/task_with_recursive_args_spec.rb
 - spec/integration/scenarios/all_file_hooks_by_option_scenario.yml
 - spec/integration/scenarios/cwd_scenario.yml
 - spec/integration/scenarios/deploy_args_scenario.yml
@@ -255,6 +257,7 @@ files:
 - spec/integration/scenarios/target_group_scenario.yml
 - spec/integration/scenarios/task_by_option_scenario.yml
 - spec/integration/scenarios/task_with_args_scenario.yml
+- spec/integration/scenarios/task_with_recursive_args_scenario.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
 - spec/integration/targets/target_by_option.yml