kitchen-puppet 0.0.9 → 0.0.10

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -20,6 +20,7 @@
 # for documentation configuration parameters with puppet_apply provisioner.
 #
 
+require 'json'
 require 'kitchen/provisioner/base'
 require 'kitchen/provisioner/puppet/librarian'
 
@@ -75,6 +76,14 @@ module Kitchen
         provisioner.calculate_path('Puppetfile', :file)
       end
 
+      default_config :modulefile_path do |provisioner|
+        provisioner.calculate_path('Modulefile', :file)
+      end
+
+      default_config :metadata_json_path do |provisioner|
+        provisioner.calculate_path('metadata.json', :file)
+      end
+
       default_config :puppet_debug, false
       default_config :puppet_verbose, false
       default_config :puppet_noop, false
@@ -104,9 +113,11 @@ module Kitchen
             ""
           end
           <<-INSTALL
+          #{Util.shell_helpers}
+
           if [ ! -d "#{config[:puppet_omnibus_remote_path]}" ]; then
             echo "-----> Installing Puppet Omnibus"
-            curl -o /tmp/puppet_install.sh #{config[:puppet_omnibus_url]}
+            do_download #{config[:puppet_omnibus_url]} /tmp/puppet_install.sh
             #{sudo('sh')} /tmp/puppet_install.sh #{version}
           fi
           #{install_busser}
@@ -157,6 +168,7 @@ module Kitchen
 
       def install_busser
           <<-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
@@ -164,7 +176,7 @@ module Kitchen
           if [ ! -d "/opt/chef" ]
           then
             echo "-----> Installing Chef Omnibus to install busser to run tests"
-            curl -o /tmp/install.sh #{chef_url}
+            do_download #{chef_url} /tmp/install.sh
             #{sudo('sh')} /tmp/install.sh
           fi
           INSTALL
@@ -274,6 +286,14 @@ module Kitchen
           config[:puppetfile_path] or ''
         end
 
+        def modulefile
+          config[:modulefile_path] or ''
+        end
+
+        def metadata_json
+          config[:metadata_json_path] or ''
+        end
+
         def manifest
           config[:manifest]
         end
@@ -385,12 +405,34 @@ module Kitchen
           if File.exists?(puppetfile)
             resolve_with_librarian
           end
+
           debug("Using modules from #{modules}")
 
           tmp_modules_dir = File.join(sandbox_path, 'modules')
           FileUtils.mkdir_p(tmp_modules_dir)
           FileUtils.cp_r(Dir.glob("#{modules}/*"), tmp_modules_dir,
             :remove_destination => true)
+
+          if File.exists?(modulefile)
+            warn("Modulefile found but this is depricated, ignoring it, see https://tickets.puppetlabs.com/browse/PUP-1188")
+          end
+
+          if File.exists?(metadata_json)
+            module_name = nil
+            begin
+              module_name = JSON.parse( IO.read(metadata_json) )['name'].split("/").last
+            rescue
+              error("not able to load or parse #{metadata_json_path} for the name of the module")
+            end
+
+            if module_name
+              module_target_path = File.join(tmp_modules_dir,module_name)
+              FileUtils.mkdir_p(module_target_path)
+              FileUtils.cp_r(Dir.glob("*").reject{|entry| entry =~ /modules/}, module_target_path,
+                :remove_destination => true)
+
+            end
+          end
         end
 
         def prepare_hiera_config

data/lib/kitchen-puppet/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Puppet
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies: []
 description: ! '== DESCRIPTION: