kitchen-ansible 0.42.3 → 0.42.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1097e78ea015107c0863b990d0e7a6c60c67c187
-  data.tar.gz: 28159f60e0fc9aa42aa0118758f5cf56964d8956
+  metadata.gz: f073a5b00c60f49fedb6a1be8b99afe72ddac33e
+  data.tar.gz: afc9f3c3879cdffcce90a8eb0dcb20dbcbcb6a1a
 SHA512:
-  metadata.gz: e7fffb3537d7511e73a2a1bafa80268a9c1b641ede2a2975268b6927506edd27966f9d827fdbc2edcaa2d418d4c2e33d9c041c5ef4dcaabd1d679aadd159ec0a
-  data.tar.gz: 2b4fc0c47c554ae9b94c4ba01ae86271713180a10eaa23014bcfcc6fc1b75ce772d22ec6cea8d46e8c57d9bb28ac86de8524a9bc8697603da22f9bbafa7974b7
+  metadata.gz: 6e630a787dbf900fa5b97792c3b4621da06516b78f71845ada2e60cedb5fe06e2a9739e4ceba632d969678ee07bb48b2785a31a56d62765cbce7f22f3f8e8b97
+  data.tar.gz: 6fd08f662dda82a65e8db694a7c5be68aa1378cfbc6c6ec5ea94bb3cd00107aca5ddaaf967ede5b108ae8138e59f3d7a95753af261e5d88d4275edfa0912fce6

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -384,7 +384,7 @@ module Kitchen
           s = https_proxy ? "https_proxy=#{https_proxy}" : nil
           p = http_proxy ? "http_proxy=#{http_proxy}" : nil
           n = no_proxy ? "no_proxy=#{no_proxy}" : nil
-          p || s || n ? " #{p} #{s} #{n} sudo -Es #{cd_ansible} #{script}" : "sudo -Es #{cd_ansible} #{script}"
+          p || s || n ? " #{p} #{s} #{n} #{config[:sudo_command]} -s #{cd_ansible} #{script}" : "#{config[:sudo_command]} -s #{cd_ansible} #{script}"
         else
           return script
         end
@@ -534,7 +534,13 @@ module Kitchen
       end
 
       def role_name
-        File.basename(roles) == 'roles' ? '' : File.basename(roles)
+        if config[:role_name]
+          config[:role_name]
+        elsif File.basename(roles) == 'roles'
+          ''
+        else
+          File.basename(roles)
+        end
       end
 
       def modules
@@ -731,11 +737,15 @@ module Kitchen
         config[:no_proxy]
       end
 
-      def sudo_env(pm)
+      def sudo_env(pm,home=false)
         s = https_proxy ? "https_proxy=#{https_proxy}" : nil
         p = http_proxy ? "http_proxy=#{http_proxy}" : nil
         n = no_proxy ? "no_proxy=#{no_proxy}" : nil
-        p || s || n ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
+        if home
+          p || s || n ? "#{sudo_home('env')} #{p} #{s} #{n} #{pm}" : "#{sudo_home(pm)}"
+        else
+          p || s || n ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
+        end
       end
 
       def export_http_proxy

data/provisioner_options.md

@@ -5,6 +5,7 @@ key | default value | Notes
 ----|---------------|--------
 ansible_version | "latest"| desired version, affects apt installs
 ansible_sudo | true | drives whether ansible-playbook is executed as root or as the current authenticated user
+sudo_command | sudo -E | sudo command change to 'sudo -E -H' to be consistent with ansible
 ansible_platform | naively tries to determine | OS platform of server
 require_ansible_repo | true | Set if using a ansible install from yum or apt repo
 ansible_apt_repo | "ppa:ansible/ansible" | apt repo. see https://launchpad.net /~ansible/+archive/ubuntu/ansible or rquillo/ansible

metadata

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