kitchen-ansible 0.0.4 → 0.0.5

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Ansible
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -46,7 +46,7 @@ module Kitchen
       default_config :ansible_version, nil
       default_config :require_ansible_repo, true
       default_config :extra_vars, {}
-      default_config :ansible_apt_repo, "ppa:rquillo/ansible"
+      default_config :ansible_apt_repo, "ppa:ansible/ansible"
       default_config :ansible_yum_repo, "https://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm"
       default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
 
@@ -76,6 +76,7 @@ module Kitchen
         provisioner.calculate_path('Ansiblefile', :file)
       end
 
+      default_config :requirements_path, false
       default_config :ansible_verbose, false
       default_config :ansible_verbosity, 1
       default_config :ansible_noop, false   # what is ansible equivalent of dry_run???? ##JMC: I think it's [--check mode](http://docs.ansible.com/playbooks_checkmode.html) TODO: Look into this...
@@ -213,20 +214,33 @@ module Kitchen
       end
 
       def install_busser
-          <<-INSTALL
+        install = ''
+        install << <<-INSTALL
           #{Util.shell_helpers}
-          # install chef omnibus so that busser works as this is needed to run tests :(
-          # TODO: work out how to install enough ruby
-          # and set busser: { :ruby_bindir => '/usr/bin/ruby' } so that we dont need the
-          # whole chef client
-          if [ ! -d "/opt/chef" ]
-          then
-            echo "-----> Installing Chef Omnibus to install busser to run tests"
-            do_download #{chef_url} /tmp/install.sh
-            #{sudo('sh')} /tmp/install.sh
+          # Fix for https://github.com/test-kitchen/busser/issues/12
+          if [ -h /usr/bin/ruby ]; then
+              L=$(readlink -f /usr/bin/ruby)
+              #{sudo('rm')} /usr/bin/ruby
+              #{sudo('ln')} -s $L /usr/bin/ruby
           fi
           INSTALL
-          end
+        if chef_url then
+          install << <<-INSTALL
+            # install chef omnibus so that busser works as this is needed to run tests :(
+            # TODO: work out how to install enough ruby
+            # and set busser: { :ruby_bindir => '/usr/bin/ruby' } so that we dont need the
+            # whole chef client
+            if [ ! -d "/opt/chef" ]
+            then
+              echo "-----> Installing Chef Omnibus to install busser to run tests"
+              do_download #{chef_url} /tmp/install.sh
+              #{sudo('sh')} /tmp/install.sh
+            fi
+            INSTALL
+        end
+
+        install
+      end
 
         def init_command
           dirs = %w{modules roles group_vars host_vars}.
@@ -275,6 +289,13 @@ module Kitchen
               sudo('cp -r'), File.join(config[:root_path],'host_vars'), '/etc/ansible/.',
           ].join(' ')
 
+          if galaxy_requirements
+            commands << [
+               sudo('ansible-galaxy'), 'install', '--force',
+               '-r', File.join(config[:root_path], galaxy_requirements),
+            ].join(' ')
+          end
+
           command = commands.join(' && ')
           debug(command)
           command
@@ -321,6 +342,10 @@ module Kitchen
           config[:ansiblefile_path] or ''
         end
 
+        def galaxy_requirements
+          config[:requirements_path] or nil
+        end
+
         def playbook
           config[:playbook]
         end
@@ -406,6 +431,10 @@ module Kitchen
           debug("Using roles from #{roles}")
 
           resolve_with_librarian if File.exists?(ansiblefile)
+
+          if galaxy_requirements
+            FileUtils.cp(galaxy_requirements, File.join(sandbox_path, galaxy_requirements))
+          end
                     
           # 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

data/provisioner_options.md

@@ -22,6 +22,7 @@ ansible_verbosity| 1| Sets the verbosity flag appropriately (e.g.: `1 => '-v', 2
 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 Ansiblefile
+requirements_path | | Path to ansible-galaxy requirements
 
 ## Configuring Provisioner Options
 

metadata

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