rundock 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98f0161c6ca4ad171cede29edf9f91560ef25a28
-  data.tar.gz: 8e6a81eac352b785e4684785619e5052c3b8c3cd
+  metadata.gz: fbd82387cd2af5b8416ca898c1195d206c2d1125
+  data.tar.gz: 3142354f64b527b7ab56d3f0ef4b8e523bbff554
 SHA512:
-  metadata.gz: 6e514a919db53432ad753bcccd29b0697af2044928f1e6dede1deb0baa065f24f03f32997b0261219432178fe88b0f89023fc471b75100e642f7dabeebec58d3
-  data.tar.gz: 05d7196e1b3f3d851d66bd7485f510ea6516c7d55ea9087eab17dfced86aa1ed1d2295ca509e9598f099f436ddcb913b8ebd4af43e83b10a062de105e2d6e00f
+  metadata.gz: bf24ed1fa1eb8fe67c635c87e19c59cfe3e0420f776c3ea8b6cbcb4496ab217f7a6a60d074402fb810fb28b08cb84bb7bc2dd8b53f50c1f71bb9a8f7e85b3bed
+  data.tar.gz: d4d6e4a40db0e57811cdc12de94c05bc0c3d50575f962aa68b1b50e4d9240c03d2a21279cd742b6406c565ed4e5bdb1c6e9ef62df79fb27025247778f072209f

data/.rubocop.yml

@@ -69,5 +69,8 @@ Style/NumericPredicate:
 Style/MethodMissing:
   Enabled: false
 
+Style/FormatStringToken:
+  Enabled: false
+
 Lint/UnusedMethodArgument:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.0
+
+Update
+
+ - Support ssh configure
+ - Support task with environment variables
+
 ## v1.0.2
 
 Update

data/lib/rundock/backend.rb

@@ -71,9 +71,7 @@ module Rundock
           Logger.debug("exit status: #{exit_status}")
         end
 
-        if exec_options[:errexit] && exit_status != 0
-          raise CommandResultStatusError
-        end
+        raise CommandResultStatusError if exec_options[:errexit] && exit_status != 0
 
         result
       end

data/lib/rundock/builder/backend_builder.rb

@@ -42,9 +42,7 @@ module Rundock
           # set unless scenario file and cli options specified and not localhost
           next if localhost?
           opt = oo.to_s.gsub(/_ssh_default/, '').to_sym
-          if !@node_info[@nodename.to_sym][:ssh_opts][opt] && !@options[opt]
-            @node_info[@nodename.to_sym][:ssh_opts][opt] = @options[oo]
-          end
+          @node_info[@nodename.to_sym][:ssh_opts][opt] = @options[oo] if !@node_info[@nodename.to_sym][:ssh_opts][opt] && !@options[opt]
         end
 
         # replace cli ssh options if exists

data/lib/rundock/operation/command.rb

@@ -22,7 +22,8 @@ module Rundock
         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(/\$[1-9]/) { |arg_n| args[arg_n.chars[1..-1].join.to_i - 1] }
+           .gsub(/(\$\{)(\w+)(\})/) { ENV[Regexp.last_match(2)] }
       end
     end
   end

data/lib/rundock/version.rb

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

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

@@ -10,3 +10,4 @@ write_echo:
     - 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
+    - cp /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario /var/tmp/hello_rundock_from_${USER}_scenario

data/spec/integration/recipes/task_with_args_spec.rb

@@ -5,6 +5,7 @@ describe file('/var/tmp/hello_rundock_from_task_with_args_scenario/hello_rundock
   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
+describe file("/var/tmp/hello_rundock_from_#{ENV['USER']}_scenario") do
   it { should be_file }
+  its(:content) { should match(/Hello Rundock from task with args Scenario. task_with_args two 2/) }
 end

data/spec/integration/scenarios/task_with_args_scenario.yml

@@ -17,3 +17,4 @@ write_echo:
     - 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
+    - cp /var/tmp/hello_rundock_from_$1_scenario/hello_rundock_from_$1_scenario /var/tmp/hello_rundock_from_${USER}_scenario

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler