r10k 4.0.0.pre → 4.0.0
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/.github/workflows/rspec_tests.yml +5 -3
- data/CHANGELOG.mkd +10 -10
- data/Gemfile +1 -1
- data/doc/common-patterns.mkd +1 -2
- data/lib/r10k/version.rb +1 -1
- data/locales/r10k.pot +19 -27
- data/r10k.gemspec +1 -1
- metadata +12 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e3243dd00fc7260b6cbbb51f070418886dfd76ad16befc18d0511185d17d4fae
|
|
4
|
+
data.tar.gz: dc8dcfe9644c9dabfd4532cc8b5a91064d57a5c8377fb38932aaf0aab1d0d6ef
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 22a3158bc9c7c65caf1c437d9d855c4586c14ac836730121826d1eaaa326e4237e74675818fb6e71430523b416f318e9f757106fba9b8c3e83b6cfbe2a2144e3
|
|
7
|
+
data.tar.gz: 3d51941a78ec8e651c4657222a5f7f27b169b5b3811d472948c55f5b00e47244b2807aa6037182241a5c9b14a8df43748102d787e0218a2d8bacf2d17ae32fd9
|
|
@@ -3,7 +3,8 @@ name: Rspec tests
|
|
|
3
3
|
on:
|
|
4
4
|
pull_request:
|
|
5
5
|
branches:
|
|
6
|
-
-
|
|
6
|
+
- main
|
|
7
|
+
- 3.x
|
|
7
8
|
|
|
8
9
|
jobs:
|
|
9
10
|
rspec_tests:
|
|
@@ -16,8 +17,9 @@ jobs:
|
|
|
16
17
|
- {os: ubuntu-latest, ruby: 3.1}
|
|
17
18
|
- {os: ubuntu-latest, ruby: 3.2}
|
|
18
19
|
- {os: ubuntu-latest, ruby: jruby-9.3}
|
|
19
|
-
- {os:
|
|
20
|
-
- {os: windows-
|
|
20
|
+
- {os: ubuntu-latest, ruby: jruby-9.4}
|
|
21
|
+
- {os: windows-latest, ruby: 2.6}
|
|
22
|
+
- {os: windows-latest, ruby: 3.2}
|
|
21
23
|
|
|
22
24
|
runs-on: ${{ matrix.cfg.os }}
|
|
23
25
|
steps:
|
data/CHANGELOG.mkd
CHANGED
|
@@ -3,9 +3,17 @@ CHANGELOG
|
|
|
3
3
|
|
|
4
4
|
Unreleased
|
|
5
5
|
----------
|
|
6
|
-
- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
|
|
7
6
|
|
|
8
|
-
|
|
7
|
+
|
|
8
|
+
4.0.0
|
|
9
|
+
-----
|
|
10
|
+
- Drop Ruby 2.3/2.4/2.5 support; use puppet_forge 4.1 or newer [#1336](https://github.com/puppetlabs/r10k/pull/1336)
|
|
11
|
+
- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261)
|
|
12
|
+
- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277)
|
|
13
|
+
- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275)
|
|
14
|
+
- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261)
|
|
15
|
+
- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254)
|
|
16
|
+
- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
|
|
9
17
|
|
|
10
18
|
|
|
11
19
|
3.16.0
|
|
@@ -33,14 +41,6 @@ Unreleased
|
|
|
33
41
|
- Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
|
|
34
42
|
- Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
|
|
35
43
|
|
|
36
|
-
- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277)
|
|
37
|
-
- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275)
|
|
38
|
-
- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261)
|
|
39
|
-
- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261)
|
|
40
|
-
- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254)
|
|
41
|
-
- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
|
|
42
|
-
- Drop EoL Ruby 2.3/2.4 support [#1280](https://github.com/puppetlabs/r10k/pull/1208)
|
|
43
|
-
|
|
44
44
|
3.15.0
|
|
45
45
|
------
|
|
46
46
|
|
data/Gemfile
CHANGED
data/doc/common-patterns.mkd
CHANGED
|
@@ -12,8 +12,7 @@ Use a [Control Repo](https://docs.puppet.com/pe/latest/cmgmt_control_repo.html)
|
|
|
12
12
|
to store your `Puppetfile`.
|
|
13
13
|
|
|
14
14
|
Hiera data should be in the Control repo OR as a separate source in
|
|
15
|
-
`r10k.yaml`.
|
|
16
|
-
environment basis, locating it at `/etc/puppetlabs/puppet/hiera.yaml` is prefered.
|
|
15
|
+
`r10k.yaml`.
|
|
17
16
|
|
|
18
17
|
Each puppet module should be contained in its own independent forge module or
|
|
19
18
|
repository.
|
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 = '4.0.0
|
|
5
|
+
VERSION = '4.0.0'
|
|
6
6
|
end
|
data/locales/r10k.pot
CHANGED
|
@@ -6,11 +6,11 @@
|
|
|
6
6
|
#, fuzzy
|
|
7
7
|
msgid ""
|
|
8
8
|
msgstr ""
|
|
9
|
-
"Project-Id-Version: r10k 3.9.3-
|
|
9
|
+
"Project-Id-Version: r10k 3.9.3-373-g117587fb\n"
|
|
10
10
|
"\n"
|
|
11
11
|
"Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
|
|
12
|
-
"POT-Creation-Date: 2023-
|
|
13
|
-
"PO-Revision-Date: 2023-
|
|
12
|
+
"POT-Creation-Date: 2023-07-26 22:34+0000\n"
|
|
13
|
+
"PO-Revision-Date: 2023-07-26 22:34+0000\n"
|
|
14
14
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
15
15
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
16
16
|
"Language: \n"
|
|
@@ -31,47 +31,47 @@ msgstr ""
|
|
|
31
31
|
msgid "Reason: %{write_lock}"
|
|
32
32
|
msgstr ""
|
|
33
33
|
|
|
34
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
34
|
+
#: ../lib/r10k/action/deploy/environment.rb:99
|
|
35
35
|
msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
|
|
36
36
|
msgstr ""
|
|
37
37
|
|
|
38
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
38
|
+
#: ../lib/r10k/action/deploy/environment.rb:119
|
|
39
39
|
msgid "Executing postrun command."
|
|
40
40
|
msgstr ""
|
|
41
41
|
|
|
42
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
42
|
+
#: ../lib/r10k/action/deploy/environment.rb:133
|
|
43
43
|
msgid "Environment %{env_dir} does not match environment name filter, skipping"
|
|
44
44
|
msgstr ""
|
|
45
45
|
|
|
46
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
46
|
+
#: ../lib/r10k/action/deploy/environment.rb:141
|
|
47
47
|
msgid "Deploying environment %{env_path}"
|
|
48
48
|
msgstr ""
|
|
49
49
|
|
|
50
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
50
|
+
#: ../lib/r10k/action/deploy/environment.rb:144
|
|
51
51
|
msgid "Environment %{env_dir} is now at %{env_signature}"
|
|
52
52
|
msgstr ""
|
|
53
53
|
|
|
54
|
-
#: ../lib/r10k/action/deploy/environment.rb:
|
|
54
|
+
#: ../lib/r10k/action/deploy/environment.rb:148
|
|
55
55
|
msgid "Environment %{env_dir} is new, updating all modules"
|
|
56
56
|
msgstr ""
|
|
57
57
|
|
|
58
|
-
#: ../lib/r10k/action/deploy/module.rb:
|
|
58
|
+
#: ../lib/r10k/action/deploy/module.rb:82
|
|
59
59
|
msgid "Running postrun command for environments: %{envs_to_run}."
|
|
60
60
|
msgstr ""
|
|
61
61
|
|
|
62
|
-
#: ../lib/r10k/action/deploy/module.rb:
|
|
62
|
+
#: ../lib/r10k/action/deploy/module.rb:92
|
|
63
63
|
msgid "No environments were modified, not executing postrun command."
|
|
64
64
|
msgstr ""
|
|
65
65
|
|
|
66
|
-
#: ../lib/r10k/action/deploy/module.rb:
|
|
66
|
+
#: ../lib/r10k/action/deploy/module.rb:104
|
|
67
67
|
msgid "Only updating modules in environment(s) %{opt_env} skipping environment %{env_path}"
|
|
68
68
|
msgstr ""
|
|
69
69
|
|
|
70
|
-
#: ../lib/r10k/action/deploy/module.rb:
|
|
70
|
+
#: ../lib/r10k/action/deploy/module.rb:106
|
|
71
71
|
msgid "Updating modules %{modules} in environment %{env_path}"
|
|
72
72
|
msgstr ""
|
|
73
73
|
|
|
74
|
-
#: ../lib/r10k/action/puppetfile/check.rb:
|
|
74
|
+
#: ../lib/r10k/action/puppetfile/check.rb:25
|
|
75
75
|
msgid "Syntax OK"
|
|
76
76
|
msgstr ""
|
|
77
77
|
|
|
@@ -111,10 +111,6 @@ msgstr ""
|
|
|
111
111
|
msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
|
|
112
112
|
msgstr ""
|
|
113
113
|
|
|
114
|
-
#: ../lib/r10k/environment/bare.rb:6
|
|
115
|
-
msgid "\"bare\" environment type is deprecated; please use \"plain\" instead (environment: %{name})"
|
|
116
|
-
msgstr ""
|
|
117
|
-
|
|
118
114
|
#: ../lib/r10k/environment/base.rb:89 ../lib/r10k/environment/base.rb:105 ../lib/r10k/environment/base.rb:114 ../lib/r10k/source/base.rb:83
|
|
119
115
|
msgid "%{class} has not implemented method %{method}"
|
|
120
116
|
msgstr ""
|
|
@@ -327,7 +323,7 @@ msgstr ""
|
|
|
327
323
|
msgid "Fetching remote '%{remote}' at %{path}"
|
|
328
324
|
msgstr ""
|
|
329
325
|
|
|
330
|
-
#: ../lib/r10k/git/rugged/working_repository.rb:
|
|
326
|
+
#: ../lib/r10k/git/rugged/working_repository.rb:131 ../lib/r10k/git/shellgit/working_repository.rb:101
|
|
331
327
|
msgid "Found local modifications in %{file_path}"
|
|
332
328
|
msgstr ""
|
|
333
329
|
|
|
@@ -407,7 +403,7 @@ msgstr ""
|
|
|
407
403
|
msgid "The module %{title} does not exist on %{url}."
|
|
408
404
|
msgstr ""
|
|
409
405
|
|
|
410
|
-
#: ../lib/r10k/module/git.rb:
|
|
406
|
+
#: ../lib/r10k/module/git.rb:78
|
|
411
407
|
msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
|
|
412
408
|
msgstr ""
|
|
413
409
|
|
|
@@ -443,19 +439,15 @@ msgstr ""
|
|
|
443
439
|
msgid "Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}."
|
|
444
440
|
msgstr ""
|
|
445
441
|
|
|
446
|
-
#: ../lib/r10k/module_loader/puppetfile.rb:
|
|
447
|
-
msgid "\"basedir\" is deprecated. Please use \"environment_name\" instead. \"basedir\" will be removed in a future version."
|
|
448
|
-
msgstr ""
|
|
449
|
-
|
|
450
|
-
#: ../lib/r10k/module_loader/puppetfile.rb:200 ../lib/r10k/puppetfile.rb:104
|
|
442
|
+
#: ../lib/r10k/module_loader/puppetfile.rb:193 ../lib/r10k/puppetfile.rb:104
|
|
451
443
|
msgid "Puppetfile %{path} missing or unreadable"
|
|
452
444
|
msgstr ""
|
|
453
445
|
|
|
454
|
-
#: ../lib/r10k/module_loader/puppetfile.rb:
|
|
446
|
+
#: ../lib/r10k/module_loader/puppetfile.rb:235
|
|
455
447
|
msgid "Puppetfiles cannot contain duplicate module names."
|
|
456
448
|
msgstr ""
|
|
457
449
|
|
|
458
|
-
#: ../lib/r10k/module_loader/puppetfile.rb:
|
|
450
|
+
#: ../lib/r10k/module_loader/puppetfile.rb:237
|
|
459
451
|
msgid "Remove the duplicates of the following modules: %{dupes}"
|
|
460
452
|
msgstr ""
|
|
461
453
|
|
data/r10k.gemspec
CHANGED
|
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
|
|
|
30
30
|
|
|
31
31
|
s.add_dependency 'puppet_forge', '>= 4.1', '< 6'
|
|
32
32
|
|
|
33
|
-
s.add_dependency 'gettext-setup', '
|
|
33
|
+
s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
|
|
34
34
|
|
|
35
35
|
s.add_dependency 'jwt', '>= 2.2.3', '< 2.8.0'
|
|
36
36
|
s.add_dependency 'minitar', '~> 0.9'
|
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: 4.0.0
|
|
4
|
+
version: 4.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adrien Thebo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-
|
|
11
|
+
date: 2023-08-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colored2
|
|
@@ -90,16 +90,22 @@ dependencies:
|
|
|
90
90
|
name: gettext-setup
|
|
91
91
|
requirement: !ruby/object:Gem::Requirement
|
|
92
92
|
requirements:
|
|
93
|
-
- - "
|
|
93
|
+
- - ">="
|
|
94
94
|
- !ruby/object:Gem::Version
|
|
95
95
|
version: '0.24'
|
|
96
|
+
- - "<"
|
|
97
|
+
- !ruby/object:Gem::Version
|
|
98
|
+
version: '2.0'
|
|
96
99
|
type: :runtime
|
|
97
100
|
prerelease: false
|
|
98
101
|
version_requirements: !ruby/object:Gem::Requirement
|
|
99
102
|
requirements:
|
|
100
|
-
- - "
|
|
103
|
+
- - ">="
|
|
101
104
|
- !ruby/object:Gem::Version
|
|
102
105
|
version: '0.24'
|
|
106
|
+
- - "<"
|
|
107
|
+
- !ruby/object:Gem::Version
|
|
108
|
+
version: '2.0'
|
|
103
109
|
- !ruby/object:Gem::Dependency
|
|
104
110
|
name: jwt
|
|
105
111
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -436,9 +442,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
436
442
|
version: 2.6.0
|
|
437
443
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
438
444
|
requirements:
|
|
439
|
-
- - "
|
|
445
|
+
- - ">="
|
|
440
446
|
- !ruby/object:Gem::Version
|
|
441
|
-
version:
|
|
447
|
+
version: '0'
|
|
442
448
|
requirements: []
|
|
443
449
|
rubygems_version: 3.0.3
|
|
444
450
|
signing_key:
|