kitchen-ansible 0.46.4 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87e37287168010d760b9011c4563626769900a6d
-  data.tar.gz: 1b0903cf20c7f7b9178a4c6452351cb3da8e3dcf
+  metadata.gz: 68789a1bc8b78cc0f7823a8fc37550b3380cce3e
+  data.tar.gz: a9c91817f79f0c2c2dd70eb7315b6b34e4dcc24a
 SHA512:
-  metadata.gz: a5a9c542115bfe96333bf757d01058cc97226c417d9e95bcf7f938758745381a7a21656ea5944cbbee42b7f29983357a7e04fa59f5def135262d6a49e11bfbf7
-  data.tar.gz: 94238d5b1cbe84153890fe692457e81e5a2de50e47f59e42512f15edd7bd0dad078e257d963c921da216a1b66401c86ee01e4e17f45ce5db897b8ad5123e284a
+  metadata.gz: 1bc3691dd665a8d8bdc14ca4f95d8319972614bcb22a2ba91cef6379beffdca495fd020287671ee66451af0e5ec024618c872dcb2152b55ce78bdb76a115b7e7
+  data.tar.gz: 0513eac5a974766edb118bedfa2da1535960a2d2303ad79961cd8f5560d7509ff3468f58db6c23282705a35f504edc3de64661966641af087e40068071c62671

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -112,24 +112,35 @@ module Kitchen
         result
       end
 
+      def detect_debug
+        if ARGV.include? 'debug'
+          result = "1"
+        else
+          result = "/dev/null"
+        end
+        return result
+      end
+
       def install_windows_support
         install = ''
         if require_windows_support
-          install << <<-INSTALL
-          if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
-            #{sudo_env('yum')} -y install python-devel krb5-devel krb5-libs krb5-workstation gcc
-          else
-            if [ -f /etc/SuSE-release ]  || [ -f /etc/SUSE-brand ]; then
-              #{sudo_env('zypper')} ar #{python_sles_repo}
-              #{sudo_env('zypper')} --non-interactive install python python-devel krb5-client pam_krb5
-            else
-              #{sudo_env('apt-get')} -y install python-dev libkrb5-dev build-essential
-            fi
-          fi
-          #{export_http_proxy}
-          #{sudo_env('easy_install')} pip
-          #{sudo_env('pip')} install pywinrm kerberos
-          INSTALL
+            info ("Installing Windows Support")
+            info ("Installing pip")
+            install << <<-INSTALL
+              if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+                #{sudo_env('yum')} -y install python-devel krb5-devel krb5-libs krb5-workstation gcc > #{detect_debug}
+              else
+                if [ -f /etc/SuSE-release ]  || [ -f /etc/SUSE-brand ]; then
+                  #{sudo_env('zypper')} ar #{python_sles_repo} > #{detect_debug}
+                  #{sudo_env('zypper')} --non-interactive install python python-devel krb5-client pam_krb5 > #{detect_debug}
+                else
+                  #{sudo_env('apt-get')} -y install python-dev libkrb5-dev build-essential > #{detect_debug}
+                fi
+              fi
+            #{export_http_proxy}
+            #{sudo_env('easy_install')} pip > #{detect_debug}
+            #{sudo_env('pip')} install pywinrm kerberos > #{detect_debug}
+            INSTALL
         end
         install
       end
@@ -156,9 +167,9 @@ module Kitchen
             if [ -n "$rhelversion6" ] || [ -n "$rhelversion7" ]; then
             if [ ! -d "/opt/rh/ruby200" ]; then
               echo "-----> Installing ruby200 SCL in CentOS6/CentOS7/RHEL6/RHEL7 to install busser to run tests"
-              #{sudo_env('yum')} install -y centos-release-scl
-              #{sudo_env('yum')} install -y ruby200
-              #{sudo_env('yum')} install -y ruby200-ruby-devel
+              #{sudo_env('yum')} install -y centos-release-scl > #{detect_debug}
+              #{sudo_env('yum')} install -y ruby200 > #{detect_debug}
+              #{sudo_env('yum')} install -y ruby200-ruby-devel > #{detect_debug}
               echo "-----> Enabling ruby200"
               source /opt/rh/ruby200/enable
               echo "/opt/rh/ruby200/root/usr/lib64" | sudo tee -a /etc/ld.so.conf
@@ -168,21 +179,21 @@ module Kitchen
             fi
             else
               if [ ! $(which ruby) ]; then
-                #{update_packages_redhat_cmd}
-                #{sudo_env('yum')} -y install ruby ruby-devel
+                #{update_packages_redhat_cmd} > #{detect_debug}
+                #{sudo_env('yum')} -y install ruby ruby-devel > #{detect_debug}
               fi
             fi
             else
-                #{update_packages_redhat_cmd}
-                #{sudo_env('yum')} -y install ruby ruby-devel gcc
+                #{update_packages_redhat_cmd} > #{detect_debug}
+                #{sudo_env('yum')} -y install ruby ruby-devel gcc > #{detect_debug}
             fi
             elif [ -f /etc/SuSE-release ]  || [ -f /etc/SUSE-brand ]; then
-                #{update_packages_suse_cmd}
-                #{sudo_env('zypper')} --non-interactive install ruby ruby-devel ca-certificates ca-certificates-cacert ca-certificates-mozilla
+                #{update_packages_suse_cmd} > #{detect_debug}
+                #{sudo_env('zypper')} --non-interactive install ruby ruby-devel ca-certificates ca-certificates-cacert ca-certificates-mozilla > #{detect_debug}
                 #{sudo_env('gem')} sources --add https://rubygems.org/
             elif [ -f /etc/alpine-release ]  || [ -d /etc/apk ]; then
                 #{update_packages_alpine_cmd}
-                #{sudo_env('apk')} add ruby ruby-dev ruby-io-console ca-certificates
+                #{sudo_env('apk')} add ruby ruby-dev ruby-io-console ca-certificates > #{detect_debug}
             else
               if [ ! $(which ruby) ]; then
                 #{update_packages_debian_cmd}
@@ -203,14 +214,14 @@ module Kitchen
                     PACKAGES="ruby ruby-dev"
                   fi
                 fi
-                #{sudo_env('apt-get')} -y install $PACKAGES
+                #{sudo_env('apt-get')} -y install $PACKAGES > #{detect_debug}
                 if [ $debvers -eq 6 ]; then
                     # in squeeze we need to update alternatives
                     # for enable ruby1.9.1
                     ALTERNATIVES_STRING="--install /usr/bin/ruby ruby /usr/bin/ruby1.9.1 10 --slave /usr/share/man/man1/ruby.1.gz ruby.1.gz /usr/share/man/man1/ruby1.9.1.1.gz --slave /usr/bin/erb erb /usr/bin/erb1.9.1 --slave /usr/bin/gem gem /usr/bin/gem1.9.1 --slave /usr/bin/irb irb /usr/bin/irb1.9.1 --slave /usr/bin/rake rake /usr/bin/rake1.9.1 --slave /usr/bin/rdoc rdoc /usr/bin/rdoc1.9.1 --slave /usr/bin/testrb testrb /usr/bin/testrb1.9.1 --slave /usr/share/man/man1/erb.1.gz erb.1.gz /usr/share/man/man1/erb1.9.1.1.gz --slave /usr/share/man/man1/gem.1.gz gem.1.gz /usr/share/man/man1/gem1.9.1.1.gz --slave /usr/share/man/man1/irb.1.gz irb.1.gz /usr/share/man/man1/irb1.9.1.1.gz --slave /usr/share/man/man1/rake.1.gz rake.1.gz /usr/share/man/man1/rake1.9.1.1.gz --slave /usr/share/man/man1/rdoc.1.gz rdoc.1.gz /usr/share/man/man1/rdoc1.9.1.1.gz --slave /usr/share/man/man1/testrb.1.gz testrb.1.gz /usr/share/man/man1/testrb1.9.1.1.gz"
                     #{sudo_env('update-alternatives')} $ALTERNATIVES_STRING
                     # need to update gem tool because gem 1.3.7 from ruby 1.9.1 is broken
-                    #{sudo_env('gem')} install rubygems-update
+                    #{sudo_env('gem')} install rubygems-update > #{detect_debug}
                     #{sudo_env('/var/lib/gems/1.9.1/bin/update_rubygems')}
                     # clear local gem cache
                     #{sudo_env('rm')} -r /home/vagrant/.gem
@@ -227,7 +238,7 @@ module Kitchen
               echo "-----> Installing Chef Omnibus to install busser to run tests"
               #{export_http_proxy}
               do_download #{chef_url} /tmp/install.sh
-              #{sudo_env('sh')} /tmp/install.sh
+              #{sudo_env('sh')} /tmp/install.sh > #{detect_debug}
             fi
             INSTALL
         end
@@ -466,59 +477,61 @@ module Kitchen
       end
 
       def install_ansible_from_source_command
-        <<-INSTALL
-        if [ ! -d #{config[:root_path]}/ansible ]; then
-          if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
-            #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
-            #{update_packages_redhat_cmd}
-            #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel libssl-devel
-          else
-            if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
-              #{sudo_env('zypper')} ar #{python_sles_repo}
-              #{update_packages_suse_cmd}
-              #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel
+          <<-INSTALL
+          if [ ! -d #{config[:root_path]}/ansible ]; then
+            if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+              #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
+              #{update_packages_redhat_cmd} > #{detect_debug}
+              #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel libssl-devel > #{detect_debug}
             else
-              #{update_packages_debian_cmd}
-              #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev
+              if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+                #{sudo_env('zypper')} ar #{python_sles_repo} > #{detect_debug}
+                #{update_packages_suse_cmd} > #{detect_debug}
+                #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel > #{detect_debug}
+              else
+                #{update_packages_debian_cmd} > #{detect_debug}
+                #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev > #{detect_debug}
+              fi
             fi
-          fi
 
-          #{export_http_proxy}
-          git clone #{config[:ansible_source_url]} --recursive #{config[:root_path]}/ansible #{install_source_rev}
-          #{sudo_env('easy_install')} pip
-          #{sudo_env('pip')} install -U setuptools
-          #{sudo_env('pip')} install six paramiko PyYAML Jinja2 httplib2
-        fi
-        INSTALL
+            #{export_http_proxy}
+            git clone #{config[:ansible_source_url]} --recursive #{config[:root_path]}/ansible #{install_source_rev}
+            #{sudo_env('easy_install')} pip > #{detect_debug}
+            #{sudo_env('pip')} install -U setuptools > #{detect_debug}
+            #{sudo_env('pip')} install six paramiko PyYAML Jinja2 httplib2 > #{detect_debug}
+          fi
+          INSTALL
       end
 
       def install_ansible_from_pip_command
-        ansible_version = ''
-        ansible_version = "==#{config[:ansible_version]}" unless config[:ansible_version] == 'latest'
+        if config[:ansible_version]=='latest' or config[:ansible_version].nil?
+          ansible_version = ''
+        else
+          ansible_version = "==#{config[:ansible_version]}"
+        end
+          <<-INSTALL
+            if [ ! $(which ansible) ]; then
+              if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
+                #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
+                #{update_packages_redhat_cmd} > #{detect_debug}
+                #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel openssl-devel gcc > #{detect_debug}
+              else
+                if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+                  #{sudo_env('zypper')} ar #{python_sles_repo} > #{detect_debug}
+                  #{update_packages_suse_cmd} > #{detect_debug}
+                  #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel > #{detect_debug}
+                else
+                  #{update_packages_debian_cmd} > #{detect_debug}
+                  #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev > #{detect_debug}
+                fi
+              fi
 
-        <<-INSTALL
-        if [ ! -d #{config[:root_path]}/ansible ]; then
-          if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
-            #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_epel_repo}
-            #{update_packages_redhat_cmd}
-            #{sudo_env('yum')} -y install libselinux-python python2-devel git python-setuptools python-setuptools-dev libffi-devel openssl-devel gcc
-          else
-            if [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
-              #{sudo_env('zypper')} ar #{python_sles_repo}
-              #{update_packages_suse_cmd}
-              #{sudo_env('zypper')} --non-interactive install python python-devel git python-setuptools python-pip python-six libyaml-devel libffi-devel libopenssl-devel
-            else
-              #{update_packages_debian_cmd}
-              #{sudo_env('apt-get')} -y install git python python-setuptools build-essential python-dev libffi-dev libssl-dev
-            fi
+            #{export_http_proxy}
+            #{sudo_env('easy_install')} pip > #{detect_debug}
+            #{sudo_env('pip')} install -U setuptools > #{detect_debug}
+            #{sudo_env('pip')} install ansible#{ansible_version} > #{detect_debug}
           fi
-
-          #{export_http_proxy}
-          #{sudo_env('easy_install')} pip
-          #{sudo_env('pip')} install -U setuptools
-          #{sudo_env('pip')} install ansible#{ansible_version}
-        fi
-        INSTALL
+          INSTALL
       end
 
       def install_omnibus_command
@@ -534,7 +547,7 @@ module Kitchen
           echo "-----> Installing Ansible Omnibus"
           #{export_http_proxy}
           do_download #{config[:ansible_omnibus_url]} /tmp/ansible_install.sh
-          #{sudo_env(config[:shell_command])} /tmp/ansible_install.sh #{version}
+          #{sudo_env(config[:shell_command])} /tmp/ansible_install.sh #{version} > #{detect_debug}
         fi
         INSTALL
       end
@@ -867,8 +880,12 @@ module Kitchen
         roles_paths = []
         roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
         if config[:additional_copy_role_path]
-          config[:additional_copy_path].each do |path|
-            roles_paths << File.join(config[:root_path], File.basename(path))
+          if config[:additional_copy_role_path].is_a? String
+            roles_paths << File.expand_path(config[:additional_copy_role_path])
+          else
+            config[:additional_copy_path].each do |path|
+              roles_paths << File.join(config[:root_path], File.expand_path(File.basename(path)))
+            end
           end
         end
         if roles_paths.empty?
@@ -889,7 +906,7 @@ module Kitchen
         if galaxy_requirements
           dest = File.join(sandbox_path, galaxy_requirements)
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(galaxy_requirements, dest)
+          FileUtils.cp(File.expand_path(galaxy_requirements), dest)
         end
 
         FileUtils.mkdir_p(File.join(tmp_roles_dir, role_name))
@@ -981,10 +998,10 @@ module Kitchen
         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)
-             debug("Copy dir: #{file} #{destination}")
-             FileUtils.cp_r(file, destination)
+           destination = File.join(sandbox_path, File.basename(File.expand_path(file)))
+           if File.directory?(File.expand_path(file)) && File.basename(File.expand_path(file))!= ?.
+             debug("Copy dir: #{File.expand_path(file)} #{destination}")
+             FileUtils.cp_r(File.expand_path(file), destination)
            else
              debug("Copy file: #{file} #{destination}")
              FileUtils.cp(file, destination)
@@ -995,7 +1012,9 @@ module Kitchen
           Find.find(file) do |files|
             destination = File.join(sandbox_path, files)
             Find.prune if config[:ignore_paths_from_root].include? File.basename(files)
+            Find.prune if "?.".include? File.basename(files)
             Find.prune if config[:ignore_extensions_from_root].include? File.extname(files)
+            debug File.basename(files)
             if File.directory?(files)
               FileUtils.mkdir_p(destination)
             else
@@ -1114,7 +1133,7 @@ module Kitchen
         if config[:additional_ssh_private_keys]
           config[:additional_ssh_private_keys].each do |key|
             debug("Adding additional_ssh_private_key file #{key}")
-            FileUtils.cp_r(key, tmp_additional_ssh_private_keys_dir, remove_destination: true)
+            FileUtils.cp_r(File.expand_path(key), tmp_additional_ssh_private_keys_dir, remove_destination: true)
           end
         else
           info 'nothing to do for additional_ssh_private_keys'
@@ -1127,7 +1146,7 @@ module Kitchen
         info('Preparing ansible vault password')
         debug("Copying ansible vault password file from #{ansible_vault_password_file} to #{tmp_ansible_vault_password_file_path}")
 
-        FileUtils.cp(ansible_vault_password_file, tmp_ansible_vault_password_file_path)
+        FileUtils.cp(File.expand_path(ansible_vault_password_file), tmp_ansible_vault_password_file_path)
       end
 
       def prepare_kerberos_conf_file
@@ -1136,7 +1155,7 @@ module Kitchen
         info('Preparing kerberos configuration file')
         debug("Copying kerberos configuration file from #{kerberos_conf_file} to #{tmp_kerberos_conf_file_path}")
 
-        FileUtils.cp(kerberos_conf_file, tmp_kerberos_conf_file_path)
+        FileUtils.cp(File.expand_path(kerberos_conf_file), tmp_kerberos_conf_file_path)
       end
 
       def resolve_with_librarian

data/lib/kitchen-ansible/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.46.4
+  version: 0.47.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen