rundock 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe1522d58ced441b963285f6d4cd963c2ca5632
-  data.tar.gz: e1a65a4ede4cff83bcd8a474838da3483a07027f
+  metadata.gz: f19b1b0d72897240ff3c158f0b88fa87aef2dd09
+  data.tar.gz: 91196ecf20088a5cebb57fbb179e90d96c50c9bf
 SHA512:
-  metadata.gz: 44e7cb01074e66f7ffab9a083c2050084ea9ed89d70b54ddad58f16614406123a293fb7b8c5583f35db3b3fa94395f801b7e2efd3be8fbbe9bcb3566414d3576
-  data.tar.gz: 893c456e09ed5b6e0152067437e7f1e6934ab76d25fa0a4f4ae9b42522cb7a12d6a2b9239e99efea8dc8f2046bf1585b661f019291b35ae08d35718eb2ba4dfe
+  metadata.gz: a93435634ab5972e631988d490bb86f8e3994f85b743adb4e0a0e0013a2aeb3f00156677af5c266d09bc0662e5fbdb6f6637b60ac7f5ac2186a5b81f6e0f1f2c
+  data.tar.gz: 3d71104a81a804218047e349044c9b622256aaf038c40dccb04f27a9320e281ad58ae123b030be354a288b3debe5c72c0da8c8d54db7094947e325f19d6178da

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.2.10
+
+Improvements
+
+- Add running operation to other node infomation
+
+Fix
+
+- Fix command in task have been excuted though cli command option was specified
+- Fix unavail cli --run-anyway option if -g options specified
+
 ## v0.2.9
 
 Improvements

data/lib/rundock/builder/operation_builder.rb

@@ -11,6 +11,7 @@ module Rundock
         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
@@ -25,27 +26,23 @@ module Rundock
 
               node = Node.new(v, backend)
               node_attribute.nodename = v
-              node_attribute.nodeinfo = builder.parsed_options
+              scen.node_info[v.to_sym] = node_attribute.nodeinfo = builder.parsed_options
 
               if @options[:command]
                 node.add_operation(build_cli_command_operation(@options[:command], @options))
               end
             else
-              if @options[:command] && (k == :command || k == :task)
-                Logger.debug(%("--command or -c" option is specified and ignore scenario file.))
-                next
-              end
 
               next unless node
 
               ope = build_operations(k, Array(v), node_attribute, @options)
-              node.add_operation(ope)
+              node.add_operation(ope) if ope
             end
           end
         end
 
         scen.nodes.push(node) if node
-        scen
+        scen.complete
       end
 
       def build_task(tasks, backend, node_attribute)
@@ -54,7 +51,7 @@ module Rundock
 
         tasks.each do |k, v|
           ope = build_operations(k, Array(v), node_attribute, nil)
-          node.add_operation(ope)
+          node.add_operation(ope) if ope
         end
 
         scen.nodes.push(node) if node
@@ -77,12 +74,19 @@ module Rundock
       private
 
       def build_cli_command_operation(command, cli_options)
-        node_attribute = Rundock::Attribute::NodeAttribute.new
-        node_attribute.errexit = !cli_options[:run_anyway]
-        Rundock::OperationFactory.instance(:command).create(Array(command), nil)
+        node_attributes = Rundock::Attribute::NodeAttribute.new
+        node_attributes.errexit = !cli_options[:run_anyway]
+        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] &&
+           (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?
         node_attributes.define_attr(ope_type, ope_content)

data/lib/rundock/node.rb

@@ -9,6 +9,7 @@ module Rundock
     def initialize(name, backend)
       @name = name
       @backend = backend
+      @operations = []
     end
 
     def add_operation(ope)
@@ -16,6 +17,12 @@ module Rundock
       @operations << ope
     end
 
+    def complete(scenario)
+      @operations.each do |ope|
+        ope.attributes[:nodeinfo] = scenario.node_info
+      end
+    end
+
     def run
       Logger.debug("run name: #{@name}")
       if @operations.blank?

data/lib/rundock/scenario.rb

@@ -11,5 +11,10 @@ module Rundock
     def run
       @nodes.each(&:run)
     end
+
+    def complete
+      @nodes.each { |n| n.complete(self) }
+      self
+    end
   end
 end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

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

@@ -7,4 +7,4 @@
 ---
 write_echo:
   command:
-    - "echo 'Hello Rundock from Scenario.' > /var/tmp/hello_rundock_from_scenario"
+    - "echo 'Hello Rundock from Scenario.' | tee /var/tmp/hello_rundock_from_scenario"

metadata

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