kitchen-ansiblepush 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b41256e29e0f18e3120b60b53e620345c1fea7c
-  data.tar.gz: 01d109452a1a2cd29c8e9fbc667cf302b72b8423
+  metadata.gz: 297f186b8f310c5a3c0cf16906feaa6f6dd02a6b
+  data.tar.gz: 0a6377640cb723d276dd887e27d4be1c9bc05e7e
 SHA512:
-  metadata.gz: 0a3b41d88ad076e638a579e002a5c6724e46c717060932c2fce06e7114524de9297546907dc6d99d279575484a76aef4cd229e2550b78409616444c5518e10fa
-  data.tar.gz: 488124771b33863b2aae7f251d8535e0f59876c33ac0bef910f15a7c047c0efdedd7a197948441d654a014b90c04ae22c6e36734709f7eae25806da6ec209753
+  metadata.gz: 87d3fd01c7dfe4c736afd686c0ec8fbf494d11111ecc4cac34b43ced36db24a7db20fc62df300fc6e37bc3b5c4e77cbb4919cb5139ec70b1b0e59bd04684e26c
+  data.tar.gz: 30409beed3538e0eb0eb74448098e2af9eee1372bbec6b765c456c99e6f30a5422f658bcd524d8754f5b49b591fed363020205e7bb823977f07955f026e1976e

data/README.md

@@ -3,27 +3,16 @@
 [![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/kitchen-ansiblepush?type=total&color=brightgreen)](https://rubygems.org/gems/kitchen-ansiblepush)
 [![Build Status](https://travis-ci.org/ahelal/kitchen-ansiblepush.svg?branch=master)](https://travis-ci.org/ahelal/kitchen-ansiblepush)
 
-A test-kitchen plugin that adds the support for ansible in push mode
+A test-kitchen plugin that adds the support for ansible in push mode i.e. normal 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 instance(s). That also means your code will not be copied to guest. 
 
-## How to install
+It is designed to just simply work with minimum configuration. Just run as you would normaly do. 
 
-### Ruby gem
-```
-gem install kitchen-ansiblepush
-```
-
-### To install from code
-```
-git clone git@github.com:ahelal/kitchen-ansiblepush.git
-cd kitchen-ansiblepush
-gem build kitchen-ansiblepush.gemspec
-gem install kitchen-ansiblepush-<version>.gem
-```
+## How to install
 
-### Use Bundler
+### (1) Use Bundler
 My preferred method is use Gemfile
 
 ```ruby
@@ -35,6 +24,19 @@ group :development do
 end
 ```
 
+### (2) Ruby gem
+```bash
+gem install kitchen-ansiblepush
+```
+
+### (3) Install from code
+```bash
+git clone git@github.com:ahelal/kitchen-ansiblepush.git
+cd kitchen-ansiblepush
+gem build kitchen-ansiblepush.gemspec
+gem install kitchen-ansiblepush-<version>.gem
+```
+
 ## kitchen.yml Options
 ```yaml
 provisioner         :
@@ -44,7 +46,7 @@ provisioner         :
     ##
     ## Optional  argument
     ansible_config      : "/path/to/ansible/ansible.cfg" # path to ansible config file
-    verbose             : "vvvv" #  verbose level v, vv, vvv, vvvv
+    verbose             : "vvvv" # verbose level v, vv, vvv, vvvv
     diff                : true  # print file diff
     mygroup             : "web" # ansible group, or list of groups
     raw_arguments       : "--timeout=200"
@@ -67,18 +69,20 @@ provisioner         :
     use_instance_name   : false  # use short (platform) instead of instance name by default
     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.
+## 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 second 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
 ```
 
-If your running ansible V2 you need to white list the callback ``` callback_whitelist = changes``` in **ansible.cfg**
+If your running ansible V2 you need to white list the callback ```callback_whitelist = changes``` in **ansible.cfg**
 You can also choose to not to fail if idempotency test fails.
 
 ##  Ansible version
 Since ansiblepush uses the host to run Ansible. you can simply specify the path of your ansible-playbook executable in your .kitchen.yml
+
 ```yaml
 ansible_playbook_bin : /path/to/ansible-playbook
 ```
@@ -88,6 +92,7 @@ For further example you can check a matrix test [ansible-usermanage](https://git
 
 ## Disable chef installation
 By default chef is installed and serverspec stuff. if you don't want to install
+
 ```yaml
 chef_bootstrap_url: nil
 ```
@@ -99,7 +104,8 @@ Ansible push generates inventory dynamically you have multiple options to name y
 
 ## Windows support
 Kitchen ansiblepush has experimental support.
-to enable windows support you need to add the following to your .kitchen.yml
+to enable windows support you need to add the following to your *.kitchen.yml*
+
 ```yaml
 ...
 transport:
@@ -108,6 +114,7 @@ transport:
 provisioner:
     name                  : ansible_push
     chef_bootstrap_url    : nil
+    ansible_port          : 5586
     ansible_connection    : "winrm"
 ...
 ```
@@ -118,6 +125,7 @@ You can use ansible push  with different pattern. I will list some of the ways t
 I define my Gemfile in the role. I then run ```bundle install``` and commit my *Gemfile.lock* I also ignore ```.kitchen```
 
 A typical structure of an ansible role
+
 ```yaml
 defaults
 handlers

data/lib/kitchen/provisioner/ansible_push.rb

@@ -10,7 +10,7 @@ require 'kitchen-ansible/idempotancy'
 module Kitchen
   class Busser
     def non_suite_dirs
-      %w({data})
+      %w[{data}]
     end
   end
 
@@ -249,7 +249,7 @@ module Kitchen
         end
         debug("hostname='#{hostname}'")
         # Generate hosts
-        hosts = generate_instance_inventory(machine_name, hostname, conf[:mygroup], instance_connection_option, conf[:ansible_connection])
+        hosts = generate_instance_inventory(machine_name, hostname, conf[:mygroup], instance_connection_option, conf)
         write_var_to_yaml("#{TEMP_INV_DIR}/ansiblepush_host_#{machine_name}.yml", hosts)
         # Generate groups (if defined)
         write_var_to_yaml(TEMP_GROUP_FILE, conf[:groups]) if conf[:groups]

data/lib/kitchen-ansible/util_inventory.rb

@@ -8,12 +8,13 @@ def write_var_to_yaml(yaml_file, hash_var)
   end
 end
 
-def generate_instance_inventory(name, host, mygroup, instance_connection_option, ansible_connection)
+def generate_instance_inventory(name, host, mygroup, instance_connection_option, conf)
   unless instance_connection_option.nil?
     port = instance_connection_option[:port]
     keys = instance_connection_option[:keys]
     user = instance_connection_option[:user]
-    pass = instance_connection_option[:pass]
+    pass = instance_connection_option[:pass] if instance_connection_option[:pass]
+    pass = instance_connection_option[:password] if instance_connection_option[:password]
   end
 
   temp_hash = {}
@@ -23,10 +24,12 @@ def generate_instance_inventory(name, host, mygroup, instance_connection_option,
   temp_hash['ansible_ssh_user'] = user if user
   temp_hash['ansible_ssh_pass'] = pass if pass
   temp_hash['mygroup'] = mygroup if mygroup
+  temp_hash['ansible_ssh_port'] = conf[:ansible_port] if conf[:ansible_port]
   # Windows issue ignore SSL
-  if ansible_connection == 'winrm'
+  if conf[:ansible_connection] == 'winrm'
     temp_hash['ansible_winrm_server_cert_validation'] = 'ignore'
     temp_hash['ansible_winrm_transport'] = 'ssl'
+    temp_hash['ansible_connection'] = 'winrm'
   end
   { name => temp_hash }
 end

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = '0.6.2'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen