kitchen-ansiblepush 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea32f1a6e9d8b8b8d192e5ea4de50405391d936
-  data.tar.gz: e2f57b3ea5a812781ee0080df0e44ad054ff1ff4
+  metadata.gz: cb4b5ceb255051cc628af09ac710a0fadd99931d
+  data.tar.gz: d54177928e491e1f6d73e851c6d3baee468b0c5b
 SHA512:
-  metadata.gz: cd94e8f964ccb215d564186b2d483e62b60b115b1eaa8ad89955bf7e4f36e822be5536b4e2d9cb78ecd15c07d1da3ab12cab679b0d5459e166ec380be6afdc84
-  data.tar.gz: d17a8d7c080cbc3fdd9e021456a12e9ddb92ed9838cf4ab2b4459c5bc0b5302e3740e5bd18429694db157906238449cad1934812c1bd1f4b3589f726efcd57dd
+  metadata.gz: 7cd93aaac94558292f01820391fd742989db1e901cef5031ed12a6ba1548476861590962e608ab97e782abd1e7ae965c7672aeb3fd57ae7cf935581c23b4c412
+  data.tar.gz: 5a4d583388acd1eb84e7a182d811f00628a39ad1c4828c8cb7f5a9b403e6906b9994eb79358dbeb6c6f0b531cd144fd3924058685d828424f0a5b93af581803a

data/lib/kitchen/provisioner/ansible_push.rb

@@ -164,16 +164,16 @@ module Kitchen
         raise "#{version_check} returned a non zero '#{exit_status}' stdout : #{stdout}, stderr: #{stderr}" unless exit_status.success?
 
         omnibus_download_dir = conf[:omnibus_cachier] ? '/tmp/vagrant-cache/omnibus_chef' : '/tmp'
-        chef_installation(conf[:chef_bootstrap_url], omnibus_download_dir, nil)
+        chef_installation(conf[:chef_bootstrap_url], omnibus_download_dir)
       end
 
-      def chef_installation(chef_url, omnibus_download_dir, transport)
+      def chef_installation(chef_url, omnibus_download_dir)
         if chef_url && (chef_url != 'nil') # ignore string nil
           scripts = []
           scripts << Util.shell_helpers
-          scripts << chef_installation_script(chef_url, omnibus_download_dir, transport)
+          scripts << chef_installation_script(chef_url, omnibus_download_dir)
           <<-INSTALL
-            sh -c "#{scripts.join('\n')}"
+            sh -c #{scripts.join("\n")}
           INSTALL
         else
           true_command
@@ -204,11 +204,9 @@ module Kitchen
                 info(" #{task}> #{line.strip}")
               end
             end
-            if conf[:fail_non_idempotent]
-              raise "idempotency test Failed. Number of non idempotent tasks: #{task}"
-            else
-              info('Warning idempotency test [failed]')
-            end
+            raise "idempotency test Failed. Number of non idempotent tasks: #{task}" if conf[:fail_non_idempotent]
+            # If we reach this point we should give a warning
+            info('Warning idempotency test [failed]')
           else
             info('idempotency test [passed]')
           end
@@ -226,9 +224,7 @@ module Kitchen
         system(env, command.to_s)
         exit_code = $CHILD_STATUS.exitstatus
         debug("ansible-playbook exit code = #{exit_code}")
-        if exit_code.to_i != 0
-          raise "#{desc} returned a non zero #{exit_code}. Please see the output above."
-        end
+        raise "#{desc} returned a non zero #{exit_code}. Please see the output above." if exit_code.to_i != 0
       end
 
       def instance_connection_option

data/lib/kitchen-ansible/chef_installation.rb

@@ -1,14 +1,15 @@
 
 def chef_installation_script(chef_url, omnibus_download_dir)
   <<-INSTALL
-      if [ ! -d "/opt/chef" ]; then
-        echo "-----> Installing Chef Omnibus needed by busser and serverspec"
-        mkdir -p #{omnibus_download_dir}
-        if [ ! -x #{omnibus_download_dir}/install.sh ]; then
-          do_download #{chef_url} #{omnibus_download_dir}/install.sh
-        fi
-        sudo sh #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
-        echo "-----> End Installing Chef Omnibus"
-      fi
+  if [ ! -d "/opt/chef" ]; then
+    echo "-----> Installing Chef Omnibus needed by busser and serverspec"
+    echo "       You can use https://github.com/neillturner/kitchen-verifier-serverspec to avoid installing chef."
+    mkdir -p #{omnibus_download_dir}
+    if [ ! -x #{omnibus_download_dir}/install.sh ]; then
+      do_download #{chef_url} #{omnibus_download_dir}/install.sh
+    fi
+    sudo sh #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
+    echo "-----> End Installing Chef Omnibus"
+  fi
   INSTALL
 end

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = '0.5.2'.freeze
+    VERSION = '0.5.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen