r10k 3.14.1 → 3.14.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.mkd +5 -0
- data/doc/dynamic-environments/usage.mkd +4 -0
- data/lib/r10k/module_loader/puppetfile.rb +8 -5
- data/lib/r10k/version.rb +1 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep +1 -0
- data/spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep +1 -0
- data/spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep +1 -0
- data/spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep +1 -0
- data/spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep +1 -0
- data/spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep +1 -0
- data/spec/unit/module_loader/puppetfile_spec.rb +2 -2
- metadata +8 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1d1dda7446b3f3ee95e7833edf157b7ef8632e0c1404bcfdd7c981078dd0ebf0
|
4
|
+
data.tar.gz: fe4af9146645978078592086e1896fb1fc6a26082b86deef9072db6d45cb9d16
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 84a6ab98f760f8de79be0ff4a1f6185c23431ccee3c1d481df7a91441130f225cc318744b2fb57e8b8504f27cb86694d6ecdda086e728c703ac8278cc5c8989b
|
7
|
+
data.tar.gz: df7654c91652b281d87f9a8352a361466107c2e98cfabaddbeba1e9b75344523e0151f8353523d990ced52b8994d83a05556d1f9ecb41b8c49cb016d7bc3d166
|
data/CHANGELOG.mkd
CHANGED
@@ -84,6 +84,10 @@ explicit, static version. These are released Forge versions, or Git modules usin
|
|
84
84
|
the `:tag`, or `:commit` keys. Git `:ref`s containing only the full 40 character
|
85
85
|
commit SHA will also be treated as static versions. Then invoke a deploy with:
|
86
86
|
|
87
|
+
There may be issues with deployments apparently successful after an initial errored
|
88
|
+
deployment. If this is happening, try running without the `--incremental` flag
|
89
|
+
to run a full deployment.
|
90
|
+
|
87
91
|
r10k deploy environment production --modules --incremental
|
88
92
|
|
89
93
|
- - -
|
@@ -157,11 +157,14 @@ module R10K
|
|
157
157
|
return @modules
|
158
158
|
end
|
159
159
|
|
160
|
-
# If this module's metadata has a static version and that version
|
161
|
-
# matches the existing module declaration
|
162
|
-
#
|
163
|
-
|
164
|
-
|
160
|
+
# If this module's metadata has a static version, and that version
|
161
|
+
# matches the existing module declaration, and it ostensibly
|
162
|
+
# has already has been deployed to disk, use it. Otherwise create a
|
163
|
+
# regular module to sync.
|
164
|
+
unless mod.version &&
|
165
|
+
mod.version == @existing_module_versions_by_name[mod.name] &&
|
166
|
+
File.directory?(mod.path)
|
167
|
+
mod = mod.to_implementation
|
165
168
|
end
|
166
169
|
|
167
170
|
@modules << mod
|
data/lib/r10k/version.rb
CHANGED
@@ -2,5 +2,5 @@ module R10K
|
|
2
2
|
# When updating to a new major (X) or minor (Y) version, include `#major` or
|
3
3
|
# `#minor` (respectively) in your commit message to trigger the appropriate
|
4
4
|
# release. Otherwise, a new patch (Z) version will be released.
|
5
|
-
VERSION = '3.14.
|
5
|
+
VERSION = '3.14.2'
|
6
6
|
end
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -0,0 +1 @@
|
|
1
|
+
This only exists so the directory can be committed to git for testing purposes.
|
@@ -385,7 +385,7 @@ describe R10K::ModuleLoader::Puppetfile do
|
|
385
385
|
expect(metadata['canary']).to eq('0.0.0')
|
386
386
|
end
|
387
387
|
|
388
|
-
it 'does not load module implementations for static
|
388
|
+
it 'does not load module implementations for static versions unless the module install path does not exist on disk' do
|
389
389
|
@path = File.join(PROJECT_ROOT, 'spec', 'fixtures', 'unit', 'puppetfile', 'various-modules')
|
390
390
|
subject.load_metadata
|
391
391
|
modules = subject.load[:modules].map { |mod| [ mod.name, mod ] }.to_h
|
@@ -394,7 +394,7 @@ describe R10K::ModuleLoader::Puppetfile do
|
|
394
394
|
expect(modules['concat']).to be_a_kind_of(R10K::Module::Forge)
|
395
395
|
expect(modules['rpm']).to be_a_kind_of(R10K::Module::Definition)
|
396
396
|
expect(modules['foo']).to be_a_kind_of(R10K::Module::Git)
|
397
|
-
expect(modules['bar']).to be_a_kind_of(R10K::Module::
|
397
|
+
expect(modules['bar']).to be_a_kind_of(R10K::Module::Git)
|
398
398
|
expect(modules['baz']).to be_a_kind_of(R10K::Module::Definition)
|
399
399
|
expect(modules['fizz']).to be_a_kind_of(R10K::Module::Definition)
|
400
400
|
expect(modules['buzz']).to be_a_kind_of(R10K::Module::Git)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: r10k
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.14.
|
4
|
+
version: 3.14.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adrien Thebo
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-02-
|
11
|
+
date: 2022-02-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: colored2
|
@@ -487,6 +487,12 @@ files:
|
|
487
487
|
- spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
|
488
488
|
- spec/fixtures/unit/puppetfile/various-modules/Puppetfile
|
489
489
|
- spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
|
490
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep
|
491
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep
|
492
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep
|
493
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep
|
494
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep
|
495
|
+
- spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep
|
490
496
|
- spec/fixtures/unit/util/purgeable/managed_one/expected_1
|
491
497
|
- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
|
492
498
|
- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
|