kitchen-ansiblepush 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cbe198c6b5c78f2bc9fc8539e3e5c37ebc3c6c
-  data.tar.gz: 633e2fd2ff220a952d7eaae9f4861a5269e3cd21
+  metadata.gz: 0ea32f1a6e9d8b8b8d192e5ea4de50405391d936
+  data.tar.gz: e2f57b3ea5a812781ee0080df0e44ad054ff1ff4
 SHA512:
-  metadata.gz: 909021bd352a2ffdc6701c2dda863a8cc73f231aaec9383c493cf5e106ea962879c1b7f803a9d3bfcf448f5aa4a58315113e09f618adf691cd92c1660e9aa519
-  data.tar.gz: 8185394ce8433fc72d60a4581814946e708a08e12a1e7697accd3a63a830b25a5e76abb811a4feadd00afd37ed14c3bfa0e471fd66403a2db5a54854dc1ce7e3
+  metadata.gz: cd94e8f964ccb215d564186b2d483e62b60b115b1eaa8ad89955bf7e4f36e822be5536b4e2d9cb78ecd15c07d1da3ab12cab679b0d5459e166ec380be6afdc84
+  data.tar.gz: d17a8d7c080cbc3fdd9e021456a12e9ddb92ed9838cf4ab2b4459c5bc0b5302e3740e5bd18429694db157906238449cad1934812c1bd1f4b3589f726efcd57dd

data/README.md

@@ -6,7 +6,7 @@
 A test-kitchen plugin that adds the support for ansible in push mode
 
 ## Intro
-This kitchen plugin adds ansible as a provisioner in push mode. Ansible will run from your host rather than run from guest machines.  
+This kitchen plugin adds ansible as a provisioner in push mode. Ansible will run from your host rather than run from guest machines.
 
 ## How to install
 
@@ -24,7 +24,7 @@ gem install kitchen-ansiblepush-<version>.gem
 ```
 
 ### Use Bundler
-My prefered method is use Gemfile
+My preferred method is use Gemfile
 
 ```ruby
 source "https://rubygems.org"
@@ -65,13 +65,13 @@ provisioner         :
     host_key_checking   : false
     generate_inv        : true
     use_instance_name   : false  # use short (platform) instead of instance name by default
-    idempotency_test    : False
+    idempotency_test    : false
 ```
 ## idempotency test
 If you want to check your code is idempotent you can use the idempotency_test. Essentially, this will run Ansible twice and check nothing changed in the next run. If something changed it will list the tasks. Note: If your using Ansible callback in your config this might conflict.
 ```yaml
-    idempotency_test: True
-    fail_non_idempotent: True
+    idempotency_test: true
+    fail_non_idempotent: true
 ```
 
 If your running ansible V2 you need to white list the callback ``` callback_whitelist = changes``` in **ansible.cfg**
@@ -83,22 +83,22 @@ Since ansiblepush uses the host to run Ansible. you can simply specify the path
 ansible_playbook_bin : /path/to/ansible-playbook
 ```
 
-You can use venv and install multi version of ansible or if you prefer you can use an automated installer [ansible-setup](https://github.com/AutomationWIthAnsible/ansible-setup) you can install multi version of ansible.
+If you want any easy way to manage ansible version [AVM](https://github.com/ahelal/avm)
 For further example you can check a matrix test [ansible-usermanage](https://github.com/AutomationWithAnsible/ansible-usermanage/blob/master/.kitchen.yml)
 
 ## Disable chef installation
-By default chef is installed and serverspec stuff. if you dont want to install
+By default chef is installed and serverspec stuff. if you don't want to install
 ```yaml
 chef_bootstrap_url: nil
 ```
 ## Instance name
-Ansible push generates inventory dynamically you have multipule options to name your instance
-*use_instance_name* 
+Ansible push generates inventory dynamically you have multiple options to name your instance
+*use_instance_name*
 *custom_instance_name*
 
 
 ## Windows support
-Kitchen ansiblepush has experimantal support.
+Kitchen ansiblepush has experimental support.
 to enable windows support you need to add the following to your .kitchen.yml
 ```yaml
 ...
@@ -128,12 +128,12 @@ vars
 Gemfile
 Gemfile.lock
 .gitingore
-tests
+test
     \_ ansible.cfg
     \_ integration
-            \_ server           
+            \_ server
                 \_ server.yml   # my play that will test something
-                \_ serverspec  
+                \_ serverspec
             \_ worker
                 \_ worker.yml # my play that will test something
                 \_ serverspec
@@ -148,5 +148,5 @@ tests
 - https://github.com/knakayama/kitchen-ansiblepush-demo
 
 ## TODO
-- Enable envirionment var ANSIBLE_CALLBACK_WHITELIST="changes" before call
-- Tests (PRs for tests is highligh appreciated)
+- Enable environment var ANSIBLE_CALLBACK_WHITELIST="changes" before call
+- Tests (PRs for tests is highlight appreciated)

data/kitchen-ansiblepush.gemspec

@@ -1,17 +1,15 @@
-# encoding: utf-8
-
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'kitchen-ansible/version'
 
 Gem::Specification.new do |gem|
-  gem.name              = "kitchen-ansiblepush"
+  gem.name              = 'kitchen-ansiblepush'
   gem.version           = Kitchen::AnsiblePush::VERSION
-  gem.authors           = ["Adham Helal"]
-  gem.email             = ["adham.helal@gmail.com"]
+  gem.authors           = ['Adham Helal']
+  gem.email             = ['adham.helal@gmail.com']
   gem.licenses          = ['MIT']
-  gem.homepage          = "https://github.com/ahelal/kitchen-ansiblepush"
-  gem.summary           = "ansible provisioner for test-kitchen"
-  candidates            = Dir.glob("{lib}/**/*") + ['README.md', 'kitchen-ansiblepush.gemspec', 'callback/changes.py']
+  gem.homepage          = 'https://github.com/ahelal/kitchen-ansiblepush'
+  gem.summary           = 'ansible provisioner for test-kitchen'
+  candidates            = Dir.glob('{lib}/**/*') + ['README.md', 'kitchen-ansiblepush.gemspec', 'callback/changes.py']
   gem.files             = candidates.sort
   gem.platform          = Gem::Platform::RUBY
   gem.require_paths     = ['lib']
@@ -28,8 +26,7 @@ Supports running ansible in push mode
 
 EOF
 
-  gem.add_runtime_dependency 'test-kitchen'
+  gem.add_runtime_dependency 'test-kitchen', '~> 1.4'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'pry'
-
-end
+end

data/lib/kitchen/provisioner/ansible_push.rb

@@ -72,7 +72,7 @@ module Kitchen
             @extra_vars = '@' + extra_vars_path if extra_vars_is_valid
           end
 
-          raise 'ansible extra_vars is in valid type: %s value: %s' % [config[:extra_vars].class.to_s, config[:extra_vars].to_s] unless extra_vars_is_valid
+          raise "ansible extra_vars is in valid type: #{config[:extra_vars].class} value: #{config[:extra_vars]}" unless extra_vars_is_valid
         end
         info('Ansible push config validated')
         @validated_config = config
@@ -80,11 +80,11 @@ module Kitchen
 
       def machine_name
         return @machine_name if defined? @machine_name
-        if config[:use_instance_name]
-          @machine_name = instance.name.gsub(/[<>]/, '')
-        else
-          @machine_name = instance.name.gsub(/[<>]/, '').split('-').drop(1).join('-')
-        end
+        @machine_name = if config[:use_instance_name]
+                          instance.name.gsub(/[<>]/, '')
+                        else
+                          instance.name.gsub(/[<>]/, '').split('-').drop(1).join('-')
+                        end
         debug('machine_name=' + @machine_name.to_s)
         @machine_name
       end
@@ -102,8 +102,8 @@ module Kitchen
         options << '--ask-sudo-pass' if conf[:ask_sudo_pass]
         options << '--ask-vault-pass' if conf[:ask_vault_pass]
         options << "--vault-password-file=#{conf[:vault_password_file]}" if conf[:vault_password_file]
-        options << '--tags=%s' % as_list_argument(conf[:tags]) if conf[:tags]
-        options << '--skip-tags=%s' % as_list_argument(conf[:skip_tags]) if conf[:skip_tags]
+        options << '--tags=#{as_list_argument(conf[:tags])}' if conf[:tags]
+        options << '--skip-tags=#{as_list_argument(conf[:skip_tags])}' if conf[:skip_tags]
         options << "--start-at-task=#{conf[:start_at_task]}" if conf[:start_at_task]
         options << "--inventory-file=#{conf[:generate_inv_path]}" if conf[:generate_inv]
 
@@ -123,7 +123,7 @@ module Kitchen
         return @command if defined? @command
         @command = [conf[:ansible_playbook_bin]]
         @command = (@command << options << conf[:playbook]).flatten.join(' ')
-        debug('Ansible push command= %s' % @command)
+        debug("Ansible push command= #{@command}")
         @command
       end
 
@@ -156,13 +156,12 @@ module Kitchen
       def install_command
         # Must install chef for busser and serverspec to work :(
         info('*************** AnsiblePush install_command ***************')
-        # Test if ansible-playbook is installed and give a meaningful
-        # error message
+        # Test if ansible-playbook is installed and give a meaningful error message
         version_check = command + ' --version'
-        stdin, stdout, stderr, wait_thr = Open3.popen3(command_env, version_check)
+        _, stdout, stderr, wait_thr = Open3.popen3(command_env, version_check)
         exit_status = wait_thr.value
 
-        raise "%s returned a non zero '%s'" % [version_check, exit_status] unless exit_status.success?
+        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)
@@ -174,7 +173,7 @@ module Kitchen
           scripts << Util.shell_helpers
           scripts << chef_installation_script(chef_url, omnibus_download_dir, transport)
           <<-INSTALL
-            sh -c '#{scripts.join("\n")}'
+            sh -c "#{scripts.join('\n')}"
           INSTALL
         else
           true_command
@@ -194,6 +193,7 @@ module Kitchen
               'PLUGIN_CHANGES_FILE'      => file_path
             ), command, 'ansible-playbook'
           )
+          debug("idempotency file #{file_path}")
           # Check ansible callback if changes has occured in the second run
           if File.file?(file_path)
             task = 0
@@ -222,12 +222,12 @@ module Kitchen
       protected
 
       def exec_ansible_command(env, command, desc)
-        debug('env=%s command=%s' % [env, command])
+        debug("env=#{env} command=#{command}")
         system(env, command.to_s)
         exit_code = $CHILD_STATUS.exitstatus
         debug("ansible-playbook exit code = #{exit_code}")
         if exit_code.to_i != 0
-          raise '%s returned a non zero \'%s\'. Please see the output above.' % [desc, exit_code.to_s]
+          raise "#{desc} returned a non zero #{exit_code}. Please see the output above."
         end
       end
 

data/lib/kitchen-ansible/chef_installation.rb

@@ -1,12 +1,10 @@
 
-def chef_installation_script(chef_url, omnibus_download_dir, transport)
+def chef_installation_script(chef_url, omnibus_download_dir)
   <<-INSTALL
-      if [ ! -d "/opt/chef" ]
-      then
+      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
+        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}

data/lib/kitchen-ansible/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement