rundock 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e657f6e86984349d8a0d7ac6e98d1602bd43d029
-  data.tar.gz: c4de7b5e3823537219d7279abc896908742702f8
+  metadata.gz: d6a61fa117dd4b85c77ab87e31b4847d3238a2f7
+  data.tar.gz: 1ddc1ab8bba6da04cb75984587ba79c874a8f7d8
 SHA512:
-  metadata.gz: 50861c2f2384facd81bd4f2acd461e017070d25d089c270dccbc168f3272902f92952282a399c3a084d110354b61809377ef30248f316d0c0f7d5a70fcba238f
-  data.tar.gz: a3d89d692a3213c7b2a98f39e1bed79337f10c0cc929bd1ba3c5b45212d2ab31ad043320598c9e242b64ab46b1eccdb8172449e0aa43a4f6e3f4ca5232e52aa1
+  metadata.gz: f2309c7c12e7d172f695aac8dbe61a608e9e4fe6e86d72aa03de6f506d2ee4d79a9ab15a64eea3a88fe8e54a154804ec44a282e2b2aacbebb297fe60fedee3be
+  data.tar.gz: 8b07d8c2f35496f5fbd5a83dee6d5e0c8d43572e11eb24c378584501604507d436f4cfdfc5d03fb145b69c4d61ff7ebcc846976469fb584bf14e691de6b1cc6e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.0.2
+
+Update
+
+ - Support task with arguments
+ - Update specify private ssh setting unless current ssh setting
+
 ## v1.0.0
 
 Update

data/lib/rundock/operation/command.rb

@@ -8,9 +8,20 @@ module Rundock
             next
           end
 
-          backend.run_commands(i, attributes)
+          backend.run_commands(
+            assign_args(i, attributes[:task_args]), attributes
+          )
         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] }
+      end
     end
   end
 end

data/lib/rundock/operation/task.rb

@@ -3,16 +3,19 @@ module Rundock
     class Task < Base
       def run(backend, attributes = {})
         @instruction.each do |i|
-          unless attributes[:task_info].key?(i.to_sym)
-            Logger.warn("task not found and ignored: #{i}")
+          task_set = i.split(' ')
+          task_name = task_set.first
+          attributes[:task_args] = task_set.slice(1..-1) if task_set.length > 1
+          unless attributes[:task_info].key?(task_name.to_sym)
+            Logger.warn("task not found and ignored: #{task_name}")
             next
           end
 
           scenario = Rundock::Builder::ScenarioBuilder.new(nil, nil).build_task(
-            attributes[:task_info][i.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes)
+            attributes[:task_info][task_name.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes)
           )
 
-          Logger.info("start task: #{i}")
+          Logger.info("start task: #{task_name}")
 
           Logger.formatter.rec_lock
 

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

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

@@ -0,0 +1,12 @@
+- target: localhost
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_args_scenario"
+  task:
+    - write_echo task_with_args two
+---
+---
+write_echo:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_$1_scenario
+    - echo 'Hello Rundock from task with args Scenario. $@ $#' > /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario
+    - cp /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario /var/tmp/hello_rundock_from_$1_scenario_$2

data/spec/integration/recipes/task_with_args_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_task_with_args_scenario/hello_rundock_from_task_with_args_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with args Scenario. task_with_args two 2/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_task_with_args_scenario_two') do
+  it { should be_file }
+end

data/spec/integration/scenarios/task_with_args_scenario.yml

@@ -0,0 +1,20 @@
+- target: localhost
+  command:
+    - "rm -rf /var/tmp/hello_rundock_from_task_with_args_scenario"
+- target: anyhost-01
+  task:
+    - write_echo task_with_args two
+---
+anyhost-01:
+  target_type: host
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+write_echo:
+  command:
+    - mkdir /var/tmp/hello_rundock_from_$1_scenario
+    - echo 'Hello Rundock from task with args Scenario. $@ $#' > /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario
+    - cp /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario /var/tmp/hello_rundock_from_$1_scenario_$2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - hiracy
@@ -204,6 +204,7 @@ files:
 - spec/integration/platforms/localhost/scenarios/target_by_option_scenario.yml
 - 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/use_default_ssh_scenario.yml
 - spec/integration/platforms/localhost/targets/target_by_option.yml
 - spec/integration/recipes/cwd_spec.rb
@@ -218,6 +219,7 @@ files:
 - spec/integration/recipes/tareget_group_scenario_spec.rb
 - 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/scenarios/all_file_hooks_by_option_scenario.yml
 - spec/integration/scenarios/cwd_scenario.yml
 - spec/integration/scenarios/deploy_erb_scenario.yml
@@ -230,6 +232,7 @@ files:
 - spec/integration/scenarios/target_by_option_scenario.yml
 - 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/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
 - spec/integration/targets/target_by_option.yml