rundock 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41eab756e59dece15df6f146b5e1c7bfe5130165
-  data.tar.gz: e06935ab43506d934940fead88343ac6b2f28f8c
+  metadata.gz: 6f82ec4374a46a20026e0417e0c7f66d7d057e8b
+  data.tar.gz: 8b580b3c626012b28be9fbc2613f97f87ee9f212
 SHA512:
-  metadata.gz: c8b825b2ba472f9acdd8e0a0a640ce53ba2c9fc2fdc0b65ddc25a020a2eb47b09d4d953104ab3d3d6d3724b8fed50df88fc55e4873ac2fec599aab3b11d64fb6
-  data.tar.gz: 1612a61ce7d34945b7782bfa16fde756a5b8426bd06ecb2b4354c7bbb3f57b04d580ebf44c03f359fb410f17ce7f2a644bae259fb6077fb4ebb3740ac9bf447b
+  metadata.gz: 6be0922ed3c5b1da9b1af40872eff0f329ee40743a6f66c6cc55a68ca61e810971920dfe35522487e54a83051ca549e039361ed9fd1a23980fea9ad762896426
+  data.tar.gz: beab9f72f9ace44c0e65e9222f1df9489306565204fda69ff213c25f60317bd51838ae75db528d88cf4ef3b2f5771fcfb37601a462ac4c53f80489e76408016b

data/.rubocop.yml

@@ -66,7 +66,10 @@ Style/NumericLiterals:
 Style/NumericPredicate:
   Enabled: false
 
-Style/MethodMissing:
+Style/MethodMissingSuper:
+  Enabled: false
+
+Style/MissingRespondToMissing:
   Enabled: false
 
 Style/FormatStringToken:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.0
+
+Update
+
+- Support target plugins
+
 ## v1.1.7
 
 Update

data/lib/rundock/builder/operation_builder.rb

@@ -2,7 +2,7 @@ module Rundock
   module Builder
     class OperationBuilder < Base
       def build_first(scenario, targets, tasks, hooks)
-        parsing_node_attribute = nil
+        parsing_node_attribute = Rundock::Attribute::NodeAttribute.new(task_info: {})
         scen = Scenario.new
         scen.tasks = tasks
 
@@ -12,21 +12,12 @@ module Rundock
           hook_contents = []
 
           sn.deep_symbolize_keys.each do |sk, sv|
-            if sk == :target
+            if %i[target target_group].include?(sk)
               target_builder = TargetBuilder.new(@options)
-              target = target_builder.build(sv, targets)
-
-              if target.is_a?(Node)
-                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
-            elsif sk == :target_group
-              target_builder = TargetBuilder.new(@options)
-              nodes = target_builder.build_group(sv, targets)
+              nodes, target_options = target_builder.build(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])
+                  parsing_node_attribute = build_node_attribute(scen, n.name, parsing_node_attribute, tasks, target_options[n.name.to_sym])
                   operations = Array(build_cli_command_operation(@options[:command], parsing_node_attribute, @options)) if @options[:command]
                 end
               end
@@ -94,14 +85,10 @@ 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.init_except_take_over_state
         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

data/lib/rundock/builder/target_builder.rb

@@ -1,51 +1,30 @@
 module Rundock
   module Builder
     class TargetBuilder < Base
-      TargetNoSupportError = Class.new(NotImplementedError)
-      TargetGroupNotFoundError = Class.new(StandardError)
-
-      attr_accessor :parsed_node_options
+      DEFAULT_TARGET_TYPE = 'host'
 
       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) ||
-           target_info[target_name.to_sym][:target_type] == 'host'
+        target_type = DEFAULT_TARGET_TYPE
 
-          backend_builder = BackendBuilder.new(@options, target_name, target_info)
-          backend = backend_builder.build
-          @parsed_node_options = { target_name.to_sym => backend_builder.parsed_options }
+        if target_info.nil? ||
+           !target_info.key?(target_name.to_sym)
+          target_info = { target_name.to_sym => {} }
+          target_type = DEFAULT_TARGET_TYPE
         else
-          raise TargetNoSupportError
+          target_type = if target_info[target_name.to_sym].key?(:target_type)
+                          target_info[target_name.to_sym][:target_type]
+                        else
+                          DEFAULT_TARGET_TYPE
+                        end
         end
 
-        Node.new(target_name, backend)
-      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
+        begin
+          target = Rundock::TargetFactory.instance(target_type).create(target_name, target_info[target_name.to_sym])
+        rescue Rundock::TargetFactory::TargetNotSupportedError
+          Logger.error("target type not supported: #{target_type}")
         end
+
+        target.create_nodes(target_info, @options)
       end
     end
   end

data/lib/rundock/builder/task_builder.rb

@@ -3,8 +3,6 @@ require 'yaml'
 module Rundock
   module Builder
     class TaskBuilder < Base
-      DEFAULT_TASKS_FILE_PATH = './tasks.yml'
-
       def build(scenario_tasks)
         tasks = if scenario_tasks.nil?
                   {}

data/lib/rundock/logger.rb

@@ -143,19 +143,16 @@ module Rundock
       end
 
       def colorize(msg, severity)
-        col = if @color
-                @color
+        col = @color ||
+              case severity
+              when 'INFO'
+                :clear
+              when 'WARN'
+                :yellow
+              when 'ERROR'
+                :red
               else
-                case severity
-                when 'INFO'
-                  :clear
-                when 'WARN'
-                  :yellow
-                when 'ERROR'
-                  :red
-                else
-                  :clear
-                end
+                :clear
               end
 
         ANSI.public_send(col) { msg }

data/lib/rundock/plugin/target/group.rb

@@ -0,0 +1,22 @@
+require 'rundock/target/base'
+
+module Rundock
+  module Target
+    class Group < Base
+      def create_nodes(target_info = {}, options = {})
+        targets = @contents[:targets]
+
+        nodes = []
+
+        targets.each do |n|
+          backend_builder = Rundock::Builder::BackendBuilder.new(options, n, target_info)
+          backend = backend_builder.build
+          @parsed_options[n.to_sym] = backend_builder.parsed_options
+          nodes << Node.new(n, backend)
+        end
+
+        [nodes, @parsed_options]
+      end
+    end
+  end
+end

data/lib/rundock/plugin/target/host.rb

@@ -0,0 +1,14 @@
+require 'rundock/target/base'
+
+module Rundock
+  module Target
+    class Host < Base
+      def create_nodes(target_info = {}, options = {})
+        backend_builder = Rundock::Builder::BackendBuilder.new(options, @name, target_info)
+        backend = backend_builder.build
+        @parsed_options = { @name.to_sym => backend_builder.parsed_options }
+        [Array(Node.new(@name, backend)), @parsed_options]
+      end
+    end
+  end
+end

data/lib/rundock/runner.rb

@@ -4,7 +4,7 @@ require 'open-uri'
 module Rundock
   class Runner
     ScenarioNotFoundError = Class.new(StandardError)
-    RUNDOCK_PLUGINS = %w[operation hook]
+    RUNDOCK_PLUGINS = %w[operation hook target]
 
     class << self
       def run(options)

data/lib/rundock/target/base.rb

@@ -0,0 +1,21 @@
+module Rundock
+  module Target
+    class Base
+      TargetNotImplementedError = Class.new(NotImplementedError)
+
+      attr_reader :name
+      attr_reader :contents
+      attr_reader :parsed_options
+
+      def initialize(name, contents = {})
+        @name = name
+        @contents = contents
+        @parsed_options = {}
+      end
+
+      def create_nodes(target_info = {}, options = {})
+        raise TargetNotImplementedError
+      end
+    end
+  end
+end

data/lib/rundock/target_factory.rb

@@ -0,0 +1,31 @@
+module Rundock
+  class TargetFactory
+    TargetNotSupportedError = Class.new(StandardError)
+
+    def self.instance(type)
+      self.new(type)
+    end
+
+    def initialize(type)
+      @type = type
+    end
+
+    def create(name, attributes)
+      klass = "Rundock::Target::#{@type.to_s.to_camel_case}"
+      Logger.debug("initialize #{klass} target")
+      raise TargetNotSupportedError unless Rundock::Target::Base.subclasses.map(&:to_s).include?(klass)
+
+      obj = nil
+      klass.split('::').map do |k|
+        obj = if obj.nil?
+                Kernel.const_get(k)
+              else
+                obj = obj.const_get(k)
+              end
+      end
+
+      target = obj.new(name, attributes)
+      target
+    end
+  end
+end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '1.1.7'
+  VERSION = '1.2.0'
 end

data/lib/rundock.rb

@@ -9,6 +9,8 @@ require 'rundock/operation/command'
 require 'rundock/operation_factory'
 require 'rundock/hook_factory'
 require 'rundock/hook/base'
+require 'rundock/target_factory'
+require 'rundock/target/base'
 require 'rundock/node'
 require 'rundock/attribute/base'
 require 'rundock/attribute/node_attribute'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,8 +197,12 @@ files:
 - lib/rundock/plugin/operation/deploy.rb
 - lib/rundock/plugin/operation/host_inventory.rb
 - lib/rundock/plugin/operation/sample_operation.rb
+- lib/rundock/plugin/target/group.rb
+- lib/rundock/plugin/target/host.rb
 - lib/rundock/runner.rb
 - lib/rundock/scenario.rb
+- lib/rundock/target/base.rb
+- lib/rundock/target_factory.rb
 - lib/rundock/version.rb
 - rundock.gemspec
 - scenario_sample.yml