rundock 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d00dfb1b4e328b253c9a566e2ba01043018c993
-  data.tar.gz: d76ebd204fa24b34db93c347f092cba6016dda66
+  metadata.gz: bcfd3d43abf83f98725cee3d7491bad4df9ee51f
+  data.tar.gz: 1d82c40d5cb2b880630eed568193ab042511be2a
 SHA512:
-  metadata.gz: e4942411fc3dfb1419da7cbddf5434f627c1f6a94d925f6c643ce1305585a7fc98b168a2aec70340f2d738676123d3bc8b923ef8c85e6f4ceeafca5b57cfc8c7
-  data.tar.gz: 07f54fb15feb55d8de8aef4e3241d6341d841cc2ae520283d2cc58ba0600f0457226cac957817ce98baf23b90b5c87af7025965ad38bdb36873c2e60a41dafff
+  metadata.gz: e29c7362f2454b6436fd199c156062e36740995ca57b25254de52e9fb34d711d4bd2dbce0a1ead397fdc5d7a31a52be02216d0b1f842a93249b90f2676ace9a2
+  data.tar.gz: 9db5cb49b8e533bfc59cfa3add439471abf1018cd426f369d372d0dfae987dbce4d89d601d7d72445e3272d1c2d1730781febf9a96bbfd669a47db118c7f7c92

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.5.3
+
+Update
+
+- Support taskfile
+- Support targetfile
+
 ## v0.5.2
 
 Update

data/Rakefile

@@ -73,14 +73,17 @@ def do_rundock_scenarios(platform)
       default_ssh_opt = ''
     end
 
-    if scenario =~ %r{^*scenarios/(.*_hooks_by_option)_scenario.yml$}
-      hooks_opt = " -k ./spec/integration/hooks/#{Regexp.last_match(1)}.yml"
-    else
-      hooks_opt = ''
+    options = ''
+    if scenario =~ %r{^*scenarios/(.*hooks_by_option)_scenario.yml$}
+      options = " -k ./spec/integration/hooks/#{Regexp.last_match(1)}.yml"
+    elsif scenario =~ %r{^*scenarios/(.*task_by_option)_scenario.yml$}
+      options = " -t ./spec/integration/tasks/#{Regexp.last_match(1)}.yml"
+    elsif scenario =~ %r{^*scenarios/(.*target_by_option)_scenario.yml$}
+      options = " -g #{base_dir}/targets/#{Regexp.last_match(1)}.yml"
     end
 
     execute('bundle exec exe/rundock' \
-       " do #{scenario}#{default_ssh_opt}#{hooks_opt} -l debug", true)
+       " do #{scenario}#{default_ssh_opt}#{options} -l debug", true)
   end
 end
 

data/lib/rundock/builder/hook_builder.rb

@@ -4,7 +4,7 @@ module Rundock
   module Builder
     class HookBuilder < Base
       DEFAULT_HOOKS_FILE_PATH = './hooks.yml'
-      HookStructureError = Class.new(NotImplementedError)
+      HookStructureError = Class.new(StandardError)
 
       attr_accessor :enable_hooks
 
@@ -21,9 +21,12 @@ module Rundock
           if FileTest.exist?(@options[:hooks])
             hooks_file = @options[:hooks]
             Logger.info("hooks file is #{hooks_file}")
-          else
+          elsif FileTest.exist?(DEFAULT_HOOKS_FILE_PATH)
             Logger.warn("hooks file is not found. use #{DEFAULT_HOOKS_FILE_PATH}")
             hooks_file = DEFAULT_HOOKS_FILE_PATH
+          else
+            Logger.warn("Hook path is not available. (#{@options[:hooks]})")
+            return []
           end
         elsif hook_attributes.nil?
           Logger.warn("Hook source is not found. (enables:#{enables.join(',')})") unless enables.empty?

data/lib/rundock/builder/operation_builder.rb

@@ -2,10 +2,6 @@ module Rundock
   module Builder
     class OperationBuilder < Base
       def build_first(scenario, targets, tasks, hooks)
-        if @options[:targetgroup] && !@options[:command]
-          raise CommandArgNotFoundError, %("--command or -c" option is required if targetgroup specified.)
-        end
-
         parsing_node_attribute = nil
         scen = Scenario.new
         scen.tasks = tasks

data/lib/rundock/builder/scenario_builder.rb

@@ -52,8 +52,8 @@ module Rundock
         ope = OperationBuilder.new(@options)
         ope.build_first(
           scenario_data[:main],
-          scenario_data[:target_info],
-          scenario_data[:tasks],
+          @options[:command] ? scenario_data[:target_info] : TargetGroupBuilder.new(@options).build(scenario_data[:target_info]),
+          TaskBuilder.new(@options).build(scenario_data[:tasks]),
           scenario_data[:hooks])
       end
     end

data/lib/rundock/builder/target_group_builder.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module Rundock
+  module Builder
+    class TargetGroupBuilder < Base
+      DEFAULT_TARGET_GROUP_FILE_PATH = './targetgroup.yml'
+
+      def build(scenario_targets)
+        targets = {} unless scenario_targets
+
+        if @options[:targetgroup]
+          if FileTest.exist?(@options[:targetgroup])
+            targets.merge!(YAML.load_file(@options[:targetgroup]).deep_symbolize_keys)
+            Logger.info("merged target file #{@options[:targetgroup]}")
+          elsif FileTest.exist?(DEFAULT_TARGET_GROUP_FILE_PATH)
+            Logger.warn("targetgroup file is not found. use #{DEFAULT_TARGET_GROUP_FILE_PATH}")
+            targets.merge!(YAML.load_file(DEFAULT_TARGET_GROUP_FILE_PATH).deep_symbolize_keys)
+          else
+            Logger.warn("Targetgroup path is not available. (#{@options[:targetgroup]})")
+          end
+        else
+          return scenario_targets
+        end
+
+        targets
+      end
+    end
+  end
+end

data/lib/rundock/builder/task_builder.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module Rundock
+  module Builder
+    class TaskBuilder < Base
+      DEFAULT_TASKS_FILE_PATH = './tasks.yml'
+
+      def build(scenario_tasks)
+        tasks = {} unless scenario_tasks
+
+        if @options[:tasks]
+          if FileTest.exist?(@options[:tasks])
+            tasks.merge!(YAML.load_file(@options[:tasks]).deep_symbolize_keys)
+            Logger.info("merged tasks file #{@options[:tasks]}")
+          elsif FileTest.exist?(DEFAULT_TASKS_FILE_PATH)
+            Logger.warn("tasks file is not found. use #{DEFAULT_TASKS_FILE_PATH}")
+            tasks.merge!(YAML.load_file(DEFAULT_TASKS_FILE_PATH).deep_symbolize_keys)
+          else
+            Logger.warn("Task path is not available. (#{@options[:tasks]})")
+          end
+        else
+          return scenario_tasks
+        end
+
+        tasks
+      end
+    end
+  end
+end

data/lib/rundock/cli.rb

@@ -31,6 +31,8 @@ module Rundock
     desc 'do [SCENARIO] [options]', 'Run rundock from scenario file'
     option :sudo, type: :boolean, default: false
     option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
+    option :targetgroup, type: :string, aliases: ['-g']
+    option :tasks, type: :string, aliases: ['-t']
     option :hooks, type: :string, aliases: ['-k']
     option :run_anyway, type: :boolean, default: false
     option :dry_run, type: :boolean, aliases: ['-n']
@@ -44,6 +46,7 @@ module Rundock
     desc 'ssh [options]', 'Run rundock ssh with various options'
     option :command, type: :string, aliases: ['-c']
     option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
+    option :tasks, type: :string, aliases: ['-t']
     option :hooks, type: :string, aliases: ['-k']
     option :host, type: :string, aliases: ['-h'], banner: 'You can specify comma separated hosts.[ex: host1,host2,..]'
     option :targetgroup, type: :string, aliases: ['-g']

data/lib/rundock/runner.rb

@@ -31,11 +31,11 @@ module Rundock
       if options[:scenario] || options[:targetgroup]
         if options[:scenario] && !FileTest.exist?(options[:scenario])
           raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found."
-        elsif options[:targetgroup] && !FileTest.exist?(options[:targetgroup])
+        elsif options[:command] && options[:targetgroup] && !FileTest.exist?(options[:targetgroup])
           raise ScenarioNotFoundError, "'#{options[:targetgroup]}' targetgroup file is not found."
         end
 
-        options[:scenario] = options[:targetgroup] if options[:targetgroup]
+        options[:scenario] = options[:targetgroup] if options[:command] && options[:targetgroup]
 
         # parse scenario
         if options[:scenario] =~ %r{^(http|https)://}

data/lib/rundock/version.rb

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

data/lib/rundock.rb

@@ -15,6 +15,8 @@ require 'rundock/scenario'
 require 'rundock/backend'
 require 'rundock/builder/base'
 require 'rundock/builder/default_ssh_builder'
+require 'rundock/builder/target_group_builder'
+require 'rundock/builder/task_builder'
 require 'rundock/builder/target_builder'
 require 'rundock/builder/backend_builder'
 require 'rundock/builder/hook_builder'

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

@@ -17,15 +17,18 @@ DOCKER_SSH_KEY_PUBLIC_REMOTE="${PLATFORM_DIR}/authorized_keys"
 DOCKER_SSH_CONFIG="${HOME}/.ssh/config_${PROJECT_NAME}_${PLATFORM_NAME}"
 RUNDOCK_SCENARIO_DIR="${PROJECT_ROOT}/scenarios"
 RUNDOCK_GROUP_DIR="${PROJECT_ROOT}/groups"
+RUNDOCK_TARGET_DIR="${PROJECT_ROOT}/targets"
 RUNDOCK_CACHE_DIR="${HOME}/.rundock/${PLATFORM_NAME}"
 RUNDOCK_DEFAULT_SSH_YML="${RUNDOCK_CACHE_DIR}/integration_default_ssh.yml"
 RUNDOCK_SCENARIO_CACHE_DIR="${RUNDOCK_CACHE_DIR}/scenarios"
 RUNDOCK_GROUP_CACHE_DIR="${RUNDOCK_CACHE_DIR}/groups"
+RUNDOCK_TARGET_CACHE_DIR="${RUNDOCK_CACHE_DIR}/targets"
 
 if [ "${1}x" = "--cleanx" ];then
   rm -f ${RUNDOCK_DEFAULT_SSH_YML}
   rm -f ${RUNDOCK_SCENARIO_CACHE_DIR}/*.yml
   rm -f ${RUNDOCK_GROUP_CACHE_DIR}/*.yml
+  rm -f ${RUNDOCK_TARGET_CACHE_DIR}/*.yml
   if sudo docker ps | grep "${DOCKER_IMAGE_NAME}" > /dev/null; then
     rm -f ${DOCKER_CACHE_IMAGE_PATH}
     rm -f ${DOCKER_SSH_KEY_PRIVATE}
@@ -41,6 +44,7 @@ fi
 
 mkdir -p "${RUNDOCK_SCENARIO_CACHE_DIR}"
 mkdir -p "${RUNDOCK_GROUP_CACHE_DIR}"
+mkdir -p "${RUNDOCK_TARGET_CACHE_DIR}"
 
 if [ ! -f ${RUNDOCK_DEFAULT_SSH_YML} ]; then
 (
@@ -55,11 +59,14 @@ fi
 
 cp ${RUNDOCK_SCENARIO_DIR}/* ${RUNDOCK_SCENARIO_CACHE_DIR}
 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"
 find ${RUNDOCK_GROUP_CACHE_DIR} -type f -name "*_group.yml" | \
   xargs sed -i -e "s#<replaced_by_platforms>#${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"
 
 sudo docker ps | grep "${DOCKER_IMAGE_NAME}" && { echo "docker image is already standing."; exit 0; }
 

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

@@ -0,0 +1,10 @@
+- target: anyhost-01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_by_option_scenario"
+  task:
+    - write_echo
+---
+---
+write_echo:
+  command:
+    - "echo 'Hello Rundock from target by option Scenario.' > /var/tmp/hello_rundock_from_target_by_option_scenario"

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

@@ -0,0 +1,5 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_task_by_option_scenario"
+  task:
+    - write_echo

data/spec/integration/platforms/localhost/targets/target_by_option.yml

@@ -0,0 +1,2 @@
+anyhost-01:
+  host: localhost

data/spec/integration/recipes/target_by_option_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_target_by_option_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from target by option Scenario./) }
+end

data/spec/integration/recipes/task_by_option_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_task_by_option_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from task by option Scenario./) }
+end

data/spec/integration/scenarios/target_by_option_scenario.yml

@@ -0,0 +1,13 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_by_option_scenario"
+- target: anyhost-01
+  command:
+    - "uname -a"
+  task:
+    - write_echo
+---
+---
+write_echo:
+  command:
+    - "echo 'Hello Rundock from target by option Scenario.' > /var/tmp/hello_rundock_from_target_by_option_scenario"

data/spec/integration/scenarios/task_by_option_scenario.yml

@@ -0,0 +1,16 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_task_by_option_scenario"
+- target: anyhost-01
+  command:
+    - "uname -a"
+  task:
+    - write_echo
+---
+anyhost-01:
+  target_type: host
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"

data/spec/integration/targets/target_by_option.yml

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

data/spec/integration/tasks/task_by_option.yml

@@ -0,0 +1,3 @@
+write_echo:
+  command:
+    - "echo 'Hello Rundock from task by option Scenario.' > /var/tmp/hello_rundock_from_task_by_option_scenario"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,8 @@ files:
 - lib/rundock/builder/operation_builder.rb
 - lib/rundock/builder/scenario_builder.rb
 - lib/rundock/builder/target_builder.rb
+- lib/rundock/builder/target_group_builder.rb
+- lib/rundock/builder/task_builder.rb
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
 - lib/rundock/ext/object/blank.rb
@@ -195,8 +197,11 @@ 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/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/deploy_erb_spec.rb
 - spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/file_hook_by_option_spec.rb
@@ -205,6 +210,8 @@ files:
 - spec/integration/recipes/simple_echo_spec.rb
 - spec/integration/recipes/simple_plugin_scenario_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/deploy_erb_scenario.yml
 - spec/integration/scenarios/deploy_scenario.yml
@@ -212,9 +219,13 @@ files:
 - spec/integration/scenarios/file_hooks_scenario.yml
 - spec/integration/scenarios/simple_echo_scenario.yml
 - spec/integration/scenarios/simple_plugin_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
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
+- spec/integration/targets/target_by_option.yml
+- spec/integration/tasks/task_by_option.yml
 homepage: https://github.com/hiracy/rundock
 licenses:
 - MIT