ansible-ruby 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac48e9bfedb879d6fb1753c6c2b79df842d98c4a
-  data.tar.gz: 394d70113ee27243bd101164f9569c1f22b308a8
+  metadata.gz: 774c6ea1e1224e83f2f96c31ef3e09e1b45653e0
+  data.tar.gz: fc7955e393670388954e3ee9906418a0a2002bb6
 SHA512:
-  metadata.gz: 196c4553ec3b99551e11afd1b283018ebeb95c08a2417665b91182a8a76b75214c574f1e05a2662d99f9c7c596d5d8ec8f49449ef2ae4ba05be5ee96e37cef07
-  data.tar.gz: 5bfee2cc930f3326b80f360706c728e06aa03285e8bb79ef9eff4c6e411f9084754ada1efb08338052deca84d45da3d5c99bdb94d1557249a777b4a9845aaf4c
+  metadata.gz: 15abf355078fd9b9e808c07c95dd17d20cff26f11e5b9567c43f5c870b14734f190624556affc9fdf304e1b9e13a60ef1699dd8373e050861595f031054247fc
+  data.tar.gz: e012f982a9e6dd5727acb4675f37ad1ac1b3fc3b7878dcd6eeb3b23b47dd373f7a95b0d9c2a6ad6847a1e2deac71750ed30125889f71ce929d97fbf9606abfe3

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

@@ -7,21 +7,25 @@ module Ansible
       class Block < Unit
         def initialize
           super
-          @tasks = []
-          @temp_counter = 0
+          @task_builders = []
+          temp_counter = 0
+          @temp_counter_incrementer = lambda do
+            temp_counter += 1
+          end
         end
 
         def task(name, &block)
-          @temp_counter += 1
-          task_builder = Task.new name, Models::Task, @temp_counter
+          task_builder = Task.new name, Models::Task, @temp_counter_incrementer
           task_builder.instance_eval(&block)
-          @tasks << task_builder._result
+          @task_builders << task_builder
+          task_builder._register
         end
 
         # allow for other attributes besides the module in any order
         def _result
+          tasks = @task_builders.map(&:_result)
           args = {
-            tasks: @tasks
+            tasks: tasks
           }.merge @task_args
           block = Models::Block.new args
           block.validate!

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

@@ -62,7 +62,7 @@ module Ansible
         def block(&block)
           builder = Block.new
           builder.instance_eval(&block)
-          @tasks << builder._result
+          @task_builders << builder
         end
 
         # allow any order

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

@@ -2,19 +2,15 @@ module Ansible
   module Ruby
     module DslBuilders
       class Result
-        def initialize(counter, register_set)
-          @name = "result_#{counter}"
-          # Until the variable is utilized, we don't know if 'register' should be set, the supplied lambda
-          # allows us to set register on the task
-          @register_set = register_set
+        def initialize(name_fetcher)
+          @name_fetcher = name_fetcher
         end
 
         # we need to respond to everything, don't want super
         # rubocop:disable Style/MethodMissing
         def method_missing(id, *args)
-          register_needed
           flat_args = args.map(&:inspect).map(&:to_s).join ', '
-          "#{@name}.#{id}#{flat_args.empty? ? '' : "(#{flat_args})"}"
+          "#{name}.#{id}#{flat_args.empty? ? '' : "(#{flat_args})"}"
         end
         # rubocop:enable Style/MethodMissing
 
@@ -22,10 +18,15 @@ module Ansible
           true
         end
 
+        def to_s
+          name
+        end
+
         private
 
-        def register_needed
-          @register_set[@name]
+        def name
+          # Don't want to assign a name until we actually use a variable
+          @name ||= @name_fetcher.call
         end
       end
     end

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

@@ -8,19 +8,29 @@ module Ansible
   module Ruby
     module DslBuilders
       class Task < Unit
-        def initialize(name, context, temp_counter)
+        def initialize(name, context, temp_counter_inc)
           super()
           @name = name
           @context = context
           @module = nil
           @inclusion = nil
-          @temp_counter = temp_counter
+          # Until the variable is utilized, we don't know if 'register' should be set, the supplied lambda
+          name_fetcher = lambda do
+            name = "result_#{temp_counter_inc.call}"
+            @task_args[:register] = name
+            name
+          end
+          @register = Result.new name_fetcher
         end
 
         def no_log(value)
           @task_args[:no_log] = value
         end
 
+        def connection(value)
+          @task_args[:connection] = value
+        end
+
         def changed_when(clause)
           @task_args[:changed_when] = clause
         end
@@ -58,12 +68,16 @@ module Ansible
           !@module || super
         end
 
+        def _register
+          @register
+        end
+
         # allow for other attributes besides the module in any order
         def _result
           args = {
-            module: @module,
             name: @name
           }.merge @task_args
+          args[:module] = @module if @module
           args[:inclusion] = @inclusion if @inclusion
           task = @context.new args
           # Quick feedback if the type is wrong, etc.
@@ -78,7 +92,10 @@ module Ansible
         private
 
         def _process_method(id, *args, &block)
-          _check_context if id == :ansible_include
+          if id == :ansible_include
+            @inclusion = _ansible_include(*args, &block)
+            return
+          end
           mcb = ModuleCall.new
           # only 1 module allowed per task, give a good error message
           if @module && mcb.respond_to?(id)
@@ -89,15 +106,9 @@ module Ansible
           @module = mcb._result
         end
 
-        def _check_context
-          raise "Can't call inclusion inside a handler(yet), only in plays/handlers" if @context == Models::Handler
-          raise "Can't call inclusion inside a task, only in plays/handlers"
-        end
-
         def method_missing_return(_id, _result, *_args)
-          # method_missing only used for modules here
-          # Keep our register variables unique
-          Result.new(@temp_counter, ->(name) { @task_args[:register] = name })
+          # Allow module call to return the register vsriable
+          @register
         end
       end
     end

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

@@ -9,9 +9,12 @@ module Ansible
       class Tasks < Base
         def initialize(context)
           @context = context
-          @tasks = []
+          @task_builders = []
           @includes = []
-          @temp_counter = 0
+          temp_counter = 0
+          @temp_counter_incrementer = lambda do
+            temp_counter += 1
+          end
         end
 
         def ansible_include(filename, &block)
@@ -20,7 +23,8 @@ module Ansible
 
         # allow multiple tasks, etc.
         def _result
-          Models::Tasks.new items: @tasks,
+          tasks = @task_builders.map(&:_result)
+          Models::Tasks.new items: tasks,
                             inclusions: @includes
         end
 
@@ -69,10 +73,14 @@ module Ansible
         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 = Task.new name, model, @temp_counter_incrementer
           task_builder.instance_eval(&block)
-          @tasks << task_builder._result
+          @last_variable = task_builder._register
+          @task_builders << task_builder
+        end
+
+        def method_missing_return(*)
+          @last_variable
         end
       end
     end

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

@@ -16,6 +16,18 @@ module Ansible
         end
 
         class << self
+          def remove_existing_validations(attr)
+            options = attr_option(attr)
+            options.clear
+            _validators.delete attr
+            callbacks = send(:get_callbacks, :validate)
+            for_this_att = callbacks.select do |callback|
+              filter = callback.filter
+              filter.respond_to?(:attributes) && filter.attributes == [attr]
+            end
+            for_this_att.each { |callback| callbacks.delete callback }
+          end
+
           def attr_options
             @attr_options ||= begin
               # need parent attribute info

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

@@ -1,4 +1,6 @@
 require 'ansible/ruby/models/unit'
+require 'ansible/ruby/models/inclusion'
+require 'ansible/ruby/modules/base'
 
 module Ansible
   module Ruby
@@ -7,7 +9,10 @@ module Ansible
         attribute :name
         validates :name, presence: true, type: String
         attribute :module
-        validates :module, presence: true
+        validates :module, type: Ansible::Ruby::Modules::Base
+        attribute :inclusion
+        validates :inclusion, type: Inclusion
+        validate :inclusion_module
         attribute :changed_when
         validates :changed_when, type: String
         attribute :failed_when
@@ -25,16 +30,21 @@ module Ansible
         validates :async, type: Integer
         attribute :poll
         validates :poll, type: Integer
+        attribute :connection
+        validates :connection,
+                  allow_nil: true,
+                  inclusion: { in: [:local, :docker, :ssh], message: '%{value} needs to be :local, :docker, or :ssh' }
 
         def to_h
           result = super
-          # Module gets referenced by name
-          mod = result.delete :module
+          # Module gets referenced by name, may not have a module though
+          mod_or_include = @inclusion ? :inclusion : :module
+          flatten = result.delete(mod_or_include) || {}
           # Module traditionally goes right after name, so rebuilding hash
           new_result = {
             name: result.delete(:name)
           }
-          new_result.merge! mod
+          new_result.merge! flatten
           result.each do |key, value|
             new_result[key] = value
           end
@@ -43,6 +53,12 @@ module Ansible
 
         private
 
+        # :reek:NilCheck - ^ doesn't work with falsey, you would have to overload the operator
+        def inclusion_module
+          errors.add :module,
+                     'You must either use an include or a module but not both!' unless @inclusion.nil? ^ @module.nil?
+        end
+
         def loop_and_dict
           errors.add :with_items, 'Cannot use both with_items and with_dict!' if with_items && with_dict
         end

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

@@ -7,7 +7,8 @@ ansible_mod.autoload(:Cloudformation, 'ansible/ruby/modules/generated/core/cloud
 ansible_mod.autoload(:Ec2, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2')
 ansible_mod.autoload(:Ec2_ami, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_ami')
 ansible_mod.autoload(:Ec2_ami_find, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_ami_find')
-ansible_mod.autoload(:Ec2_asg, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_asg')
+# Using custom module
+ansible_mod.autoload(:Ec2_asg, 'ansible/ruby/modules/custom/cloud/core/amazon/ec2_asg')
 ansible_mod.autoload(:Ec2_eip, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_eip')
 ansible_mod.autoload(:Ec2_elb, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_elb')
 ansible_mod.autoload(:Ec2_elb_lb, 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_elb_lb')
@@ -53,7 +54,8 @@ ansible_mod.autoload(:Digital_ocean, 'ansible/ruby/modules/generated/core/cloud/
 ansible_mod.autoload(:Digital_ocean_domain, 'ansible/ruby/modules/generated/core/cloud/digital_ocean/digital_ocean_domain')
 ansible_mod.autoload(:Digital_ocean_sshkey, 'ansible/ruby/modules/generated/core/cloud/digital_ocean/digital_ocean_sshkey')
 ansible_mod.autoload(:Docker, 'ansible/ruby/modules/generated/core/cloud/docker/docker')
-ansible_mod.autoload(:Docker_container, 'ansible/ruby/modules/generated/core/cloud/docker/docker_container')
+# Using custom module
+ansible_mod.autoload(:Docker_container, 'ansible/ruby/modules/custom/cloud/core/docker/docker_container')
 ansible_mod.autoload(:Docker_image, 'ansible/ruby/modules/generated/core/cloud/docker/docker_image')
 ansible_mod.autoload(:Docker_image_facts, 'ansible/ruby/modules/generated/core/cloud/docker/docker_image_facts')
 ansible_mod.autoload(:Docker_login, 'ansible/ruby/modules/generated/core/cloud/docker/docker_login')
@@ -137,21 +139,26 @@ ansible_mod.autoload(:Postgresql_privs, 'ansible/ruby/modules/generated/core/dat
 ansible_mod.autoload(:Postgresql_user, 'ansible/ruby/modules/generated/core/database/postgresql/postgresql_user')
 ansible_mod.autoload(:Acl, 'ansible/ruby/modules/generated/core/files/acl')
 ansible_mod.autoload(:Assemble, 'ansible/ruby/modules/generated/core/files/assemble')
-ansible_mod.autoload(:Copy, 'ansible/ruby/modules/generated/core/files/copy')
-ansible_mod.autoload(:Fetch, 'ansible/ruby/modules/generated/core/files/fetch')
-ansible_mod.autoload(:File, 'ansible/ruby/modules/generated/core/files/file')
+# Using custom module
+ansible_mod.autoload(:Copy, 'ansible/ruby/modules/custom/files/copy')
+# Using custom module
+ansible_mod.autoload(:Fetch, 'ansible/ruby/modules/custom/files/fetch')
+# Using custom module
+ansible_mod.autoload(:File, 'ansible/ruby/modules/custom/files/file')
 ansible_mod.autoload(:Find, 'ansible/ruby/modules/generated/core/files/find')
 ansible_mod.autoload(:Ini_file, 'ansible/ruby/modules/generated/core/files/ini_file')
 ansible_mod.autoload(:Lineinfile, 'ansible/ruby/modules/generated/core/files/lineinfile')
 ansible_mod.autoload(:Replace, 'ansible/ruby/modules/generated/core/files/replace')
 ansible_mod.autoload(:Stat, 'ansible/ruby/modules/generated/core/files/stat')
 ansible_mod.autoload(:Synchronize, 'ansible/ruby/modules/generated/core/files/synchronize')
-ansible_mod.autoload(:Template, 'ansible/ruby/modules/generated/core/files/template')
+# Using custom module
+ansible_mod.autoload(:Template, 'ansible/ruby/modules/custom/files/template')
 ansible_mod.autoload(:Unarchive, 'ansible/ruby/modules/generated/core/files/unarchive')
 ansible_mod.autoload(:Xattr, 'ansible/ruby/modules/generated/core/files/xattr')
 ansible_mod.autoload(:Add_host, 'ansible/ruby/modules/generated/core/inventory/add_host')
 ansible_mod.autoload(:Group_by, 'ansible/ruby/modules/generated/core/inventory/group_by')
-ansible_mod.autoload(:Get_url, 'ansible/ruby/modules/generated/core/network/basics/get_url')
+# Using custom module
+ansible_mod.autoload(:Get_url, 'ansible/ruby/modules/custom/network/basics/get_url')
 ansible_mod.autoload(:Slurp, 'ansible/ruby/modules/generated/core/network/basics/slurp')
 ansible_mod.autoload(:Uri, 'ansible/ruby/modules/generated/core/network/basics/uri')
 ansible_mod.autoload(:Cl_bond, 'ansible/ruby/modules/generated/core/network/cumulus/cl_bond')
@@ -230,7 +237,8 @@ ansible_mod.autoload(:Async_status, 'ansible/ruby/modules/generated/core/utiliti
 ansible_mod.autoload(:Debug, 'ansible/ruby/modules/generated/core/utilities/logic/debug')
 ansible_mod.autoload(:Fail, 'ansible/ruby/modules/generated/core/utilities/logic/fail')
 ansible_mod.autoload(:Pause, 'ansible/ruby/modules/generated/core/utilities/logic/pause')
-ansible_mod.autoload(:Set_fact, 'ansible/ruby/modules/generated/core/utilities/logic/set_fact')
+# Using custom module
+ansible_mod.autoload(:Set_fact, 'ansible/ruby/modules/custom/utilities/logic/set_fact')
 ansible_mod.autoload(:Wait_for, 'ansible/ruby/modules/generated/core/utilities/logic/wait_for')
 ansible_mod.autoload(:Apache2_module, 'ansible/ruby/modules/generated/core/web_infrastructure/apache2_module')
 ansible_mod.autoload(:Django_manage, 'ansible/ruby/modules/generated/core/web_infrastructure/django_manage')

data/lib/ansible/ruby/modules/custom/cloud/core/amazon/ec2_asg.rb

@@ -0,0 +1,17 @@
+# VALIDATED_CHECKSUM: ke2ZdaLvxoGxPtqdOxXDJIIz+sG3choGauiyWbayeSQ=
+# See LICENSE.txt for license
+
+require 'ansible/ruby/modules/generated/core/cloud/amazon/ec2_asg'
+
+module Ansible
+  module Ruby
+    module Modules
+      class Ec2_asg
+        remove_existing_validations :termination_policies
+        # @return [:OldestInstance, :NewestInstance, :OldestLaunchConfiguration, :ClosestToNextInstanceHour, :Default, nil] An ordered list of criteria used for selecting instances to be removed from the Auto Scaling group when reducing capacity.,For 'Default', when used to create a new autoscaling group, the "Default" value is used. When used to change an existent autoscaling group, the current termination policies are mantained
+        attribute :termination_policies
+        validates :termination_policies, type: Array
+      end
+    end
+  end
+end

data/lib/ansible/ruby/modules/custom/cloud/core/docker/docker_container.rb

@@ -0,0 +1,41 @@
+# VALIDATED_CHECKSUM: HoHvaFYbnOUeU03yrUaG8NMWRHEC9ofwjEVNquhM7Dw=
+# See LICENSE.txt for license
+
+require 'ansible/ruby/modules/generated/core/cloud/docker/docker_container'
+
+module Ansible
+  module Ruby
+    module Modules
+      class Docker_container
+        remove_existing_validations :volumes
+        validates :volumes, type: Hash
+        remove_existing_validations :network_mode
+        validates :network_mode, type: String
+
+        def to_h
+          result = super
+          data = result[:docker_container]
+          if data.include? :volumes
+            data[:volumes] = transform_volumes data[:volumes]
+          end
+          result
+        end
+
+        private
+
+        def transform_volumes(input)
+          input.map do |host_path, info|
+            image_path = if info.is_a? Hash
+                           flags = info[:flags]
+                           path = info[:path]
+                           [path, flags].join ':'
+                         else
+                           info
+                         end
+            [host_path, image_path].join ':'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/modules/custom/commands/command.rb

@@ -1,7 +1,6 @@
+# VALIDATED_CHECKSUM: HlJ7AWUxwcrY8Vt+1L/V59AdmCQdJO3Ts8bbemlo4eY=
 # See LICENSE.txt for license
 
-# VALIDATED_CHECKSUM: JQvTPI3GbhVRRPRvDgbzLeeuYLABoDT7ogPPA2odrHs=
-
 require 'ansible/ruby/modules/free_form'
 require 'ansible/ruby/modules/generated/core/commands/command'
 

data/lib/ansible/ruby/modules/custom/commands/raw.rb

@@ -1,4 +1,4 @@
-# VALIDATED_CHECKSUM: aHiGPJ0CGZvoBX3EPdvSwymkBZ1qlHyXEBrLfi27C6A=
+# VALIDATED_CHECKSUM: btGcDE59YLyMKJs2cIrGEUILUgFMG3ChnfFburRtSYg=
 # See LICENSE.txt for license
 
 require 'ansible/ruby/modules/free_form'

data/lib/ansible/ruby/modules/custom/commands/script.rb

@@ -1,4 +1,4 @@
-# VALIDATED_CHECKSUM: RhHDiVtIFNT3I5ESwjmmuJBl8pv6qi2oIyGxPsjxmpE=
+# VALIDATED_CHECKSUM: 9JallgUysKJIyHfAPqGtC5OEbyuq4elfgTdiAnipb3M=
 # See LICENSE.txt for license
 
 require 'ansible/ruby/modules/free_form'

data/lib/ansible/ruby/modules/custom/commands/shell.rb

@@ -1,4 +1,4 @@
-# VALIDATED_CHECKSUM: hbLqxsuZqxyO5SXR1JlPnhnNc6lrDZBDWwhN+7UNW7Q=
+# VALIDATED_CHECKSUM: bL1wWjIPPEipr7Ri9/KKydfJ3w5S0A1ezC2BTh9hc8I=
 # See LICENSE.txt for license
 
 require 'ansible/ruby/modules/free_form'

data/lib/ansible/ruby/modules/custom/files/copy.rb

@@ -0,0 +1,15 @@
+# VALIDATED_CHECKSUM: xP6DW+ebKQO0s/qZz8E8aOeRWZtmT6jaPtrvAtsQwyU=
+# see LICENSE.txt in project root
+
+require 'ansible/ruby/modules/generated/core/files/copy'
+require 'ansible/ruby/modules/missing_file_stuff'
+
+module Ansible
+  module Ruby
+    module Modules
+      class Copy
+        include MissingFileStuff
+      end
+    end
+  end
+end