r10k 3.14.1 → 3.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51cffcbc4e3340cf55e51da3a60e66e4c4b851d17bdd566d257213e6a4244bdc
-  data.tar.gz: 10c04f87924b3c5f4eb84cba797879a0a1ac09a6fbc3e0f598c53788d1d5f9b2
+  metadata.gz: bbe3c00c11efc712b5146a3dc869eb9855151bbe1d686fef6c13f9c17efc6283
+  data.tar.gz: 8d67474c7fe6266d04fd5ae42a301c4eb9f72f284b7d487350843384f1e37816
 SHA512:
-  metadata.gz: 8684fc987a031207807de406810ec0529ef00ab8cad321923451a51d5d869ec2aee3cbca411ca37dbe1bbc7ec3c4a0e7daa58df099b0bc1c74005e5c914e0ba2
-  data.tar.gz: b8515912cdc5099dfd5c238da01663f7352185bd8454363cdce4bf562138302002fd563fe7783c212071fee2a8855f5abc78dd7d66c1dc006595613b697cd8eb
+  metadata.gz: 5eadfe0185cd3bf7dcad760135e566dff7d8652a42c4b70e3968c9dfffd08770a722c07ad89a3c92065c5b57ef91ace5c79d13edf54277932297a67431c818df
+  data.tar.gz: 49cdc0476700c4938ac010eae9293fe94945ff81450bc72aaac00b969af96d9f04cc7733a54e79a576d9533011cec8e947d893fb79f824a9bbb6992f57912de0

data/.github/workflows/docker.yml

@@ -27,6 +27,11 @@ jobs:
         with:
           ruby-version: 2.6.x
       - run: gem install bundler
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Build container
         working-directory: docker
         run: |

data/.github/workflows/rspec_tests.yml

@@ -15,6 +15,7 @@ jobs:
           - {os: ubuntu-18.04, ruby: 2.5}
           - {os: ubuntu-18.04, ruby: 2.6}
           - {os: ubuntu-18.04, ruby: 2.7}
+          - {os: ubuntu-18.04, ruby: 3.1}
           - {os: ubuntu-18.04, ruby: jruby-9.2.10.0}
           - {os: windows-2019, ruby: 2.5}
           - {os: windows-2019, ruby: 2.6}

data/CHANGELOG.mkd

@@ -4,6 +4,25 @@ CHANGELOG
 Unreleased
 ----------
 
+3.15.1
+------
+- Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
+- Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
+
+3.15.0
+------
+
+- Support and test Ruby 3
+- Allow puppet_forge 3.x & newer versions of fast_gettext/gettext [#1302](https://github.com/puppetlabs/r10k/pull/1302)
+- Allow newer cri versions [#1302](https://github.com/puppetlabs/r10k/pull/1302)
+- Fix error when using install_path from environment module [#1288](https://github.com/puppetlabs/r10k/issues/1288)
+- (RK-399) Do not warn about local modifications in the spec directory when `exclude_spec` is set [#1291](https://github.com/puppetlabs/r10k/pull/1291)
+
+3.14.2
+------
+
+- (RK-397) Ensure `--incremental` does not skip undeployed modules [#1278](https://github.com/puppetlabs/r10k/pull/1278)
+
 3.14.1
 ------
 

data/CODEOWNERS

@@ -1,2 +1,2 @@
-*        @puppetlabs/puppetserver-maintainers
-/docker/ @puppetlabs/platform-services
+# This repo is owned by the dumpling team
+* @puppetlabs/dumpling

data/README.mkd

@@ -18,7 +18,7 @@ Requirements
 ------------
 
 R10k supports the Ruby versions `>= 2.4.0`. It's tested on Ruby 2.4.0 up to
-Ruby 2.7.0 + Jruby.
+Ruby 3.1.0 + Jruby.
 
 R10k requires additional components, depending on how you plan on managing
 environments and modules.
@@ -61,7 +61,7 @@ for installation.
 If you have more specific needs or plan on modifying r10k you can run it out of
 a git repository using Bundler for dependencies:
 
-    git clone git://github.com/puppetlabs/r10k
+    git clone https://github.com/puppetlabs/r10k
     cd r10k
     bundle install
     bundle exec r10k help

data/doc/dynamic-environments/configuration.mkd

@@ -1,6 +1,70 @@
 Dynamic Environment Configuration
 =================================
 
+<!-- vim-markdown-toc GFM -->
+
+* [Config file location](#config-file-location)
+  * [Manual configuration](#manual-configuration)
+  * [Automatic configuration](#automatic-configuration)
+* [General options](#general-options)
+  * [cachedir](#cachedir)
+  * [proxy](#proxy)
+  * [pool_size](#pool_size)
+  * [git](#git)
+    * [provider](#provider)
+    * [proxy](#proxy-1)
+    * [username](#username)
+    * [private_key](#private_key)
+    * [oauth_token](#oauth_token)
+    * [repositories](#repositories)
+      * [private_key](#private_key-1)
+      * [oauth_token](#oauth_token-1)
+      * [proxy](#proxy-2)
+  * [forge](#forge)
+    * [proxy](#proxy-3)
+    * [baseurl](#baseurl)
+    * [authorization_token](#authorization_token)
+    * [allow_puppetfile_override](#allow_puppetfile_override)
+* [Deployment options](#deployment-options)
+  * [postrun](#postrun)
+  * [sources](#sources)
+  * [deploy](#deploy)
+    * [purge\_levels](#purge_levels)
+      * [deployment](#deployment)
+      * [environment](#environment)
+      * [puppetfile](#puppetfile)
+    * [purge\_allowlist](#purge_allowlist)
+    * [write\_lock](#write_lock)
+    * [generate\_types](#generate_types)
+    * [puppet\_path](#puppet_path)
+    * [puppet\_conf](#puppet_conf)
+    * [exclude_spec](#exclude_spec)
+* [Source options](#source-options)
+  * [remote](#remote)
+  * [basedir](#basedir)
+  * [prefix](#prefix)
+    * [prefix behaviour](#prefix-behaviour)
+  * [strip\_component](#strip_component)
+    * [strip\_component behaviour](#strip_component-behaviour)
+  * [ignore_branch_prefixes](#ignore_branch_prefixes)
+    * [ignore_branch_prefixes behaviour](#ignore_branch_prefixes-behaviour)
+  * [filter_command](#filter_command)
+* [Examples](#examples)
+  * [Minimal example](#minimal-example)
+  * [Separate hiera data](#separate-hiera-data)
+  * [Multiple tenancy](#multiple-tenancy)
+    * [Multiple tenancy with external hieradata](#multiple-tenancy-with-external-hieradata)
+* [Experimental Features](#experimental-features)
+  * [YAML Environment Source](#yaml-environment-source)
+  * [YAMLdir Environment Source](#yamldir-environment-source)
+  * [Exec environment Source](#exec-environment-source)
+  * [Environment Modules](#environment-modules)
+    * [Puppetfile module conflicts](#puppetfile-module-conflicts)
+  * [Plain Environment Type](#plain-environment-type)
+  * [Tarball Environment Type](#tarball-environment-type)
+
+<!-- vim-markdown-toc -->
+
 R10k uses a configuration file to determine how dynamic environments should be
 deployed.
 
@@ -226,7 +290,7 @@ postrun: ['/usr/bin/curl', '-F', 'deploy=done', 'http://my-app.site/endpoint']
 The postrun setting can only be set once.
 
 Occurrences of the string `$modifiedenvs` in the postrun command will be
-replaced with the current environment(s) being deployed.
+replaced with the current environment(s) being deployed, space separated.
 
 ### sources
 
@@ -398,13 +462,16 @@ specific documentation for more information.
 The 'remote' setting specifies where the source repository should be fetched
 from. It may be any valid URL that the source may check out or clone. The remote
 must be able to be fetched without any interactive input, eg usernames or
-passwords cannot be prompted for in order to fetch the remote.
+passwords cannot be prompted for in order to fetch the remote. We support the
+`git`, `ssh`, and `https` transport protocols. An SSH private key or access
+token must be provided for authentication. Only `https` may be used without
+authentication. See [GitHub's blog on protocol security](https://github.blog/2021-09-01-improving-git-protocol-security-github/) for more info.
 
 ```yaml
 ---
 sources:
   mysource:
-    remote: 'git://git-server.site/my-org/main-modules'
+    remote: 'https://git-server.site/my-org/main-modules'
 ```
 
 ### basedir
@@ -522,7 +589,7 @@ hiera data files are kept. In this case you will specify a single source:
 ---
 sources:
   operations:
-    remote: 'git://git-server.site/my-org/org-modules'
+    remote: 'https://git-server.site/my-org/org-modules'
     basedir: '/etc/puppet/environments'
 ```
 
@@ -535,10 +602,10 @@ repository and your modules in another repository, you can specify two sources:
 ---
 sources:
   operations:
-    remote: 'git://git-server.site/my-org/org-modules'
+    remote: 'https://git-server.site/my-org/org-modules'
     basedir: '/etc/puppet/environments'
   hiera:
-    remote: 'git://git-server.site/my-org/org-hiera-data'
+    remote: 'https://git-server.site/my-org/org-hiera-data'
     basedir: '/etc/puppet/hiera-data'
 ```
 
@@ -553,15 +620,15 @@ not the modules of other groups.
 ---
 sources:
   main:
-    remote: 'git://git-server.site/my-org/main-modules'
+    remote: 'https://git-server.site/my-org/main-modules'
     basedir: '/etc/puppet/environments'
     prefix: false # Prefix defaults to false so this is only here for clarity
   qa:
-    remote: 'git://git-server.site/my-org/qa-puppet-modules'
+    remote: 'https://git-server.site/my-org/qa-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: true
   dev:
-    remote: 'git://git-server.site/my-org/dev-puppet-modules'
+    remote: 'https://git-server.site/my-org/dev-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: true
 ```
@@ -587,11 +654,11 @@ must override the `prefix` so environment folders line up in both directories:
 ---
 sources:
   app1_data:
-    remote: 'git://git-server.site/my-org/app1-hieradata'
+    remote: 'https://git-server.site/my-org/app1-hieradata'
     basedir: '/etc/puppet/hieradata'
     prefix: "app1"
   app1_modules:
-    remote: 'git://git-server.site/my-org/app1-puppet-modules'
+    remote: 'https://git-server.site/my-org/app1-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: "app1"
 ```

data/doc/dynamic-environments/usage.mkd

@@ -84,6 +84,10 @@ explicit, static version. These are released Forge versions, or Git modules usin
 the `:tag`, or `:commit` keys. Git `:ref`s containing only the full 40 character
 commit SHA will also be treated as static versions. Then invoke a deploy with:
 
+There may be issues with deployments apparently successful after an initial errored
+deployment. If this is happening, try running without the `--incremental` flag
+to run a full deployment.
+
     r10k deploy environment production --modules --incremental
 
 - - -

data/doc/dynamic-environments/workflow-guide.mkd

@@ -38,7 +38,7 @@ mod "puppetlabs/ntp"
 
 # Your modules:
 mod "custom_facts",
-  :git => "git://github.com/user/custom_facts"
+  :git => "https://github.com/user/custom_facts"
 ```
 
 For any existing modules that you branched, add a reference to the new branch
@@ -46,7 +46,7 @@ name. Don't forget the comma at the end of the *:git* value.
 
 ```
 mod "other_module",
-  :git => "git://github.com/user/other_module",
+  :git => "https://github.com/user/other_module",
   :ref => "feature"
 ```
 
@@ -159,7 +159,7 @@ the *:git* value.
 
 ```
 mod "other_module",
-  :git => "git://github.com/user/other_module",
+  :git => "https://github.com/user/other_module",
   :ref => "feature"
 ```
 

data/doc/faq.mkd

@@ -17,7 +17,7 @@ modify. For example creating the script:
 
 ```
 $ cat /usr/local/bin/generate-puppet-types.sh
-!#/bin/bash
+#!/bin/bash
 
 for environment in $1; do
   /opt/puppetlabs/bin/puppet generate types --environment $environment

data/docker/Makefile

@@ -7,6 +7,10 @@ hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
 hadolint_command := hadolint
 hadolint_container := ghcr.io/hadolint/hadolint:latest
 alpine_version := 3.14
+# --load (--output=type=docker) can only be used with a single arch / platform
+# https://github.com/docker/buildx/issues/59
+output_type := docker
+platform := linux/amd64
 export BUNDLE_PATH = $(PWD)/.bundle/gems
 export BUNDLE_BIN = $(PWD)/.bundle/bin
 export GEMFILE = $(PWD)/Gemfile
@@ -32,6 +36,10 @@ else
 	dockerfile_context := $(PWD)/..
 endif
 
+ifeq ($(IS_LATEST),true)
+	latest_tag := --tag $(NAMESPACE)/r10k:$(LATEST_VERSION)
+endif
+
 prep:
 	@git fetch --unshallow 2> /dev/null ||:
 	@git fetch origin 'refs/tags/*:refs/tags/*'
@@ -52,17 +60,15 @@ build: prep
 	docker pull alpine:$(alpine_version)
 	docker buildx build \
 		${DOCKER_BUILD_FLAGS} \
-		--load \
+		--output=type=$(output_type) \
+		--platform $(platform) \
 		--build-arg alpine_version=$(alpine_version) \
 		--build-arg vcs_ref=$(vcs_ref) \
 		--build-arg build_date=$(build_date) \
 		--build-arg version=$(VERSION) \
 		--build-arg pupperware_analytics_stream=$(PUPPERWARE_ANALYTICS_STREAM) \
 		--file r10k/$(dockerfile) \
-		--tag $(NAMESPACE)/r10k:$(VERSION) $(dockerfile_context)
-ifeq ($(IS_LATEST),true)
-	@docker tag $(NAMESPACE)/r10k:$(VERSION) puppet/r10k:$(LATEST_VERSION)
-endif
+		--tag $(NAMESPACE)/r10k:$(VERSION) $(latest_tag) $(dockerfile_context)
 
 test: prep
 	@bundle install --path $$BUNDLE_PATH --gemfile $$GEMFILE --with test
@@ -71,11 +77,12 @@ test: prep
 		bundle exec --gemfile $$GEMFILE \
 		rspec spec
 
-push-image: prep
-	@docker push $(NAMESPACE)/r10k:$(VERSION)
-ifeq ($(IS_LATEST),true)
-	@docker push $(NAMESPACE)/r10k:$(LATEST_VERSION)
-endif
+# call build to produce multiple architectures
+# uses cached output from amd64 build target if it exists
+# registry output is equivalent to --push
+push-image: platform=linux/amd64,linux/arm64
+push-image: output_type=registry
+push-image: prep build
 
 push-readme:
 	@docker pull sheogorath/readme-to-dockerhub

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -16,7 +16,7 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'git://github.com/puppetlabs/puppetlabs-motd'
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
 EOS
 
 proxy_env_value = 'http://cattastic.net:3219'

data/integration/tests/git_source/git_source_repeated_remote.rb

@@ -29,11 +29,11 @@ CONF
 # Install the same module in two different places
 puppetfile = <<-EOS
 mod 'prod_apache',
-  :git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-apache.git',
   :tag => 'v6.0.0'
 
 mod 'test_apache',
-  :git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-apache.git',
   :tag => 'v6.0.0'
 EOS
 

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -30,12 +30,12 @@ CONF
 puppetfile = <<-EOS
 mod 'non_module_object_1',
   :install_path => './',
-  :git => 'git://github.com/puppetlabs/control-repo.git',
+  :git => 'https://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 
 mod 'non_module_object_2',
  :install_path => '',
- :git => 'git://github.com/puppetlabs/control-repo.git',
+ :git => 'https://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 EOS
 

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb

@@ -27,7 +27,7 @@ stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
   :tag => 'v7.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb

@@ -31,7 +31,7 @@ puppet_file = <<-PUPPETFILE
 moduledir '#{@module_path}'
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
   :tag => 'v7.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb

@@ -65,7 +65,7 @@ env_structs = {:production => GitEnv.new('/git_repos',
                                          '/git_repos_alt/environments_alt.git',
                                          '/root/environments_alt',
                                          '/root/environments_alt/Puppetfile',
-                                         'mod "puppetlabs/stdlib", :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git", :tag => "v7.0.1"',
+                                         'mod "puppetlabs/stdlib", :git => "https://github.com/puppetlabs/puppetlabs-stdlib.git", :tag => "v7.0.1"',
                                          '/root/environments_alt/manifests/site.pp',
                                          create_site_pp(master_certname, stage_env_manifest)
                                         ),

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb

@@ -15,7 +15,7 @@ r10k_fqp = get_r10k_fqp(master)
 
 #File
 puppet_file = <<-PUPPETFILE
-mod 'broken', :git => 'git://github.com/puppetlabs/puppetlabs-broken'
+mod 'broken', :git => 'https://github.com/puppetlabs/puppetlabs-broken'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module_ref.rb

@@ -12,7 +12,7 @@ r10k_fqp = get_r10k_fqp(master)
 #File
 puppet_file = <<-PUPPETFILE
 mod 'broken',
-  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
   :ref => 'does_not_exist'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb

@@ -28,7 +28,7 @@ notify_message_regex = /I am in the production environment/
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/inifile',
-  :git => 'git://github.com/puppetlabs/puppetlabs-inifile',
+  :git => 'https://github.com/puppetlabs/puppetlabs-inifile',
   :tag => 'v5.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb

@@ -27,7 +27,7 @@ PUPPETFILE
 
 puppet_file_git = <<-PUPPETFILE
 mod "puppetlabs/motd",
-  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
   :tag => '1.2.0'
 PUPPETFILE
 

data/lib/r10k/environment/with_modules.rb

@@ -103,6 +103,29 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     end
   end
 
+  def resolve_path(base, dirname, path)
+    if Pathname.new(path).absolute?
+      cleanpath(path)
+    else
+      cleanpath(File.join(base, dirname, path))
+    end
+  end
+
+  # .cleanpath is as good as we can do without touching the filesystem.
+  # The .realpath methods will choke if some of the intermediate paths
+  # are missing, even though in some cases we will create them later as
+  # needed.
+  def cleanpath(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  def validate_install_path(path, modname)
+    unless /^#{Regexp.escape(@basedir)}.*/ =~ path
+      raise R10K::Error.new("Environment cannot manage content '#{modname}' outside of containing environment: #{path} is not within #{@basedir}")
+    end
+    true
+  end
+
   # @param [String] name
   # @param [Hash] args
   def add_module(name, args)
@@ -111,7 +134,7 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     args[:overrides] = @overrides
 
     if install_path = args.delete(:install_path)
-      install_path = resolve_install_path(install_path)
+      install_path = resolve_path(@basedir, @dirname, install_path)
       validate_install_path(install_path, name)
     else
       install_path = @moduledir

data/lib/r10k/git/rugged/thin_repository.rb

@@ -75,6 +75,13 @@ class R10K::Git::Rugged::ThinRepository < R10K::Git::Rugged::WorkingRepository
     end
   end
 
+  def stage_files(files=['.'])
+    with_repo do |repo|
+      index = repo.index
+      files.each { |p| index.add( :path => p ) }
+    end
+  end
+
   private
 
   # Override the parent class repo setup so that we can make sure the alternates file is up to date

data/lib/r10k/git/rugged/working_repository.rb

@@ -117,11 +117,15 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     with_repo { |repo| repo.config['remote.origin.url'] }
   end
 
-  def dirty?
+  def dirty?(exclude_spec=false)
     with_repo do |repo|
-      diff = repo.diff_workdir('HEAD')
+      if exclude_spec
+        diff = repo.diff_workdir('HEAD').select { |d| ! d.delta.old_file[:path].start_with?('spec/') }
+      else
+        diff = repo.diff_workdir('HEAD').to_a
+      end
 
-      diff.each_patch do |p|
+      diff.each do |p|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, p.delta.old_file[:path])}))
         logger.debug1(p.to_s)
       end

data/lib/r10k/git/shellgit/thin_repository.rb

@@ -43,6 +43,10 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
     git(['ls-tree', '-t', '-r', '--name-only', ref], :path => @path.to_s).stdout.split("\n")
   end
 
+  def stage_files(files=['.'])
+    git(['add', files].flatten, :path => @path.to_s)
+  end
+
   private
 
   def setup_cache_remote

data/lib/r10k/git/shellgit/working_repository.rb

@@ -90,11 +90,12 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
   end
 
   # does the working tree have local modifications to tracked files?
-  def dirty?
+  def dirty?(exclude_spec=false)
     result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
 
     if result.exit_code != 0
       dirty_files = result.stdout.split('\n')
+      dirty_files.delete_if { |f| f.start_with?('spec/') } if exclude_spec
 
       dirty_files.each do |file|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, file)}))
@@ -103,7 +104,7 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
         logger.debug1 { git(['diff-index', '-p', 'HEAD', file], :path => @path.to_s, :raise_on_fail => false).stdout }
       end
 
-      return true
+      return dirty_files.size > 0
     else
       return false
     end

data/lib/r10k/git/stateful_repository.rb

@@ -36,7 +36,7 @@ class R10K::Git::StatefulRepository
   end
 
   # Returns true if the sync actually updated the repo, false otherwise
-  def sync(ref, force=true)
+  def sync(ref, force=true, exclude_spec=false)
     @cache.sync if sync_cache?(ref)
 
     sha = @cache.resolve(ref)
@@ -45,7 +45,7 @@ class R10K::Git::StatefulRepository
       raise R10K::Git::UnresolvableRefError.new(_("Unable to sync repo to unresolvable ref '%{ref}'") % {ref: ref}, :git_dir => @repo.git_dir)
     end
 
-    workdir_status = status(ref)
+    workdir_status = status(ref, exclude_spec)
 
     updated = true
     case workdir_status
@@ -75,7 +75,7 @@ class R10K::Git::StatefulRepository
     updated
   end
 
-  def status(ref)
+  def status(ref, exclude_spec=false)
     if !@repo.exist?
       :absent
     elsif !@cache.exist?
@@ -88,7 +88,7 @@ class R10K::Git::StatefulRepository
       :mismatched
     elsif @repo.head.nil?
       :mismatched
-    elsif @repo.dirty?
+    elsif @repo.dirty?(exclude_spec)
       :dirty
     elsif !(@repo.head == @cache.resolve(ref))
       :outdated

data/lib/r10k/module/git.rb

@@ -100,7 +100,7 @@ class R10K::Module::Git < R10K::Module::Base
   def sync(opts={})
     force = opts[:force] || @force
     if should_sync?
-      updated = @repo.sync(version, force)
+      updated = @repo.sync(version, force, @exclude_spec)
     else
       updated = false
     end

data/lib/r10k/module_loader/puppetfile.rb

@@ -157,11 +157,14 @@ module R10K
           return @modules
         end
 
-        # If this module's metadata has a static version and that version
-        # matches the existing module declaration use it, otherwise create
-        # a regular module to sync.
-        unless mod.version && (mod.version == @existing_module_versions_by_name[mod.name])
-          mod = mod.to_implementation
+        # If this module's metadata has a static version, and that version
+        # matches the existing module declaration, and it ostensibly
+        # has already has been deployed to disk, use it. Otherwise create a
+        # regular module to sync.
+        unless mod.version &&
+               mod.version == @existing_module_versions_by_name[mod.name] &&
+               File.directory?(mod.path)
+            mod = mod.to_implementation
         end
 
         @modules << mod

data/lib/r10k/settings/container.rb

@@ -1,3 +1,4 @@
+require 'set'
 # Defines a collection for application settings
 #
 # This implements a hierarchical interface to application settings. Containers

data/lib/r10k/version.rb

@@ -2,5 +2,5 @@ module R10K
   # When updating to a new major (X) or minor (Y) version, include `#major` or
   # `#minor` (respectively) in your commit message to trigger the appropriate
   # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '3.14.1'
+  VERSION = '3.15.1'
 end