kitchen-puppet 1.40.2 → 1.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a52a9b68db3301a65d7801ce0ccc5b96d3a9243
-  data.tar.gz: 363c6d58945981575f34e78714decce33cccf65e
+  metadata.gz: a4dbe4234aae9408764bb74e4f92d5e46af49c2c
+  data.tar.gz: 1d15df9eaf3229a394ca3aef95fe78c99f041ec1
 SHA512:
-  metadata.gz: 17ae32e249492274b0f6e7de9a7530f62aa8b6d4a09249c4051c3aae098dd28a4a9b5fad460a857ca0db4ae0d8510123071fdbfb9d59976dc415907a861dcc55
-  data.tar.gz: c01e08ef9578ee06d60ae6cbd6da376ac62ef9d778cf6316575ee54778ac0ecdc5d5d7f4f92e12c30f4b628d965e69a4e84082360dfeb4242c474599c2e69335
+  metadata.gz: ef9fff2416a9f99c4f71f1844c29f69081015a14581a74989f8a40dd4ddfbaf4aa8feb57a484c3c563bcc5e6779851ac3e8749de93863bb937f93fe7f213c5e2
+  data.tar.gz: 4c36673caf5d02a2269d43eb7af94726d3dfb17b8fef03c7c5062f5f2dfef43d0f7925eecc1d1495278865414043817cf5dd2494ce54cd73fc5d30215e779df6

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.40.2'.freeze
+    VERSION = '1.41.0'.freeze
   end
 end

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

@@ -44,7 +44,9 @@ module Kitchen
           debug("Using Puppetfile from #{puppetfile}")
 
           env = ::Librarian::Puppet::Environment.new(
-            project_path: File.dirname(puppetfile))
+            project_path: File.dirname(puppetfile)
+          )
+
           env.config_db.local['path'] = path
           ::Librarian::Action::Resolve.new(env).run
           ::Librarian::Action::Install.new(env).run

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -77,6 +77,7 @@ module Kitchen
       default_config :http_proxy, nil
       default_config :https_proxy, nil
 
+      default_config :ignored_paths_from_root, []
       default_config :hiera_data_remote_path, '/var/lib/hiera'
       default_config :manifest, 'site.pp'
 
@@ -155,6 +156,7 @@ module Kitchen
       end
 
       default_config :hiera_deep_merge, false
+      default_config :puppet_no_sudo, false
 
       def calculate_path(path, type = :directory)
         base = config[:test_base_path]
@@ -466,18 +468,21 @@ module Kitchen
         end
 
         if puppet_git_pr
-          commands << [sudo('git'),
-                       '--git-dir=/etc/puppet/.git/',
-                       'fetch -f',
-                       'origin',
-                       "pull/#{puppet_git_pr}/head:pr_#{puppet_git_pr}"
-                      ].join(' ')
-
-          commands << [sudo('git'), '--git-dir=/etc/puppet/.git/',
-                       '--work-tree=/etc/puppet/',
-                       'checkout',
-                       "pr_#{puppet_git_pr}"
-                      ].join(' ')
+          commands << [
+            sudo('git'),
+            '--git-dir=/etc/puppet/.git/',
+            'fetch -f',
+            'origin',
+            "pull/#{puppet_git_pr}/head:pr_#{puppet_git_pr}"
+          ].join(' ')
+
+          commands << [
+            sudo('git'),
+            '--git-dir=/etc/puppet/.git/',
+            '--work-tree=/etc/puppet/',
+            'checkout',
+            "pr_#{puppet_git_pr}"
+          ].join(' ')
         end
 
         if puppet_config
@@ -678,10 +683,15 @@ module Kitchen
       end
 
       def puppet_cmd
+        puppet_bin = 'puppet'
         if config[:require_puppet_collections]
-          sudo_env("#{config[:puppet_coll_remote_path]}/bin/puppet")
+          puppet_bin = "#{config[:puppet_coll_remote_path]}/bin/puppet"
+        end
+
+        if config[:puppet_no_sudo]
+          puppet_bin
         else
-          sudo_env('puppet')
+          sudo_env(puppet_bin)
         end
       end
 
@@ -1006,8 +1016,11 @@ module Kitchen
         return unless module_name
         module_target_path = File.join(sandbox_path, 'modules', module_name)
         FileUtils.mkdir_p(module_target_path)
+
+        excluded_paths = %w(modules spec pkg) + config[:ignored_paths_from_root]
+
         FileUtils.cp_r(
-          Dir.glob(File.join(config[:kitchen_root], '*')).reject { |entry| entry =~ /modules$|spec$|pkg$/ },
+          Dir.glob(File.join(config[:kitchen_root], '*')).reject { |entry| entry =~ /#{excluded_paths.join('$|')}$/ },
           module_target_path,
           remove_destination: true
         )

data/provisioner_options.md

@@ -61,6 +61,8 @@ require_puppet_omnibus | false | Set if using omnibus puppet install
 puppet_omnibus_url | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet.sh | omnibus puppet v3 install location.
 _for puppet v4 change to_ | https://raw.githubusercontent.com/ petems/puppet-install-shell/ master/install_puppet_agent.sh |
 puppet_enc | | path for external node classifier script
+puppet_no_sudo | false | allow puppet command to run without sudo if required
+ignored_paths_from_root | [] | allow extra paths to be ignored when copying from puppet repository
 
 ## Puppet Apply Configuring Provisioner Options
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.40.2
+  version: 1.41.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen