kitchen-ansible 0.50.0 → 0.50.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ad611fbb31e8722a7867348c3ed91580a66b85f1458ae44217396dac67509c
-  data.tar.gz: da95ffe993c35e40964c8c8eb4a367309c937b0b705c9145823766d528f13746
+  metadata.gz: 12f00ffe0cf6ec8436074b5fffcfbf108a8b382a6f5b0ea916214bbc139a8994
+  data.tar.gz: 5ccb79c952524c5dc2388a89459b8c3c0b2265a9cf4f0fc4b534b3e1008efb4c
 SHA512:
-  metadata.gz: fb4fc3b33307eeacf64eae37da8ae10f8b9604256db742a662345bb8727efc9c7f6cdd67af73ec783bb3a198595203952d8c07ec13226ecb67cd1656791e6c9d
-  data.tar.gz: 8c651db78e32cf1cdbb655961f8ce86119ec2182f32863b8a2348820713c78288aa35225dbaf1be37395cdf70c3a0923e419effdcfd8a3e3e97af0309f259d5f
+  metadata.gz: 8d8b98e8cc45cf4f18c4b291af31e8dea39748ef0a1110af663508eb9714f82e0f4f7c14cdad2d60bed6e2600b84da51a2b57c43fa12187c090dccf4fefd7f6f
+  data.tar.gz: 4c9cfc4c83fe4a99bbf86cca8c0a1cd69dfea00838b9a5df2bbe056e3f6c22c3dcea3daaa7babf885c8fd5b09eb1372e666b1bba9938f868b92078313df362ee

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible/os/debian.rb

@@ -55,7 +55,9 @@ module Kitchen
                 #{sudo_env('apt-get')} -y install software-properties-common
 
                 ## 10.04, 12.04 include add-apt-repository in
-                #{sudo_env('apt-get')} -y install python-software-properties
+                if [apt-cache pkgnames | grep -q 'python-software-properties']; then
+                   #{sudo_env('apt-get')} -y install python-software-properties
+                fi   
 
                 ## 10.04 version of add-apt-repository doesn't accept --yes
                 ## later versions require interaction from user, so we must specify --yes

data/lib/kitchen/provisioner/ansible/os/fedora.rb

@@ -29,7 +29,13 @@ module Kitchen
             if [ ! $(which ansible) ]; then
             #{redhat_yum_repo}
             #{update_packages_command}
-            #{sudo_env('dnf')} -y install #{ansible_package_name} libselinux-python git python2-dnf
+            FEDORA_RELEASE=$(rpm --query --queryformat="%{VERSION}" --file /etc/fedora-release)
+
+            if [ ${FEDORA_RELEASE} -le 28 ]; then
+              #{sudo_env('dnf')} -y install #{ansible_package_name} libselinux-python git python2-dnf
+            else
+              #{sudo_env('dnf')} -y install #{ansible_package_name} python3-libselinux git python3-dnf
+            fi
             fi
             INSTALL
           end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -921,10 +921,10 @@ module Kitchen
         roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
         if config[:additional_copy_role_path]
           if config[:additional_copy_role_path].is_a? String
-            roles_paths << File.join(config[:root_path], File.basename(config[:additional_copy_role_path]))
+            roles_paths << File.join(config[:root_path], 'roles', File.basename(config[:additional_copy_role_path]))
           else
             config[:additional_copy_role_path].each do |path|
-              roles_paths << File.join(config[:root_path], File.basename(File.expand_path(path)))
+              roles_paths << File.join(config[:root_path], 'roles', File.basename(File.expand_path(path)))
             end
           end
         end
@@ -952,12 +952,12 @@ module Kitchen
         if config[:additional_copy_role_path]
           if config[:additional_copy_role_path].is_a? String
             debug("Using additional roles copy from #{File.expand_path(config[:additional_copy_role_path])}")
-            dest = File.join(sandbox_path, File.basename(File.expand_path(config[:additional_copy_role_path])))
+            dest = File.join(sandbox_path, 'roles', File.basename(File.expand_path(config[:additional_copy_role_path])))
             FileUtils.mkdir_p(File.dirname(dest))
             FileUtils.cp_r(File.expand_path(config[:additional_copy_role_path]), dest)
           else
             config[:additional_copy_role_path].each do |path|
-              dest = File.join(sandbox_path, File.basename(File.expand_path(path)))
+              dest = File.join(sandbox_path, 'roles', File.basename(File.expand_path(path)))
               FileUtils.mkdir_p(File.dirname(dest))
               FileUtils.cp_r(File.expand_path(path), dest)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.50.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ansible provisioner for test-kitchen