ansible-ruby 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7dc314111b76ada2715f1dc9619d2f8f087dc4
-  data.tar.gz: 1a1063f74eef0b00698eb35b2018df427863be4d
+  metadata.gz: 59e1d73a3de56b29f57a5cd7d44cd87fc9a21c90
+  data.tar.gz: cf89185af3770233e0b043c88976c6de41fe8006
 SHA512:
-  metadata.gz: 7db7a733456eaf690c3cef12d995bcde355eb81b88dcb9043fd2bb72746a28538753382219b47e2eab2c3ad2f39c30bfb09c9127aa376b304c8b076e2565fc89
-  data.tar.gz: d5f63ff327a8e9f88771f2e63989594f755d0c8650afe4d21ab7db4466cfdb8d3e8e96687885545081f713228cf7f83766c2bcc7514e9bb63df65a33c273e4c2
+  metadata.gz: 732dc45ee62ab5280092c6bcb706761a4f23a814b9c4040f50855810b38de4aad7c212c1df40968604f49aa44463eaf28ac4e07f99bf17cfb0d94302d877347a
+  data.tar.gz: 4b30771eb0007094a2d4d47a59e6dd0950e492b39bab0ee3578aba854920c226877f1835a8ed54d1063e82fd742ac9193df549f634d307459699f014caee3fc2

data/lib/ansible/ruby/dsl_builders/base.rb

@@ -6,15 +6,7 @@ module Ansible
           @result = nil
         end
 
-        attr_reader :result
-
-        def _evaluate(*args, &block)
-          if block
-            instance_eval(&block)
-          else
-            raise 'Expected code as an argument if no block supplied!' unless args.length == 1
-            instance_eval args[0]
-          end
+        def _result
           @result
         end
 
@@ -22,13 +14,17 @@ module Ansible
           super
         end
 
+        def jinja(text)
+          "{{ #{text} }}"
+        end
+
         def method_missing(id, *args, &block)
           result = begin
             _process_method id, *args, &block
           rescue StandardError => our_error
             begin
               super
-            rescue NoMethodError => ruby_error
+            rescue NameError => ruby_error
               matching_line = ruby_error.backtrace
                                         .map { |str| str.split ':' }
                                         .find { |arr| arr[0] == '(eval)' }[1]
@@ -40,6 +36,25 @@ module Ansible
 
         private
 
+        def _ansible_include(filename, &block)
+          args = if block
+                   args_builder = Args.new
+                   args_builder.instance_eval(&block)
+                   args_builder._result
+                 else
+                   {}
+                 end
+          Models::Inclusion.new(args.merge(file: filename))
+        end
+
+        def _valid_attributes
+          (self.class.instance_methods - Object.instance_methods - [:_result, :method_missing])
+        end
+
+        def no_method_error(method, only_valid_clause)
+          raise "Invalid method/local variable `#{method}'. #{only_valid_clause}"
+        end
+
         def method_missing_return(*)
           # Don't leak return values
           nil

data/lib/ansible/ruby/dsl_builders/block.rb

@@ -0,0 +1,39 @@
+# see LICENSE.txt in project root
+require 'ansible/ruby/models/block'
+
+module Ansible
+  module Ruby
+    module DslBuilders
+      class Block < Unit
+        def initialize
+          super
+          @tasks = []
+          @temp_counter = 0
+        end
+
+        def task(name, &block)
+          @temp_counter += 1
+          task_builder = Task.new name, Models::Task, @temp_counter
+          task_builder.instance_eval(&block)
+          @tasks << task_builder._result
+        end
+
+        # allow for other attributes besides the module in any order
+        def _result
+          args = {
+            tasks: @tasks
+          }.merge @task_args
+          block = Models::Block.new args
+          block.validate!
+          block
+        end
+
+        private
+
+        def _process_method(id, *)
+          no_method_error id, "Only valid options are #{_valid_attributes}"
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/dsl_builders/file_level.rb

@@ -13,38 +13,53 @@ module Ansible
         end
 
         def play(name = nil, &block)
-          if @context == :tasks
-            raise 'This is a tasks file due to a task coming before this play, cannot use play here!'
-          end
+          _validate_context :playbook
           @context = :playbook
           play_builder = Play.new name
-          @plays << play_builder._evaluate(&block)
+          play_builder.instance_eval(&block)
+          @plays << play_builder._result
         end
 
         def task(name, &block)
-          if @context == :playbook
-            raise 'This is a playbook file due to a play coming before this task, cannot use task here!'
-          end
+          _validate_context :tasks
           @context = :tasks
-          @tasks_builder ||= Tasks.new
+          @tasks_builder ||= Tasks.new(:tasks)
           @tasks_builder.task name, &block
         end
 
-        def _evaluate(*)
-          super
+        def handler(name, &block)
+          _validate_context :handlers
+          @context = :handlers
+          @tasks_builder ||= Tasks.new(:handlers)
+          @tasks_builder.handler name, &block
+        end
+
+        # any order/lazy result
+        # :reek:NilCheck - when nil is the simplest way to check this
+        def _result
           case @context
           when :playbook
             # TODO: Add a playbook DSL and do this like tasks
             Models::Playbook.new plays: @plays
-          when :tasks
-            @tasks_builder._evaluate {}
+          when :tasks, :handlers
+            @tasks_builder._result
+          when nil
+            raise 'Must supply at least 1 handler/task/play!'
           else
             raise "Unknown context #{@context}"
           end
         end
 
         def _process_method(id, *)
-          raise "undefined local variable or method `#{id}'"
+          no_method_error id, 'Only valid options are [:task, :handler, :play]'
+        end
+
+        private
+
+        def _validate_context(expected)
+          if @context && @context != expected
+            raise "This is a #{@context} file, cannot use #{expected} here!"
+          end
         end
       end
     end

data/lib/ansible/ruby/dsl_builders/jinja_item_node.rb

@@ -0,0 +1,33 @@
+# see LICENSE.txt in project root
+module Ansible
+  module Ruby
+    module DslBuilders
+      class JinjaItemNode
+        def initialize(contexts = 'item')
+          @contexts = [*contexts]
+        end
+
+        def +(other)
+          to_s + other.to_s
+        end
+
+        def to_s
+          flat = @contexts.join '.'
+          "{{ #{flat} }}"
+        end
+
+        def to_str
+          to_s
+        end
+
+        # we need to respond to everything, don't want super
+        # rubocop:disable Style/MethodMissing
+        def method_missing(id, *)
+          contexts = @contexts + [id]
+          JinjaItemNode.new contexts
+        end
+        # rubocop:enable Style/MethodMissing
+      end
+    end
+  end
+end

data/lib/ansible/ruby/dsl_builders/module_call.rb

@@ -2,6 +2,7 @@ require 'ansible/ruby/dsl_builders/base'
 require 'ansible/ruby/dsl_builders/args'
 require 'ansible/ruby/modules/base'
 require 'ansible/ruby/modules/custom/free_form'
+require 'ansible/ruby/dsl_builders/jinja_item_node'
 
 module Ansible
   module Ruby
@@ -39,7 +40,28 @@ module Ansible
           free_form = free_form_module && _free_form_arg(module_args)
           args.merge! _block_args(&block)
           args[:free_form] = free_form if free_form
-          args
+          _jinja_nodes(args)
+        end
+
+        def _jinja_nodes(args)
+          Hash[args.map do |key, value|
+            [key, _convert_ast_node(value)]
+          end]
+        end
+
+        def _convert_ast_node(value)
+          case value
+          when DslBuilders::JinjaItemNode
+            value.to_s
+          when Hash
+            Hash[
+              value.map { |key, hash_val| [key, _convert_ast_node(hash_val)] }
+            ]
+          when Array
+            value.map { |val| _convert_ast_node(val) }
+          else
+            value
+          end
         end
 
         def _module_klass(id)
@@ -50,8 +72,9 @@ module Ansible
         def _block_args(&block)
           return {} unless block
           # Delegate everything to the args builder and apply it to the module class we located
-          module_builder = Args.new
-          module_builder._evaluate(&block)
+          args_builder = Args.new
+          args_builder.instance_eval(&block)
+          args_builder._result
         end
 
         def _free_form_arg(module_args)

data/lib/ansible/ruby/dsl_builders/play.rb

@@ -1,38 +1,39 @@
 require 'ansible/ruby/models/play'
 require 'ansible/ruby/dsl_builders/tasks'
+require 'ansible/ruby/dsl_builders/block'
 
 module Ansible
   module Ruby
     module DslBuilders
       class Play < Tasks
         def initialize(name = nil)
-          super()
-          @playbook_args = {}
-          @playbook_args[:name] = name
+          super :tasks
+          @play_args = {}
+          @play_args[:name] = name if name
         end
 
         def hosts(value)
-          @playbook_args[:hosts] = value
+          @play_args[:hosts] = value
         end
 
         def roles(value)
-          @playbook_args[:roles] = value
+          @play_args[:roles] = value
         end
 
         def connection(value)
-          @playbook_args[:connection] = value
+          @play_args[:connection] = value
         end
 
         def user(value)
-          @playbook_args[:user] = value
+          @play_args[:user] = value
         end
 
         def serial(value)
-          @playbook_args[:serial] = value
+          @play_args[:serial] = value
         end
 
         def gather_facts(value)
-          @playbook_args[:gather_facts] = value
+          @play_args[:gather_facts] = value
         end
 
         def local_host
@@ -40,13 +41,28 @@ module Ansible
           connection :local
         end
 
-        def _evaluate(*)
+        def block(&block)
+          builder = Block.new
+          builder.instance_eval(&block)
+          @items << builder._result
+        end
+
+        # allow any order
+        def _result
           tasks = super
-          args = @playbook_args.merge({})
+          args = @play_args.merge({})
           # Don't want to trigger validation
-          args[:tasks] = tasks if tasks.tasks.any?
+          args[:tasks] = tasks if tasks.items.any?
           Models::Play.new args
         end
+
+        private
+
+        def _process_method(id, *args, &block)
+          return super if respond_to_missing?(id, *args, &block)
+          valid = _valid_attributes << :task
+          no_method_error id, "Only valid options are #{valid}"
+        end
       end
     end
   end

data/lib/ansible/ruby/dsl_builders/task.rb

@@ -2,37 +2,19 @@ require 'ansible/ruby/dsl_builders/base'
 require 'ansible/ruby/dsl_builders/module_call'
 require 'ansible/ruby/dsl_builders/result'
 require 'ansible/ruby/models/task'
+require 'ansible/ruby/dsl_builders/unit'
 
 module Ansible
   module Ruby
     module DslBuilders
-      class Task < Base
-        def initialize(name)
+      class Task < Unit
+        def initialize(name, context, temp_counter)
           super()
-          @module = nil
-          @temp_counter = 0
           @name = name
-          @task_args = {}
-        end
-
-        def _evaluate(*)
-          super
-          args = {
-            module: @module,
-            name: @name
-          }.merge @task_args
-          task = Models::Task.new args
-          task.validate!
-          task
-        end
-
-        def become(*args)
-          value = _implicit_bool args
-          @task_args[:become] = value
-        end
-
-        def become_user(value)
-          @task_args[:become_user] = value
+          @context = context
+          @module = nil
+          @inclusion = nil
+          @temp_counter = temp_counter
         end
 
         def changed_when(clause)
@@ -43,12 +25,17 @@ module Ansible
           @task_args[:failed_when] = clause
         end
 
-        def ansible_when(clause)
-          @task_args[:when] = clause
-        end
-
         def with_dict(clause)
           @task_args[:with_dict] = clause
+          return unless block_given?
+          hash_key = JinjaItemNode.new('item.key')
+          hash_value = JinjaItemNode.new('item.value')
+          yield [hash_key, hash_value]
+        end
+
+        def with_items(clause)
+          @task_args[:with_items] = clause
+          yield JinjaItemNode.new if block_given?
         end
 
         def async(value)
@@ -63,29 +50,42 @@ module Ansible
           @task_args[:notify] = value
         end
 
-        def ignore_errors(*args)
-          value = _implicit_bool args
-          @task_args[:ignore_errors] = value
-        end
-
         def respond_to_missing?(*)
           !@module || super
         end
 
+        # allow for other attributes besides the module in any order
+        def _result
+          args = {
+            module: @module,
+            name: @name
+          }.merge @task_args
+          args[:inclusion] = @inclusion if @inclusion
+          task = @context.new args
+          task.validate!
+          task
+        end
+
         private
 
         def _process_method(id, *args, &block)
+          if id == :ansible_include
+            if @context == Models::Handler
+              raise "Can't call inclusion inside a handler(yet), only in plays/handlers"
+            else
+              raise "Can't call inclusion inside a task, only in plays/handlers"
+            end
+          end
           # only 1 module, so don't try and do this again
-          raise "undefined local variable or method `#{id}'" if @module
-          module_call_builder = ModuleCall.new
-          module_call_builder.send(id, *args, &block)
-          @module = module_call_builder.result
+          no_method_error id, "Only valid options are #{_valid_attributes}" if @module
+          mcb = ModuleCall.new
+          mcb.send(id, *args, &block)
+          @module = mcb._result
         end
 
         def method_missing_return(_id, _result, *_args)
           # method_missing only used for modules here
           # Keep our register variables unique
-          @temp_counter += 1
           Result.new(@temp_counter, ->(name) { @task_args[:register] = name })
         end
       end

data/lib/ansible/ruby/dsl_builders/tasks.rb

@@ -1,26 +1,76 @@
 # See LICENSE.txt for license
 require 'ansible/ruby/dsl_builders/task'
+require 'ansible/ruby/models/handler'
+require 'ansible/ruby/models/inclusion'
 
 module Ansible
   module Ruby
     module DslBuilders
       class Tasks < Base
-        def initialize
-          @tasks = []
+        def initialize(context)
+          @context = context
+          @items = []
+          @temp_counter = 0
         end
 
-        def task(name, &block)
-          task_builder = Task.new name
-          @tasks << task_builder._evaluate(&block)
+        def ansible_include(filename, &block)
+          @items << _ansible_include(filename, &block)
         end
 
-        def _evaluate(*)
-          super
-          Models::Tasks.new tasks: @tasks
+        # allow multiple tasks, etc.
+        def _result
+          Models::Tasks.new items: @items
         end
 
-        def _process_method(id, *)
-          raise "undefined local variable or method `#{id}'"
+        class << self
+          def context(context)
+            contexts[context]
+          end
+
+          def contexts
+            {
+              tasks: {
+                valid_methods: [:task],
+                model: Models::Task
+              },
+              handlers: {
+                valid_methods: [:handler],
+                model: Models::Handler
+              }
+            }
+          end
+        end
+
+        def respond_to_missing?(id, *)
+          _valid_methods.include? id
+        end
+
+        private
+
+        def _context
+          self.class.context @context
+        end
+
+        def _valid_methods
+          raise "Unknown context #{@context}" unless _context
+          valid = _context[:valid_methods]
+          raise "Valid methods not configured for #{@context}!" unless valid
+          valid
+        end
+
+        def _process_method(id, *args, &block)
+          valid = _valid_methods
+          no_method_error id, "Only #{valid} is valid" unless valid.include? id
+          _handle args[0], &block
+        end
+
+        def _handle(name, &block)
+          model = _context[:model]
+          raise "Model not configured for #{@context}" unless model
+          @temp_counter += 1
+          task_builder = Task.new name, model, @temp_counter
+          task_builder.instance_eval(&block)
+          @items << task_builder._result
         end
       end
     end

data/lib/ansible/ruby/dsl_builders/unit.rb

@@ -0,0 +1,32 @@
+# see LICENSE.txt in project root
+module Ansible
+  module Ruby
+    module DslBuilders
+      class Unit < Base
+        def initialize
+          super()
+          @temp_counter = 0
+          @task_args = {}
+        end
+
+        def become(*args)
+          value = _implicit_bool args
+          @task_args[:become] = value
+        end
+
+        def become_user(value)
+          @task_args[:become_user] = value
+        end
+
+        def ansible_when(clause)
+          @task_args[:when] = clause
+        end
+
+        def ignore_errors(*args)
+          value = _implicit_bool args
+          @task_args[:ignore_errors] = value
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/models/base.rb

@@ -16,15 +16,22 @@ module Ansible
         end
 
         class << self
+          def attr_options
+            @attr_options ||= begin
+              # need parent attribute info
+              hash = Base > self ? superclass.attr_options : {}
+              hash.clone
+            end
+          end
+
           def attribute(name, options = {})
             attr_accessor name
-            @attr_options ||= {}
-            for_name = @attr_options[name] ||= {}
+            for_name = attr_options[name] ||= {}
             for_name.merge! options
           end
 
-          def attr_options(name)
-            @attr_options[name]
+          def attr_option(name)
+            attr_options[name]
           end
 
           def validates(*attributes)
@@ -35,8 +42,8 @@ module Ansible
             return unless type_validator
             if type_validator.is_a?(TypeGeneric)
               name = attributes[0]
-              for_name = @attr_options[name] ||= {}
-              for_name[:generic] = type_validator.klass
+              for_name = attr_options[name] ||= {}
+              for_name[:generic] = type_validator.klasses
             end
           end
         end
@@ -46,10 +53,10 @@ module Ansible
           Hash[
             @set_vars.map do |key|
               value = send key
-              options = self.class.attr_options(key)
+              options = self.class.attr_option(key)
               value = hashify value
-              generic_type = options[:generic]
-              value = convert_generic generic_type, value if generic_type
+              generic_types = options[:generic]
+              value = convert_generic generic_types, value if generic_types
               key = options[:original_name] || key
               [key, value]
             end.compact]
@@ -68,10 +75,9 @@ module Ansible
           end
         end
 
-        def convert_generic(generic_type, value)
+        def convert_generic(generic_types, value)
           # hash friendly of [*value]
-          case value
-          when generic_type
+          if generic_types.any? { |type| value.is_a? type }
             [value]
           else
             value

data/lib/ansible/ruby/models/block.rb

@@ -0,0 +1,28 @@
+# see LICENSE.txt in project root
+
+require 'ansible/ruby/models/unit'
+
+module Ansible
+  module Ruby
+    module Models
+      class Block < Unit
+        attribute :tasks
+        validates :tasks, type: TypeGeneric.new(Task)
+        validate :enough_tasks
+
+        def to_h
+          # we put the list of tasks directly under the block in Ansible
+          result = super
+          tasks = result.delete :tasks
+          { block: tasks }.merge result
+        end
+
+        private
+
+        def enough_tasks
+          errors.add :tasks, 'Must have at least 1 task in your block!' unless tasks.any?
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/models/handler.rb

@@ -0,0 +1,12 @@
+# see LICENSE.txt in project root
+
+require 'ansible/ruby/models/task'
+
+module Ansible
+  module Ruby
+    module Models
+      class Handler < Task
+      end
+    end
+  end
+end

data/lib/ansible/ruby/models/inclusion.rb

@@ -0,0 +1,28 @@
+# see LICENSE.txt in project root
+module Ansible
+  module Ruby
+    module Models
+      class Inclusion < Base
+        attribute :file
+        validates :file, presence: true, type: String
+        attribute :static
+        validates :static, type: MultipleTypes.new(TrueClass, FalseClass)
+        attribute :variables
+        validates :variables, type: Hash
+
+        def to_h
+          initial = super
+          # gets rendered as include
+          result = {
+            include: initial[:file]
+          }
+          # a more intuitive name
+          vars = initial[:variables]
+          result[:vars] = vars if vars
+          result[:static] = static unless static.is_a?(NilClass)
+          result
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/models/play.rb

@@ -28,7 +28,7 @@ module Ansible
         def to_h
           result = super
           hosts = result.delete :hosts
-          tasks = result.delete :tasks
+          tasks = result.delete :items
           roles = result.delete :roles
           name = result.delete :name
           # Be consistent with Ansible order

data/lib/ansible/ruby/models/task.rb

@@ -1,39 +1,33 @@
+require 'ansible/ruby/models/unit'
+
 module Ansible
   module Ruby
     module Models
-      class Task < Base
+      class Task < Unit
         attribute :name
         validates :name, presence: true, type: String
         attribute :module
         validates :module, presence: true
-        attribute :register
-        validates :register, type: String
-        attribute :become
-        validates :become, type: MultipleTypes.new(TrueClass, FalseClass)
-        attribute :become_user
-        validates :become_user, type: String
         attribute :changed_when
         validates :changed_when, type: String
         attribute :failed_when
         validates :failed_when, type: String
-        attribute :when
-        validates :when, type: String
         attribute :with_dict
-        validates :with_dict, type: String
+        validates :with_dict, type: MultipleTypes.new(String, Hash)
+        attribute :with_items
+        validates :with_items, type: MultipleTypes.new(String, Array)
+        validate :loop_and_dict
         attribute :notify
         validates :notify, type: TypeGeneric.new(String)
         attribute :async
         validates :async, type: Integer
         attribute :poll
         validates :poll, type: Integer
-        attribute :ignore_errors
-        validates :ignore_errors, type: MultipleTypes.new(TrueClass, FalseClass)
 
         def to_h
           result = super
           # Module gets referenced by name
           mod = result.delete :module
-          notify = result.delete :notify
           # Module traditionally goes right after name, so rebuilding hash
           new_result = {
             name: result.delete(:name)
@@ -42,9 +36,14 @@ module Ansible
           result.each do |key, value|
             new_result[key] = value
           end
-          new_result[:notify] = [*notify] if notify
           new_result
         end
+
+        private
+
+        def loop_and_dict
+          errors.add :with_items, 'Cannot use both with_items and with_dict!' if with_items && with_dict
+        end
       end
     end
   end

data/lib/ansible/ruby/models/tasks.rb

@@ -1,16 +1,18 @@
 require 'ansible/ruby/models/base'
 require 'ansible/ruby/models/task'
+require 'ansible/ruby/models/block'
+require 'ansible/ruby/models/inclusion'
 
 module Ansible
   module Ruby
     module Models
       class Tasks < Base
-        attribute :tasks
-        validates :tasks, presence: true, type: TypeGeneric.new(Task)
+        attribute :items
+        validates :items, presence: true, type: TypeGeneric.new(Task, Block, Inclusion)
 
         def to_h
           # Don't need to return highest level
-          super[:tasks]
+          super[:items]
         end
       end
     end

data/lib/ansible/ruby/models/type_generic.rb

@@ -1,29 +1,31 @@
 # See LICENSE.txt for license
 class TypeGeneric
-  attr_reader :klass
+  attr_reader :klasses
 
-  def initialize(klass)
-    @klass = klass
+  def initialize(*klasses)
+    @klasses = klasses
   end
 
   def valid?(value)
     validation_object = validation_object(value)
     # Don't worry about nil
     return true unless validation_object
-    validation_object.is_a? @klass
+    @klasses.any? { |klass| validation_object.is_a? klass }
   end
 
   def error(attribute, value)
     object = validation_object(value)
-    "Attribute #{attribute} expected to be a #{@klass} but was a #{object.class}"
+    "Attribute #{attribute} expected to be a #{@klasses} but was a #{object.class}"
   end
 
   def eql?(other)
-    other.is_a?(TypeGeneric) && other.klass == @klass
+    other.is_a?(TypeGeneric) && other.klasses == @klasses
   end
 
   def hash
-    @klass.hash
+    @klasses.inject(0) do |hash, klass|
+      hash ^ klass.hash
+    end
   end
 
   private

data/lib/ansible/ruby/models/unit.rb

@@ -0,0 +1,26 @@
+# see LICENSE.txt in project root
+module Ansible
+  module Ruby
+    module Models
+      class Unit < Base
+        attribute :register
+        validates :register, type: String
+        attribute :become
+        validates :become, type: MultipleTypes.new(TrueClass, FalseClass)
+        attribute :become_user
+        validates :become_user, type: String
+        attribute :when
+        validates :when, type: String
+        attribute :ignore_errors
+        validates :ignore_errors, type: MultipleTypes.new(TrueClass, FalseClass)
+
+        def to_h
+          result = super
+          notify = result.delete :notify
+          result[:notify] = [*notify] if notify
+          result
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/rake/compile.rb

@@ -30,7 +30,8 @@ module Ansible
               puts "Updating Ansible file #{filename.name} from #{filename.source}..."
               ruby = File.read filename.source
               playbook_builder = Ansible::Ruby::DslBuilders::FileLevel.new
-              playbook = playbook_builder._evaluate ruby
+              playbook_builder.instance_eval ruby
+              playbook = playbook_builder._result
               yml = Ansible::Ruby::Serializer.serialize playbook.to_h
               File.write filename.name, yml
             end

data/lib/ansible/ruby/rake/execute.rb

@@ -30,7 +30,7 @@ module Ansible
           end
           symbol = name.inspect.to_s
           desc "Compiles YAML files for #{symbol} task"
-          compiled_files = playbooks + role_task_files
+          compiled_files = playbooks + nested_files
           Compile.new compile_task_name do |compile_task|
             compile_task.files = compiled_files
           end
@@ -46,8 +46,9 @@ module Ansible
           [*@playbooks]
         end
 
-        def role_task_files
-          FileList['roles/*/tasks/**/*.rb']
+        def nested_files
+          FileList['roles/*/tasks/**/*.rb',
+                   'roles/*/handlers/**/*.rb']
         end
 
         def flat_options

data/lib/ansible/ruby/version.rb

@@ -1,5 +1,5 @@
 module Ansible
   module Ruby
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brady Wied
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,13 +48,19 @@ files:
 - lib/ansible-ruby.rb
 - lib/ansible/ruby/dsl_builders/args.rb
 - lib/ansible/ruby/dsl_builders/base.rb
+- lib/ansible/ruby/dsl_builders/block.rb
 - lib/ansible/ruby/dsl_builders/file_level.rb
+- lib/ansible/ruby/dsl_builders/jinja_item_node.rb
 - lib/ansible/ruby/dsl_builders/module_call.rb
 - lib/ansible/ruby/dsl_builders/play.rb
 - lib/ansible/ruby/dsl_builders/result.rb
 - lib/ansible/ruby/dsl_builders/task.rb
 - lib/ansible/ruby/dsl_builders/tasks.rb
+- lib/ansible/ruby/dsl_builders/unit.rb
 - lib/ansible/ruby/models/base.rb
+- lib/ansible/ruby/models/block.rb
+- lib/ansible/ruby/models/handler.rb
+- lib/ansible/ruby/models/inclusion.rb
 - lib/ansible/ruby/models/multiple_types.rb
 - lib/ansible/ruby/models/play.rb
 - lib/ansible/ruby/models/playbook.rb
@@ -62,6 +68,7 @@ files:
 - lib/ansible/ruby/models/tasks.rb
 - lib/ansible/ruby/models/type_generic.rb
 - lib/ansible/ruby/models/type_validator.rb
+- lib/ansible/ruby/models/unit.rb
 - lib/ansible/ruby/modules/all.rb
 - lib/ansible/ruby/modules/base.rb
 - lib/ansible/ruby/modules/custom/commands/command.rb