rundock 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa664318ebae9c57a378f4e5ccef806395eb2fbc
-  data.tar.gz: 45d2618d0d9b0e76180ca754d5f4d39d3009abe2
+  metadata.gz: e0a18e2fe745300ae9f65c19888268983681a74b
+  data.tar.gz: f9683ce81d50dad93028198bd475608078fefdab
 SHA512:
-  metadata.gz: 2f9114c8b24850151732f713e4d9311d90d75b0597032af5c402a427aa7d1de4b2bce37e3c9de0e76fb86ef58472f7fd606bc82faeb37bd82780f9ed5458ae59
-  data.tar.gz: 70295a6126b533ed8863bef489f2483d9269f006a7984bb46b22cb1d9271ae7daf9249a443a68f96b00b37d47455c402416450f6b26cd5d5e7ea3f571f155bc3
+  metadata.gz: e7f65308868d53438a140fe859ee387f5f8578215a3cedd554bd9d9183514eb3403438da8280bf7baf6b65c09a62ea975a03f80079b3f8be7305535d66b4838e
+  data.tar.gz: 4aba11b47b26ed6bbfd819cc91d72aa61873c7fbbdc5b0e0eae50806ab4a3502ca7f1cf1b36c5070db6e59219230a18630927f391eea900fe0bb42a36f3cfd1a

data/.rubocop.yml

@@ -17,6 +17,9 @@ Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 50
 
+Metrics/BlockLength:
+  Max: 50
+
 Metrics/AbcSize:
   Enabled: true
   Max: 100
@@ -57,5 +60,11 @@ Style/Alias:
 Style/MutableConstant:
   Enabled: false
 
+Style/NumericPredicate:
+  Enabled: false
+
+Style/MethodMissing:
+  Enabled: false
+
 Lint/UnusedMethodArgument:
   Enabled: false

data/Rakefile

@@ -44,13 +44,16 @@ def do_rundock_ssh(commands, platform)
       execute("bundle exec exe/rundock ssh -c \"#{cmd}\" -h localhost -l debug", true, true)
     end
   else
+    host = `cat #{ENV['HOME']}/.ssh/config_rundock_spec_#{platform} | grep 'HostName ' | awk '{print $2}' | tr -d '\n'`
+    port = `cat #{ENV['HOME']}/.ssh/config_rundock_spec_#{platform} | grep 'Port ' | awk '{print $2}' | tr -d '\n'`
+
     commands.each do |cmd|
       execute('bundle exec exe/rundock' \
-        " ssh -c \"#{cmd}\" -h 172.17.42.1 -p 22222 -u tester" \
+        " ssh -c \"#{cmd}\" -h #{host} -p #{port} -u tester" \
         " -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" \
+          " ssh -c \"#{cmd}\" -g #{g} -p #{port} -u tester" \
           " -i #{ENV['HOME']}/.ssh/id_rsa_rundock_spec_#{platform}_tmp -l debug", true, true)
       end
     end

data/lib/rundock/backend.rb

@@ -57,7 +57,7 @@ module Rundock
 
         Logger.debug(%(Start executing: "#{command}"))
 
-        return nil if options[:dry_run]
+        return nil if exec_options[:dry_run]
 
         result = @backend.run_command(command)
         exit_status = result.exit_status

data/lib/rundock/builder/operation_builder.rb

@@ -126,7 +126,7 @@ module Rundock
                                     else
                                       !cli_options[:run_anyway]
                                     end
-          node_attributes.dry_run = (cli_options && cli_options[:dry_run]) ? true : false
+          node_attributes.dry_run = cli_options && cli_options[:dry_run]
         end
 
         # override by scenario

data/lib/rundock/builder/target_builder.rb

@@ -16,11 +16,11 @@ module Rundock
           backend_builder = BackendBuilder.new(@options, target_name, target_info)
           backend = backend_builder.build
           @parsed_node_options = { target_name.to_sym => backend_builder.parsed_options }
-
-          return Node.new(target_name, backend)
         else
           raise TargetNoSupportError
         end
+
+        Node.new(target_name, backend)
       end
 
       def build_group(target_group_name, target_info)

data/lib/rundock/runner.rb

@@ -29,13 +29,11 @@ module Rundock
 
     def build(options)
       if options[:scenario] || options[:targetgroup]
-        raise ScenarioNotFoundError,
-              "'#{options[:scenario]}' scenario file is not found." if options[:scenario] &&
-                                                                       !FileTest.exist?(options[:scenario])
-        raise ScenarioNotFoundError,
-              "'#{options[:targetgroup]}' targetgroup file is not found." if options[:command] &&
-                                                                             options[:targetgroup] &&
-                                                                             !FileTest.exist?(options[:targetgroup])
+        raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found." if options[:scenario] &&
+                                                                                              !FileTest.exist?(options[:scenario])
+        raise ScenarioNotFoundError, "'#{options[:targetgroup]}' targetgroup file is not found." if options[:command] &&
+                                                                                                    options[:targetgroup] &&
+                                                                                                    !FileTest.exist?(options[:targetgroup])
 
         options[:scenario] = options[:targetgroup] if options[:command] && options[:targetgroup]
 

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/integration/groups/simple_host_group.yml

@@ -5,8 +5,8 @@
 ---
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"

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

@@ -6,10 +6,10 @@ PROJECT_NAME=rundock_spec
 PLATFORM_NAME=centos6
 PLATFORM_DIR="${PROJECT_ROOT}/platforms/${PLATFORM_NAME}"
 DOCKER_IMAGE_NAME="${PROJECT_NAME}/${PLATFORM_NAME}"
-DOCKER_ADDRESS="172.17.42.1"
+DOCKER_BRIDGE_ADDRESS=`ip addr show | grep "global docker0" | awk '{print $2}' | cut -d'/' -f1`
+DOCKER_BRIDGE_SSH_PORT=22222
 DOCKER_CACHE_DIR="${HOME}/docker"
 DOCKER_CACHE_IMAGE_PATH="${DOCKER_CACHE_DIR}/${PLATFORM_NAME}.tar"
-DOCKER_SSH_PORT=22222
 DOCKER_SSH_USER=tester
 DOCKER_SSH_KEY_PRIVATE="${HOME}/.ssh/id_rsa_${PROJECT_NAME}_${PLATFORM_NAME}_tmp"
 DOCKER_SSH_KEY_PUBLIC_LOCAL="${HOME}/.ssh/id_rsa_${PROJECT_NAME}_${PLATFORM_NAME}_tmp.pub"
@@ -49,7 +49,7 @@ mkdir -p "${RUNDOCK_TARGET_CACHE_DIR}"
 if [ ! -f ${RUNDOCK_DEFAULT_SSH_YML} ]; then
 (
 cat << EOP
-:port: ${DOCKER_SSH_PORT}
+:port: ${DOCKER_BRIDGE_SSH_PORT}
 :paranoid: false
 :user: "${DOCKER_SSH_USER}"
 :keys: ["${DOCKER_SSH_KEY_PRIVATE}"]
@@ -62,11 +62,23 @@ cp ${RUNDOCK_GROUP_DIR}/* ${RUNDOCK_GROUP_CACHE_DIR}
 cp ${RUNDOCK_TARGET_DIR}/* ${RUNDOCK_TARGET_CACHE_DIR}
 
 find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" | \
-  xargs sed -i -e "s#<replaced_by_platforms>#${DOCKER_SSH_KEY_PRIVATE}#g"
+  xargs sed -i -e "s#<replaced_by_platforms_key>#${DOCKER_SSH_KEY_PRIVATE}#g"
 find ${RUNDOCK_GROUP_CACHE_DIR} -type f -name "*_group.yml" | \
-  xargs sed -i -e "s#<replaced_by_platforms>#${DOCKER_SSH_KEY_PRIVATE}#g"
+  xargs sed -i -e "s#<replaced_by_platforms_key>#${DOCKER_SSH_KEY_PRIVATE}#g"
 find ${RUNDOCK_TARGET_CACHE_DIR} -type f -name "*.yml" | \
-  xargs sed -i -e "s#<replaced_by_platforms>#${DOCKER_SSH_KEY_PRIVATE}#g"
+  xargs sed -i -e "s#<replaced_by_platforms_key>#${DOCKER_SSH_KEY_PRIVATE}#g"
+find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_host>#${DOCKER_BRIDGE_ADDRESS}#g"
+find ${RUNDOCK_GROUP_CACHE_DIR} -type f -name "*_group.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_host>#${DOCKER_BRIDGE_ADDRESS}#g"
+find ${RUNDOCK_TARGET_CACHE_DIR} -type f -name "*.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_host>#${DOCKER_BRIDGE_ADDRESS}#g"
+find ${RUNDOCK_SCENARIO_CACHE_DIR} -type f -name "*_scenario.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_port>#${DOCKER_BRIDGE_SSH_PORT}#g"
+find ${RUNDOCK_GROUP_CACHE_DIR} -type f -name "*_group.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_port>#${DOCKER_BRIDGE_SSH_PORT}#g"
+find ${RUNDOCK_TARGET_CACHE_DIR} -type f -name "*.yml" | \
+  xargs sed -i -e "s#<replaced_by_platforms_port>#${DOCKER_BRIDGE_SSH_PORT}#g"
 
 sudo docker ps | grep "${DOCKER_IMAGE_NAME}" && { echo "docker image is already standing."; exit 0; }
 
@@ -85,11 +97,11 @@ sudo docker build -t "${DOCKER_IMAGE_NAME}" ${PLATFORM_DIR}
 rm -f ${DOCKER_SSH_KEY_PUBLIC_REMOTE}
 mkdir -p ${DOCKER_CACHE_DIR}
 sudo docker save "${DOCKER_IMAGE_NAME}" > ${DOCKER_CACHE_IMAGE_PATH}
-sudo docker run -d --privileged -p ${DOCKER_ADDRESS}:${DOCKER_SSH_PORT}:22 "${DOCKER_IMAGE_NAME}"
+sudo docker run -d --privileged -p ${DOCKER_BRIDGE_ADDRESS}:${DOCKER_BRIDGE_SSH_PORT}:22 "${DOCKER_IMAGE_NAME}"
 
 echo "Host ${PLATFORM_NAME}"                          >  $DOCKER_SSH_CONFIG
-echo "        HostName ${DOCKER_ADDRESS}"             >> $DOCKER_SSH_CONFIG
+echo "        HostName ${DOCKER_BRIDGE_ADDRESS}"      >> $DOCKER_SSH_CONFIG
 echo "        User     ${DOCKER_SSH_USER}"            >> $DOCKER_SSH_CONFIG
-echo "        Port     ${DOCKER_SSH_PORT}"            >> $DOCKER_SSH_CONFIG
+echo "        Port     ${DOCKER_BRIDGE_SSH_PORT}"     >> $DOCKER_SSH_CONFIG
 echo "        IdentityFile ${DOCKER_SSH_KEY_PRIVATE}" >> $DOCKER_SSH_CONFIG
 echo "        StrictHostKeyChecking no"               >> $DOCKER_SSH_CONFIG

data/spec/integration/scenarios/all_file_hooks_by_option_scenario.yml

@@ -7,8 +7,8 @@
   hook: all
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"

data/spec/integration/scenarios/cwd_scenario.yml

@@ -6,11 +6,11 @@
     - pwd_echo
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 pwd_echo:
   command:

data/spec/integration/scenarios/deploy_erb_scenario.yml

@@ -8,11 +8,11 @@
     - deploy_task
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 deploy_task:
   command:

data/spec/integration/scenarios/deploy_scenario.yml

@@ -12,11 +12,11 @@
     - deploy_task
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 deploy_task:
   deploy:

data/spec/integration/scenarios/file_hooks_by_option_scenario.yml

@@ -14,8 +14,8 @@
     - file_array_2
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"

data/spec/integration/scenarios/file_hooks_scenario.yml

@@ -9,11 +9,11 @@
     - file_hook_two
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 ---
 file_hook_one:

data/spec/integration/scenarios/simple_echo_scenario.yml

@@ -15,18 +15,18 @@
 ---
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 anyhost-02:
   target_type: host
-  host: "172.17.42.1"
+  host: "<replaced_by_platforms_host>"
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    keys: ["<replaced_by_platforms>"]
+    keys: ["<replaced_by_platforms_key>"]
 ---
 echo_platform:
   command:

data/spec/integration/scenarios/simple_plugin_scenario.yml

@@ -3,11 +3,11 @@
     - write_echo
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 write_echo:
   sample_operation:

data/spec/integration/scenarios/sudo_scenario.yml

@@ -6,11 +6,11 @@
     - sudo_touch
 ---
 anyhost-01:
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 sudo_touch:
   command:

data/spec/integration/scenarios/target_group_scenario.yml

@@ -19,18 +19,18 @@ target_group_02:
     - anyhost-02
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 anyhost-02:
   target_type: host
-  host: "172.17.42.1"
+  host: "<replaced_by_platforms_host>"
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    keys: ["<replaced_by_platforms>"]
+    keys: ["<replaced_by_platforms_key>"]
 ---
 write_echo_01:
   command:

data/spec/integration/scenarios/task_by_option_scenario.yml

@@ -9,8 +9,8 @@
 ---
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"

data/spec/integration/scenarios/task_with_args_scenario.yml

@@ -6,11 +6,11 @@
 ---
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 ---
 write_echo:
   command:

data/spec/integration/targets/target_by_option.yml

@@ -1,8 +1,8 @@
 anyhost-01:
   target_type: host
-  host: 172.17.42.1
+  host: <replaced_by_platforms_host>
   ssh_opts:
-    port: 22222
+    port: <replaced_by_platforms_port>
     user: tester
-    key: "<replaced_by_platforms>"
+    key: "<replaced_by_platforms_key>"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple and extensible server orchestration framework