rundock 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd82387cd2af5b8416ca898c1195d206c2d1125
-  data.tar.gz: 3142354f64b527b7ab56d3f0ef4b8e523bbff554
+  metadata.gz: e9d5fbdbec3793e39aa69bf57a931215bedf4c98
+  data.tar.gz: 1301a6b4db8220b709225b34d4851a73e97033aa
 SHA512:
-  metadata.gz: bf24ed1fa1eb8fe67c635c87e19c59cfe3e0420f776c3ea8b6cbcb4496ab217f7a6a60d074402fb810fb28b08cb84bb7bc2dd8b53f50c1f71bb9a8f7e85b3bed
-  data.tar.gz: d4d6e4a40db0e57811cdc12de94c05bc0c3d50575f962aa68b1b50e4d9240c03d2a21279cd742b6406c565ed4e5bdb1c6e9ef62df79fb27025247778f072209f
+  metadata.gz: 78e493176f50ebb48ae7817f6180de0624743bc0f714f8acaaebed3b04b7a100ca40b72396355baea1a0e4791606258f2a527b17b53a28271eb23c4bfc620837
+  data.tar.gz: a9b0c2565b7444383545cecc1ade484a447cb0869fe51be6e2c95ee21255cddeddcd9ca6264a004f80dc5d62f27ca32ef65f179fed922f356131df3ce3d061b5

data/CHANGELOG.md

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

data/lib/rundock/operation/base.rb

@@ -21,6 +21,14 @@ module Rundock
         h_ope = "start #{self.class.to_s.split('::').last.downcase}:"
         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)
+           .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)] }
+      end
     end
   end
 end

data/lib/rundock/operation/command.rb

@@ -15,16 +15,6 @@ module Rundock
           )
         end
       end
-
-      private
-
-      def assign_args(cmd, args)
-        return cmd unless args
-        cmd.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)] }
-      end
     end
   end
 end

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

@@ -70,18 +70,22 @@ module Rundock
                         end
 
           if is_erb
-            erb_content = conv_erb(opt[:src], trim_mode, val_binding)
+            erb_content = conv_erb(assign_args(opt[:src], attributes[:task_args]),
+                                   trim_mode,
+                                   val_binding)
 
             tempfile = Tempfile.new('', Dir.tmpdir)
             begin
               tempfile.write(erb_content)
               tempfile.rewind
-              backend.send_file(tempfile.path, opt[:dst])
+              backend.send_file(tempfile.path,
+                                assign_args(opt[:dst], attributes[:task_args]))
             ensure
               tempfile.close
             end
           else
-            backend.send_file(opt[:src], opt[:dst])
+            backend.send_file(assign_args(opt[:src], attributes[:task_args]),
+                              assign_args(opt[:dst], attributes[:task_args]))
           end
         end
       end
@@ -104,6 +108,8 @@ module Rundock
         map = {}
         binding.each do |k, v|
           map[k] = backend.specinfra_run_command(v[:value]).stdout.strip if v.key?(:value)
+
+          # write types other than the command here
         end
 
         map

data/lib/rundock/version.rb

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

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

@@ -0,0 +1,13 @@
+- target: localhost
+  command:
+    - "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"
+  task:
+    - deploy_file arg_1 arg_2
+---
+---
+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

data/spec/integration/recipes/deploy_args_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+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

data/spec/integration/scenarios/deploy_args_scenario.yml

@@ -0,0 +1,21 @@
+- target: localhost
+  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"
+- target: anyhost-01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_arg_2_scenario"
+  task:
+    - deploy_task  arg_1 arg_2
+---
+anyhost-01:
+  host: <replaced_by_platforms_host>
+  ssh_opts:
+    port: <replaced_by_platforms_port>
+    user: tester
+    key: "<replaced_by_platforms_key>"
+---
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,6 +209,7 @@ files:
 - spec/integration/platforms/centos6/setup.sh
 - spec/integration/platforms/localhost/scenarios/all_file_hooks_by_option_scenario.yml
 - 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_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_by_option_scenario.yml
@@ -224,6 +225,7 @@ files:
 - 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
+- spec/integration/recipes/deploy_args_spec.rb
 - spec/integration/recipes/deploy_erb_spec.rb
 - spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/file_hook_by_option_spec.rb
@@ -238,6 +240,7 @@ files:
 - spec/integration/recipes/task_with_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
 - spec/integration/scenarios/deploy_erb_scenario.yml
 - spec/integration/scenarios/deploy_scenario.yml
 - spec/integration/scenarios/file_hooks_by_option_scenario.yml