ansible-ruby 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e1d73a3de56b29f57a5cd7d44cd87fc9a21c90
-  data.tar.gz: cf89185af3770233e0b043c88976c6de41fe8006
+  metadata.gz: 727699f832b62d2e6870209e65cbef3d3324b27c
+  data.tar.gz: 9f1012dd3e2979a07227e337cf7b055a20d246b3
 SHA512:
-  metadata.gz: 732dc45ee62ab5280092c6bcb706761a4f23a814b9c4040f50855810b38de4aad7c212c1df40968604f49aa44463eaf28ac4e07f99bf17cfb0d94302d877347a
-  data.tar.gz: 4b30771eb0007094a2d4d47a59e6dd0950e492b39bab0ee3578aba854920c226877f1835a8ed54d1063e82fd742ac9193df549f634d307459699f014caee3fc2
+  metadata.gz: c44972041ab6bb679378e79288ce3e973b5c0f5c50729e1ca5629178e9521ced8f5934f47689640f438f595307a716dcd54df197f32f7bff830b9f4f0d539b4d
+  data.tar.gz: 25d9c8ef06bd5065d23664bf9c8d403677316d5644247fd4c804d7e3ba1f7d480dd55c2c4436ae19f01921893f8ffe21718352b5255ffb8a01a628c82d87c78c

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

@@ -4,14 +4,43 @@ module Ansible
   module Ruby
     module DslBuilders
       class Args < Base
-        def initialize
-          super
-          @result = {}
+        KERNEL_METHOD_OVERRIDES = [:system, :test, :warn, :sleep].freeze
+
+        def initialize(recipient, &block)
+          super()
+          @error_handler = block
+          @recipient = recipient
         end
 
         def _process_method(id, *args)
+          setter = "#{id}=".to_sym
+          @error_handler[id] if @error_handler && !@recipient.respond_to?(setter)
           value = args.length == 1 ? args[0] : args
-          @result[id] = value
+          value = _convert_ast_node value
+          @recipient.send(setter, value)
+        end
+
+        KERNEL_METHOD_OVERRIDES.each do |method|
+          define_method(method) do |*args|
+            _process_method method, *args
+          end
+        end
+
+        private
+
+        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
       end
     end

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

@@ -18,33 +18,23 @@ module Ansible
           "{{ #{text} }}"
         end
 
+        # For the DSL, don't want to defer to regular method_missing
+        # rubocop:disable Style/MethodMissing
         def method_missing(id, *args, &block)
-          result = begin
-            _process_method id, *args, &block
-          rescue StandardError => our_error
-            begin
-              super
-            rescue NameError => ruby_error
-              matching_line = ruby_error.backtrace
-                                        .map { |str| str.split ':' }
-                                        .find { |arr| arr[0] == '(eval)' }[1]
-              raise "#{our_error.message} at line #{matching_line}!"
-            end
-          end
+          result = _process_method id, *args, &block
           method_missing_return id, result, *args
         end
+        # rubocop:enable Style/MethodMissing
 
         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))
+          inclusion = Models::Inclusion.new(file: filename)
+          if block
+            args_builder = Args.new inclusion
+            args_builder.instance_eval(&block)
+          end
+          inclusion
         end
 
         def _valid_attributes

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

@@ -34,6 +34,23 @@ module Ansible
           @tasks_builder.handler name, &block
         end
 
+        def _handled_eval(ruby_filename)
+          ruby_code = File.read ruby_filename
+          instance_eval ruby_code, ruby_filename
+          # error code
+          nil
+        rescue StandardError => error
+          only_user_code = error.backtrace_locations
+                                .select { |trace| trace.absolute_path == ruby_filename }
+                                .map { |trace| format_trace_line(trace) }
+          message = "#{error.message}\n****Error Location:****\n#{only_user_code.join("\n")}"
+          Exception.new message
+        end
+
+        def format_trace_line(trace)
+          "#{trace.path}:#{trace.lineno}"
+        end
+
         # any order/lazy result
         # :reek:NilCheck - when nil is the simplest way to check this
         def _result

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

@@ -12,7 +12,7 @@ module Ansible
 
         def respond_to_missing?(method_name, _)
           klass_name = _klass_name method_name
-          MODULES_MOD.const_defined?(klass_name) || super
+          MODULES_MOD.const_defined?(klass_name)
         end
 
         private
@@ -23,44 +23,32 @@ module Ansible
 
         def _process_method(id, *module_args, &block)
           module_klass = _module_klass(id)
-          args = _arguments(block, module_args, module_klass)
-          @result = module_klass.new(args)
+          @result = module_klass.new({})
+          _arguments(block, module_args)
           @result.validate!
         end
 
-        def _arguments(block, module_args, module_klass)
-          free_form_module = module_klass.include?(Ansible::Ruby::Modules::FreeForm)
+        def _arguments(block, module_args)
+          free_form_module = @result.class.include?(Ansible::Ruby::Modules::FreeForm)
           if module_args.any? && !free_form_module
             raise "Can't use arguments #{module_args} on this type of module"
           end
           if !free_form_module && !block
             raise 'You must supply a block when using this type of module'
           end
-          args = {}
           free_form = free_form_module && _free_form_arg(module_args)
-          args.merge! _block_args(&block)
-          args[:free_form] = free_form if free_form
-          _jinja_nodes(args)
-        end
-
-        def _jinja_nodes(args)
-          Hash[args.map do |key, value|
-            [key, _convert_ast_node(value)]
-          end]
+          args_builder = Args.new @result do |attribute|
+            # More user friendly to get rid of = mutators
+            valid = _valid_module_attrib
+            raise "Unknown attribute '#{attribute}' for #{@result.class.name}.\n\nValid attributes are: #{valid}\n"
+          end
+          _block_args(args_builder, &block)
+          args_builder.free_form free_form if free_form
         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
+        def _valid_module_attrib
+          (@result.methods - Modules::Base.instance_methods).reject do |method|
+            method.to_s.end_with?('=') || method == :free_form
           end
         end
 
@@ -69,12 +57,10 @@ module Ansible
           MODULES_MOD.const_get _klass_name(id)
         end
 
-        def _block_args(&block)
+        def _block_args(args_builder, &block)
           return {} unless block
           # Delegate everything to the args builder and apply it to the module class we located
-          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

@@ -36,6 +36,20 @@ module Ansible
           @play_args[:gather_facts] = value
         end
 
+        def become(*args)
+          value = _implicit_bool args
+          @play_args[:become] = value
+        end
+
+        def become_user(value)
+          @play_args[:become_user] = value
+        end
+
+        def ignore_errors(*args)
+          value = _implicit_bool args
+          @play_args[:ignore_errors] = value
+        end
+
         def local_host
           hosts 'localhost'
           connection :local

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

@@ -69,20 +69,26 @@ module Ansible
         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
-          no_method_error id, "Only valid options are #{_valid_attributes}" if @module
+          _check_context if id == :ansible_include
           mcb = ModuleCall.new
+          if @module && mcb.respond_to?(id)
+            # only 1 module allowed per task, give a good error message
+            raise "Invalid module call `#{id}' since `#{@module.ansible_name}' module has already been used in this task. Only valid options are #{_valid_attributes}"
+          elsif @module
+            no_method_error id, "Only valid options are #{_valid_attributes}"
+          end
           mcb.send(id, *args, &block)
           @module = mcb._result
         end
 
+        def _check_context
+          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
+
         def method_missing_return(_id, _result, *_args)
           # method_missing only used for modules here
           # Keep our register variables unique

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

@@ -11,8 +11,8 @@ module Ansible
         include ActiveModel::Validations
 
         def initialize(args = {})
+          @set_vars = {}
           super
-          @set_vars = args.keys
         end
 
         class << self
@@ -25,7 +25,13 @@ module Ansible
           end
 
           def attribute(name, options = {})
-            attr_accessor name
+            attr_reader name
+            # Want to keep track of what we set (avoid default issues)
+            ivar = "@#{name}".to_sym
+            define_method("#{name}=".to_sym) do |value|
+              @set_vars[name] = true
+              instance_variable_set ivar, value
+            end
             for_name = attr_options[name] ||= {}
             for_name.merge! options
           end
@@ -51,7 +57,7 @@ module Ansible
         def to_h
           validate!
           Hash[
-            @set_vars.map do |key|
+            @set_vars.map do |key, _|
               value = send key
               options = self.class.attr_option(key)
               value = hashify value

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

@@ -7,6 +7,12 @@ module Ansible
       class Play < Base
         attribute :hosts
         validates :hosts, presence: true, type: TypeGeneric.new(String)
+        attribute :become
+        validates :become, type: MultipleTypes.new(TrueClass, FalseClass)
+        attribute :become_user
+        validates :become_user, type: String
+        attribute :ignore_errors
+        validates :ignore_errors, type: MultipleTypes.new(TrueClass, FalseClass)
         attribute :name
         validates :name, type: String
         attribute :tasks

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

@@ -6,9 +6,13 @@ module Ansible
       class Base < Models::Base
         def to_h
           {
-            self.class.name.demodulize.underscore.to_sym => super
+            ansible_name.to_sym => super
           }
         end
+
+        def ansible_name
+          self.class.name.demodulize.underscore
+        end
       end
     end
   end

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

@@ -28,10 +28,11 @@ module Ansible
             return if @rule_done
             ::Rake.application.create_rule '.yml' => '.rb' do |filename|
               puts "Updating Ansible file #{filename.name} from #{filename.source}..."
-              ruby = File.read filename.source
-              playbook_builder = Ansible::Ruby::DslBuilders::FileLevel.new
-              playbook_builder.instance_eval ruby
-              playbook = playbook_builder._result
+              file_builder = Ansible::Ruby::DslBuilders::FileLevel.new
+              exception = file_builder._handled_eval filename.source
+              # Avoid lengthy stack trace
+              raise exception if exception
+              playbook = file_builder._result
               yml = Ansible::Ruby::Serializer.serialize playbook.to_h
               File.write filename.name, yml
             end

data/lib/ansible/ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Brady Wied
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake