rundock 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2edc8af21fef25b6da99b4b109b52e5bc706211
-  data.tar.gz: 737f981e31b4507c83d4c9727694465e8e8aa65f
+  metadata.gz: 3d00dfb1b4e328b253c9a566e2ba01043018c993
+  data.tar.gz: d76ebd204fa24b34db93c347f092cba6016dda66
 SHA512:
-  metadata.gz: 0adfd065978317da2da25ee3a4301556496ab7cbe164854440e3c96d2c4a631da974c069d34603a1292b06cb0a9ea998a81b1db825614d3964df2bc382835a35
-  data.tar.gz: cefbc63aacef98bdd97015735b0caa6e7256a84bbe917f8b8e312047f8a786fc82c7373a0036e5936be4c01c2c17fb21dbe14bf4d5e2be6003be80a321333d2c
+  metadata.gz: e4942411fc3dfb1419da7cbddf5434f627c1f6a94d925f6c643ce1305585a7fc98b168a2aec70340f2d738676123d3bc8b923ef8c85e6f4ceeafca5b57cfc8c7
+  data.tar.gz: 07f54fb15feb55d8de8aef4e3241d6341d841cc2ae520283d2cc58ba0600f0457226cac957817ce98baf23b90b5c87af7025965ad38bdb36873c2e60a41dafff

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.5.2
+
+Update
+
+- Support deploy ERB Template file
+
+## v0.5.1
+
+Update
+
+- Support target group in scenario section
+
 ## v0.5.0
 
 Update
@@ -87,7 +99,7 @@ Fix
 
 Improvements
 
-- Add running operation to other node infomation
+- Add running operation to other node information
 
 Fix
 

data/lib/rundock/attribute/node_attribute.rb

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

data/lib/rundock/backend.rb

@@ -43,6 +43,10 @@ module Rundock
         end
       end
 
+      def specinfra_run_command(command)
+        @backend.run_command(command)
+      end
+
       private
 
       def run_command(cmd, exec_options = {})

data/lib/rundock/builder/backend_builder.rb

@@ -19,9 +19,6 @@ module Rundock
         # update ssh options for node from node_info
         @parsed_options.merge!(@node_info[@nodename.to_sym][:ssh_opts])
 
-        # delete trash ssh_options(node[host::ssh_options])
-        @node_info[@nodename.to_sym].delete(:ssh_opts)
-
         # add any attributes for host from node_info
         @parsed_options.merge!(@node_info[@nodename.to_sym])
 

data/lib/rundock/builder/operation_builder.rb

@@ -6,53 +6,55 @@ module Rundock
           raise CommandArgNotFoundError, %("--command or -c" option is required if targetgroup specified.)
         end
 
-        node = nil
-        node_attribute = nil
+        parsing_node_attribute = nil
         scen = Scenario.new
         scen.tasks = tasks
 
-        # use scenario file
-        scenario.each do |n|
-          scen.nodes.push(node) if node
+        scenario.each do |sn|
+          nodes = []
+          operations = []
+          hook_contents = []
 
-          n.deep_symbolize_keys.each do |sk, sv|
+          sn.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
+                nodes = Array(target)
+                parsing_node_attribute = build_node_attribute(scen, sv, parsing_node_attribute, tasks, target_builder.parsed_node_options[sv.to_sym])
+                operations = Array(build_cli_command_operation(@options[:command], parsing_node_attribute, @options)) if @options[:command]
               end
-
-              if @options[:command]
-                node.add_operation(build_cli_command_operation(@options[:command], node_attribute, @options))
+            elsif sk == :target_group
+              target_builder = TargetBuilder.new(@options)
+              nodes = target_builder.build_group(sv, targets)
+              nodes.each do |n|
+                if n.is_a?(Node)
+                  parsing_node_attribute = build_node_attribute(scen, n.name, parsing_node_attribute, tasks, target_builder.parsed_node_options[n.name.to_sym])
+                  operations = Array(build_cli_command_operation(@options[:command], parsing_node_attribute, @options)) if @options[:command]
+                end
               end
             elsif sk == :hook
               hooks_builder = HookBuilder.new(@options)
-              if node
-                node.hooks = hooks_builder.build(Array(sv), hooks)
-                node_attribute.hooks = hooks_builder.enable_hooks
-              end
+              hook_contents = hooks_builder.build(Array(sv), hooks)
+              parsing_node_attribute.hooks = hooks_builder.enable_hooks
             else
+              ope = build_operations(sk, Array(sv), parsing_node_attribute, @options, false)
+              operations << ope if ope
+            end
+          end
 
-              next unless node
-
-              ope = build_operations(sk, Array(sv), node_attribute, @options, false)
-              node.add_operation(ope) if ope
+          nodes.each do |n|
+            operations.each do |o|
+              n.add_operation(o)
             end
+
+            n.hooks = hook_contents
           end
+
+          scen.nodes.concat(nodes)
         end
 
-        scen.nodes.push(node) if node
         scen
       end
 
@@ -86,8 +88,22 @@ module Rundock
 
       private
 
+      def build_node_attribute(scenario, nodename, node_attribute, tasks, parsed_options)
+        if node_attribute.nil?
+          node_attribute = Rundock::Attribute::NodeAttribute.new(task_info: {})
+        else
+          node_attribute.init_except_take_over_state
+        end
+
+        node_attribute.nodename = nodename
+        tasks.each { |k, v| node_attribute.task_info[k] = v } if tasks
+        scenario.node_info[nodename.to_sym] = node_attribute.nodeinfo = parsed_options
+
+        node_attribute
+      end
+
       def build_cli_command_operation(command, node_attributes, cli_options)
-        node_attributes.nodename = @options[:host]
+        node_attributes.nodename = @options[:host] unless node_attributes.nodename
         node_attributes.errexit = !cli_options[:run_anyway]
         node_attributes.dry_run = cli_options[:dry_run] ? true : false
         Rundock::OperationFactory.instance(:command).create(Array(command), node_attributes.list)

data/lib/rundock/builder/target_builder.rb

@@ -2,10 +2,12 @@ module Rundock
   module Builder
     class TargetBuilder < Base
       TargetNoSupportError = Class.new(NotImplementedError)
+      TargetGroupNotFoundError = Class.new(StandardError)
 
-      attr_accessor :parsed_options
+      attr_accessor :parsed_node_options
 
       def build(target_name, target_info)
+        # host type specified if target not found.
         if target_info.nil? ||
            !target_info.key?(target_name.to_sym) ||
            !target_info[target_name.to_sym].key?(:target_type) ||
@@ -13,13 +15,38 @@ module Rundock
 
           backend_builder = BackendBuilder.new(@options, target_name, target_info)
           backend = backend_builder.build
-          @parsed_options = backend_builder.parsed_options
+          @parsed_node_options = { target_name.to_sym => backend_builder.parsed_options }
 
           return Node.new(target_name, backend)
         else
           raise TargetNoSupportError
         end
       end
+
+      def build_group(target_group_name, target_info)
+        if !target_info.nil? &&
+           target_info.key?(target_group_name.to_sym) &&
+           target_info[target_group_name.to_sym][:target_type] == 'group' &&
+           target_info[target_group_name.to_sym].key?(:targets) &&
+           target_info[target_group_name.to_sym][:targets].is_a?(Array)
+
+          targets = target_info[target_group_name.to_sym][:targets]
+          nodes = []
+          @parsed_node_options = {}
+
+          targets.each do |n|
+            backend_builder = BackendBuilder.new(@options, n, target_info)
+            backend = backend_builder.build
+
+            @parsed_node_options[n.to_sym] = backend_builder.parsed_options
+            nodes << Node.new(n, backend)
+          end
+
+          nodes
+        else
+          raise TargetGroupNotFoundError
+        end
+      end
     end
   end
 end

data/lib/rundock/plugin/operation/deploy.rb

@@ -1,4 +1,7 @@
 require 'rundock/operation/base'
+require 'erb'
+require 'tempfile'
+require 'ostruct'
 
 module Rundock
   module Operation
@@ -16,6 +19,17 @@ module Rundock
     #      dst: /tmp/deploy_dest_remote_file
     #    - src: /tmp/deploy_from_local_dir
     #      dst: /tmp/deploy_dest_remote_dir
+    #    - src: /tmp/deploy_from_local_erb_bile
+    #      dst: /tmp/deploy_dest_remote_file
+    #      erb: true
+    #      trim_mode: '-'
+    #      binding:
+    #        hostname:
+    #          type: command
+    #          value: 'hostname'
+    #        memtotal:
+    #          type: command
+    #          value: "cat /proc/meminfo | grep 'MemTotal' | awk '{print $2}'"
     # ---
     # anyhost-01:
     #   host: 192.168.1.11
@@ -25,16 +39,75 @@ module Rundock
     #     key:  ~/.ssh/id_rsa
     # ---
     class Deploy < Base
+      DEFAULT_TRIM_MODE = '-'
+      DEFAULT_BINDING_TYPE = 'command'
+
       def run(backend, attributes)
         options = attributes[:deploy]
 
-        options.each do |path|
-          Logger.error('src: options not found.') if !path[:src] || path[:src].blank?
-          Logger.error('dst: options not found.') if !path[:dst] || path[:dst].blank?
-          Logger.info("deploy localhost:#{path[:src]} remote:#{attributes[:nodeinfo][:host]}:#{path[:dst]}")
-          backend.send_file(path[:src], path[:dst])
+        options.each do |opt|
+          Logger.error('src: options not found.') if !opt.key?(:src) || opt[:src].blank?
+          Logger.error('dst: options not found.') if !opt.key?(:dst) || opt[:dst].blank?
+
+          is_erb = opt.key?(:erb) && opt[:erb]
+
+          if opt.key?(:trim_mode)
+            trim_mode = opt[:trim_mode]
+          else
+            trim_mode = DEFAULT_TRIM_MODE
+          end
+
+          erb_options = ''
+          erb_options = " erb: true trim_mode: #{trim_mode}" if is_erb
+
+          Logger.info("deploy localhost: #{opt[:src]} remote:#{attributes[:nodeinfo][:host]}:#{opt[:dst]}#{erb_options}")
+          Logger.debug("deploy erb binding: #{opt[:binding]}") if is_erb
+
+          if is_erb
+            val_binding = extract_map(backend, opt[:binding])
+          else
+            val_binding = {}
+          end
+
+          if is_erb
+            erb_content = conv_erb(opt[:src], trim_mode, val_binding)
+
+            tempfile = Tempfile.new('', Dir.tmpdir)
+            begin
+              tempfile.write(erb_content)
+              tempfile.rewind
+              backend.send_file(tempfile.path, opt[:dst])
+            ensure
+              tempfile.close
+            end
+          else
+            backend.send_file(opt[:src], opt[:dst])
+          end
         end
       end
+
+      private
+
+      def conv_erb(src, trim_mode, mapping)
+        srcfile = ::File.open(src, &:read)
+
+        begin
+          ERB.new(srcfile, nil, trim_mode).tap do |erb|
+            erb.filename = src
+          end.result(OpenStruct.new(mapping).instance_eval { binding })
+        rescue => ex
+          Logger.error("ERB Error: #{ex.message}")
+        end
+      end
+
+      def extract_map(backend, binding)
+        map = {}
+        binding.each do |k, v|
+          map[k] = backend.specinfra_run_command(v[:value]).stdout.strip if v.key?(:value)
+        end
+
+        map
+      end
     end
   end
 end

data/lib/rundock/version.rb

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

data/scenario_sample.yml

@@ -5,10 +5,12 @@
 # ###  scenario section  ###
 # - target: <target_name>
 #   <operation_name>:
-#     - <operation_detail>
-#     - :
+#     <operation_content>
 #   <operation_name>:
 #     :
+#  hook:
+#    - <hook_name>
+#     :
 # - target: <target_name>
 #   :
 # ---

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

@@ -0,0 +1,17 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_erb_dst_file_scenario"
+    - "echo 'Hello Rundock from deploy erb <%= erb_val_1 %> Scenario.' > /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+    - "echo '<%= erb_val_2 %>' >> /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_erb_dst_file_scenario
+      erb: true
+      binding:
+        erb_val_1:
+          type: command
+          value: 'echo "runrunrundock"'
+        erb_val_2:
+          type: command
+          value: 'uname'

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

@@ -0,0 +1,30 @@
+- target_group: target_group_01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_group_1_scenario"
+  task: write_echo_01
+- target_group: target_group_02
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_group_2_scenario"
+  task: write_echo_02
+---
+target_group_01:
+  target_type: group
+  targets:
+    - anyhost-01
+    - anyhost-02
+target_group_02:
+  target_type: group
+  targets:
+    - anyhost-01
+    - anyhost-02
+anyhost-01:
+  host: localhost
+anyhost-02:
+  host: 127.0.0.1
+---
+write_echo_01:
+  command:
+    - "echo 'Hello Rundock from target group 1 Scenario.' | tee /var/tmp/hello_rundock_from_target_group_1_scenario"
+write_echo_02:
+  command:
+    - "echo 'Hello Rundock from target group 2 Scenario.' | tee /var/tmp/hello_rundock_from_target_group_2_scenario"

data/spec/integration/recipes/deploy_erb_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_deploy_erb_dst_file_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from deploy erb runrunrundock Scenario./) }
+  its(:content) { should match(/Linux/) }
+end

data/spec/integration/recipes/tareget_group_scenario_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_target_group_1_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from target group 1 Scenario./) }
+end
+
+describe file('/var/tmp/hello_rundock_from_target_group_2_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from target group 2 Scenario./) }
+end

data/spec/integration/scenarios/deploy_erb_scenario.yml

@@ -0,0 +1,29 @@
+- target: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+    - "echo 'Hello Rundock from deploy erb <%= erb_val_1 %> Scenario.' > /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+    - "echo '<%= erb_val_2 %>' >> /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario"
+- target: anyhost-01
+  task:
+    - deploy_task
+---
+anyhost-01:
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+deploy_task:
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_erb_dst_file_scenario"
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_erb_src_file_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_erb_dst_file_scenario
+      erb: true
+      binding:
+        erb_val_1:
+          type: command
+          value: "echo 'runrunrundock'"
+        erb_val_2:
+          value: 'uname'

data/spec/integration/scenarios/target_group_scenario.yml

@@ -0,0 +1,40 @@
+- target_group: target_group_01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_group_1_scenario"
+  task: write_echo_01
+- target_group: target_group_02
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_target_group_2_scenario"
+  task: write_echo_02
+---
+target_group_01:
+  target_type: group
+  targets:
+    - anyhost-01
+    - anyhost-02
+target_group_02:
+  target_type: group
+  targets:
+    - anyhost-01
+    - anyhost-02
+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
+    user: tester
+    keys: ["<replaced_by_platforms>"]
+---
+write_echo_01:
+  command:
+    - "echo 'Hello Rundock from target group 1 Scenario.' | tee /var/tmp/hello_rundock_from_target_group_1_scenario"
+write_echo_02:
+  command:
+    - "echo 'Hello Rundock from target group 2 Scenario.' | tee /var/tmp/hello_rundock_from_target_group_2_scenario"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,25 +188,31 @@ 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/deploy_erb_scenario.yml
 - spec/integration/platforms/localhost/scenarios/deploy_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_by_option_scenario.yml
 - spec/integration/platforms/localhost/scenarios/file_hooks_scenario.yml
 - 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_group_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
+- spec/integration/recipes/deploy_erb_spec.rb
 - spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/file_hook_by_option_spec.rb
 - spec/integration/recipes/file_hook_spec.rb
 - 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/tareget_group_scenario_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
 - 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/target_group_scenario.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb
 homepage: https://github.com/hiracy/rundock