r10k 4.0.1 → 4.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.mkd +25 -0
- data/CODEOWNERS +1 -2
- data/integration/Gemfile +1 -1
- data/integration/Rakefile +1 -1
- data/integration/pre-suite/00_pe_install.rb +3 -0
- data/lib/r10k/module/git.rb +5 -0
- data/lib/r10k/module_loader/puppetfile.rb +4 -1
- data/lib/r10k/version.rb +1 -1
- data/r10k.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 030acd30658f5b8fdf89d1c18512defc7273e39545066e66bc9cd3cd0c16294d
|
4
|
+
data.tar.gz: 1548b9b6d4ce6f136eee88c5504fbcdc781fce4fee5ce847097d8f0a9b18e849
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: be34df44f090809213bb34ca283172c41825f4ccd9b9e50568021d12df30b6c659e87e523e8e2cb1ee8ae0a5acbca806e5e26c8693b3b13adeb00a5912f446d7
|
7
|
+
data.tar.gz: 8ce2f367c6f2367f7bfabc89a9f60e69ac983e4a6b1b142de56be5f137d43f592a51297bd1b507b8b33f6acee399a9280f5ad8dd770753e3747a5e7ba02ed6d9
|
data/CHANGELOG.mkd
CHANGED
@@ -4,6 +4,20 @@ CHANGELOG
|
|
4
4
|
Unreleased
|
5
5
|
----------
|
6
6
|
|
7
|
+
4.1.0
|
8
|
+
-----
|
9
|
+
|
10
|
+
- Allow jwt gem >= 2.8
|
11
|
+
- r10k::module::git: expose remote as getter [#1379](https://github.com/puppetlabs/r10k/pull/1379)
|
12
|
+
|
13
|
+
4.0.2
|
14
|
+
-----
|
15
|
+
|
16
|
+
- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
|
17
|
+
- Use the production forge for integration testing
|
18
|
+
- (maint) Update beaker-pe to 3 [#1376](https://github.com/puppetlabs/r10k/pull/1376)
|
19
|
+
- (maint) Stop puppet service during tests [#1377](https://github.com/puppetlabs/r10k/pull/1377)
|
20
|
+
|
7
21
|
4.0.1
|
8
22
|
-----
|
9
23
|
|
@@ -20,8 +34,15 @@ Unreleased
|
|
20
34
|
- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
|
21
35
|
|
22
36
|
|
37
|
+
3.16.1
|
38
|
+
------
|
39
|
+
|
40
|
+
- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
|
41
|
+
- Use the production forge for integration testing
|
42
|
+
|
23
43
|
3.16.0
|
24
44
|
------
|
45
|
+
|
25
46
|
- Emit more debug output when modules fail to sync [#1347](https://github.com/puppetlabs/r10k/pull/1347)
|
26
47
|
- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
|
27
48
|
- Update R10K proxy usage to follow newer rugged best practices [PE-35980](https://tickets.puppet.com/browse/PE-35980)
|
@@ -29,19 +50,23 @@ Unreleased
|
|
29
50
|
|
30
51
|
3.15.4
|
31
52
|
------
|
53
|
+
|
32
54
|
- Pin dependencies to maintain support for old Ruby versions [#1329](https://github.com/puppetlabs/r10k/pull/1329)
|
33
55
|
|
34
56
|
3.15.3
|
35
57
|
------
|
58
|
+
|
36
59
|
- Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
|
37
60
|
- Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)
|
38
61
|
|
39
62
|
3.15.2
|
40
63
|
------
|
64
|
+
|
41
65
|
- Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
|
42
66
|
|
43
67
|
3.15.1
|
44
68
|
------
|
69
|
+
|
45
70
|
- Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
|
46
71
|
- Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
|
47
72
|
|
data/CODEOWNERS
CHANGED
@@ -1,2 +1 @@
|
|
1
|
-
|
2
|
-
* @puppetlabs/dumpling
|
1
|
+
* @puppetlabs/dumpling @puppetlabs/skeletor
|
data/integration/Gemfile
CHANGED
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
|
|
11
11
|
end
|
12
12
|
|
13
13
|
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
|
14
|
-
gem 'beaker-pe', '~>
|
14
|
+
gem 'beaker-pe', '~> 3.0'
|
15
15
|
gem 'beaker-answers'
|
16
16
|
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
|
17
17
|
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')
|
data/integration/Rakefile
CHANGED
@@ -69,7 +69,7 @@ rototiller_task :beaker_hostgenerator do |t|
|
|
69
69
|
# This is a hack :(
|
70
70
|
t.add_flag(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
|
71
71
|
|
72
|
-
t.add_flag(:name => '--global-config', :default => '{forge_host=
|
72
|
+
t.add_flag(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
|
73
73
|
end
|
74
74
|
end
|
75
75
|
|
data/lib/r10k/module/git.rb
CHANGED
@@ -46,6 +46,11 @@ class R10K::Module::Git < R10K::Module::Base
|
|
46
46
|
# @return [String]
|
47
47
|
attr_reader :default_override_ref
|
48
48
|
|
49
|
+
# @!attribute[r] remote
|
50
|
+
# @api private
|
51
|
+
# @return [String]
|
52
|
+
attr_reader :remote
|
53
|
+
|
49
54
|
include R10K::Util::Setopts
|
50
55
|
|
51
56
|
def initialize(title, dirname, opts, environment=nil)
|
@@ -104,8 +104,11 @@ module R10K
|
|
104
104
|
@existing_module_versions_by_name = @existing_module_metadata.map {|mod| [ mod.name, mod.version ] }.to_h
|
105
105
|
empty_load_output.merge(modules: @existing_module_metadata)
|
106
106
|
|
107
|
-
rescue
|
107
|
+
rescue ScriptError, StandardError => e
|
108
108
|
logger.warn _("Unable to preload Puppetfile because of %{msg}" % { msg: e.message })
|
109
|
+
|
110
|
+
@existing_module_metadata = []
|
111
|
+
@existing_module_versions_by_name = {}
|
109
112
|
end
|
110
113
|
|
111
114
|
def add_module_metadata(name, info)
|
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
|
5
|
+
VERSION = '4.1.0'
|
6
6
|
end
|
data/r10k.gemspec
CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
|
|
32
32
|
|
33
33
|
s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
|
34
34
|
|
35
|
-
s.add_dependency 'jwt', '>= 2.2.3', '<
|
35
|
+
s.add_dependency 'jwt', '>= 2.2.3', '< 3'
|
36
36
|
s.add_dependency 'minitar', '~> 0.9'
|
37
37
|
|
38
38
|
s.add_development_dependency 'rspec', '~> 3.1'
|
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
|
4
|
+
version: 4.1.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:
|
11
|
+
date: 2024-04-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: colored2
|
@@ -115,7 +115,7 @@ dependencies:
|
|
115
115
|
version: 2.2.3
|
116
116
|
- - "<"
|
117
117
|
- !ruby/object:Gem::Version
|
118
|
-
version:
|
118
|
+
version: '3'
|
119
119
|
type: :runtime
|
120
120
|
prerelease: false
|
121
121
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -125,7 +125,7 @@ dependencies:
|
|
125
125
|
version: 2.2.3
|
126
126
|
- - "<"
|
127
127
|
- !ruby/object:Gem::Version
|
128
|
-
version:
|
128
|
+
version: '3'
|
129
129
|
- !ruby/object:Gem::Dependency
|
130
130
|
name: minitar
|
131
131
|
requirement: !ruby/object:Gem::Requirement
|