kitchen-ansible 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08d06cb07b8db0c91b7e09c02c456eab49f0ee6
-  data.tar.gz: 138bc11bc88f938f2c8441e800c0680539a6fde6
+  metadata.gz: 6b4d280df66920431cf01969f165457c8e884fc2
+  data.tar.gz: a9a62abb6f496d3d862f0a30776f4642ed739822
 SHA512:
-  metadata.gz: f54b626becfd89c1cf4a1a62a5fda490b896dd1dde6badf61a7213ba42b5fd9d55f5e6ff3a562661a5115e4c10aff7fd4d91d34b0e50ca83ee3d83d76e260c46
-  data.tar.gz: ced7c72e09d801abe19d4066572b446130e6def6abacff9b68b46928af4bb35dc585272b8dcbae01f9f624525e8d9fb8d72c2cc9ad44fd82ecbbdd587452cc73
+  metadata.gz: e2c4d149b73a3959c182003b11cf28414f05f3fdad19d92d46876cbcf161142ae05b14a2dc5f5a2486995fc6dc73759a0dd7ed4a553dc82331aa6512acf62990
+  data.tar.gz: eda4854cba439e31bbbe4c6bdb388088343ca62970950123e0843e2ed1a87d31b469cffd4a36750f46c6bd7bca7c7fc09a7c396b86fdaa8a29a3098232f1e86d

data/kitchen-ansible.gemspec

@@ -26,7 +26,7 @@ Ansible Provisioner for Test Kitchen
 Supports running ansible-playbook
 
 EOF
-  s.add_runtime_dependency 'test-kitchen'
+  s.add_runtime_dependency 'test-kitchen', '~> 1.4'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.32"
+    VERSION = "0.0.33"
   end
 end

data/lib/kitchen/provisioner/ansible/config.rb

@@ -64,6 +64,7 @@ module Kitchen
         default_config :http_proxy, nil
         default_config :https_proxy, nil
         default_config :no_proxy, nil
+        default_config :ansible_playbook_command, nil
 
         default_config :playbook do |provisioner|
           provisioner.calculate_path('default.yml', :file) or

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -276,41 +276,45 @@ module Kitchen
       end
 
       def run_command
-        if config[:require_ansible_source]
-          # this is an ugly hack to get around the fact that extra vars uses ' and "
-          cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man #{config[:root_path]}/ansible/bin/ansible-playbook")
+        if !config[:ansible_playbook_command].nil?
+          return config[:ansible_playbook_command]
         else
-          cmd = ansible_command("ansible-playbook")
-        end
-        if config[:ansible_binary_path]
-          cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
-        end
-        if https_proxy
-          cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}"
-        end
-        if http_proxy
-          cmd = "HTTP_PROXY=#{http_proxy} #{cmd}"
-        end
-        if ansible_roles_path
-          cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}"
-        end
+          if config[:require_ansible_source]
+            # this is an ugly hack to get around the fact that extra vars uses ' and "
+            cmd = ansible_command("PATH=#{config[:root_path]}/ansible/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games PYTHONPATH=#{config[:root_path]}/ansible/lib MANPATH=#{config[:root_path]}/ansible/docs/man #{config[:root_path]}/ansible/bin/ansible-playbook")
+          else
+            cmd = ansible_command("ansible-playbook")
+          end
+          if config[:ansible_binary_path]
+            cmd = ansible_command("#{config[:ansible_binary_path]}/ansible-playbook")
+          end
+          if https_proxy
+            cmd = "HTTPS_PROXY=#{https_proxy} #{cmd}"
+          end
+          if http_proxy
+            cmd = "HTTP_PROXY=#{http_proxy} #{cmd}"
+          end
+          if ansible_roles_path
+            cmd = "ANSIBLE_ROLES_PATH=#{ansible_roles_path} #{cmd}"
+          end
 
-        result = [
-          cmd,
-          ansible_inventory_flag,
-          "-c #{config[:ansible_connection]}",
-          "-M #{File.join(config[:root_path], 'modules')}",
-          ansible_verbose_flag,
-          ansible_check_flag,
-          ansible_diff_flag,
-          ansible_vault_flag,
-          extra_vars,
-          tags,
-          ansible_extra_flags,
-          "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
-        ].join(" ")
-        info("Going to invoke ansible-playbook with: #{result}")
-        result
+          result = [
+            cmd,
+            ansible_inventory_flag,
+            "-c #{config[:ansible_connection]}",
+            "-M #{File.join(config[:root_path], 'modules')}",
+            ansible_verbose_flag,
+            ansible_check_flag,
+            ansible_diff_flag,
+            ansible_vault_flag,
+            extra_vars,
+            tags,
+            ansible_extra_flags,
+            "#{File.join(config[:root_path], File.basename(config[:playbook]))}",
+          ].join(" ")
+          info("Going to invoke ansible-playbook with: #{result}")
+          result
+        end
       end
 
       def ansible_command(script)
@@ -752,6 +756,7 @@ module Kitchen
       # [example_servers]
       # localhost
       def prepare_hosts
+        return if ansible_inventory_file
         info('Preparing hosts file')
 
         if config[:hosts].nil?

data/provisioner_options.md

@@ -42,6 +42,7 @@ ansible_vault_password_file| | Path of Ansible Vault Password File
 ansible_connection | local | Connection for Hosts and Groups
 ansible_inventory_file | hosts | Custom inventory file
 ansible_extra_flags | '' | Additional options to pass to `ansible-playbook` -- e.g.: `'--skip-tags=redis'`
+ansible_playbook_command | | Override the ansible playbook command
 require_ruby_for_busser|false|install ruby to run busser for tests
 require_chef_for_busser|true|install chef to run busser for tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
 chef_bootstrap_url |https://www.getchef.com /chef/install.sh| the chef install

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-05 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