rundock 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 427a5c5bf1af65355a3fd503eafb597c152db37e
-  data.tar.gz: 4d518a9ce6c376fe2b0fa18c5528c24927d6fac9
+  metadata.gz: 718bf71616360d5ef7fcd4f101327d27c5b93338
+  data.tar.gz: 8a7988875fe45b1f7ae288dd7663e0179d203019
 SHA512:
-  metadata.gz: 9f28cd34e259c5c6537016a32cc8c11190898328584c6d48548651b659986a57db9231b1e95d739750b1d493b5c1930ed0237484bcfcab07253ef58e82e014f9
-  data.tar.gz: edb622626765bd919c198f4ae289e79346b5001f6cc2de03458588de1fbbba7f6ecc67e4f1d9e5802604fcdc9caa15dc5b2e0c474088772cc4a0c007fcb7261d
+  metadata.gz: a73393c18bbe1cd693464cd209e070bbb8d690b28f2aaf2008b0d6355757f483f490bc3ddcce4ffdc6acb5211ec4a53c523442da1afdd51fe5247375f86a6870
+  data.tar.gz: 3f07d87fef9fe10c50a279feee52da7d15a4c65ee4fd225154fa3e8dd19098f45198abe3012d4da6a7377ba6db53c58b798759d103fcb069d69e370b6a14f6a4

data/CHANGELOG.md

@@ -1,8 +1,9 @@
-## v1.1.3
+## v1.1.4
 
 Update
 
  - Support simple string replace to deploy erb operation
+ - Support binding argument to deploy erb operation
 
 ## v1.1.2
 

data/lib/rundock/plugin/operation/deploy.rb

@@ -64,7 +64,7 @@ module Rundock
           Logger.debug("deploy erb binding: #{opt[:binding]}") if is_erb
 
           val_binding = if is_erb
-                          extract_map(backend, opt[:binding])
+                          extract_map(backend, opt[:binding], attributes[:task_args])
                         else
                           {}
                         end
@@ -104,20 +104,23 @@ module Rundock
         end
       end
 
-      def extract_map(backend, binding)
+      def extract_map(backend, binding, args)
         map = {}
         binding.each do |k, v|
           next unless v.key?(:value)
+          bind_key  = assign_args(k.to_s, args)
+          bind_type = assign_args(v[:type].to_s, args)
+          bind_value = assign_args(v[:value].to_s, args)
 
           # write types other than the command here
-          map[k] = case v[:type].to_s
-                   when 'command'
-                     backend.specinfra_run_command(v[:value]).stdout.strip
-                   when 'string'
-                     v[:value]
-                   else
-                     v[:value]
-                   end
+          map[bind_key] = case bind_type
+                          when 'command'
+                            backend.specinfra_run_command(bind_value).stdout.strip
+                          when 'string'
+                            bind_value
+                          else
+                            bind_value
+                          end
         end
 
         map

data/lib/rundock/version.rb

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

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

@@ -3,11 +3,24 @@
     - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_arg_1_scenario"
     - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_arg_2_scenario"
     - "echo 'Hello Rundock from deploy args Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_arg_1_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_arg_binding_scenario"
+    - "echo 'Hello Rundock from deploy args <%= arg_1 %> Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario"
   task:
-    - deploy_file arg_1 arg_2
+    - deploy_file         arg_1 arg_2
+    - deploy_file_binding arg_1 runrunrundock
 ---
 ---
 deploy_file:
   deploy:
     - src: /var/tmp/hello_rundock_from_deploy_src_file_$1_scenario
       dst: /var/tmp/hello_rundock_from_deploy_dst_file_$2_scenario
+deploy_file_binding:
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_arg_binding_scenario
+      erb: true
+      binding:
+        $1:
+          type: string
+          value: $2

data/spec/integration/recipes/deploy_args_spec.rb

@@ -4,3 +4,8 @@ describe file('/var/tmp/hello_rundock_from_deploy_dst_file_arg_2_scenario') do
   it { should be_file }
   its(:content) { should match(/Hello Rundock from deploy args Scenario./) }
 end
+
+describe file('/var/tmp/hello_rundock_from_deploy_dst_file_arg_binding_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from deploy args runrunrundock Scenario./) }
+end

data/spec/integration/scenarios/deploy_args_scenario.yml

@@ -2,11 +2,15 @@
   command:
     - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_arg_1_scenario"
     - "echo 'Hello Rundock from deploy args Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_arg_1_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario"
+    - "echo 'Hello Rundock from deploy args <%= arg_1 %> Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario"
 - target: anyhost-01
   command:
     - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_arg_2_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_arg_binding_scenario"
   task:
-    - deploy_task  arg_1 arg_2
+    - deploy_task         arg_1 arg_2
+    - deploy_task_binding arg_1 runrunrundock
 ---
 anyhost-01:
   host: <replaced_by_platforms_host>
@@ -19,3 +23,12 @@ deploy_task:
   deploy:
     - src: /var/tmp/hello_rundock_from_deploy_src_file_$1_scenario
       dst: /var/tmp/hello_rundock_from_deploy_dst_file_$2_scenario
+deploy_task_binding:
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_arg_binding_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_arg_binding_scenario
+      erb: true
+      binding:
+        $1:
+          type: string
+          value: $2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - hiracy