rundock 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57db6da4ef09d2b72d4100d7a0fefb1404bb06a
-  data.tar.gz: 0d778d72fffd50b046d32d86300d2847de359b3a
+  metadata.gz: 6fb16148337d2df02dd98c9c568f73053ae4f0fe
+  data.tar.gz: 7146e8b107b4735c73b547e6627447bb71328ae2
 SHA512:
-  metadata.gz: 09f7c9a551f014b35ed6ae5dc03279694805a2a4b9745f9db66560b362d7a4ede30aedd1c8bfb44b52c822c4a138fe719157fe7ec9171f2d0023b7e3e45f7772
-  data.tar.gz: 65a57189d24d4da66da1652d0ee2ccd3b26b85d0f52bd6c05379cb37abfbd3fcfa4f82a9b23453d04d1a218d2c0ee6ba9c32fe92192447e64087552921c649c1
+  metadata.gz: d03e7b40cf4896e5ce763dd9ea1a46e0e4a560f33fb95f3d76f847fb3fd48c0aa89617fd1062d7ce3f67f5664df2f41d1cae53ad80f7f93416777f682bf1553c
+  data.tar.gz: 4b40aa2cde7aaa29c94bc8730e05ab537cc71bc5e4d18696bfe6b8c171c39228cf0e7fec4ea62894a73a1a570103a9da524cb02cd27eba3d6172b3b96d247b2d

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.4.11
+
+Update
+
+- Add dry_run state attribute for node info
+
+Fix
+
+- Fix task execute can not carry over attributes
+
 ## v0.4.9
 
 Update

data/lib/rundock/attribute/node_attribute.rb

@@ -6,10 +6,12 @@ module Rundock
       attr_accessor :task_info
       attr_accessor :errexit
       attr_accessor :enable_hooks
+      attr_accessor :dry_run
 
       AVAIL_TAKE_OVERS = [
         :task_info,
-        :errexit
+        :errexit,
+        :dry_run
       ]
 
       def finalize_node

data/lib/rundock/builder/operation_builder.rb

@@ -38,7 +38,7 @@ module Rundock
 
               next unless node
 
-              ope = build_operations(k, Array(v), node_attribute, @options)
+              ope = build_operations(k, Array(v), node_attribute, @options, false)
               node.add_operation(ope) if ope
             end
           end
@@ -54,7 +54,7 @@ module Rundock
         scen = Scenario.new
 
         tasks.each do |k, v|
-          ope = build_operations(k, Array(v), node_attribute, nil)
+          ope = build_operations(k, Array(v), node_attribute, nil, true)
           node.add_operation(ope) if ope
         end
 
@@ -84,16 +84,26 @@ module Rundock
         Rundock::OperationFactory.instance(:command).create(Array(command), node_attributes.list)
       end
 
-      def build_operations(ope_type, ope_content, node_attributes, cli_options)
-        if cli_options &&
-           cli_options[:command] &&
+      def build_operations(ope_type, ope_content, node_attributes, cli_options, recursive)
+        cli_options = {} if cli_options.nil?
+
+        if cli_options[:command] &&
            (ope_type == :command || ope_type == :task)
           Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
           return
         end
 
-        node_attributes.errexit = !cli_options[:run_anyway] if cli_options
-        node_attributes.errexit = true if cli_options.nil?
+        unless recursive
+          # apply cli options
+          if !cli_options.key?(:run_anyway)
+            node_attributes.errexit = true
+          else
+            node_attributes.errexit = !cli_options[:run_anyway]
+          end
+          node_attributes.dry_run = (cli_options && cli_options[:dry_run]) ? true : false
+        end
+
+        # override by scenario
         node_attributes.define_attr(ope_type, ope_content)
         Rundock::OperationFactory.instance(ope_type).create(Array(ope_content), node_attributes.list)
       end

data/lib/rundock/operation/task.rb

@@ -11,6 +11,7 @@ module Rundock
           scenario = Rundock::Builder::ScenarioBuilder.new(nil, nil).build_task(
             attributes[:task_info][i.to_sym], backend, Rundock::Attribute::NodeAttribute.new(attributes))
 
+          Logger.info("start task: #{i}")
           scenario.run
         end
       end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler