kitchen-ansible 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49ee3c2a66571122b0b5f9f9a275ee76ac531ec
-  data.tar.gz: 538a482c315ee52137a0967099d4aaebcbb0231f
+  metadata.gz: fd9aedef2a0fd3fe1680cc80cdf1b81405fc9e99
+  data.tar.gz: f33efab9c29b88338a1ca92abb679340c30dd2cf
 SHA512:
-  metadata.gz: 99fbcd27f38933982f2178cb5fd180db04cedd3b037156b2b53fa3f654f6e291a604e1a61ada3983ca36fa7ffd1b61ae087b0d4fc3c19d54c1257e5cfb84dd5a
-  data.tar.gz: 40da82b0882a67494a6c2c51a7d365fe0a5767a0f10620371d7a311043ffaad371708769ad91016befcf845ee6e7df3de3ab7a999881bf1ff9c0db9544764b9b
+  metadata.gz: a96346256bd6987adc18d078160ff241d41516c7b3e670c100c918fb4b52773cfbd3d876e023b20a85dcfe72c4f510b1abe1912b593d9785a0959301702b8cd1
+  data.tar.gz: 5b3a32a7573408c9375cbcb00895dcc490afa77c663cf6af0cda6cf0150e835c00891ea578886b3d202b5062a61ffed2af017975b956ecb3f0acc56cb945de87

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -82,7 +82,7 @@ module Kitchen
 
             if [ ! $(which ansible) ]; then
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
-                if ! [ grep -q 'Amazon Linux' /etc/system-release ]; then
+                if ! [ -z `grep -q 'Amazon Linux' /etc/system-release` ]; then
                 #{Kitchen::Provisioner::Ansible::Os::Redhat.new('redhat', config).install_command}
                 else
                 #{Kitchen::Provisioner::Ansible::Os::Amazon.new('amazon', config).install_command}
@@ -140,7 +140,7 @@ module Kitchen
         if require_ruby_for_busser
           install << <<-INSTALL
             if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ]; then
-            if ! [ grep -q 'Amazon Linux' /etc/system-release ]; then
+            if ! [ -z `grep -q 'Amazon Linux' /etc/system-release` ]; then
             rhelversion6=$(cat /etc/redhat-release | grep 'release 6')
             rhelversion7=$(cat /etc/redhat-release | grep 'release 7')
             # For CentOS6/CentOS7/RHEL6/RHEL7 install ruby from SCL
@@ -188,7 +188,7 @@ module Kitchen
                   ubuntuvers=$(lsb_release -sr | tr -d .)
                   if [ $ubuntuvers -ge 1410 ]; then
                     # Default ruby is 2.x in utopic and newer
-                    PACKAGES="ruby ruby-dev ruby2.1 ruby2.1-dev"
+                    PACKAGES="ruby ruby-dev"
                   fi
                 fi
                 #{sudo_env('apt-get')} -y install $PACKAGES
@@ -315,11 +315,7 @@ module Kitchen
           if config[:require_ansible_source]
             commands << setup_ansible_env_from_source
           end
-          commands << [
-            'ansible-galaxy', 'install', '--force',
-            '-p', File.join(config[:root_path], 'roles'),
-            '-r', File.join(config[:root_path], galaxy_requirements)
-          ].join(' ')
+          commands << ansible_galaxy_command
         end
 
         if kerberos_conf_file
@@ -394,6 +390,18 @@ module Kitchen
         end
       end
 
+      def ansible_galaxy_command
+        cmd = [
+            'ansible-galaxy', 'install', '--force',
+            '-p', File.join(config[:root_path], 'roles'),
+            '-r', File.join(config[:root_path], galaxy_requirements)
+        ].join(' ')
+        cmd = "https_proxy=#{https_proxy} #{cmd}" if https_proxy
+        cmd = "http_proxy=#{http_proxy} #{cmd}" if http_proxy
+        cmd = "no_proxy=#{no_proxy} #{cmd}" if no_proxy
+        cmd
+      end
+
       def cd_ansible
        # this is not working so just return nil for now
        # File.exist?('ansible.cfg') ? "cd #{config[:root_path]};" : nil

metadata

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