rundock 0.4.16 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c0aa8f73630ca0f4fcab31e3db5fe9d6c56e4a
-  data.tar.gz: 93a2cabce87a681f76f5a344b4d36135365a85ba
+  metadata.gz: c2edc8af21fef25b6da99b4b109b52e5bc706211
+  data.tar.gz: 737f981e31b4507c83d4c9727694465e8e8aa65f
 SHA512:
-  metadata.gz: cf3d9806d2389fbf71c5eb34523e9d3bc9f3c6dbfb7a2b6a9060d77c86840f3bb22bbdf65c570d119159efa4a1cca77a97758ffa89d6ab5d113609c4611eeb84
-  data.tar.gz: d6c254e1e05c9c836b9f2bba9166c4119cfd2aac76113306acc79b72d791dc01c5bde8d9d865d6503a45091ed3bcfd784538f814837d4255b5ae3dc91a918a06
+  metadata.gz: 0adfd065978317da2da25ee3a4301556496ab7cbe164854440e3c96d2c4a631da974c069d34603a1292b06cb0a9ea998a81b1db825614d3964df2bc382835a35
+  data.tar.gz: cefbc63aacef98bdd97015735b0caa6e7256a84bbe917f8b8e312047f8a786fc82c7373a0036e5936be4c01c2c17fb21dbe14bf4d5e2be6003be80a321333d2c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.5.0
+
+Update
+
+- Change scenario 'node' attribute to 'target'
+
 ## v0.4.16
 
 Update

data/README.md

@@ -18,14 +18,14 @@ $ gem install rundock
 
 ## Usage
 
-Edit your hostgroup to "hostgroup.yml" like this sample.
+Edit your targetgroup to "targetgroup.yml" like this sample.
 
 ```
-# node section
-- node: 192.168.1.11
-- node: host-alias-01
+# target section
+- target: 192.168.1.11
+- target: host-alias-01
 ---
-# host information section
+# target information section
 host-alias-01:
   host: 192.168.1.12
   ssh_opts:
@@ -36,7 +36,7 @@ host-alias-01:
 
 and execute rundock.
 
-    $ rundock ssh -g /path/to/your-dir/hostgroup.yml -c 'your-gread-command'
+    $ rundock ssh -g /path/to/your-dir/targetgroup.yml -c 'your-gread-command'
 
 or
 
@@ -44,18 +44,18 @@ Edit your operation scenario to "[scenario.yml](https://github.com/hiracy/rundoc
 
 ```
 # scenario section
-- node: 192.168.1.11
+- target: 192.168.1.11
   command:
     - "sudo hostname new-host-01"
     - "sudo sed -i -e 's/HOSTNAME=old-host-01/HOSTNAME=new-host-01/g' /etc/sysconfig/network"
-- node: host-alias-01
+- target: host-alias-01
   command:
     - "sudo yum -y install ruby"
   task:
     - update_gem
     - install_bundler
 ---
-# host information section
+# target information section
 host-alias-01:
   host: 192.168.1.12
   ssh_opts:
@@ -80,17 +80,17 @@ 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.
 
 ```
-$ rundock ssh -g /path/to/your-dir/hostgroup.yml -c 'your-gread-command' -d /path/to/your-dir/default_ssh_options.yml
+$ rundock ssh -g /path/to/your-dir/targetgroup.yml -c 'your-gread-command' -d /path/to/your-dir/default_ssh_options.yml
 ```
 ```
-$ rundock do -s /path/to/your-dir/scenario.yml -d /path/to/your-dir/default_ssh_options.yml
+$ 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.
 
 ## Documentations
 
-Now on editing...
+- [Rundock Wiki](https://github.com/hiracy/rundock/wiki)
 
 ## Run tests
 

data/lib/rundock.rb

@@ -15,6 +15,7 @@ require 'rundock/scenario'
 require 'rundock/backend'
 require 'rundock/builder/base'
 require 'rundock/builder/default_ssh_builder'
+require 'rundock/builder/target_builder'
 require 'rundock/builder/backend_builder'
 require 'rundock/builder/hook_builder'
 require 'rundock/builder/operation_builder'

data/lib/rundock/attribute/node_attribute.rb

@@ -14,7 +14,7 @@ module Rundock
         :dry_run
       ]
 
-      def finalize_node
+      def next
         list.each do |k, _v|
           define_attr(k, nil) unless AVAIL_TAKE_OVERS.include?(k)
         end

data/lib/rundock/builder/operation_builder.rb

@@ -1,47 +1,52 @@
 module Rundock
   module Builder
     class OperationBuilder < Base
-      def build_first(scenario, node_info, tasks, hooks)
-        if @options[:hostgroup] && !@options[:command]
-          raise CommandArgNotFoundError, %("--command or -c" option is required if hostgroup specified.)
+      def build_first(scenario, targets, tasks, hooks)
+        if @options[:targetgroup] && !@options[:command]
+          raise CommandArgNotFoundError, %("--command or -c" option is required if targetgroup specified.)
         end
 
         node = nil
+        node_attribute = nil
         scen = Scenario.new
-        node_attribute = Rundock::Attribute::NodeAttribute.new(task_info: {})
-        tasks.each { |k, v| node_attribute.task_info[k] = v } if tasks
-        scen.node_info = node_info
-        scen.node_info = {} unless node_info
         scen.tasks = tasks
 
         # use scenario file
         scenario.each do |n|
           scen.nodes.push(node) if node
 
-          n.deep_symbolize_keys.each do |k, v|
-            if k == :node
-              node_attribute.finalize_node
-              backend_builder = BackendBuilder.new(@options, v, node_info)
-              backend = backend_builder.build
-
-              node = Node.new(v, backend)
-              node_attribute.nodename = v
-              scen.node_info[v.to_sym] = node_attribute.nodeinfo = backend_builder.parsed_options
+          n.deep_symbolize_keys.each do |sk, sv|
+            if sk == :target
+              target_builder = TargetBuilder.new(@options)
+              target = target_builder.build(sv, targets)
+
+              if target.is_a?(Node)
+                if node_attribute.nil?
+                  node_attribute = Rundock::Attribute::NodeAttribute.new(task_info: {})
+                else
+                  node_attribute.next
+                end
+
+                node_attribute.nodename = sv
+                node = target
+                tasks.each { |k, v| node_attribute.task_info[k] = v } if tasks
+                scen.node_info[sv.to_sym] = node_attribute.nodeinfo = target_builder.parsed_options
+              end
 
               if @options[:command]
                 node.add_operation(build_cli_command_operation(@options[:command], node_attribute, @options))
               end
-            elsif k == :hook
+            elsif sk == :hook
               hooks_builder = HookBuilder.new(@options)
               if node
-                node.hooks = hooks_builder.build(Array(v), hooks)
+                node.hooks = hooks_builder.build(Array(sv), hooks)
                 node_attribute.hooks = hooks_builder.enable_hooks
               end
             else
 
               next unless node
 
-              ope = build_operations(k, Array(v), node_attribute, @options, false)
+              ope = build_operations(sk, Array(sv), node_attribute, @options, false)
               node.add_operation(ope) if ope
             end
           end

data/lib/rundock/builder/scenario_builder.rb

@@ -22,8 +22,8 @@ module Rundock
         build_scenario_with_file
       end
 
-      def build_task(tasks, backend, node_attributes)
-        OperationBuilder.new(@options).build_task(tasks, backend, node_attributes)
+      def build_task(tasks, backend, target_attributes)
+        OperationBuilder.new(@options).build_task(tasks, backend, target_attributes)
       end
 
       private
@@ -37,7 +37,7 @@ module Rundock
       def build_scenario_with_file
         if @scenario_file
 
-          type = [:main, :node_info, :tasks, :hooks]
+          type = [:main, :target_info, :tasks, :hooks]
           scenario_data = {}
 
           YAML.load_documents(@scenario_file).each_with_index do |data, idx|
@@ -52,7 +52,7 @@ module Rundock
         ope = OperationBuilder.new(@options)
         ope.build_first(
           scenario_data[:main],
-          scenario_data[:node_info],
+          scenario_data[:target_info],
           scenario_data[:tasks],
           scenario_data[:hooks])
       end

data/lib/rundock/builder/target_builder.rb

@@ -0,0 +1,25 @@
+module Rundock
+  module Builder
+    class TargetBuilder < Base
+      TargetNoSupportError = Class.new(NotImplementedError)
+
+      attr_accessor :parsed_options
+
+      def build(target_name, target_info)
+        if target_info.nil? ||
+           !target_info.key?(target_name.to_sym) ||
+           !target_info[target_name.to_sym].key?(:target_type) ||
+           target_info[target_name.to_sym][:target_type] == 'host'
+
+          backend_builder = BackendBuilder.new(@options, target_name, target_info)
+          backend = backend_builder.build
+          @parsed_options = backend_builder.parsed_options
+
+          return Node.new(target_name, backend)
+        else
+          raise TargetNoSupportError
+        end
+      end
+    end
+  end
+end

data/lib/rundock/cli.rb

@@ -5,7 +5,7 @@ module Rundock
   class CLI < Thor
     DEFAULT_SCENARIO_FILE_PATH = './scenario.yml'
     DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH = './default_ssh.yml'
-    DEFAULT_HOSTGROUP_FILE_PATH = './hostgroup.yml'
+    DEFAULT_HOSTGROUP_FILE_PATH = './targetgroup.yml'
 
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
     class_option :color, type: :boolean, default: true
@@ -46,7 +46,7 @@ module Rundock
     option :default_ssh_opts, type: :string, aliases: ['-d'], default: DEFAULT_SSH_OPTIONS_DEFAULT_FILE_PATH
     option :hooks, type: :string, aliases: ['-k']
     option :host, type: :string, aliases: ['-h'], banner: 'You can specify comma separated hosts.[ex: host1,host2,..]'
-    option :hostgroup, type: :string, aliases: ['-g']
+    option :targetgroup, type: :string, aliases: ['-g']
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']

data/lib/rundock/runner.rb

@@ -8,7 +8,7 @@ module Rundock
 
     class << self
       def run(options)
-        Logger.debug 'Starting Rundoc:'
+        Logger.debug 'Starting Rundock:'
 
         runner = self.new(options)
         runner.load_plugins
@@ -28,14 +28,14 @@ module Rundock
     end
 
     def build(options)
-      if options[:scenario] || options[:hostgroup]
+      if options[:scenario] || options[:targetgroup]
         if options[:scenario] && !FileTest.exist?(options[:scenario])
           raise ScenarioNotFoundError, "'#{options[:scenario]}' scenario file is not found."
-        elsif options[:hostgroup] && !FileTest.exist?(options[:hostgroup])
-          raise ScenarioNotFoundError, "'#{options[:hostgroup]}' hostgroup file is not found."
+        elsif options[:targetgroup] && !FileTest.exist?(options[:targetgroup])
+          raise ScenarioNotFoundError, "'#{options[:targetgroup]}' targetgroup file is not found."
         end
 
-        options[:scenario] = options[:hostgroup] if options[:hostgroup]
+        options[:scenario] = options[:targetgroup] if options[:targetgroup]
 
         # parse scenario
         if options[:scenario] =~ %r{^(http|https)://}

data/lib/rundock/scenario.rb

@@ -6,6 +6,7 @@ module Rundock
 
     def initialize
       @nodes = []
+      @node_info = {}
     end
 
     def run

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.4.16'
+  VERSION = '0.5.0'
 end

data/scenario_sample.yml

@@ -3,41 +3,47 @@
 #
 # -------------------------------------------------------------------
 # ###  scenario section  ###
-# - node: <nodename>
-#   <taskname>:
-#     - <task detail>
+# - target: <target_name>
+#   <operation_name>:
+#     - <operation_detail>
 #     - :
-#   <taskname>:
-#     - <task detail>
-#     - :
-# - node: <nodename>
+#   <operation_name>:
+#     :
+# - target: <target_name>
 #   :
 # ---
-# ###  host information section  ###
-# <hostname>:
-#   host: xxx.xxx.xxx.xxx
-#   <other_attributes>:
+# ###  target information section  ###
+# <target_name>:
+#   target_type: host
+#   <target_attributes>:
 #     :
-# <hostname>:
+# <target_name>:
 #   :
 # ---
-# ###  task information section  ###
+# ###  task section  ###
 # <taskname>:
 #   - "<actual command>"
 #   - :
 # <taskname>:
 #   :
+# ---
+# ###  hook section  ###
+# <hookname>:
+#   hook_type: <hook_type>
+#   <hook_attribute_key>: <hook_attribute_value>
+#     :
+# <hookname>:
+#   :
 # -------------------------------------------------------------------
 #
 
-- node: 127.0.0.1
+- target: 127.0.0.1
   command:
     - "hostname"
     - "uname -a"
   hook:
-    - mail
-    - file
-- node: anyhost-01
+    - logging
+- target: anyhost-01
   task:
     - echo_platform
     - echo_users
@@ -50,6 +56,7 @@
   hook: all
 ---
 anyhost-01:
+  target_type: host
   host: 192.168.1.11
   ssh_opts:
     port: 22
@@ -65,3 +72,7 @@ echo_users:
   command:
     - "whoami"
     - "w"
+---
+logging:
+  hook_type: file
+  filepath: /var/log/rundock.log

data/spec/integration/groups/simple_host_group.yml

@@ -1,9 +1,10 @@
-- node: localhost
+- target: localhost
   command:
     - "echo 'Should this message does not appear';cat /notexist"
-- node: anyhost-01
+- target: anyhost-01
 ---
 anyhost-01:
+  target_type: host
   host: 172.17.42.1
   ssh_opts:
     port: 22222

data/spec/integration/platforms/centos6/Dockerfile

@@ -1,6 +1,6 @@
 FROM centos:6
 
-RUN yum install -y yum install openssh openssh-server openssh-clients sudo
+RUN yum install -y yum install openssh openssh-server openssh-clients sudo passwd
 RUN useradd tester
 RUN echo "tester" | passwd --stdin tester
 RUN mkdir -p /home/tester/.ssh; chown tester /home/tester/.ssh; chmod 700 /home/tester/.ssh

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

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_file_hook_all_1_scenario"
     - "rm -f /var/tmp/hello_rundock_from_file_hook_all_2_scenario"

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

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_scenario"
     - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_scenario"

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

@@ -1,10 +1,10 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_file_hook_one_scenario"
     - "rm -f /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
     - "rm -f /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
   hook: file_one
-- node: anyhost-01
+- target: anyhost-01
   command:
     - "echo aaa"
   hook:

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

@@ -1,8 +1,8 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_file_hook_innner_one_scenario"
   hook: file_hook_one
-- node: anyhost-01
+- target: anyhost-01
   task:
     - remove_task
   hook:

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

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - errexit: false
     - "rm /noexistdir/noexistfile1"

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

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_scenario"
   task:

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

@@ -1,10 +1,11 @@
-- node: anyhost-01
+- target: anyhost-01
   host_inventory:
     - memory/total
   task:
     - write_echo
 ---
 anyhost-01:
+  target_type: host
   host: localhost
 ---
 write_echo:

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

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - "hostname"
     - "uname -a"

data/spec/integration/scenarios/all_file_hooks_by_option_scenario.yml

@@ -1,4 +1,4 @@
-- node: anyhost-01
+- target: anyhost-01
   command:
     - "echo 'hookname:file_all_1 ' > /var/tmp/hello_rundock_from_file_hook_all_1_scenario"
     - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_all_1_scenario"

data/spec/integration/scenarios/deploy_scenario.yml

@@ -1,10 +1,10 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_scenario"
     - "rm -fr /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
     - "echo 'Hello Rundock from deploy Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_scenario"
     - "mkdir /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
-- node: anyhost-01
+- target: anyhost-01
   command:
     - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_scenario"
     - "rm -fr /var/tmp/hello_rundock_from_deploy_dst_dir_scenario"

data/spec/integration/scenarios/file_hooks_by_option_scenario.yml

@@ -1,4 +1,4 @@
-- node: anyhost-01
+- target: anyhost-01
   command:
     - "echo 'hookname:file_one ' > /var/tmp/hello_rundock_from_file_hook_one_scenario"
     - "echo '[DEBUG:] dumy log' >> /var/tmp/hello_rundock_from_file_hook_one_scenario"

data/spec/integration/scenarios/file_hooks_scenario.yml

@@ -1,4 +1,4 @@
-- node: anyhost-01
+- target: anyhost-01
   command:
     - "echo 'hookname:file_hook_one ' > /var/tmp/hello_rundock_from_file_hook_inner_one_scenario"
     - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_inner_one_scenario"

data/spec/integration/scenarios/simple_echo_scenario.yml

@@ -1,25 +1,27 @@
-- node: localhost
+- target: localhost
   command:
     - "rm -f /var/tmp/hello_rundock_from_scenario"
     - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"
-- node: anyhost-01
+- target: anyhost-01
   task:
     - echo_platform
   command:
     - "hostname"
-- node: anyhost-02
+- target: anyhost-02
   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>"
 anyhost-02:
+  target_type: host
   host: "172.17.42.1"
   ssh_opts:
     port: 22222

data/spec/integration/scenarios/simple_plugin_scenario.yml

@@ -1,4 +1,4 @@
-- node: anyhost-01
+- target: anyhost-01
   task:
     - write_echo
 ---

data/spec/integration/scenarios/use_default_ssh_scenario.yml

@@ -1,4 +1,4 @@
-- node: localhost
+- target: localhost
   command:
     - "hostname"
     - "uname -a"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.0
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - lib/rundock/builder/hook_builder.rb
 - lib/rundock/builder/operation_builder.rb
 - lib/rundock/builder/scenario_builder.rb
+- lib/rundock/builder/target_builder.rb
 - lib/rundock/cli.rb
 - lib/rundock/ext/hash.rb
 - lib/rundock/ext/object/blank.rb