kitchen-ansible 0.44.5 → 0.44.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ae94568dfbde9ddc1ffc0842ab25d29e89f5bd
-  data.tar.gz: 5fab05dd26b8e44e49ffd5e1aff8f82a6ddaa3c1
+  metadata.gz: 7fbf1e47a7ca285b3ae2dba5f2ae82a112a6f9de
+  data.tar.gz: e0f3f3fd2e1736f45c0ab0735946db1d61f03350
 SHA512:
-  metadata.gz: 00196e338c949de05e2cbc065247f13ecda8f6d17f77764b18a8b313c8ff485be876cdf6154c7d01e6fa0bf4c3e72589193ad9bf2155de570a07e0eba5184bbf
-  data.tar.gz: e31a591ba021a2474458627f0ff5039818207fcb0e28db2b10df30385b332652c0eccb20113001557009fddb991456d0da37134cdf3b60247931e7f27862e3c3
+  metadata.gz: aa72291e7fae7d2e2910344e4b1d08cd08a32c3c9bc31df1e25b03b3a0b094a776c7dca030e2f6560d439a51e44dadf77df1971aa20bd9710c6060fd46afcabe
+  data.tar.gz: be14119c1cc4a5f36cb91a3d2dc005c87df77446440aac3eb6f4e2f731bf9ff8469f1665b6f018dff10c0e238e99d34b98c8d1c7907586a958bea5ae14a32a48

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.44.5'
+    VERSION = '0.44.6'
   end
 end

data/lib/kitchen/provisioner/ansible/config.rb

@@ -93,6 +93,10 @@ module Kitchen
           provisioner.calculate_path('additional_copy', :directory)
         end
 
+        default_config :recursive_additional_copy_path do |provisioner|
+          provisioner.calculate_path('recursive_additional_copy', :directory)
+        end
+
         default_config :host_vars_path do |provisioner|
           provisioner.calculate_path('host_vars', :directory)
         end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -592,6 +592,10 @@ module Kitchen
         config[:additional_copy_path]
       end
 
+      def recursive_additional_copy
+        config[:recursive_additional_copy_path]
+      end
+
       def host_vars
         config[:host_vars_path].to_s
       end
@@ -904,7 +908,18 @@ module Kitchen
       def prepare_additional_copy_path
         info('Preparing additional_copy_path')
         additional_files.each do |file|
-          info("Copy additional path: #{file}")
+           destination = File.join(sandbox_path, File.basename(file))
+           if File.directory?(file)
+             info("Copy dir: #{file} #{destination}")
+             Find.prune if config[:ignore_paths_from_root].include? File.basename(file)
+             FileUtils.mkdir_p(destination)
+           else
+             info("Copy file: #{file} #{destination}")
+             FileUtils.cp(file, destination)
+           end
+        end
+        recursive_additional_files.each do |file|
+          info("Copy recursive additional path: #{file}")
           Find.find(file) do |files|
             destination = File.join(sandbox_path, files)
             Find.prune if config[:ignore_paths_from_root].include? File.basename(files)
@@ -925,6 +940,14 @@ module Kitchen
         additional_files.map(&:to_s)
       end
 
+      def recursive_additional_files
+        recursive_additional_files = []
+        if  recursive_additional_copy
+          recursive_additional_files = recursive_additional_copy.is_a?(Array) ? recursive_additional_copy : [recursive_additional_copy]
+        end
+        recursive_additional_files.map(&:to_s)
+      end
+
       def prepare_host_vars
         info('Preparing host_vars')
         FileUtils.mkdir_p(tmp_host_vars_dir)

data/provisioner_options.md

@@ -1,6 +1,28 @@
+# Ansible Install Options
+
+Kitchen-ansible is very flexible in how it installs ansible:
+
+It installs it in the following order:
+
+* if require_ansible_omnibus is set to true
+
+  Installs using the omnibus_ansible script specified in the ansible_omnibus_url parameter and passes the ansible_version if specied as -v option.
+
+* If require_ansible_source is set to true
+
+  Install require packages and download the ansible source from github from  master or from a branch specified in the parameter install_source_rev.
+
+* if require_pip is set to true
+
+  Install require packages and then installs ansible using the python pip command with ansible version if specified.
+
+* if require_ansible_repo is set to true (the default)
+
+  Installs from the operation system repository with the ansible version that is in the particular repository and will use the ansible_version in the package name where appropriate.
+
 # Provisioner Options
 
-kitchen-ansible runs the ansible playbook command http://linux.die.net/man/1/ansible-playbook with options from parameters in the kitchen.yml file:  
+kitchen-ansible runs the ansible playbook command http://linux.die.net/man/1/ansible-playbook with options from parameters in the kitchen.yml file:
 
 key | default value | Notes
 ----|---------------|--------
@@ -47,6 +69,7 @@ no_proxy | nil | List of URLs or IPs that should be excluded from proxying
 playbook | default.yml | Playbook for `ansible-playbook` to run
 private_key | | ssh private key file for ssh connection
 python_sles_repo | `http://download.opensuse.org/repositories` `/devel:/languages:/python/SLE_12` `/devel:languages:python.repo` | Zypper SuSE python repo
+recursive_additional_copy_path | | Arbitrary array of files and directories to copy into test environment, relative to the current dir, e.g. vars or included playbooks
 require_ansible_omnibus | false | Set to `true` if using Omnibus Ansible `pip` install
 require_ansible_repo | true | Set if installing Ansible from a `yum` or `apt` repo
 require_ansible_source | false | Install Ansible from source using method described [here](http://docs.ansible.com/intro_installation.html#running-from-source). Only works on Debian/Ubuntu at present

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.44.5
+  version: 0.44.6
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen