rundock 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d5fbdbec3793e39aa69bf57a931215bedf4c98
-  data.tar.gz: 1301a6b4db8220b709225b34d4851a73e97033aa
+  metadata.gz: 7879491846da01dd89f32447e3d005ff6a605a4d
+  data.tar.gz: 9ca056e0dea037fc0d282c52425064558b14b7d7
 SHA512:
-  metadata.gz: 78e493176f50ebb48ae7817f6180de0624743bc0f714f8acaaebed3b04b7a100ca40b72396355baea1a0e4791606258f2a527b17b53a28271eb23c4bfc620837
-  data.tar.gz: a9b0c2565b7444383545cecc1ade484a447cb0869fe51be6e2c95ee21255cddeddcd9ca6264a004f80dc5d62f27ca32ef65f179fed922f356131df3ce3d061b5
+  metadata.gz: 0339360367affaea08aa104c30111fddbce757581b90a12fca1a6864c44e9181d1dd7cd1750ea1faf1adafbddc5e15513d28a302600fd4fc609f7b94244d6070
+  data.tar.gz: d6af35bfaba87880eff13126372b0d27ac83de9f3511da109327e0567a81268604ee8e6702e9efb1c7a99beabc67e4114067400d6534fed305706f1d7fcb019e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.2
+
+Update
+
+ - Support deploy arguments to deploy operation
+
 ## v1.1.1
 
 Update

data/lib/rundock/operation/base.rb

@@ -22,9 +22,9 @@ module Rundock
         Logger.send(severity.to_sym, "#{h_host} #{h_ope} #{message}")
       end
 
-      def assign_args(cmd, args)
-        return cmd unless args
-        cmd.gsub(/\$#/, args.length.to_s)
+      def assign_args(src, args)
+        return src unless args
+        src.gsub(/\$#/, args.length.to_s)
            .gsub(/\$@/, args.join(' '))
            .gsub(/\$[1-9]/) { |arg_n| args[arg_n.chars[1..-1].join.to_i - 1] }
            .gsub(/(\$\{)(\w+)(\})/) { ENV[Regexp.last_match(2)] }

data/lib/rundock/operation/task.rb

@@ -3,9 +3,16 @@ 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
-          attributes[:task_args] = task_set.slice(1..-1) if task_set.length > 1
+
+          if task_set.length > 1
+            attributes[:task_args] = task_set.slice(1..-1).map do |arg|
+              assign_args(arg, previous_args)
+            end
+          end
+
           unless attributes[:task_info].key?(task_name.to_sym)
             Logger.warn("task not found and ignored: #{task_name}")
             next

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

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

@@ -0,0 +1,16 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_c_d_a_b_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_a_b_c_d_scenario"
+    - "echo 'Hello Rundock from deploy recursive Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_c_d_a_b_scenario"
+  task:
+    - deploy_file_1 a b
+---
+---
+deploy_file_1:
+  task:
+    deploy_file_2 c d $1 $2
+deploy_file_2:
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_$1_$2_$3_$4_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_$3_$4_$1_$2_scenario

data/spec/integration/recipes/deploy_recursive_spec.rb

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

data/spec/integration/scenarios/deploy_recursive_scenario.yml

@@ -0,0 +1,24 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_c_d_a_b_scenario"
+    - "echo 'Hello Rundock from deploy recursive Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_c_d_a_b_scenario"
+- target: anyhost-01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_a_b_c_d_scenario"
+  task:
+    - deploy_task_1 a b
+---
+anyhost-01:
+  host: <replaced_by_platforms_host>
+  ssh_opts:
+    port: <replaced_by_platforms_port>
+    user: tester
+    key: "<replaced_by_platforms_key>"
+---
+deploy_task_1:
+  task:
+    deploy_task_2 c d $1 $2
+deploy_task_2:
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_$1_$2_$3_$4_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_$3_$4_$1_$2_scenario

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,6 +211,7 @@ files:
 - spec/integration/platforms/localhost/scenarios/cwd_scenario.yml
 - spec/integration/platforms/localhost/scenarios/deploy_args_scenario.yml
 - spec/integration/platforms/localhost/scenarios/deploy_erb_scenario.yml
+- spec/integration/platforms/localhost/scenarios/deploy_recursive_scenario.yml
 - spec/integration/platforms/localhost/scenarios/deploy_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_by_option_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_scenario.yml
@@ -227,6 +228,7 @@ files:
 - spec/integration/recipes/cwd_spec.rb
 - spec/integration/recipes/deploy_args_spec.rb
 - spec/integration/recipes/deploy_erb_spec.rb
+- spec/integration/recipes/deploy_recursive_spec.rb
 - spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/file_hook_by_option_spec.rb
 - spec/integration/recipes/file_hook_spec.rb
@@ -242,6 +244,7 @@ files:
 - spec/integration/scenarios/cwd_scenario.yml
 - spec/integration/scenarios/deploy_args_scenario.yml
 - spec/integration/scenarios/deploy_erb_scenario.yml
+- spec/integration/scenarios/deploy_recursive_scenario.yml
 - spec/integration/scenarios/deploy_scenario.yml
 - spec/integration/scenarios/file_hooks_by_option_scenario.yml
 - spec/integration/scenarios/file_hooks_scenario.yml