kitchen-ansible 0.0.2 → 0.0.3

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

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

@@ -45,7 +45,7 @@ module Kitchen
 
         def resolve
           version = ::Librarian::Ansible::VERSION
-          info("Resolving module dependencies with Librarian-Ansible #{version}...")
+          info("Resolving role dependencies with Librarian-Ansible #{version}...")
           debug("Using Ansiblefile from #{ansiblefile}")
 
           env = ::Librarian::Ansible::Environment.new(

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -398,7 +398,9 @@ module Kitchen
         def prepare_roles
           info('Preparing roles')
           debug("Using roles from #{roles}")
-          
+
+          resolve_with_librarian if File.exists?(ansiblefile)
+                    
           # Detect whether we are running tests on a role
           # If so, make sure to copy into VM so dir structure is like: /tmp/kitchen/roles/role_name
 
@@ -417,9 +419,9 @@ module Kitchen
                file.write("#no roles path specified\n")
             end
           else
-            debug("Setting roles_path inside VM to #{File.join(config[:root_path], 'roles', role_name)}")
+            debug("Setting roles_path inside VM to #{File.join(config[:root_path], 'roles')}")
             File.open( ansible_config_file, "wb") do |file|
-               file.write("[defaults]\nroles_path = #{File.join(config[:root_path], 'roles', role_name)}\n")
+               file.write("[defaults]\nroles_path = #{File.join(config[:root_path], 'roles')}\n")
             end
           end
         end
@@ -486,14 +488,11 @@ module Kitchen
           else
             info 'nothing to do for modules'
           end
-
-          resolve_with_librarian if File.exists?(ansiblefile)
-
         end
 
         def resolve_with_librarian
           Kitchen.mutex.synchronize do
-            Ansible::Librarian.new(ansiblefile, tmp_modules_dir, logger).resolve
+            Ansible::Librarian.new(ansiblefile, tmp_roles_dir, logger).resolve
           end
         end
     end

data/provisioner_options.md

@@ -21,7 +21,7 @@ ansible_verbose| false| Extra information logging
 ansible_verbosity| 1| Sets the verbosity flag appropriately (e.g.: `1 => '-v', 2 => '-vv', 3 => '-vvv" ...`) Valid values are one of: `1, 2, 3, 4` OR `:info, :warn, :debug, :trace`.
 update_package_repos| true| update OS repository metadata
 chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
-ansiblefile_path | | Path to Aansiblefile
+ansiblefile_path | | Path to Ansiblefile
 
 ## Configuring Provisioner Options
 
@@ -60,7 +60,7 @@ To override a setting at the suite-level, specify the setting name under the sui
 
 ### Per-suite Structure
 
-It can be beneficial to keep different Aansible layouts for different suites. Rather than having to specify the roles, modules, etc for each suite, you can create the following directory structure and they will automatically be found:
+It can be beneficial to keep different Ansible layouts for different suites. Rather than having to specify the roles, modules, etc for each suite, you can create the following directory structure and they will automatically be found:
 
     $kitchen_root/ansible/$suite_name/roles
     $kitchen_root/ansible/$suite_name/modules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: