r10k 3.14.1 → 3.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51cffcbc4e3340cf55e51da3a60e66e4c4b851d17bdd566d257213e6a4244bdc
-  data.tar.gz: 10c04f87924b3c5f4eb84cba797879a0a1ac09a6fbc3e0f598c53788d1d5f9b2
+  metadata.gz: 1d1dda7446b3f3ee95e7833edf157b7ef8632e0c1404bcfdd7c981078dd0ebf0
+  data.tar.gz: fe4af9146645978078592086e1896fb1fc6a26082b86deef9072db6d45cb9d16
 SHA512:
-  metadata.gz: 8684fc987a031207807de406810ec0529ef00ab8cad321923451a51d5d869ec2aee3cbca411ca37dbe1bbc7ec3c4a0e7daa58df099b0bc1c74005e5c914e0ba2
-  data.tar.gz: b8515912cdc5099dfd5c238da01663f7352185bd8454363cdce4bf562138302002fd563fe7783c212071fee2a8855f5abc78dd7d66c1dc006595613b697cd8eb
+  metadata.gz: 84a6ab98f760f8de79be0ff4a1f6185c23431ccee3c1d481df7a91441130f225cc318744b2fb57e8b8504f27cb86694d6ecdda086e728c703ac8278cc5c8989b
+  data.tar.gz: df7654c91652b281d87f9a8352a361466107c2e98cfabaddbeba1e9b75344523e0151f8353523d990ced52b8994d83a05556d1f9ecb41b8c49cb016d7bc3d166

data/CHANGELOG.mkd

@@ -4,6 +4,11 @@ CHANGELOG
 Unreleased
 ----------
 
+3.14.2
+------
+
+- (RK-397) Ensure `--incremental` does not skip undeployed modules [#1278](https://github.com/puppetlabs/r10k/pull/1278)
+
 3.14.1
 ------
 

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/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/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.14.2'
 end

data/spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -385,7 +385,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(metadata['canary']).to eq('0.0.0')
       end
 
-      it 'does not load module implementations for static versioned' do
+      it 'does not load module implementations for static versions unless the module install path does not exist on disk' do
         @path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'various-modules')
         subject.load_metadata
         modules = subject.load[:modules].map { |mod| [ mod.name, mod ] }.to_h
@@ -394,7 +394,7 @@ describe R10K::ModuleLoader::Puppetfile do
         expect(modules['concat']).to be_a_kind_of(R10K::Module::Forge)
         expect(modules['rpm']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['foo']).to be_a_kind_of(R10K::Module::Git)
-        expect(modules['bar']).to be_a_kind_of(R10K::Module::Definition)
+        expect(modules['bar']).to be_a_kind_of(R10K::Module::Git)
         expect(modules['baz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['fizz']).to be_a_kind_of(R10K::Module::Definition)
         expect(modules['buzz']).to be_a_kind_of(R10K::Module::Git)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.14.1
+  version: 3.14.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -487,6 +487,12 @@ files:
 - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile
 - spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
+- spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep
+- spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep
 - spec/fixtures/unit/util/purgeable/managed_one/expected_1
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
 - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1