kitchen-ansiblepush 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e56c2e6e6fcca8d1216cb2823abe3bba874ad8ce
-  data.tar.gz: 6d2f7cb65fe9189e7985a060076de5384b54864c
+  metadata.gz: 2792ec1be3d5497fa3ba68a8d2a077307e8793a1
+  data.tar.gz: 9e6ce1e36d47af5563b4316815cbaaa8d55bf479
 SHA512:
-  metadata.gz: d64f716d9605eee6029b13d44a2d09c6ec88fb1bdfdf90aa99327f1213b3cb14738a896704675c3f28d37b613e9d9ee449ce2ac2cf826c188ad28e8b66ed7dd3
-  data.tar.gz: 890960b45240caf511cf2cd489cdc3524558b0b50ffbf114d9be9a8979d834e05c26b9905045cb69d791582569a8f55e9d83564f18ecf45f80952c876c9cd869
+  metadata.gz: 511bb93a0bb4f7d647a8e2721f957419412316e04a5358e5d375d33c74722c4ae5d60fe17bebc8dfaeff6db7464f03b7e808f63f24135be66b719c9e7f049f66
+  data.tar.gz: b4cd34996a1ac0db558a734bea519faa109c66bbac4cb55b2c2616de0cb0eca8563492b21e5980768f3110f4a9ef428a3d2ac00e8cdc60f6cd5c3ee0be6dc723

data/README.md

@@ -6,9 +6,9 @@
 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 instance(s). That also means your code will not be copied to guest. 
+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.
 
-It is designed to just simply work with minimum configuration. Just run as you would normaly do. 
+It is designed to just simply work with minimum configuration. Just run as you would normaly do.
 
 ## How to install
 
@@ -80,7 +80,8 @@ If you want to check your code is idempotent you can use the idempotency_test. E
 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
+## 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
@@ -91,18 +92,23 @@ If you want any easy way to manage ansible version [AVM](https://github.com/ahel
 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 don't want to install
 
 ```yaml
 chef_bootstrap_url: nil
 ```
+
 ## Instance name
+
 Ansible push generates inventory dynamically you have multiple options to name your instance
-*use_instance_name*
-*custom_instance_name*
 
+* *use_instance_name* = false (default): <platform>
+* *use_instance_name* = true: <instance_name>-<platform>
+* *custom_instance_name*: <custom_instance_name>
 
 ## Windows support
+
 Kitchen ansiblepush has experimental support.
 to enable windows support you need to add the following to your *.kitchen.yml*
 
@@ -118,8 +124,11 @@ provisioner:
     ansible_connection    : "winrm"
 ...
 ```
+
 ## Pattern of usage
+
 You can use ansible push  with different pattern. I will list some of the ways that I use it, But by no means they are the only patterns.
+
 ### Roles
 
 I define my Gemfile in the role. I then run ```bundle install``` and commit my *Gemfile.lock* I also ignore ```.kitchen```
@@ -149,12 +158,14 @@ test
 ```
 
 ## Real example usages
+
+- https://github.com/ahelal/ansible-concourse
 - https://github.com/hellofresh/ansible-deployment
 - https://github.com/AutomationWithAnsible/ansible-usermanage
-- https://github.com/ahelal/ansible-concourse
 - https://github.com/danrue/ansible-variables
 - https://github.com/knakayama/kitchen-ansiblepush-demo
 
 ## TODO
-- Enable environment var ANSIBLE_CALLBACK_WHITELIST="changes" before call
-- Tests (PRs for tests is highlight appreciated)
+
+* Enable environment var ANSIBLE_CALLBACK_WHITELIST="changes" before call
+* Tests (PRs for tests is highlight appreciated)

data/callback/changes.py

@@ -1,6 +1,8 @@
-import json
 import os
 import errno
+import json as js
+if not hasattr(js, 'dumps'):
+    js = js.json
 
 try:
     from ansible.plugins.callback import CallbackBase
@@ -44,7 +46,7 @@ class CallbackModule(CallbackBase):
 
         try:
             with open(self.change_file, 'at') as the_file:
-                the_file.write(json.dumps(changed_data) + "\n")
+                the_file.write(js.dumps(changed_data) + "\n")
         except Exception, e:
             print "Ansible callback idempotency: Write to file failed '%s' error:'%s'" % (self.change_file, e)
             exit(1)

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/lib/kitchen/provisioner/ansible_push.rb

@@ -95,6 +95,8 @@ module Kitchen
         return @machine_name if defined? @machine_name
         @machine_name = if config[:use_instance_name]
                           instance.name.gsub(/[<>]/, '')
+                        elsif config[:custom_instance_name]
+                          config[:custom_instance_name]
                         else
                           instance.name.gsub(/[<>]/, '').split('-').drop(1).join('-')
                         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen