ansible-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727699f832b62d2e6870209e65cbef3d3324b27c
-  data.tar.gz: 9f1012dd3e2979a07227e337cf7b055a20d246b3
+  metadata.gz: ac48e9bfedb879d6fb1753c6c2b79df842d98c4a
+  data.tar.gz: 394d70113ee27243bd101164f9569c1f22b308a8
 SHA512:
-  metadata.gz: c44972041ab6bb679378e79288ce3e973b5c0f5c50729e1ca5629178e9521ced8f5934f47689640f438f595307a716dcd54df197f32f7bff830b9f4f0d539b4d
-  data.tar.gz: 25d9c8ef06bd5065d23664bf9c8d403677316d5644247fd4c804d7e3ba1f7d480dd55c2c4436ae19f01921893f8ffe21718352b5255ffb8a01a628c82d87c78c
+  metadata.gz: 196c4553ec3b99551e11afd1b283018ebeb95c08a2417665b91182a8a76b75214c574f1e05a2662d99f9c7c596d5d8ec8f49449ef2ae4ba05be5ee96e37cef07
+  data.tar.gz: 5bfee2cc930f3326b80f360706c728e06aa03285e8bb79ef9eff4c6e411f9084754ada1efb08338052deca84d45da3d5c99bdb94d1557249a777b4a9845aaf4c

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

@@ -38,7 +38,7 @@ module Ansible
         end
 
         def _valid_attributes
-          (self.class.instance_methods - Object.instance_methods - [:_result, :method_missing])
+          (self.class.instance_methods - Object.instance_methods - [:_result, :method_missing, :validate?])
         end
 
         def no_method_error(method, only_valid_clause)

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

@@ -10,6 +10,7 @@ module Ansible
           @plays = []
           @tasks_builder = nil
           @context = nil
+          @includes = []
         end
 
         def play(name = nil, &block)
@@ -34,6 +35,10 @@ module Ansible
           @tasks_builder.handler name, &block
         end
 
+        def ansible_include(filename, &block)
+          @includes << _ansible_include(filename, &block)
+        end
+
         def _handled_eval(ruby_filename)
           ruby_code = File.read ruby_filename
           instance_eval ruby_code, ruby_filename
@@ -57,9 +62,12 @@ module Ansible
           case @context
           when :playbook
             # TODO: Add a playbook DSL and do this like tasks
-            Models::Playbook.new plays: @plays
+            Models::Playbook.new plays: @plays,
+                                 inclusions: @includes
           when :tasks, :handlers
-            @tasks_builder._result
+            tasks_model = @tasks_builder._result
+            tasks_model.inclusions += @includes
+            tasks_model
           when nil
             raise 'Must supply at least 1 handler/task/play!'
           else
@@ -74,9 +82,7 @@ module Ansible
         private
 
         def _validate_context(expected)
-          if @context && @context != expected
-            raise "This is a #{@context} file, cannot use #{expected} here!"
-          end
+          raise "This is a #{@context} file, cannot use #{expected} here!" if @context && @context != expected
         end
       end
     end

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

@@ -1,7 +1,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/modules/free_form'
 require 'ansible/ruby/dsl_builders/jinja_item_node'
 
 module Ansible
@@ -64,12 +64,9 @@ module Ansible
         end
 
         def _free_form_arg(module_args)
-          if module_args.any?
-            raise 'Expected only 1 argument for this type of module' if module_args.length > 1
-            module_args[0]
-          else
-            raise 'Expected 1 argument for this type of module'
-          end
+          raise 'Expected 1 argument for this type of module' unless module_args.any?
+          raise 'Expected only 1 argument for this type of module' if module_args.length > 1
+          module_args[0]
         end
       end
     end

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

@@ -16,6 +16,10 @@ module Ansible
           @play_args[:hosts] = value
         end
 
+        def no_log(value)
+          @play_args[:no_log] = value
+        end
+
         def roles(value)
           @play_args[:roles] = value
         end
@@ -58,12 +62,15 @@ module Ansible
         def block(&block)
           builder = Block.new
           builder.instance_eval(&block)
-          @items << builder._result
+          @tasks << builder._result
         end
 
         # allow any order
         def _result
           tasks = super
+          if tasks.inclusions.any? && @play_args[:roles]
+            raise 'Includes cannot be used in a play using a role. They can only be used in task files or in plays with a task list.'
+          end
           args = @play_args.merge({})
           # Don't want to trigger validation
           args[:tasks] = tasks if tasks.items.any?

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

@@ -17,6 +17,10 @@ module Ansible
           @temp_counter = temp_counter
         end
 
+        def no_log(value)
+          @task_args[:no_log] = value
+        end
+
         def changed_when(clause)
           @task_args[:changed_when] = clause
         end
@@ -62,31 +66,32 @@ module Ansible
           }.merge @task_args
           args[:inclusion] = @inclusion if @inclusion
           task = @context.new args
-          task.validate!
+          # Quick feedback if the type is wrong, etc.
+          task.validate! if validate?
           task
         end
 
+        def validate?
+          true
+        end
+
         private
 
         def _process_method(id, *args, &block)
           _check_context if id == :ansible_include
           mcb = ModuleCall.new
+          # only 1 module allowed per task, give a good error message
           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
+          no_method_error id, "Only valid options are #{_valid_attributes}" if @module
           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
+          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)

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

@@ -9,17 +9,19 @@ module Ansible
       class Tasks < Base
         def initialize(context)
           @context = context
-          @items = []
+          @tasks = []
+          @includes = []
           @temp_counter = 0
         end
 
         def ansible_include(filename, &block)
-          @items << _ansible_include(filename, &block)
+          @includes << _ansible_include(filename, &block)
         end
 
         # allow multiple tasks, etc.
         def _result
-          Models::Tasks.new items: @items
+          Models::Tasks.new items: @tasks,
+                            inclusions: @includes
         end
 
         class << self
@@ -70,7 +72,7 @@ module Ansible
           @temp_counter += 1
           task_builder = Task.new name, model, @temp_counter
           task_builder.instance_eval(&block)
-          @items << task_builder._result
+          @tasks << task_builder._result
         end
       end
     end

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

@@ -45,12 +45,10 @@ module Ansible
             # avoid having to dupe this in the :attribute call
             hash = attributes.length > 1 && attributes[1]
             type_validator = hash && hash[:type]
-            return unless type_validator
-            if type_validator.is_a?(TypeGeneric)
-              name = attributes[0]
-              for_name = attr_options[name] ||= {}
-              for_name[:generic] = type_validator.klasses
-            end
+            return unless type_validator && type_validator.is_a?(TypeGeneric)
+            name = attributes[0]
+            for_name = attr_options[name] ||= {}
+            for_name[:generic] = type_validator.klasses
           end
         end
 

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

@@ -13,6 +13,8 @@ module Ansible
         validates :become_user, type: String
         attribute :ignore_errors
         validates :ignore_errors, type: MultipleTypes.new(TrueClass, FalseClass)
+        attribute :no_log
+        validates :no_log, type: MultipleTypes.new(TrueClass, FalseClass)
         attribute :name
         validates :name, type: String
         attribute :tasks

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

@@ -6,10 +6,13 @@ module Ansible
       class Playbook < Base
         attribute :plays
         validates :plays, presence: true, type: TypeGeneric.new(Play)
+        attribute :inclusions
+        validates :inclusions, type: TypeGeneric.new(Inclusion)
 
         def to_h
+          super_result = super
           # Don't need to return highest level
-          super[:plays]
+          super_result[:plays] + (super_result[:inclusions] || [])
         end
       end
     end

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

@@ -14,6 +14,8 @@ module Ansible
         validates :failed_when, type: String
         attribute :with_dict
         validates :with_dict, type: MultipleTypes.new(String, Hash)
+        attribute :no_log
+        validates :no_log, type: MultipleTypes.new(TrueClass, FalseClass)
         attribute :with_items
         validates :with_items, type: MultipleTypes.new(String, Array)
         validate :loop_and_dict

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

@@ -9,10 +9,13 @@ module Ansible
       class Tasks < Base
         attribute :items
         validates :items, presence: true, type: TypeGeneric.new(Task, Block, Inclusion)
+        attribute :inclusions
+        validates :inclusions, type: TypeGeneric.new(Inclusion)
 
         def to_h
+          super_result = super
           # Don't need to return highest level
-          super[:items]
+          (super_result[:inclusions] || []) + super_result[:items]
         end
       end
     end

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

@@ -573,3 +573,4 @@ ansible_mod.autoload(:Win_unzip, 'ansible/ruby/modules/generated/extras/windows/
 ansible_mod.autoload(:Win_updates, 'ansible/ruby/modules/generated/extras/windows/win_updates')
 ansible_mod.autoload(:Win_uri, 'ansible/ruby/modules/generated/extras/windows/win_uri')
 ansible_mod.autoload(:Win_webpicmd, 'ansible/ruby/modules/generated/extras/windows/win_webpicmd')
+ansible_mod.autoload(:Include_vars, 'ansible/ruby/modules/custom/utilities/include_vars')

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

@@ -2,7 +2,7 @@
 
 # VALIDATED_CHECKSUM: JQvTPI3GbhVRRPRvDgbzLeeuYLABoDT7ogPPA2odrHs=
 
-require 'ansible/ruby/modules/custom/free_form'
+require 'ansible/ruby/modules/free_form'
 require 'ansible/ruby/modules/generated/core/commands/command'
 
 module Ansible

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

@@ -1,7 +1,7 @@
 # VALIDATED_CHECKSUM: aHiGPJ0CGZvoBX3EPdvSwymkBZ1qlHyXEBrLfi27C6A=
 # See LICENSE.txt for license
 
-require 'ansible/ruby/modules/custom/free_form'
+require 'ansible/ruby/modules/free_form'
 require 'ansible/ruby/modules/generated/core/commands/raw'
 
 module Ansible

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

@@ -1,7 +1,7 @@
 # VALIDATED_CHECKSUM: RhHDiVtIFNT3I5ESwjmmuJBl8pv6qi2oIyGxPsjxmpE=
 # See LICENSE.txt for license
 
-require 'ansible/ruby/modules/custom/free_form'
+require 'ansible/ruby/modules/free_form'
 require 'ansible/ruby/modules/generated/core/commands/script'
 
 module Ansible

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

@@ -1,7 +1,7 @@
 # VALIDATED_CHECKSUM: hbLqxsuZqxyO5SXR1JlPnhnNc6lrDZBDWwhN+7UNW7Q=
 # See LICENSE.txt for license
 
-require 'ansible/ruby/modules/custom/free_form'
+require 'ansible/ruby/modules/free_form'
 require 'ansible/ruby/modules/generated/core/commands/shell'
 
 module Ansible

data/lib/ansible/ruby/modules/custom/utilities/include_vars.rb

@@ -0,0 +1,14 @@
+require 'ansible/ruby/modules/free_form'
+
+module Ansible
+  module Ruby
+    module Modules
+      class Include_vars < Base
+        attribute :free_form
+        validates :free_form, presence: true
+
+        include FreeForm
+      end
+    end
+  end
+end

data/lib/ansible/ruby/modules/generated/core/cloud/docker/docker_image.rb

@@ -14,7 +14,7 @@ module Ansible
         attribute :dockerfile
         validates :dockerfile, type: String
 
-        # @return [Boolean, nil] Use with absent state to un-tag and remove all images matching the specified name. Use with states 'present' and 'tagged' to take action even when an image already exists.
+        # @return [Boolean, nil] Use with state I(absent) to un-tag and remove all images matching the specified name. Use with state C(present) to build, load or pull an image when the image already exists.
         attribute :force
         validates :force, inclusion: {:in=>[true, false], :message=>"%{value} needs to be true, false"}, allow_nil: true
 
@@ -45,9 +45,9 @@ module Ansible
         attribute :repository
         validates :repository, type: String
 
-        # @return [:absent, :present, :"build (DEPRECATED)", nil] Make assertions about the state of an image.,When 'absent' an image will be removed. Use the force option to un-tag and remove all images matching the provided name.,When 'present' check if an image exists using the provided name and tag. If the image is not found or the force option is used, the image will either be pulled, built or loaded. By default the image will be pulled from Docker Hub. To build the image, provide a path value set to a directory containing a context and Dockerfile. To load an image, specify load_path to provide a path to an archive file. To tag an image to a repository, provide a repository path. If the name contains a repository path, it will be pushed.,NOTE: 'build' is DEPRECATED. Specifying 'build' will behave the same as 'present'.
+        # @return [:absent, :present, :build, nil] Make assertions about the state of an image.,When 'absent' an image will be removed. Use the force option to un-tag and remove all images matching the provided name.,When 'present' check if an image exists using the provided name and tag. If the image is not found or the force option is used, the image will either be pulled, built or loaded. By default the image will be pulled from Docker Hub. To build the image, provide a path value set to a directory containing a context and Dockerfile. To load an image, specify load_path to provide a path to an archive file. To tag an image to a repository, provide a repository path. If the name contains a repository path, it will be pushed.,NOTE: C(build) is DEPRECATED and will be removed in release 2.3. Specifying C(build) will behave the same as C(present).
         attribute :state
-        validates :state, inclusion: {:in=>[:absent, :present, :"build (DEPRECATED)"], :message=>"%{value} needs to be :absent, :present, :\"build (DEPRECATED)\""}, allow_nil: true
+        validates :state, inclusion: {:in=>[:absent, :present, :build], :message=>"%{value} needs to be :absent, :present, :build"}, allow_nil: true
 
         # @return [String, nil] Used to select an image when pulling. Will be added to the image when pushing, tagging or building. Defaults to 'latest' when pulling an image.
         attribute :tag

data/lib/ansible/ruby/modules/generated/core/files/synchronize.rb

@@ -14,9 +14,9 @@ module Ansible
         attribute :dest
         validates :dest, presence: true
 
-        # @return [Integer, nil] Port number for ssh on the destination host. Prior to ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
+        # @return [Array<String>, String, nil] Port number for ssh on the destination host. Prior to ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
         attribute :dest_port
-        validates :dest_port, type: Integer
+        validates :dest_port, type: TypeGeneric.new(String)
 
         # @return [:push, :pull, nil] Specify the direction of the synchronization. In push mode the localhost or delegate is the source; In pull mode the remote host in context is the source.
         attribute :mode

data/lib/ansible/ruby/modules/generated/core/network/nxos/nxos_feature.rb

@@ -6,11 +6,11 @@ module Ansible
   module Ruby
     module Modules
       class Nxos_feature < Base
-        # @return [String] Name of feature
+        # @return [String] Name of feature.
         attribute :feature
         validates :feature, presence: true, type: String
 
-        # @return [:enabled, :disabled, nil] Desired state of the feature
+        # @return [:enabled, :disabled, nil] Desired state of the feature.
         attribute :state
         validates :state, inclusion: {:in=>[:enabled, :disabled], :message=>"%{value} needs to be :enabled, :disabled"}, allow_nil: true
       end

data/lib/ansible/ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brady Wied
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,8 @@ files:
 - lib/ansible/ruby/modules/custom/commands/raw.rb
 - lib/ansible/ruby/modules/custom/commands/script.rb
 - lib/ansible/ruby/modules/custom/commands/shell.rb
-- lib/ansible/ruby/modules/custom/free_form.rb
+- lib/ansible/ruby/modules/custom/utilities/include_vars.rb
+- lib/ansible/ruby/modules/free_form.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/cloudformation.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/ec2.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/ec2_ami.rb