r10k 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84930e8294eba7ee0bb6891b043c7b5c50adc06b
-  data.tar.gz: 941551e36b98e187c52afbbc1c20e98c4b869ae8
+  metadata.gz: 4e4eadf9d07ce0163d2ec4a20c748956fda46c7c
+  data.tar.gz: c89ec234651cb578c26df88d02ee0196406abf0a
 SHA512:
-  metadata.gz: 9eef55519460f134d9e2a376e64cab9e04a63836c9a4aa7a46f3d220576b29beed54215fc9710057f6d932a9892b9abeb7e91cfe9f2caa29a2846fed951de662
-  data.tar.gz: 53f5d878d87b1db35402539a0ca21d97ab22f230f84b583885dd67fa4c162a0c6ec1b05c71e535f116015583e49b76c87fd6642e8e7311d16c7a7addd08e1343
+  metadata.gz: 5be4326a9c9fddc77c1c84daa5deb557059b2f876beb278c97d7f8c36e3c742ec39aeeed6231b3087490b696b7655de39569524b18acf0103c29f3ab41ba17a1
+  data.tar.gz: 7ee4a185142460a472ceb7f7b09c66bf3bbe03abf5de5a99e66a6cf62476b18ffc870e4fafb020c8146a8f854330979baee3b9b4e1da56237e028cd995a6bfef

data/CHANGELOG.mkd

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+3.2.0
+-----
+
+## New Feature
+
+Add support for running `puppet generate types`
+
 3.1.1
 -----
 

data/azure-pipelines.yml

@@ -20,10 +20,15 @@ steps:
     #
     # Azure
     #
-    Write-Host "`n`n$line`nAzure`n$line`n"
-    Invoke-RestMethod -Headers @{'Metadata'='true'} -URI http://169.254.169.254/metadata/instance?api-version=2017-12-01 -Method Get |
-      ConvertTo-Json -Depth 10 |
-      Write-Host
+    $assetTag = Get-WmiObject -class Win32_SystemEnclosure -namespace root\CIMV2 |
+      Select -ExpandProperty SMBIOSAssetTag
+    if ($assetTag -eq '7783-7084-3265-9085-8269-3286-77')
+    {
+      Write-Host "`n`n$line`nAzure`n$line`n"
+      Invoke-RestMethod -Headers @{'Metadata'='true'} -URI http://169.254.169.254/metadata/instance?api-version=2017-12-01 -Method Get |
+        ConvertTo-Json -Depth 10 |
+        Write-Host
+    }
     #
     # Docker
     #
@@ -38,6 +43,7 @@ steps:
     Write-Host "`n`n$line`nRuby`n$line`n"
     ruby --version
     gem --version
+    gem env
     bundle --version
     #
     # Environment

data/doc/dynamic-environments/configuration.mkd

@@ -300,6 +300,26 @@ deploy:
   write_lock: "Deploying code is disallowed until the next maintenance window (2038-01-19)"
 ```
 
+#### generate\_types
+
+The `generate_types` setting controls whether r10k should update generated types
+after a successful environment update. See [Environment isolation](https://puppet.com/docs/puppet/latest/environment\_isolation.html)
+for more information on generated types. Defaults to false.
+
+```yaml
+deploy:
+  generate_types: true
+```
+
+#### puppet\_path
+
+The path to the puppet executable used for generating types. Defaults to `/opt/puppetlabs/bin/puppet`.
+
+```yaml
+deploy:
+  puppet_path: '/usr/local/bin/puppet'
+```
+
 Source options
 --------------
 

data/docker/.rspec

@@ -1,3 +1,4 @@
+--require ./r10k/spec/spec_helper
 --format RspecJunitFormatter
 --out TEST-rspec.xml
 --format documentation

data/docker/Makefile

@@ -1,4 +1,5 @@
 PUPPERWARE_ANALYTICS_STREAM ?= dev
+NAMESPACE ?= puppet
 git_describe = $(shell git describe)
 vcs_ref := $(shell git rev-parse HEAD)
 build_date := $(shell date -u +%FT%T)
@@ -37,20 +38,32 @@ build: prep
 		--build-arg version=$(version) \
 		--build-arg pupperware_analytics_stream=$(PUPPERWARE_ANALYTICS_STREAM) \
 		--file r10k/$(dockerfile) \
-		--tag puppet/r10k:$(version) \
+		--tag $(NAMESPACE)/r10k:$(version) \
 		r10k
 ifeq ($(IS_LATEST),true)
-	@docker tag puppet/r10k:$(version) puppet/r10k:latest
+	@docker tag $(NAMESPACE)/r10k:$(version) puppet/r10k:latest
 endif
 
 test: prep
 	@bundle install --path .bundle/gems
-	@PUPPET_TEST_DOCKER_IMAGE=puppet/r10k:$(version) bundle exec rspec r10k/spec
+	@PUPPET_TEST_DOCKER_IMAGE=$(NAMESPACE)/r10k:$(version) bundle exec rspec r10k/spec
 
-publish: prep
-	@docker push puppet/r10k:$(version)
+push-image: prep
+	@docker push $(NAMESPACE)/r10k:$(version)
 ifeq ($(IS_LATEST),true)
-	@docker push puppet/r10k:latest
+	@docker push $(NAMESPACE)/r10k:latest
 endif
 
-.PHONY: lint build test publish
+push-readme:
+	@docker pull sheogorath/readme-to-dockerhub
+	@docker run --rm \
+		-v $(PWD)/README.md:/data/README.md \
+		-e DOCKERHUB_USERNAME="$(DISTELLI_DOCKER_USERNAME)" \
+		-e DOCKERHUB_PASSWORD="$(DISTELLI_DOCKER_PW)" \
+		-e DOCKERHUB_REPO_PREFIX=puppet \
+		-e DOCKERHUB_REPO_NAME=r10k \
+		sheogorath/readme-to-dockerhub
+
+publish: push-image push-readme
+
+.PHONY: prep lint build test publish push-image push-readme

data/docker/README.md

@@ -0,0 +1,28 @@
+# [puppetlabs/r10k](https://github.com/puppetlabs/r10k)
+
+r10k on a Docker image. Based on Alpine 3.8.
+
+## Configuration
+
+The following environment variables are supported:
+
+- `PUPPERWARE_ANALYTICS_ENABLED`
+
+  Set to 'true' to enable Google Analytics metrics. Defaults to 'false'.
+
+## Analytics Data Collection
+
+The r10k container collects usage data. This is disabled by default. You can enable it by passing `--env PUPPERWARE_ANALYTICS_ENABLED=true`
+to your `docker run` command.
+
+### What data is collected?
+* Version of the r10k container.
+* Anonymized IP address is used by Google Analytics for Geolocation data, but the IP address is not collected.
+
+### Why does the r10k container collect data?
+
+We collect data to help us understand how the containers are used and make decisions about upcoming changes.
+
+### How can I opt out of r10k container data collection?
+
+This is disabled by default.

data/docker/ci/build.ps1

@@ -54,6 +54,8 @@ function Invoke-ContainerTest(
 
   bundle install --path .bundle/gems
   $ENV:PUPPET_TEST_DOCKER_IMAGE = "$Namespace/r10k:$Version"
+  Write-Host "Testing against image: ${ENV:PUPPET_TEST_DOCKER_IMAGE}"
+  bundle exec rspec --version
   bundle exec rspec r10k/spec
 
   Pop-Location
@@ -72,7 +74,7 @@ function Clear-ContainerBuilds(
 
   # this provides example data which ConvertFrom-String infers parsing structure with
   $template = @'
-{Version*:1.2.3} {ID:5b84704c1d01} {[DateTime]Created:2019-02-07 18:24:51} +0000 GMT
+{Version*:10.2.3*} {ID:5b84704c1d01} {[DateTime]Created:2019-02-07 18:24:51} +0000 GMT
 {Version*:latest} {ID:0123456789ab} {[DateTime]Created:2019-01-29 00:05:33} +0000 GMT
 '@
   $output = docker images --filter=reference="$Namespace/${Name}" --format "{{.Tag}} {{.ID}} {{.CreatedAt}}"

data/docker/r10k/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM alpine:3.8
 
 ARG vcs_ref
 ARG build_date
@@ -9,7 +9,6 @@ ARG pupperware_analytics_stream="dev"
 ENV PUPPERWARE_ANALYTICS_STREAM="$pupperware_analytics_stream"
 
 ENV R10K_VERSION="$version"
-ENV UBUNTU_CODENAME="xenial"
 
 LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
       org.label-schema.vendor="Puppet" \
@@ -23,27 +22,14 @@ LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.dockerfile="/Dockerfile"
 
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y wget ca-certificates lsb-release && \
-    wget https://apt.puppetlabs.com/puppet5-release-"$UBUNTU_CODENAME".deb && \
-    dpkg -i puppet5-release-"$UBUNTU_CODENAME".deb && \
-    rm puppet5-release-"$UBUNTU_CODENAME".deb && \
-    apt-get update && \
-    apt-get install --no-install-recommends -y puppet-agent && \
-    apt-get install --no-install-recommends -y git openssh-client && \
-    apt-get remove --purge -y wget && \
-    apt-get autoremove -y && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN /opt/puppetlabs/puppet/bin/gem install r10k:"$R10K_VERSION"
+RUN apk add --no-cache ruby openssh-client git ruby-rugged curl ruby-dev make gcc musl-dev
+
+RUN gem install --no-doc r10k:"$R10K_VERSION" json etc
 
 COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh
 COPY docker-entrypoint.d /docker-entrypoint.d
 
-ENV PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["help"]
 

data/docker/r10k/docker-entrypoint.d/10-analytics.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ "${PUPPERWARE_DISABLE_ANALYTICS}" = "true" ]; then
-    echo "($0) Pupperware analytics disabled; skipping metric submission"
+if [ "${PUPPERWARE_ANALYTICS_ENABLED}" != "true" ]; then
+    # Don't print out any messages here since this is a CLI container
     exit 0
 fi
 
@@ -19,10 +19,12 @@ cid=$(cat $_file 2>/dev/null || (cat /proc/sys/kernel/random/uuid | tee $_file))
 ec=${PUPPERWARE_ANALYTICS_STREAM:-dev}
 # Event Action
 ea=start
+# Anonymize ip
+aip=1
 
-_params="v=1&t=event&tid=${tid}&an=${an}&av=${av}&cid=${cid}&ec=${ec}&ea=${ea}"
+_params="v=1&t=event&tid=${tid}&an=${an}&av=${av}&cid=${cid}&ec=${ec}&ea=${ea}&aip=${aip}"
 _url="http://www.google-analytics.com/collect?${_params}"
 
-echo "($0) Sending metrics ${_url}"
+# Don't print out any messages here since this is a CLI container
 curl --fail --silent --show-error --output /dev/null \
     -X POST -H "Content-Length: 0" $_url

data/docker/r10k/docker-entrypoint.sh

@@ -3,9 +3,9 @@
 set -e
 
 for f in /docker-entrypoint.d/*.sh; do
-  echo "Running $f"
+  # Don't print out any messages here since this is a CLI container
   chmod +x "$f"
   "$f"
 done
 
-exec /opt/puppetlabs/puppet/bin/r10k "$@"
+exec /usr/bin/r10k "$@"

data/docker/r10k/spec/dockerfile_spec.rb

@@ -1,9 +1,19 @@
 require 'rspec/core'
 require 'fileutils'
+require 'open3'
 
 SPEC_DIRECTORY = File.dirname(__FILE__)
 
 describe 'r10k container' do
+  include Helpers
+
+  def run_r10k(command)
+    run_command("docker run --rm \
+                   --volume #{File.join(SPEC_DIRECTORY, 'fixtures')}:/test \
+                   #{@image} #{command} \
+                   --puppetfile /test/Puppetfile")
+  end
+
   before(:all) do
     @image = ENV['PUPPET_TEST_DOCKER_IMAGE']
     if @image.nil?
@@ -15,31 +25,20 @@ describe 'r10k container' do
       MSG
       fail error_message
     end
-    @container = %x(docker run --rm --detach \
-               --env PUPPERWARE_DISABLE_ANALYTICS=true \
-               --entrypoint /bin/bash \
-               --interactive \
-               --volume #{File.join(SPEC_DIRECTORY, 'fixtures')}:/test \
-               #{@image}).chomp
-
-    %x(docker exec #{@container} cp test/Puppetfile /)
   end
 
   after(:all) do
-    %x(docker container kill #{@container})
     FileUtils.rm_rf(File.join(SPEC_DIRECTORY, 'fixtures', 'modules'))
   end
 
   it 'should validate the Puppetfile' do
-    %x(docker exec #{@container} r10k puppetfile check)
-    status = $?
-    expect(status).to eq(0)
+    result = run_r10k('puppetfile check')
+    expect(result[:status].exitstatus).to eq(0)
   end
 
   it 'should install the Puppetfile' do
-    %x(docker exec #{@container} r10k puppetfile install)
-    status = $?
-    expect(status).to eq(0)
+    result = run_r10k('puppetfile install')
+    expect(result[:status].exitstatus).to eq(0)
     expect(Dir.exist?(File.join(SPEC_DIRECTORY, 'fixtures', 'modules', 'ntp'))).to eq(true)
   end
 end

data/docker/r10k/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'open3'
+
+module Helpers
+  def run_command(command)
+    stdout_string = ''
+    status = nil
+
+    Open3.popen3(command) do |stdin, stdout, stderr, wait_thread|
+      Thread.new do
+        stdout.each { |l| stdout_string << l; STDOUT.puts l }
+      end
+      Thread.new do
+        stderr.each { |l| STDOUT.puts l }
+      end
+
+      stdin.close
+      status = wait_thread.value
+    end
+
+    { status: status, stdout: stdout_string }
+  end
+end

data/lib/r10k/action/deploy/environment.rb

@@ -19,6 +19,7 @@ module R10K
           settings ||= {}
           @purge_levels = settings.fetch(:deploy, {}).fetch(:purge_levels, [])
           @user_purge_whitelist = settings.fetch(:deploy, {}).fetch(:purge_whitelist, [])
+          @generate_types = settings.fetch(:deploy, {}).fetch(:generate_types, false)
 
           super
 
@@ -86,6 +87,7 @@ module R10K
           end
 
           started_at = Time.new
+          @environment_ok = true
 
           status = environment.status
           logger.info _("Deploying environment %{env_path}") % {env_path: environment.path}
@@ -98,7 +100,11 @@ module R10K
               logger.debug(_("Environment %{env_dir} is new, updating all modules") % {env_dir: environment.dirname})
             end
 
+            previous_ok = @visit_ok
+            @visit_ok = true
             yield
+            @environment_ok = @visit_ok
+            @visit_ok &&= previous_ok
           end
 
           if @purge_levels.include?(:environment)
@@ -110,6 +116,15 @@ module R10K
             end
           end
 
+          if @generate_types
+            if @environment_ok
+              logger.debug("Generating puppet types for environment '#{environment.dirname}'...")
+              environment.generate_types!
+            else
+              logger.debug("Not generating puppet types for environment '#{environment.dirname}' due to puppetfile failures.")
+            end
+          end
+
           write_environment_info!(environment, started_at, @visit_ok)
         end
 
@@ -151,7 +166,7 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(puppetfile: :self, cachedir: :self, :'no-force' => :self)
+          super.merge(puppetfile: :self, cachedir: :self, 'no-force': :self, 'generate-types': :self, 'puppet-path': :self)
         end
       end
     end

data/lib/r10k/action/deploy/module.rb

@@ -62,13 +62,17 @@ module R10K
           if @argv.include?(mod.name)
             logger.info _("Deploying module %{mod_path}") % {mod_path: mod.path}
             mod.sync(force: @force)
+            if mod.environment && @generate_types
+              logger.debug("Generating puppet types for environment '#{mod.environment.dirname}'...")
+              mod.environment.generate_types!
+            end
           else
             logger.debug1(_("Only updating modules %{modules}, skipping module %{mod_name}") % {modules: @argv.inspect, mod_name: mod.name})
           end
         end
 
         def allowed_initialize_opts
-          super.merge(environment: true, :'no-force' => :self)
+          super.merge(environment: true, 'no-force': :self, 'generate-types': :self, 'puppet-path': :self)
         end
       end
     end

data/lib/r10k/action/runner.rb

@@ -42,10 +42,14 @@ module R10K
       def setup_settings
         config_settings = settings_from_config(@opts[:config])
 
-        overrides = {:cachedir => @opts[:cachedir]}
-        overrides.delete_if { |_, val| val.nil? }
+        overrides = {}
+        overrides[:cachedir] = @opts[:cachedir] unless @opts[:cachedir].nil?
+        overrides[:deploy] = {} if @opts[:'puppet-path'] || @opts[:'generate-types']
+        overrides[:deploy][:puppet_path] = @opts[:'puppet-path'] unless @opts[:'puppet-path'].nil?
+        overrides[:deploy][:generate_types] = @opts[:'generate-types'] unless @opts[:'generate-types'].nil?
 
         with_overrides = config_settings.merge(overrides) do |key, oldval, newval|
+          newval = oldval.merge(newval) if oldval.is_a? Hash
           logger.debug2 _("Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'") % {key: key, old_val: oldval, new_val: newval}
           newval
         end

data/lib/r10k/cli/deploy.rb

@@ -23,6 +23,14 @@ module R10K::CLI
 
         required nil, :cachedir, 'Specify a cachedir, overriding the value in config'
         flag nil, :'no-force', 'Prevent the overwriting of local module modifications'
+        flag nil, :'generate-types', 'Run `puppet generate types` after updating an environment'
+        option nil, :'puppet-path', 'Path to puppet executable', argument: :required do |value, cmd|
+          unless File.executable? value
+            $stderr.puts "The specified puppet executable #{value} is not executable."
+            puts cmd.help
+            exit 1
+          end
+        end
 
         run do |opts, args, cmd|
           puts cmd.help(:verbose => opts[:verbose])

data/lib/r10k/environment/base.rb

@@ -1,3 +1,5 @@
+require 'r10k/util/subprocess'
+
 # This class defines a common interface for environment implementations.
 #
 # @since 1.3.0
@@ -133,4 +135,16 @@ class R10K::Environment::Base
 
     list.to_a
   end
+
+  def generate_types!
+    argv = [R10K::Settings.puppet_path, 'generate', 'types', '--environment', dirname, '--environmentpath', basedir]
+    subproc = R10K::Util::Subprocess.new(argv)
+    subproc.raise_on_fail = true
+    subproc.logger = logger
+    result = subproc.execute
+    unless result.stderr.empty?
+      logger.warn "There were problems generating types for environment #{dirname}:"
+      result.stderr.split(%r{\n}).map { |msg| logger.warn msg }
+    end
+  end
 end

data/lib/r10k/initializers.rb

@@ -30,6 +30,8 @@ module R10K
           logger.warn(_("the purgedirs key in r10k.yaml is deprecated. it is currently ignored."))
         end
 
+        with_setting(:deploy) { |value| DeployInitializer.new(value).call }
+
         with_setting(:cachedir) { |value| R10K::Git::Cache.settings[:cache_root] = value }
         with_setting(:cachedir) { |value| R10K::Forge::ModuleRelease.settings[:cache_root] = value }
 
@@ -38,6 +40,12 @@ module R10K
       end
     end
 
+    class DeployInitializer < BaseInitializer
+      def call
+        with_setting(:puppet_path) { |value| R10K::Settings.puppet_path = value }
+      end
+    end
+
     class GitInitializer < BaseInitializer
       def call
         with_setting(:provider) { |value| R10K::Git.provider = value }

data/lib/r10k/module/base.rb

@@ -27,6 +27,10 @@ class R10K::Module::Base
   #   @return [Pathname] The full path of the module
   attr_reader :path
 
+  # @!attribute [r] environment
+  #   @return [R10K::Environment, nil] The parent environment of the module
+  attr_reader :environment
+
   # There's been some churn over `author` vs `owner` and `full_name` over
   # `title`, so in the short run it's easier to support both and deprecate one
   # later.

data/lib/r10k/settings.rb

@@ -9,6 +9,11 @@ module R10K
     require 'r10k/settings/definition'
     require 'r10k/settings/list'
 
+    class << self
+      # Path to puppet executable
+      attr_accessor :puppet_path
+    end
+
     def self.git_settings
       R10K::Settings::Collection.new(:git, [
 
@@ -108,6 +113,24 @@ module R10K
           :desc => "A list of filename patterns to be excluded from any purge operations. Patterns are matched relative to the root of each deployed environment, if you want a pattern to match recursively you need to use the '**' glob in your pattern. Basic shell style globs are supported.",
           :default => [],
         }),
+
+        Definition.new(:generate_types, {
+          :desc => "Controls whether to generate puppet types after deploying an environment. Defaults to false.",
+          :default => false,
+          :normalize => lambda do |input|
+            input.to_s == 'true'
+          end,
+        }),
+
+        Definition.new(:puppet_path, {
+          :desc => "Path to puppet executable. Defaults to /opt/puppetlabs/bin/puppet.",
+          :default => '/opt/puppetlabs/bin/puppet',
+          :validate => lambda do |value|
+            unless File.executable? value
+              raise ArgumentError, "The specified puppet executable #{value} is not executable"
+            end
+          end
+        }),
       ])
     end
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

data/spec/fixtures/unit/action/r10k.yaml

@@ -0,0 +1,5 @@
+---
+  cachedir: /config_cachedir
+  deploy:
+    generate_types: /config_generate_types
+    puppet_path: /config_puppet_path

data/spec/fixtures/unit/action/r10k_cachedir.yaml

@@ -0,0 +1,2 @@
+---
+  cachedir: /config_cachedir

data/spec/fixtures/unit/action/r10k_generate_types.yaml

@@ -0,0 +1,3 @@
+---
+  deploy:
+    generate_types: /config_generate_types

data/spec/fixtures/unit/action/r10k_puppet_path.yaml

@@ -0,0 +1,3 @@
+---
+  deploy:
+    puppet_path: /config_puppet_path

data/spec/unit/action/deploy/environment_spec.rb

@@ -24,6 +24,14 @@ describe R10K::Action::Deploy::Environment do
     end
 
     it "normalizes environment names in the arg vector"
+
+    it 'can accept a generate-types option' do
+      described_class.new({ 'generate-types': true }, [])
+    end
+
+    it 'can accept a puppet-path option' do
+      described_class.new({ 'puppet-path': '/nonexistent' }, [])
+    end
   end
 
   describe "when called" do
@@ -207,5 +215,117 @@ describe R10K::Action::Deploy::Environment do
         end
       end
     end
+    describe "generate-types" do
+      let(:deployment) do
+        R10K::Deployment.new(
+          R10K::Deployment::MockConfig.new(
+            sources: {
+              control: {
+                type: :mock,
+                basedir: '/some/nonexistent/path/control',
+                environments: %w[first second]
+              }
+            }
+          )
+        )
+      end
+
+      before do
+        allow(R10K::Deployment).to receive(:new).and_return(deployment)
+      end
+
+      before(:each) do
+        allow(subject).to receive(:write_environment_info!)
+        expect(subject.logger).not_to receive(:error)
+      end
+
+      context 'with generate-types enabled' do
+        subject do
+          described_class.new(
+            {
+              config: '/some/nonexistent/path',
+              puppetfile: true,
+              'generate-types': true
+            },
+            %w[first second]
+          )
+        end
+
+        it 'generate_types is true' do
+          expect(subject.instance_variable_get(:@generate_types)).to eq(true)
+        end
+
+        it 'only calls puppet generate types on specified environment' do
+          subject.instance_variable_set(:@argv, %w[first])
+          expect(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+            if environment.dirname == 'first'
+              expect(environment).to receive(:generate_types!)
+            else
+              expect(environment).not_to receive(:generate_types!)
+            end
+            original.call(environment, &block)
+          end.twice
+          subject.call
+        end
+
+        it 'does not call puppet generate types on puppetfile failure' do
+          allow(subject).to receive(:visit_puppetfile) { subject.instance_variable_set(:@visit_ok, false) }
+          expect(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+            expect(environment).not_to receive(:generate_types!)
+            original.call(environment, &block)
+          end.twice
+          subject.call
+        end
+
+        it 'calls puppet generate types on previous puppetfile failure' do
+          allow(subject).to receive(:visit_puppetfile) do |puppetfile|
+            subject.instance_variable_set(:@visit_ok, false) if puppetfile.environment.dirname == 'first'
+          end
+          expect(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+            if environment.dirname == 'second'
+              expect(environment).to receive(:generate_types!)
+            else
+              expect(environment).not_to receive(:generate_types!)
+            end
+            original.call(environment, &block)
+          end.twice
+          subject.call
+        end
+      end
+
+      context 'with generate-types disabled' do
+        subject do
+          described_class.new(
+            {
+              config: '/some/nonexistent/path',
+              puppetfile: true,
+              'generate-types': false
+            },
+            %w[first]
+          )
+        end
+
+        it 'generate_types is false' do
+          expect(subject.instance_variable_get(:@generate_types)).to eq(false)
+        end
+
+        it 'does not call puppet generate types' do
+          expect(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+            expect(environment).not_to receive(:generate_types!)
+            original.call(environment, &block)
+          end.twice
+          subject.call
+        end
+      end
+    end
+
+    describe 'with puppet-path' do
+
+      subject { described_class.new({ config: '/some/nonexistent/path', 'puppet-path': '/nonexistent' }, []) }
+
+      it 'sets puppet_path' do
+        expect(subject.instance_variable_get(:@puppet_path)).to eq('/nonexistent')
+      end
+    end
   end
 end

data/spec/unit/action/deploy/module_spec.rb

@@ -17,6 +17,14 @@ describe R10K::Action::Deploy::Module do
     it "can accept a no-force option" do
       described_class.new({:'no-force' => true}, [])
     end
+
+    it 'can accept a generate-types option' do
+      described_class.new({ 'generate-types': true }, [])
+    end
+
+    it 'can accept a puppet-path option' do
+      described_class.new({ 'puppet-path': '/nonexistent' }, [])
+    end
   end
 
   describe "with no-force" do
@@ -27,4 +35,92 @@ describe R10K::Action::Deploy::Module do
       expect(subject.force).to equal(false)
     end
   end
+
+  describe 'generate-types' do
+    let(:deployment) do
+      R10K::Deployment.new(
+        sources: {
+          control: {
+            type: :mock,
+            basedir: '/some/nonexistent/path/control',
+            environments: %w[first second]
+          }
+        }
+      )
+    end
+
+    before do
+      allow(R10K::Deployment).to receive(:new).and_return(deployment)
+    end
+
+    context 'with generate-types enabled' do
+      subject do
+        described_class.new(
+          {
+            config: '/some/nonexistent/path',
+            'generate-types': true
+          },
+          %w[first]
+        )
+      end
+
+      before do
+        allow(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+          expect(environment.puppetfile).to receive(:modules).and_return(
+            [R10K::Module::Local.new(environment.name, '/fakedir', [], environment)]
+          )
+          original.call(environment, &block)
+        end
+      end
+
+      it 'generate_types is true' do
+        expect(subject.instance_variable_get(:@generate_types)).to eq(true)
+      end
+
+      it 'only calls puppet generate types on environments with specified module' do
+        expect(subject).to receive(:visit_module).and_wrap_original do |original, mod, &block|
+          if mod.name == 'first'
+            expect(mod.environment).to receive(:generate_types!)
+          else
+            expect(mod.environment).not_to receive(:generate_types!)
+          end
+          original.call(mod, &block)
+        end.twice
+        subject.call
+      end
+    end
+
+    context 'with generate-types disabled' do
+      subject do
+        described_class.new(
+          {
+            config: '/some/nonexistent/path',
+            'generate-types': false
+          },
+          %w[first]
+        )
+      end
+
+      it 'generate_types is false' do
+        expect(subject.instance_variable_get(:@generate_types)).to eq(false)
+      end
+
+      it 'does not call puppet generate types' do |it|
+        expect(subject).to receive(:visit_environment).and_wrap_original do |original, environment, &block|
+          expect(environment).not_to receive(:generate_types!)
+          original.call(environment, &block)
+        end.twice
+        subject.call
+      end
+    end
+  end
+
+  describe 'with puppet-path' do
+
+    subject { described_class.new({ config: '/some/nonexistent/path', 'puppet-path': '/nonexistent' }, []) }
+
+    it 'sets puppet_path' do
+      expect(subject.instance_variable_get(:@puppet_path)).to eq('/nonexistent')
+    end
+  end
 end

data/spec/unit/action/runner_spec.rb

@@ -25,6 +25,10 @@ describe R10K::Action::Runner do
 
   subject(:runner) { described_class.new({:opts => :yep}, %w[args yes], action_class) }
 
+  before(:each) do
+    expect(runner.logger).not_to receive(:error)
+  end
+
   describe "instantiating the wrapped class" do
     it "creates an instance of the class" do
       expect(runner.instance).to be_a_kind_of action_class
@@ -62,6 +66,97 @@ describe R10K::Action::Runner do
     end
   end
 
+  describe "configuring settings" do
+    subject(:runner) { described_class.new(options, %w[args yes], action_class) }
+
+    let(:global_settings) { R10K::Settings.global_settings }
+
+    before(:each) do
+      expect(R10K::Settings).to receive(:global_settings).and_return(global_settings)
+      allow(File).to receive(:executable?).and_return(true)
+    end
+
+    opts = {
+      cachedir:       nil,
+      puppet_path:    :deploy,
+      generate_types: :deploy,
+    }
+
+    opts.each do |opt, conf_path|
+      context "with #{opt} config setting" do
+        let(:options) { { config: "spec/fixtures/unit/action/r10k_#{opt}.yaml" } }
+
+        context "when not overridden" do
+          it "uses the config value" do
+            override = { "#{opt}": "/config_#{opt}" }
+            overrides = if conf_path.nil?
+                          override
+                        else
+                          { "#{conf_path}": override }
+                        end
+            expect(global_settings).to receive(:evaluate).with(overrides).and_call_original
+            runner.call
+          end
+        end
+
+        context "when overridden" do
+          let(:options) { super().merge("#{opt.to_s.sub('_','-')}": "/overridden_#{opt}") }
+
+          it "uses the overridden value" do
+            override = { "#{opt}": "/overridden_#{opt}" }
+            overrides = if conf_path.nil?
+                          override
+                        else
+                          { "#{conf_path}": override }
+                        end
+            expect(global_settings).to receive(:evaluate).with(overrides).and_call_original
+            runner.call
+          end
+        end
+      end
+
+      context "with complete config" do
+        let(:options) { { config: "spec/fixtures/unit/action/r10k.yaml" } }
+        let(:config) do
+          config = {}
+          opts.each do |o, path|
+            if path.nil?
+              config[o] = "/config_#{o}"
+            else
+              config[path] ||= {}
+              config[path][o] = "/config_#{o}"
+            end
+          end
+          config
+        end
+
+        context "when not overridden" do
+          it "uses the config value" do
+            expect(global_settings).to receive(:evaluate).with(config).and_call_original
+            runner.call
+          end
+        end
+
+        context "when overridden" do
+          let(:options) {
+            super().merge("#{opt.to_s.sub('_','-')}": "/overridden_#{opt}")
+          }
+
+          it "uses the overridden value" do
+            with_overrides = config
+            if conf_path.nil?
+              with_overrides[opt] = "/overridden_#{opt}"
+            else
+              with_overrides[conf_path][opt] = "/overridden_#{opt}"
+            end
+            expect(global_settings).to receive(:evaluate).with(with_overrides).and_call_original
+            runner.call
+          end
+        end
+      end
+    end
+  end
+
   describe "configuring logging" do
     it "sets the log level if :loglevel is provided" do
       runner = described_class.new({:opts => :yep, :loglevel => 'FATAL'}, %w[args yes], action_class)

data/spec/unit/settings_spec.rb

@@ -117,6 +117,18 @@ describe R10K::Settings do
         end
       end
     end
+
+    describe 'puppet_path' do
+      it 'when executable raises no error' do
+        expect(File).to receive(:executable?).with('/nonexistent').and_return(true)
+        expect { subject.evaluate('puppet_path' => '/nonexistent') }.not_to raise_error
+      end
+
+      it 'when not executable raises error' do
+        expect(File).to receive(:executable?).with('/nonexistent')
+        expect { subject.evaluate('puppet_path' => '/nonexistent') }.to raise_error(R10K::Settings::Collection::ValidationError)
+      end
+    end
   end
 
   describe "global settings" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -191,6 +191,7 @@ files:
 - docker/.rspec
 - docker/Gemfile
 - docker/Makefile
+- docker/README.md
 - docker/ci/build.ps1
 - docker/distelli-manifest.yml
 - docker/r10k/Dockerfile
@@ -198,6 +199,7 @@ files:
 - docker/r10k/docker-entrypoint.sh
 - docker/r10k/spec/dockerfile_spec.rb
 - docker/r10k/spec/fixtures/Puppetfile
+- docker/r10k/spec/spec_helper.rb
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -405,6 +407,10 @@ files:
 - spec/fixtures/module/forge/bad_module/metadata.json
 - spec/fixtures/module/forge/eight_hundred/Modulefile
 - spec/fixtures/module/forge/eight_hundred/metadata.json
+- spec/fixtures/unit/action/r10k.yaml
+- spec/fixtures/unit/action/r10k_cachedir.yaml
+- spec/fixtures/unit/action/r10k_generate_types.yaml
+- spec/fixtures/unit/action/r10k_puppet_path.yaml
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
 - spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
@@ -509,7 +515,6 @@ files:
 - spec/unit/util/subprocess/subprocess_error_spec.rb
 - spec/unit/util/subprocess_spec.rb
 - spec/unit/util/symbolize_keys_spec.rb
-- test
 homepage: https://github.com/puppetlabs/r10k
 licenses:
 - Apache-2.0

data/test

@@ -1 +0,0 @@
-integration