rundock 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfd3d43abf83f98725cee3d7491bad4df9ee51f
-  data.tar.gz: 1d82c40d5cb2b880630eed568193ab042511be2a
+  metadata.gz: be69d1204087ff6b81446b6303ec46351a15324b
+  data.tar.gz: c8d4edf9535b4495e8c57f3b0186baabba97fcbb
 SHA512:
-  metadata.gz: e29c7362f2454b6436fd199c156062e36740995ca57b25254de52e9fb34d711d4bd2dbce0a1ead397fdc5d7a31a52be02216d0b1f842a93249b90f2676ace9a2
-  data.tar.gz: 9db5cb49b8e533bfc59cfa3add439471abf1018cd426f369d372d0dfae987dbce4d89d601d7d72445e3272d1c2d1730781febf9a96bbfd669a47db118c7f7c92
+  metadata.gz: 4a11d81638882d166d039e394e2efd3db08d01d5d24fa3f5e5e397cdb2101091b7a1bd14f02b601d3a22c62075e7a0d3ae63bae44fe2bc59007b2e194992439f
+  data.tar.gz: 1d2bc6ac9a8d3a1545161138fa5d599dd2556fb10199370f4ad6685d798c0a39cf6f6c3f60663858fab5994abb6467140d5bbd74945c95d0ef49c3df7bb3344d

data/.rubocop.yml

@@ -48,5 +48,8 @@ Style/HashSyntax:
 Style/FormatString:
   EnforcedStyle: percent
 
+Style/RegexpLiteral:
+  Enabled: false
+
 Lint/UnusedMethodArgument:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.5.4
+
+Update
+
+ - Support change directory
+ - Support sudo in scenario
+
 ## v0.5.3
 
 Update

data/README.md

@@ -79,14 +79,38 @@ and execute rundock.
 
 You can also specify [default_ssh_options.yml](https://github.com/hiracy/rundock/blob/master/default_ssh.yml) [(Net::SSH options)](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html) file contents that you specified "-d" option to the default ssh options.
 
+- use adhoc ssh
+
 ```
 $ rundock ssh -g /path/to/your-dir/targetgroup.yml -c 'your-gread-command' -d /path/to/your-dir/default_ssh_options.yml
 ```
+
+- use scenario file
+
 ```
 $ rundock do /path/to/your-dir/scenario.yml -d /path/to/your-dir/default_ssh_options.yml
 ```
 
-For more detail. You can see from `rundock -h` command.
+You can see from `rundock -h` command.
+
+```
+Commands:
+  rundock do [SCENARIO] [options]  # Run rundock from scenario file
+  rundock help [COMMAND]           # Describe available commands or one specific command
+  rundock ssh [options]            # Run rundock ssh with various options
+  rundock version                  # Print version
+
+Options:
+  -l, [--log-level=LOG_LEVEL]
+                                             # Default: info
+      [--color], [--no-color]
+                                             # Default: true
+      [--header], [--no-header]
+                                             # Default: true
+      [--short-header], [--no-short-header]
+      [--date-header], [--no-date-header]
+                                             # Default: true
+```
 
 ## Documentations
 

data/Rakefile

@@ -8,7 +8,7 @@ run_commands = [
     'echo \'Hello Rundock.\' > /var/tmp/hello_rundock'
 ]
 
-def execute(command, clean_env)
+def execute(command, clean_env, errexit)
   puts "[EXECUTE:] #{command}"
 
   if clean_env
@@ -18,11 +18,11 @@ def execute(command, clean_env)
   else
     system command
   end
-  raise 'Execute Error.' unless $?.to_i == 0
+  raise 'Execute Error.' if $?.to_i != 0 && errexit
 end
 
 def setup_docker(platform, timeout, interval)
-  execute("./spec/integration/platforms/#{platform}/setup.sh &", false)
+  execute("./spec/integration/platforms/#{platform}/setup.sh &", false, true)
   found = false
   (timeout / interval).times do
     system 'sudo docker ps | grep rundock'
@@ -41,17 +41,17 @@ def do_rundock_ssh(commands, platform)
 
   if platform == 'localhost'
     commands.each do |cmd|
-      execute("bundle exec exe/rundock ssh -c \"#{cmd}\" -h localhost -l debug", true)
+      execute("bundle exec exe/rundock ssh -c \"#{cmd}\" -h localhost -l debug", true, true)
     end
   else
     commands.each do |cmd|
       execute('bundle exec exe/rundock' \
         " ssh -c \"#{cmd}\" -h 172.17.42.1 -p 22222 -u tester" \
-        " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
+        " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true, true)
       Dir.glob(groups_files_pattern).each do |g|
         execute('bundle exec exe/rundock' \
           " ssh -c \"#{cmd}\" -g #{g} -p 22222 -u tester" \
-          " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true)
+          " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true, true)
       end
     end
   end
@@ -83,23 +83,23 @@ def do_rundock_scenarios(platform)
     end
 
     execute('bundle exec exe/rundock' \
-       " do #{scenario}#{default_ssh_opt}#{options} -l debug", true)
+       " do #{scenario}#{default_ssh_opt}#{options} -l debug", true, true)
   end
 end
 
 desc 'Cleaning environments'
 
 task :clean do
-  execute('rm -fr /var/tmp/hello_rundock*', false)
+  execute('rm -fr /var/tmp/hello_rundock*', false, false)
   Dir.glob('./spec/integration/platforms/*').each do |platform|
     next if platform =~ /localhost$/
-    execute("#{platform}/setup.sh --clean", false)
+    execute("#{platform}/setup.sh --clean", false, true)
   end
 end
 
 desc 'execute rubocop'
 task :rubocop do
-  execute('rubocop', false)
+  execute('rubocop', false, true)
 end
 
 desc 'Run all tests.'

data/lib/rundock/attribute/node_attribute.rb

@@ -5,12 +5,16 @@ module Rundock
       attr_accessor :nodeinfo
       attr_accessor :task_info
       attr_accessor :errexit
+      attr_accessor :cwd
+      attr_accessor :sudo
       attr_accessor :dry_run
       attr_accessor :hooks
 
       AVAIL_TAKE_OVERS = [
         :task_info,
         :errexit,
+        :cwd,
+        :sudo,
         :dry_run
       ]
 

data/lib/rundock/backend.rb

@@ -51,6 +51,7 @@ module Rundock
 
       def run_command(cmd, exec_options = {})
         command = cmd.strip
+        command = "sudo #{command.gsub(/^sudo +/, '')}" if exec_options[:sudo]
         command = "cd #{Shellwords.escape(exec_options[:cwd])} && #{command}" if exec_options[:cwd]
         command = "sudo -H -u #{Shellwords.escape(user)} -- /bin/sh -c #{command}" if exec_options[:user]
 
@@ -62,6 +63,8 @@ module Rundock
         exit_status = result.exit_status
 
         Logger.formatter.indent do
+          Logger.debug("cwd: #{exec_options[:cwd]}") if exec_options[:cwd]
+          Logger.debug("sudo: #{exec_options[:sudo]}") if exec_options[:sudo]
           Logger.error("#{result.stderr.strip}") unless result.stderr.strip.blank?
           Logger.info("#{result.stdout.strip}") unless result.stdout.strip.blank?
           Logger.debug("errexit: #{exec_options[:errexit]}")

data/lib/rundock/plugin/hook/file.rb

@@ -1,4 +1,4 @@
-require 'rundock/operation/base'
+require 'rundock/hook/base'
 
 module Rundock
   module Hook

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/integration/platforms/centos6/Dockerfile

@@ -6,7 +6,7 @@ RUN echo "tester" | passwd --stdin tester
 RUN mkdir -p /home/tester/.ssh; chown tester /home/tester/.ssh; chmod 700 /home/tester/.ssh
 ADD authorized_keys /home/tester/.ssh/
 RUN chown tester /home/tester/.ssh/authorized_keys; chmod 600 /home/tester/.ssh/authorized_keys
-RUN echo "tester    ALL=(ALL)       ALL" >> /etc/sudoers.d/tester
+RUN echo "tester    ALL=(ALL)       NOPASSWD:ALL" >> /etc/sudoers.d/tester
 RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
 RUN sed -ri 's/#UsePAM no/UsePAM no/g' /etc/ssh/sshd_config
 RUN sed -ri 's/PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config

data/spec/integration/platforms/centos6/setup.sh

@@ -25,6 +25,7 @@ RUNDOCK_GROUP_CACHE_DIR="${RUNDOCK_CACHE_DIR}/groups"
 RUNDOCK_TARGET_CACHE_DIR="${RUNDOCK_CACHE_DIR}/targets"
 
 if [ "${1}x" = "--cleanx" ];then
+  set +e
   rm -f ${RUNDOCK_DEFAULT_SSH_YML}
   rm -f ${RUNDOCK_SCENARIO_CACHE_DIR}/*.yml
   rm -f ${RUNDOCK_GROUP_CACHE_DIR}/*.yml
@@ -35,7 +36,6 @@ if [ "${1}x" = "--cleanx" ];then
     rm -f ${DOCKER_SSH_KEY_PUBLIC_LOCAL}
     rm -f ${DOCKER_SSH_CONFIG}
     rm -f ${DOCKER_SSH_KEY_PUBLIC_REMOTE}
-    set +x
     sudo docker ps -q | xargs sudo docker rm -f
   fi
 

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

@@ -0,0 +1,6 @@
+- target: localhost
+  command:
+    - "mkdir -p /var/tmp/cwd_scenario_test"
+    - "rm -f /var/tmp/hello_rundock_from_cwd_scenario"
+    - cwd: /var/tmp/cwd_scenario_test
+    - "echo `pwd` > /var/tmp/hello_rundock_from_cwd_scenario"

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

@@ -0,0 +1,8 @@
+- target: localhost
+  command:
+    - "sudo rm -f /var/tmp/hello_rundock_from_sudo_scenario"
+    - "sudo rm -f /var/tmp/hello_rundock_from_no_sudo_scenario"
+    - sudo: true
+    - "sudo touch /var/tmp/hello_rundock_from_sudo_scenario"
+    - sudo: false
+    - "touch /var/tmp/hello_rundock_from_no_sudo_scenario"

data/spec/integration/recipes/cwd_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_cwd_scenario') do
+  it { should be_file }
+  its(:content) { should match(/^\/var\/tmp\/cwd_scenario_test/) }
+end

data/spec/integration/recipes/sudo_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_sudo_scenario') do
+  it { should be_file }
+  it { should be_owned_by 'root' }
+end
+
+describe file('/var/tmp/hello_rundock_from_no_sudo_scenario') do
+  it { should be_file }
+  it { should_not be_owned_by 'root' }
+end

data/spec/integration/scenarios/cwd_scenario.yml

@@ -0,0 +1,18 @@
+- target: anyhost-01
+  command:
+    - "mkdir -p /var/tmp/cwd_scenario_test"
+    - "rm -f /var/tmp/hello_rundock_from_cwd_scenario"
+  task:
+    - pwd_echo
+---
+anyhost-01:
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+pwd_echo:
+  command:
+    - cwd: /var/tmp/cwd_scenario_test
+    - "echo `pwd` > /var/tmp/hello_rundock_from_cwd_scenario"

data/spec/integration/scenarios/sudo_scenario.yml

@@ -0,0 +1,20 @@
+- target: anyhost-01
+  command:
+    - "sudo rm -f /var/tmp/hello_rundock_from_sudo_scenario"
+    - "sudo rm -f /var/tmp/hello_rundock_from_no_sudo_scenario"
+  task:
+    - sudo_touch
+---
+anyhost-01:
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+sudo_touch:
+  command:
+    - sudo: true
+    - "sudo touch /var/tmp/hello_rundock_from_sudo_scenario"
+    - sudo: false
+    - "touch /var/tmp/hello_rundock_from_no_sudo_scenario"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,7 @@ files:
 - spec/integration/platforms/centos6/Dockerfile
 - 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_erb_scenario.yml
 - spec/integration/platforms/localhost/scenarios/deploy_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_by_option_scenario.yml
@@ -197,11 +198,13 @@ files:
 - spec/integration/platforms/localhost/scenarios/run_anyway_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_echo_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_plugin_scenario.yml
+- spec/integration/platforms/localhost/scenarios/sudo_scenario.yml
 - 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/use_default_ssh_scenario.yml
 - spec/integration/platforms/localhost/targets/target_by_option.yml
+- spec/integration/recipes/cwd_spec.rb
 - spec/integration/recipes/deploy_erb_spec.rb
 - spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/file_hook_by_option_spec.rb
@@ -209,16 +212,19 @@ files:
 - spec/integration/recipes/simple_echo_scenario_spec.rb
 - spec/integration/recipes/simple_echo_spec.rb
 - spec/integration/recipes/simple_plugin_scenario_spec.rb
+- spec/integration/recipes/sudo_spec.rb
 - 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/scenarios/all_file_hooks_by_option_scenario.yml
+- spec/integration/scenarios/cwd_scenario.yml
 - spec/integration/scenarios/deploy_erb_scenario.yml
 - spec/integration/scenarios/deploy_scenario.yml
 - spec/integration/scenarios/file_hooks_by_option_scenario.yml
 - spec/integration/scenarios/file_hooks_scenario.yml
 - spec/integration/scenarios/simple_echo_scenario.yml
 - spec/integration/scenarios/simple_plugin_scenario.yml
+- spec/integration/scenarios/sudo_scenario.yml
 - spec/integration/scenarios/target_by_option_scenario.yml
 - spec/integration/scenarios/target_group_scenario.yml
 - spec/integration/scenarios/task_by_option_scenario.yml