kitchen-ansible 0.47.2 → 0.47.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3dd8c9159c950e8fde92b7af78ea9c0fd60bd15
-  data.tar.gz: 05953af8cd5fa4fc3e60ed8cc09463576ab19d1d
+  metadata.gz: a02777c2b92ce73f0f024a38a31978bc31d8f0e8
+  data.tar.gz: 55f7374587123f90fbc8baa5f93a6c853aecdf7f
 SHA512:
-  metadata.gz: 8edae71515a2652af588fb5ed1524c99825235ef38ee3c7720c86b4aedb75c194200ad820bbb268033069f5cc8388fb393ef47198335bfe82fd5deb37ff89192
-  data.tar.gz: a560098d97a3a0de38bdd326dd870bbc76a9561b5d74d824c0ff147899af53bee40eb5d93ac906429d24ad5a3a68df49e47a7ef9995a03165f8c3c6550c6ce6b
+  metadata.gz: d7189af481ea28b766894179a1626230e06328ffdcde93062b0bf82705104fcf90439aa2a38f15544c49953aed864815bd90f57e9fefd6d4b2579b9e4c13c587
+  data.tar.gz: 9b398d3756d52f5ac0bb8cd40d1ceeddaf402c6b167c18128a7a0c329be22dca76204855991b0036acae774e53ff57cf6540a8110a547dba71c5ad9e14d7b907

data/kitchen-ansible.gemspec

@@ -31,6 +31,9 @@ EOF
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
+  if RUBY_VERSION < '2.2'
+    s.add_dependency 'mixlib-shellout', '<= 2.2.7'
+  end  
   if RUBY_VERSION >= '2.0'
     s.add_dependency 'net-ssh', '>= 3'
   else

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.47.2'.freeze
+    VERSION = '0.47.3'.freeze
   end
 end

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

@@ -85,6 +85,7 @@ module Kitchen
         default_config :custom_pre_play_command, nil
         default_config :custom_post_install_command, nil
         default_config :custom_post_play_command, nil
+        default_config :show_command_output, false
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) ||

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -113,8 +113,8 @@ module Kitchen
       end
 
       def detect_debug
-        if ARGV.include? 'debug'
-          result = "1"
+        if ARGV.include? 'debug' or config[:show_command_output]
+          result = "/dev/stdout"
         else
           result = "/dev/null"
         end

data/provisioner_options.md

@@ -26,8 +26,8 @@ kitchen-ansible runs the ansible playbook command http://linux.die.net/man/1/ans
 
 key | default value | Notes
 ----|---------------|--------
-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
-additional_copy_role_path | false | additional_copy_path directories are appended to the ANSIBLE_ROLES_PATH env var when running ansible
+additional_copy_path | | Arbitrary array of files and directories to copy into test environment e.g. vars or included playbooks. See below section Copying Additional Files
+additional_copy_role_path | |  Arbitrary array of files and directories to copy into test environment and are appended to the ANSIBLE_ROLES_PATH env var when running ansible. See below section Copying Additional Files
 additional_ssh_private_keys | | List of additional ssh private key files to be added to ~/.ssh
 ansible_apt_repo | ppa:ansible/ansible | `apt` repo; see `https://launchpad.net` `/~ansible/+archive/ubuntu/ansible` or `rquillo/ansible`
 ansible_binary_path | NULL | If specified this will override the location where `kitchen` tries to run `ansible-playbook` from, i.e. `ansible_binary_path: /usr/local/bin`
@@ -70,8 +70,8 @@ hosts |  | Create Ansible hosts file for localhost with this server group or lis
 http_proxy | nil | Use HTTP proxy when installing Ansible, packages and running Ansible
 https_proxy | nil | Use HTTPS proxy when installing Ansible, packages and running Ansible
 idempotency_test | false | Enable to test Ansible playbook idempotency
-ignore_extensions_from_root | ['.pyc'] | allow extensions to be ignored when copying from roles and recursive_additional_copy_path
-ignore_paths_from_root | [] | allow extra paths to be ignored when copying from roles and recursive_additional_copy_path
+ignore_extensions_from_root | ['.pyc'] | allow extensions to be ignored when copying from roles using additional_copy_role_path or doing recursive_additional_copy_path
+ignore_paths_from_root | [] | allow extra paths to be ignored when copying from roles using additional_copy_role_path or using recursive_additional_copy_path
 kerberos_conf_file | | Path of krb5.conf file using in Windows support
 library_plugins_path | library | Ansible repo library plugins directory
 lookup_plugins_path | lookup_plugins | Ansible repo `lookup_plugins` directory
@@ -81,7 +81,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
+recursive_additional_copy_path | | Arbitrary array of files and directories to copy into test environment. See below section Copying Additional Files
 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
@@ -94,11 +94,60 @@ retry_on_exit_code | [] | Array of exit codes to retry converge command against
 role_name | | use when the repo name does not match the name the role is published as.
 roles_path | roles | Ansible repo roles directory
 shell_command | 'sh' | Shell command to use, usually an alias for bash. may need to set to bash.
+show_command_output | false | Show output of commands that are run to provision system.
 ssh_known_hosts | | List of hosts that should be added to ~/.ssh/known_hosts
 sudo_command | sudo -E | `sudo` command; change to `sudo -E -H` to be consistent with Ansible
 update_package_repos | true | Update OS repository metadata
 wait_for_retry | 30 | number of seconds to wait before retrying converge command
 
+## Copying Additional Files
+
+Several parameters have been developed rather organically to support the requirement to copy additional files beyond the ones in the standard ansible locations.
+* These could be used for the verification phase later
+* additional files required by the application
+* or these could be ansible roles
+
+### additional_copy_path  - Arbitrary array of files and directories to copy into test environment
+* If you specify a directory it will copy all the files to /tmp/kitchen with the directory structure
+* if you specify the full file name they are copied to the top of the /tmp/kitchen folder in the server and the path is ignored.
+i.e. if we have a directory data/ containing file xyz.txt
+```
+  additional_copy_path:
+    - data/xyz.txt
+```
+it will copy data/xyz.txt to /tmp/kitchen/xyz.txt
+* if you specify the directory without the filename it will preserve the path when copying to /tmp/kitchen.
+```
+  additional_copy_path:
+    - data
+```
+it will copy data/xyz.txt to /tmp/kitchen/data/xyz.txt
+NOTE: additional_copy_path does copy files that are links but if you specify the full file path only the file name is copied to /tmp/kitchen
+
+### recursive_additional_copy_path
+This copies the directories in a resursive fashion which can work better for some directory structures
+* It does not support specifying files with paths. i.e. you can only specify files at the top level of the repository
+```
+  recursive_additional_copy_path:
+  - xyz.txt
+```
+* It does support copying directories in a similar fashion to additional_copy_path but uses recursion to discover the files in the directory structure which can be
+problematic with files with links.
+```
+  recursive_additional_copy_path:
+    - data
+```
+### additional_copy_role_path
+This is the same as additional_copy_path but adds the extra paths to the ANSIBLE_ROLES_PATH ansible command parameter.
+
+### ignore_paths_from_root and ignore_extensions_from_root
+During recursive_additional_copy_path or additional_copy_role_path there are 2 additional parameters.
+(NOTE: These don't apply with additional_copy_path)
+* ignore_paths_from_root defaults to empty array []. This causes these paths to be ignored.
+* ignore_extensions_from_root defaults to an array containg ['.pyc']. This causes files with these extensions to be ignored.
+as these are implemented with the 'Find.prune' command they can be problematic with file links.
+
+
 ## Configuring Provisioner Options
 
 The provisioner can be configured globally or per suite, global settings act as defaults for all suites, you can then customise per suite, for example:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.47.2
+  version: 0.47.3
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement