kitchen-ansible 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac89415331c2a0fa7949888fe368bb0d18cf26e
-  data.tar.gz: c1e2f6e1e84231e1f75f30ab4f3562e6523905ad
+  metadata.gz: 222d1ee98effa69d0d9992fe20f9c9511b4c9ff1
+  data.tar.gz: 55f68c2848abc4233e8acd74fa784c5372557026
 SHA512:
-  metadata.gz: fb9713bb088897ab10cbf0189862bf8cf30a55591aa318ff66030dfd8f746f9f4aa8df0f3bad5e55860d601aeced3c2249391b008667f1bc4412df6739c62855
-  data.tar.gz: 8876e39e61831b33cc314f9fcfd36cee3e8544774f4d2fc246d922374922d47c0fe77e190a1e1cfabba3a59358f14105d49d05c7595cb6c3e4d1e4acd9be5821
+  metadata.gz: 6622698240ee163482c9a45fca1f7cb8d020e3874e487620925e943ca3a76aac7e5799bcd862d11e23597144526bc8b7d1fa057221e54ec6c1534524d72595ea
+  data.tar.gz: a48e95524e38f482f008df670c15585509bdc8432a7a2b85644a586b10d141be27040a862cc3d0610c356542e77293b554202d6de06ffab0597e8a9fdfba3dde

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/kitchen-ansible.svg)](http://badge.fury.io/rb/kitchen-ansible)
 [![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/kitchen-ansible?type=total&color=brightgreen)](https://rubygems.org/gems/kitchen-ansible)
+[![Build Status](https://travis-ci.org/neillturner/kitchen-ansible.png)](https://travis-ci.org/neillturner/kitchen-ansible)
 
 A Test Kitchen Provisioner for Ansible
 

data/kitchen-ansible.gemspec

@@ -5,6 +5,7 @@ require 'kitchen-ansible/version'
 
 Gem::Specification.new do |s|
   s.name          = "kitchen-ansible"
+  s.license       = "Apache-2.0"
   s.version       = Kitchen::Ansible::VERSION
   s.authors       = ["Neill Turner"]
   s.email         = ["neillwturner@gmail.com"]
@@ -26,8 +27,8 @@ Supports running ansible-playbook
 
 EOF
   s.add_runtime_dependency 'test-kitchen'
-  
+
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'
-
+  s.add_runtime_dependency 'librarian-ansible'
 end

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -66,7 +66,7 @@ module Kitchen
       end
 
       default_config :additional_copy_path do |provisioner|
-         provisioner.calculate_path('addt_dir', :directory)
+         provisioner.calculate_path('additional_copy', :directory)
       end
 
       default_config :host_vars_path do |provisioner|
@@ -276,7 +276,7 @@ module Kitchen
           prepare_roles
           prepare_ansible_cfg
           prepare_group_vars
-          prepare_addt_dir
+          prepare_additional_copy_path
           prepare_host_vars
           prepare_hosts
           prepare_filter_plugins
@@ -404,7 +404,7 @@ module Kitchen
           config[:group_vars_path].to_s
         end
 
-        def addt_dir
+        def additional_copy
           config[:additional_copy_path]
         end
 
@@ -521,8 +521,8 @@ module Kitchen
 
           roles_paths = []
           roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
-          additional_dirs.each do |additional_dir|
-            roles_paths << File.join(config[:root_path], File.basename(additional_dir))
+          additional_files.each do |additional_file|
+            roles_paths << File.join(config[:root_path], File.basename(additional_file))
           end
 
           if roles_paths.empty?
@@ -576,32 +576,26 @@ module Kitchen
           FileUtils.cp_r(Dir.glob("#{group_vars}/*"), tmp_group_vars_dir)
         end
 
-        def prepare_addt_dir
+        def prepare_additional_copy_path
           info('Preparing additional_copy_path')
-
-          additional_dirs.each do |additional_dir|
-
-            tmp_addt_dir = File.join(sandbox_path, File.basename(additional_dir))
-            FileUtils.mkdir_p(tmp_addt_dir)
-
-            unless File.directory?(additional_dir)
-              info "invalid value #{additional_dir} in additional_copy_path"
-              return
+          additional_files.each do |file|
+            destination = File.join(sandbox_path, File.basename(file))
+            if File.directory?(file)
+              info("Copy dir: #{file} #{destination}")
+              FileUtils.cp_r(file, destination)
+            else
+              info("Copy file: #{file} #{destination}")
+              FileUtils.cp file, destination
             end
-
-            debug("Using additional_copy_path from #{additional_dir}")
-            FileUtils.cp_r(Dir.glob("#{additional_dir}/*"), tmp_addt_dir)
           end
         end
 
-        def additional_dirs
-          additional_dirs = []
-
-          if ( addt_dir )
-            additional_dirs = addt_dir.kind_of?(Array) ? addt_dir : [addt_dir]
+        def additional_files
+          additional_files = []
+          if ( additional_copy )
+            additional_files = additional_copy.kind_of?(Array) ? additional_copy : [additional_copy]
           end
-
-          additional_dirs.map { |additional_dir| additional_dir.to_s }
+          additional_files.map { |additional_dir | additional_dir.to_s }
         end
 
         def prepare_host_vars

data/provisioner_options.md

@@ -16,7 +16,7 @@ roles_path | roles | ansible repo roles directory
 group_vars_path | group_vars | ansible repo group_vars directory
 host_vars_path | host_vars | ansible repo hosts directory
 filter_plugins | filter_plugins | ansible repo filter_plugins directory
-additional_copy_path | | arbitrary array of directories to copy into test environment, relative to CWD. (eg, vars)
+additional_copy_path | | arbitrary array of files and directories to copy into test environment, relative to CWD. (eg, vars or included playbooks)
 extra_vars | Hash.new | Hash to set the extra_vars passed to ansibile-playbook command
 playbook | 'site.yml' | playbook for ansible-playbook to run
 modules_path | | ansible repo manifests directory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: librarian-ansible
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |+
   == DESCRIPTION:
 
@@ -74,7 +88,8 @@ files:
 - lib/kitchen/provisioner/ansible_playbook.rb
 - provisioner_options.md
 homepage: https://github.com/neillturner/kitchen-ansible
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []