rundock 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940c942d94419b9a6eb11d29669d6a35c8da0fe4
-  data.tar.gz: d7eb5f064af783640f66a0aac77eee6fe4e8cd01
+  metadata.gz: 24c0aa8f73630ca0f4fcab31e3db5fe9d6c56e4a
+  data.tar.gz: 93a2cabce87a681f76f5a344b4d36135365a85ba
 SHA512:
-  metadata.gz: 6de9ad7cf3cf83a341a60eba88db15ac38893772c457ff6c41d432eee49c9da31181c195634a054f4f884e90e88acce73c395495a985ad29d5a869f4df5ef837
-  data.tar.gz: 41d324f0e916f2375d1bd687a5ee2fcbe39e7afd70f6b828efd1a0dfd3efe002bbcc094b601c54d37802be79fd6ec8904be71fd2e6f14d9774ca84d4d635b0aa
+  metadata.gz: cf3d9806d2389fbf71c5eb34523e9d3bc9f3c6dbfb7a2b6a9060d77c86840f3bb22bbdf65c570d119159efa4a1cca77a97758ffa89d6ab5d113609c4611eeb84
+  data.tar.gz: d6c254e1e05c9c836b9f2bba9166c4119cfd2aac76113306acc79b72d791dc01c5bde8d9d865d6503a45091ed3bcfd784538f814837d4255b5ae3dc91a918a06

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.4.16
+
+Update
+
+- Support hooks define in scenario file
+
 ## v0.4.15
 
 Update

data/Rakefile

@@ -73,7 +73,7 @@ def do_rundock_scenarios(platform)
       default_ssh_opt = ''
     end
 
-    if scenario =~ %r{^*scenarios/(.*_hooks)_scenario.yml$}
+    if scenario =~ %r{^*scenarios/(.*_hooks_by_option)_scenario.yml$}
       hooks_opt = " -k ./spec/integration/hooks/#{Regexp.last_match(1)}.yml"
     else
       hooks_opt = ''

data/lib/rundock/attribute/node_attribute.rb

@@ -5,8 +5,8 @@ module Rundock
       attr_accessor :nodeinfo
       attr_accessor :task_info
       attr_accessor :errexit
-      attr_accessor :enable_hooks
       attr_accessor :dry_run
+      attr_accessor :hooks
 
       AVAIL_TAKE_OVERS = [
         :task_info,

data/lib/rundock/builder/hook_builder.rb

@@ -6,11 +6,18 @@ module Rundock
       DEFAULT_HOOKS_FILE_PATH = './hooks.yml'
       HookStructureError = Class.new(NotImplementedError)
 
-      def build(enables)
+      attr_accessor :enable_hooks
+
+      def initialize(options)
+        super(options)
+        @enable_hooks = {}
+      end
+
+      def build(enables, hook_attributes)
         if enables.blank?
           Logger.info('Empty hook is specified.')
           return []
-        elsif @options[:hooks]
+        elsif hook_attributes.nil? && @options[:hooks]
           if FileTest.exist?(@options[:hooks])
             hooks_file = @options[:hooks]
             Logger.info("hooks file is #{hooks_file}")
@@ -18,36 +25,44 @@ module Rundock
             Logger.warn("hooks file is not found. use #{DEFAULT_HOOKS_FILE_PATH}")
             hooks_file = DEFAULT_HOOKS_FILE_PATH
           end
-        else
+        elsif hook_attributes.nil?
+          Logger.warn("Hook source is not found. (enables:#{enables.join(',')})") unless enables.empty?
           return []
         end
 
-        build_from_file(hooks_file, enables)
+        if hooks_file
+          build_from_attributes(YAML.load_file(hooks_file).deep_symbolize_keys, enables)
+        else
+          build_from_attributes(hook_attributes, enables)
+        end
       end
 
-      def build_from_attributes(attributes)
-        return [] unless attributes.key?(:enable_hooks)
-        build_from_file(attributes[:hooks], attributes[:enable_hooks])
+      def rebuild(node_attributes)
+        hooks = []
+
+        node_attributes.each do |k, v|
+          hooks = Rundock::HookFactory.instance(v[:hook_type]).create(k.to_s, v)
+        end
+
+        hooks
       end
 
       private
 
-      def build_from_file(file, enables)
+      def build_from_attributes(attributes, enables)
         hooks = []
+
         allow_all = enables.include?('all')
 
-        File.open(file) do |f|
-          YAML.load_documents(f) do |y|
-            y.each do |k, v|
-              raise HookStructureError if !v.is_a?(Hash) || !v.key?('hook_type')
-              next if !allow_all && !enables.include?(k)
-              hook = Rundock::HookFactory.instance(v['hook_type']).create(k, v.deep_symbolize_keys)
-              hooks << hook
-            end
-          end
+        attributes.each do |k, v|
+          raise HookStructureError unless v.is_a?(Hash)
+          next if !allow_all && !enables.include?(k.to_s)
+          @enable_hooks[k] = v
+          hooks << Rundock::HookFactory.instance(v[:hook_type]).create(k.to_s, v)
         end
 
         Logger.warn('Empty hook is detected. Please verity hooks file and scenario file.') if hooks.empty?
+
         hooks
       end
     end

data/lib/rundock/builder/operation_builder.rb

@@ -1,7 +1,7 @@
 module Rundock
   module Builder
     class OperationBuilder < Base
-      def build_first(scenario, node_info, tasks)
+      def build_first(scenario, node_info, tasks, hooks)
         if @options[:hostgroup] && !@options[:command]
           raise CommandArgNotFoundError, %("--command or -c" option is required if hostgroup specified.)
         end
@@ -32,8 +32,11 @@ module Rundock
                 node.add_operation(build_cli_command_operation(@options[:command], node_attribute, @options))
               end
             elsif k == :hook
-              node_attribute.enable_hooks = Array(v)
-              node.hooks = HookBuilder.new(@options).build(Array(v)) if node
+              hooks_builder = HookBuilder.new(@options)
+              if node
+                node.hooks = hooks_builder.build(Array(v), hooks)
+                node_attribute.hooks = hooks_builder.enable_hooks
+              end
             else
 
               next unless node
@@ -50,7 +53,6 @@ module Rundock
 
       def build_task(tasks, backend, node_attribute)
         node = Node.new(node_attribute.nodename, backend)
-        node.hooks = HookBuilder.new(nil).build_from_attributes(node_attribute.nodeinfo)
         scen = Scenario.new
 
         tasks.each do |k, v|
@@ -68,7 +70,7 @@ module Rundock
         @options[:host].split(',').each do |host|
           backend = BackendBuilder.new(@options, host, nil).build
           node = Node.new(host, backend)
-          node.hooks = HookBuilder.new(@options).build(['all'])
+          node.hooks = HookBuilder.new(@options).build(['all'], nil)
           node.add_operation(
             build_cli_command_operation(@options[:command], Rundock::Attribute::NodeAttribute.new, @options))
           scen.nodes.push(node)

data/lib/rundock/builder/scenario_builder.rb

@@ -37,7 +37,7 @@ module Rundock
       def build_scenario_with_file
         if @scenario_file
 
-          type = [:main, :node_info, :tasks]
+          type = [:main, :node_info, :tasks, :hooks]
           scenario_data = {}
 
           YAML.load_documents(@scenario_file).each_with_index do |data, idx|
@@ -51,7 +51,10 @@ module Rundock
 
         ope = OperationBuilder.new(@options)
         ope.build_first(
-          scenario_data[:main], scenario_data[:node_info], scenario_data[:tasks])
+          scenario_data[:main],
+          scenario_data[:node_info],
+          scenario_data[:tasks],
+          scenario_data[:hooks])
       end
     end
   end

data/lib/rundock/logger.rb

@@ -33,18 +33,19 @@ module Rundock
       attr_accessor :show_header
       attr_accessor :short_header
       attr_accessor :date_header
-      attr_accessor :onrec
       attr_accessor :buffer
 
       def initialize(*args)
         super
         @indent_depth = 0
         @buffer = []
+        @rec = false
+        @lock = false
       end
 
       def call(severity, datetime, progname, msg)
         out = formatted_message(severity, datetime, progname, msg)
-        @buffer << LogEntity.new(severity, datetime, progname, msg, indent_depth, self)
+        @buffer << LogEntity.new(severity, datetime, progname, msg, indent_depth, self) if @rec
 
         if colored
           colorize(out, severity)
@@ -77,11 +78,28 @@ module Rundock
       end
 
       def flush
+        return nil if @lock
         ret = @buffer.dup
         @buffer.clear
         ret
       end
 
+      def on_rec
+        @rec = true unless @lock
+      end
+
+      def off_rec
+        @rec = false unless @lock
+      end
+
+      def rec_lock
+        @lock = true
+      end
+
+      def rec_unlock
+        @lock = false
+      end
+
       def formatted_message(severity, datetime, progname, msg)
         if !@show_header
           out = "%s\n" % [msg2str(msg)]

data/lib/rundock/node.rb

@@ -20,7 +20,7 @@ module Rundock
     end
 
     def run
-      Logger.formatter.onrec = true
+      Logger.formatter.on_rec
       Logger.debug("run node: #{@name}")
       Logger.warn("no operation running: #{@name}") if @operations.blank?
 
@@ -39,7 +39,7 @@ module Rundock
         h.hook(node_attributes, log_buffer)
       end
 
-      Logger.formatter.onrec = false
+      Logger.formatter.off_rec
     end
   end
 end

data/lib/rundock/operation/task.rb

@@ -12,7 +12,11 @@ module Rundock
             attributes[:task_info][i.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes))
 
           Logger.info("start task: #{i}")
+
+          Logger.formatter.rec_lock
+
           scenario.run
+          Logger.formatter.rec_unlock
         end
       end
     end

data/lib/rundock/version.rb

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

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

@@ -0,0 +1,23 @@
+- node: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_file_hook_innner_one_scenario"
+  hook: file_hook_one
+- node: anyhost-01
+  task:
+    - remove_task
+  hook:
+    - file_hook_two
+---
+anyhost-01:
+  host: localhost
+---
+remove_task:
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_file_hook_inner_two_scenario"
+---
+file_hook_one:
+  hook_type: file
+  filepath: /var/tmp/hello_rundock_from_file_hook_inner_one_scenario
+file_hook_two:
+  hook_type: file
+  filepath: /var/tmp/hello_rundock_from_file_hook_inner_two_scenario

data/spec/integration/recipes/file_hook_by_option_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_file_hook_one_scenario') do
+  it { should be_file }
+  its(:content) { should match(/hookname:file_one /) }
+  its(:content) { should match(/DEBUG/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_file_hook_array_1_scenario') do
+  it { should be_file }
+  its(:content) { should match(/anyhost-01/) }
+  its(:content) { should match(/hookname:file_array_1 /) }
+  its(:content) { should match(/DEBUG/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_file_hook_array_2_scenario') do
+  it { should be_file }
+  its(:content) { should match(/anyhost-01/) }
+  its(:content) { should match(/hookname:file_array_2 /) }
+  its(:content) { should match(/DEBUG/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_file_hook_all_1_scenario') do
+  it { should be_file }
+  its(:content) { should match(/hookname:file_all_1 /) }
+  its(:content) { should match(/DEBUG/) }
+end
+
+describe file('/var/tmp/hello_rundock_from_file_hook_all_2_scenario') do
+  it { should be_file }
+  its(:content) { should match(/hookname:file_all_2 /) }
+  its(:content) { should match(/DEBUG/) }
+end

data/spec/integration/recipes/file_hook_spec.rb

@@ -1,28 +1,13 @@
 require 'spec_helper'
 
-describe file('/var/tmp/hello_rundock_from_file_hook_one_scenario') do
+describe file('/var/tmp/hello_rundock_from_file_hook_inner_one_scenario') do
   it { should be_file }
-  its(:content) { should match(/hookname:file_one /) }
+  its(:content) { should match(/hookname:file_hook_one /) }
+  its(:content) { should match(/DEBUG/) }
 end
 
-describe file('/var/tmp/hello_rundock_from_file_hook_array_1_scenario') do
+describe file('/var/tmp/hello_rundock_from_file_hook_inner_two_scenario') do
   it { should be_file }
-  its(:content) { should match(/anyhost-01/) }
-  its(:content) { should match(/hookname:file_array_1 /) }
-end
-
-describe file('/var/tmp/hello_rundock_from_file_hook_array_2_scenario') do
-  it { should be_file }
-  its(:content) { should match(/anyhost-01/) }
-  its(:content) { should match(/hookname:file_array_2 /) }
-end
-
-describe file('/var/tmp/hello_rundock_from_file_hook_all_1_scenario') do
-  it { should be_file }
-  its(:content) { should match(/hookname:file_all_1 /) }
-end
-
-describe file('/var/tmp/hello_rundock_from_file_hook_all_2_scenario') do
-  it { should be_file }
-  its(:content) { should match(/hookname:file_all_2 /) }
+  its(:content) { should match(/hookname:file_hook_two /) }
+  its(:content) { should match(/DEBUG/) }
 end

data/spec/integration/scenarios/{all_file_hooks_scenario.yml → all_file_hooks_by_option_scenario.yml}

@@ -1,7 +1,9 @@
 - node: 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"
     - "echo 'hookname:file_all_2 ' > /var/tmp/hello_rundock_from_file_hook_all_2_scenario"
+    - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_all_2_scenario"
   hook: all
 ---
 anyhost-01:

data/spec/integration/scenarios/{simple_file_hooks_scenario.yml → file_hooks_by_option_scenario.yml}

@@ -1,10 +1,13 @@
 - node: 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"
     - "echo 'anyhost-01' > /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
     - "echo 'anyhost-01' > /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
     - "echo 'hookname:file_array_1 ' >> /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
     - "echo 'hookname:file_array_2 ' >> /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
+    - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_array_1_scenario"
+    - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_array_2_scenario"
   hook:
     - file_one
     - file_array_1

data/spec/integration/scenarios/file_hooks_scenario.yml

@@ -0,0 +1,24 @@
+- node: 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"
+    - "echo 'hookname:file_hook_two ' > /var/tmp/hello_rundock_from_file_hook_inner_two_scenario"
+    - "echo '[DEBUG:] dummy log' >> /var/tmp/hello_rundock_from_file_hook_inner_two_scenario"
+  hook:
+    - file_hook_one
+    - file_hook_two
+---
+anyhost-01:
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+---
+file_hook_one:
+  hook_type: file
+  filepath: /var/tmp/hello_rundock_from_file_hook_inner_one_scenario
+file_hook_two:
+  hook_type: file
+  filepath: /var/tmp/hello_rundock_from_file_hook_inner_two_scenario

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,26 +182,29 @@ files:
 - rundock.gemspec
 - scenario_sample.yml
 - spec/integration/groups/simple_host_group.yml
-- spec/integration/hooks/all_file_hooks.yml
-- spec/integration/hooks/simple_file_hooks.yml
+- spec/integration/hooks/all_file_hooks_by_option.yml
+- spec/integration/hooks/file_hooks_by_option.yml
 - spec/integration/platforms/centos6/Dockerfile
 - spec/integration/platforms/centos6/setup.sh
-- spec/integration/platforms/localhost/scenarios/all_file_hooks_scenario.yml
+- spec/integration/platforms/localhost/scenarios/all_file_hooks_by_option_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_file_hooks_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_plugin_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
 - 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/scenarios/all_file_hooks_scenario.yml
+- spec/integration/scenarios/all_file_hooks_by_option_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_file_hooks_scenario.yml
 - spec/integration/scenarios/simple_plugin_scenario.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml
 - spec/integration/spec_helper.rb