pdksync 0.6.0 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/pull_request_template.md +15 -0
- data/.github/workflows/ci.yml +23 -0
- data/.github/workflows/labeller.yml +22 -0
- data/.github/workflows/mend.yml +15 -0
- data/.github/workflows/nightly.yml +22 -0
- data/.github/workflows/release.yml +16 -0
- data/.github/workflows/release_prep.yml +20 -0
- data/.gitignore +1 -0
- data/.rubocop.yml +9 -31
- data/CHANGELOG.md +61 -59
- data/Gemfile +6 -3
- data/README.md +38 -4
- data/Rakefile +0 -27
- data/lib/pdksync/logger.rb +5 -1
- data/lib/pdksync/rake_tasks.rb +3 -3
- data/lib/pdksync/utils.rb +5 -2
- data/lib/pdksync/version.rb +3 -0
- data/lib/pdksync.rb +1 -2
- data/managed_modules.yml +4 -16
- data/pdksync.gemspec +3 -3
- data/spec/fixtures/fake_managed_modules.yaml +1 -1
- data/spec/pdksync_spec.rb +8 -8
- data/spec/spec_helper.rb +2 -2
- data/spec/utils_spec.rb +13 -10
- metadata +14 -21
- data/.travis.yml +0 -28
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 167daa2e3f6211d588249d856b2f7a7146649e48f8ad208790d4a7bdaadd9443
|
|
4
|
+
data.tar.gz: 5c214f25324c32d3b585b6b0de43c858a0acbe4afc81e22d149d3aef3c7af19e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: df85f2394b095bb7d86dd342a7ef18d6a25028b1331768de29608b9c0c0714361c93ec67a801c52223e291431ecc8792d1448448e3e62eed7b65f3a39a508da4
|
|
7
|
+
data.tar.gz: 92b8351e50eef6f3678717379a82d4461e1d2fd90ebb45618a6a8bd18308e30ee71fba3d6c9113d2e1e563e24f2b78ce85469c8ed3147956eff8b27d16d7e75e
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
## Summary
|
|
2
|
+
Provide a detailed description of all the changes present in this pull request.
|
|
3
|
+
|
|
4
|
+
## Additional Context
|
|
5
|
+
Add any additional context about the problem here.
|
|
6
|
+
- [ ] Root cause and the steps to reproduce. (If applicable)
|
|
7
|
+
- [ ] Thought process behind the implementation.
|
|
8
|
+
|
|
9
|
+
## Related Issues (if any)
|
|
10
|
+
Mention any related issues or pull requests.
|
|
11
|
+
|
|
12
|
+
## Checklist
|
|
13
|
+
- [ ] 🟢 Spec tests.
|
|
14
|
+
- [ ] 🟢 Acceptance tests.
|
|
15
|
+
- [ ] Manually verified.
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
name: "ci"
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
branches:
|
|
6
|
+
- "main"
|
|
7
|
+
workflow_dispatch:
|
|
8
|
+
|
|
9
|
+
jobs:
|
|
10
|
+
|
|
11
|
+
spec:
|
|
12
|
+
strategy:
|
|
13
|
+
fail-fast: false
|
|
14
|
+
matrix:
|
|
15
|
+
ruby_version:
|
|
16
|
+
- '2.7'
|
|
17
|
+
- '3.2'
|
|
18
|
+
name: "spec (ruby ${{ matrix.ruby_version }})"
|
|
19
|
+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
|
|
20
|
+
secrets: "inherit"
|
|
21
|
+
with:
|
|
22
|
+
ruby_version: ${{ matrix.ruby_version }}
|
|
23
|
+
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
name: community-labeller
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
issues:
|
|
5
|
+
types:
|
|
6
|
+
- opened
|
|
7
|
+
pull_request_target:
|
|
8
|
+
types:
|
|
9
|
+
- opened
|
|
10
|
+
|
|
11
|
+
jobs:
|
|
12
|
+
label:
|
|
13
|
+
runs-on: ubuntu-latest
|
|
14
|
+
steps:
|
|
15
|
+
|
|
16
|
+
- uses: puppetlabs/community-labeller@v0
|
|
17
|
+
name: Label issues or pull requests
|
|
18
|
+
with:
|
|
19
|
+
label_name: community
|
|
20
|
+
label_color: '5319e7'
|
|
21
|
+
org_membership: puppetlabs
|
|
22
|
+
token: ${{ secrets.IAC_COMMUNITY_LABELER }}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
name: "nightly"
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
schedule:
|
|
5
|
+
- cron: "0 0 * * *"
|
|
6
|
+
workflow_dispatch:
|
|
7
|
+
|
|
8
|
+
jobs:
|
|
9
|
+
|
|
10
|
+
spec:
|
|
11
|
+
strategy:
|
|
12
|
+
fail-fast: false
|
|
13
|
+
matrix:
|
|
14
|
+
ruby_version:
|
|
15
|
+
- '2.7'
|
|
16
|
+
- '3.2'
|
|
17
|
+
name: "spec (ruby ${{ matrix.ruby_version }})"
|
|
18
|
+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
|
|
19
|
+
secrets: "inherit"
|
|
20
|
+
with:
|
|
21
|
+
ruby_version: ${{ matrix.ruby_version }}
|
|
22
|
+
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
name: "Release"
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
workflow_dispatch:
|
|
5
|
+
inputs:
|
|
6
|
+
target:
|
|
7
|
+
description: "The target for the release. This can be a commit sha or a branch."
|
|
8
|
+
required: false
|
|
9
|
+
default: "main"
|
|
10
|
+
|
|
11
|
+
jobs:
|
|
12
|
+
release:
|
|
13
|
+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_release.yml@main"
|
|
14
|
+
with:
|
|
15
|
+
target: "${{ github.event.inputs.target }}"
|
|
16
|
+
secrets: "inherit"
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
name: "Release Prep"
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
workflow_dispatch:
|
|
5
|
+
inputs:
|
|
6
|
+
target:
|
|
7
|
+
description: "The target for the release. This can be a commit sha or a branch."
|
|
8
|
+
required: false
|
|
9
|
+
default: "main"
|
|
10
|
+
version:
|
|
11
|
+
description: "Version of gem to be released."
|
|
12
|
+
required: true
|
|
13
|
+
|
|
14
|
+
jobs:
|
|
15
|
+
release_prep:
|
|
16
|
+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_release_prep.yml@main"
|
|
17
|
+
with:
|
|
18
|
+
target: "${{ github.event.inputs.target }}"
|
|
19
|
+
version: "${{ github.event.inputs.version }}"
|
|
20
|
+
secrets: "inherit"
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
---
|
|
2
|
+
inherit_from: .rubocop_todo.yml
|
|
3
|
+
|
|
4
|
+
require:
|
|
5
|
+
- rubocop-performance
|
|
6
|
+
- rubocop-rspec
|
|
2
7
|
AllCops:
|
|
8
|
+
NewCops: enable
|
|
3
9
|
DisplayCopNames: true
|
|
10
|
+
ExtraDetails: true
|
|
11
|
+
DisplayStyleGuide: true
|
|
12
|
+
TargetRubyVersion: '2.7'
|
|
4
13
|
Include:
|
|
5
14
|
- "./**/*.rb"
|
|
6
15
|
Exclude:
|
|
@@ -57,37 +66,6 @@ Style/TrailingCommaInArguments:
|
|
|
57
66
|
Style/SymbolArray:
|
|
58
67
|
Description: Using percent style obscures symbolic intent of array's contents.
|
|
59
68
|
EnforcedStyle: brackets
|
|
60
|
-
inherit_from: ".rubocop_todo.yml"
|
|
61
|
-
Style/CollectionMethods:
|
|
62
|
-
Enabled: true
|
|
63
|
-
Style/MethodCalledOnDoEndBlock:
|
|
64
|
-
Enabled: true
|
|
65
|
-
Style/StringMethods:
|
|
66
|
-
Enabled: true
|
|
67
|
-
Layout/EndOfLine:
|
|
68
|
-
Enabled: false
|
|
69
|
-
Metrics/AbcSize:
|
|
70
|
-
Enabled: false
|
|
71
|
-
Metrics/BlockLength:
|
|
72
|
-
Enabled: false
|
|
73
|
-
Metrics/ClassLength:
|
|
74
|
-
Enabled: false
|
|
75
|
-
Metrics/CyclomaticComplexity:
|
|
76
|
-
Enabled: false
|
|
77
|
-
Metrics/MethodLength:
|
|
78
|
-
Enabled: false
|
|
79
|
-
Metrics/ModuleLength:
|
|
80
|
-
Enabled: false
|
|
81
|
-
Metrics/ParameterLists:
|
|
82
|
-
Enabled: false
|
|
83
|
-
Metrics/PerceivedComplexity:
|
|
84
|
-
Enabled: false
|
|
85
|
-
Style/AsciiComments:
|
|
86
|
-
Enabled: false
|
|
87
|
-
Style/IfUnlessModifier:
|
|
88
|
-
Enabled: false
|
|
89
|
-
Style/SymbolProc:
|
|
90
|
-
Enabled: false
|
|
91
69
|
Style/Documentation:
|
|
92
70
|
Exclude:
|
|
93
71
|
- lib/pdksync/utils.rb
|
data/CHANGELOG.md
CHANGED
|
@@ -1,111 +1,113 @@
|
|
|
1
|
-
|
|
1
|
+
<!-- markdownlint-disable MD024 -->
|
|
2
|
+
# Changelog
|
|
2
3
|
|
|
3
|
-
All notable changes to this project will be documented in this file.
|
|
4
|
+
All notable changes to this project will be documented in this file.
|
|
4
5
|
|
|
5
|
-
|
|
6
|
+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
|
|
6
7
|
|
|
7
|
-
[
|
|
8
|
+
## [v0.8.0](https://github.com/puppetlabs/pdksync/tree/v0.8.0) - 2023-07-14
|
|
9
|
+
|
|
10
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/v0.7.0...v0.8.0)
|
|
8
11
|
|
|
9
12
|
### Added
|
|
10
13
|
|
|
11
|
-
-
|
|
12
|
-
-
|
|
13
|
-
- \(MODULES-10379\) Multi Gem testing [\#128](https://github.com/puppetlabs/pdksync/pull/128) ([sheenaajay](https://github.com/sheenaajay))
|
|
14
|
-
- \(maint\) Add bundler tasks and pdk requirement [\#120](https://github.com/puppetlabs/pdksync/pull/120) ([logicminds](https://github.com/logicminds))
|
|
15
|
-
- \(MODULES-9786\) Using pdksync to update the Gemfile [\#114](https://github.com/puppetlabs/pdksync/pull/114) ([sheenaajay](https://github.com/sheenaajay))
|
|
16
|
-
- Major refactor and new features [\#105](https://github.com/puppetlabs/pdksync/pull/105) ([logicminds](https://github.com/logicminds))
|
|
14
|
+
- Improve module validation performance [#193](https://github.com/puppetlabs/pdksync/pull/193) ([seanmil](https://github.com/seanmil))
|
|
15
|
+
- (CONT-1138) - Add ruby 3.x compatibility [#191](https://github.com/puppetlabs/pdksync/pull/191) ([jordanbreen28](https://github.com/jordanbreen28))
|
|
17
16
|
|
|
18
17
|
### Fixed
|
|
19
18
|
|
|
20
|
-
-
|
|
21
|
-
- \(MODULES-8440\) Ensure pdksync works on windows [\#133](https://github.com/puppetlabs/pdksync/pull/133) ([michaeltlombardi](https://github.com/michaeltlombardi))
|
|
22
|
-
- \(maint\) fix gemfury upload [\#132](https://github.com/puppetlabs/pdksync/pull/132) ([sheenaajay](https://github.com/sheenaajay))
|
|
23
|
-
- fix gemfury testing upload [\#131](https://github.com/puppetlabs/pdksync/pull/131) ([DavidS](https://github.com/DavidS))
|
|
24
|
-
- \(IAC-354\) Fix Gemfile update [\#130](https://github.com/puppetlabs/pdksync/pull/130) ([sheenaajay](https://github.com/sheenaajay))
|
|
25
|
-
- \(maint\) 27x performance improvement [\#123](https://github.com/puppetlabs/pdksync/pull/123) ([DavidS](https://github.com/DavidS))
|
|
26
|
-
- \(maint\) Add Requirements to README.md and fix travis [\#118](https://github.com/puppetlabs/pdksync/pull/118) ([mihaibuzgau](https://github.com/mihaibuzgau))
|
|
19
|
+
- (CONT-1215) - Fix formatting for pdksync:show_config [#189](https://github.com/puppetlabs/pdksync/pull/189) ([jordanbreen28](https://github.com/jordanbreen28))
|
|
27
20
|
|
|
28
|
-
## [
|
|
21
|
+
## [v0.7.0](https://github.com/puppetlabs/pdksync/tree/v0.7.0) - 2023-05-25
|
|
29
22
|
|
|
30
|
-
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/
|
|
23
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/v0.6.0...v0.7.0)
|
|
31
24
|
|
|
32
25
|
### Added
|
|
33
26
|
|
|
34
|
-
-
|
|
35
|
-
- \(MODULES-8730\) Display warning on outdated pdk version [\#92](https://github.com/puppetlabs/pdksync/pull/92) ([eimlav](https://github.com/eimlav))
|
|
27
|
+
- (maint) Add Support for AlmaLinux and Rocky [#165](https://github.com/puppetlabs/pdksync/pull/165) ([david22swan](https://github.com/david22swan))
|
|
36
28
|
|
|
37
29
|
### Fixed
|
|
38
30
|
|
|
39
|
-
-
|
|
31
|
+
- Fix `Logger.error` [#173](https://github.com/puppetlabs/pdksync/pull/173) ([alexjfisher](https://github.com/alexjfisher))
|
|
40
32
|
|
|
41
|
-
## [
|
|
33
|
+
## [v0.6.0](https://github.com/puppetlabs/pdksync/tree/v0.6.0) - 2021-08-16
|
|
42
34
|
|
|
43
|
-
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/
|
|
35
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.5.0...v0.6.0)
|
|
44
36
|
|
|
45
37
|
### Added
|
|
46
38
|
|
|
47
|
-
-
|
|
48
|
-
-
|
|
39
|
+
- (FEAT) Add tasks for updating supported platforms / requirements [#142](https://github.com/puppetlabs/pdksync/pull/142) ([sanfrancrisko](https://github.com/sanfrancrisko))
|
|
40
|
+
- Add tasks to add / update entries in module's provision.yaml [#136](https://github.com/puppetlabs/pdksync/pull/136) ([sanfrancrisko](https://github.com/sanfrancrisko))
|
|
41
|
+
- (MODULES-10379) Multi Gem testing [#128](https://github.com/puppetlabs/pdksync/pull/128) ([sheenaajay](https://github.com/sheenaajay))
|
|
42
|
+
- (maint) Add bundler tasks and pdk requirement [#120](https://github.com/puppetlabs/pdksync/pull/120) ([logicminds](https://github.com/logicminds))
|
|
43
|
+
- (MODULES-9786) Using pdksync to update the Gemfile [#114](https://github.com/puppetlabs/pdksync/pull/114) ([sheenaajay](https://github.com/sheenaajay))
|
|
44
|
+
- Major refactor and new features [#105](https://github.com/puppetlabs/pdksync/pull/105) ([logicminds](https://github.com/logicminds))
|
|
49
45
|
|
|
50
46
|
### Fixed
|
|
51
47
|
|
|
52
|
-
-
|
|
53
|
-
-
|
|
48
|
+
- (GH-148) Fix logging for pdksync:pdk_validate task [#150](https://github.com/puppetlabs/pdksync/pull/150) ([sanfrancrisko](https://github.com/sanfrancrisko))
|
|
49
|
+
- (MODULES-8440) Ensure pdksync works on windows [#133](https://github.com/puppetlabs/pdksync/pull/133) ([michaeltlombardi](https://github.com/michaeltlombardi))
|
|
50
|
+
- (maint) fix gemfury upload [#132](https://github.com/puppetlabs/pdksync/pull/132) ([sheenaajay](https://github.com/sheenaajay))
|
|
51
|
+
- fix gemfury testing upload [#131](https://github.com/puppetlabs/pdksync/pull/131) ([DavidS](https://github.com/DavidS))
|
|
52
|
+
- (IAC-354) Fix Gemfile update [#130](https://github.com/puppetlabs/pdksync/pull/130) ([sheenaajay](https://github.com/sheenaajay))
|
|
53
|
+
- (maint) 27x performance improvement [#123](https://github.com/puppetlabs/pdksync/pull/123) ([DavidS](https://github.com/DavidS))
|
|
54
|
+
- (maint) Add Requirements to README.md and fix travis [#118](https://github.com/puppetlabs/pdksync/pull/118) ([mihaibuzgau](https://github.com/mihaibuzgau))
|
|
54
55
|
|
|
55
|
-
## [
|
|
56
|
+
## [0.5.0](https://github.com/puppetlabs/pdksync/tree/0.5.0) - 2019-08-21
|
|
56
57
|
|
|
57
|
-
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.
|
|
58
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.4.0...0.5.0)
|
|
58
59
|
|
|
59
60
|
### Added
|
|
60
61
|
|
|
61
|
-
-
|
|
62
|
-
-
|
|
62
|
+
- pdksync externalisation fixes [#95](https://github.com/puppetlabs/pdksync/pull/95) ([DavidS](https://github.com/DavidS))
|
|
63
|
+
- (MODULES-8730) Display warning on outdated pdk version [#92](https://github.com/puppetlabs/pdksync/pull/92) ([eimlav](https://github.com/eimlav))
|
|
63
64
|
|
|
64
65
|
### Fixed
|
|
65
66
|
|
|
66
|
-
-
|
|
67
|
+
- (MODULES-9011) deal with modules that do not need updating [#101](https://github.com/puppetlabs/pdksync/pull/101) ([DavidS](https://github.com/DavidS))
|
|
67
68
|
|
|
68
|
-
## [0.
|
|
69
|
+
## [0.4.0](https://github.com/puppetlabs/pdksync/tree/0.4.0) - 2019-02-04
|
|
69
70
|
|
|
70
|
-
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/
|
|
71
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/v0.3.0...0.4.0)
|
|
71
72
|
|
|
72
73
|
### Added
|
|
73
74
|
|
|
74
|
-
-
|
|
75
|
-
-
|
|
76
|
-
- \(feat\) adding git commit rake task [\#63](https://github.com/puppetlabs/pdksync/pull/63) ([tphoney](https://github.com/tphoney))
|
|
77
|
-
- \(FEAT\) add clone\_managed\_modules task [\#58](https://github.com/puppetlabs/pdksync/pull/58) ([tphoney](https://github.com/tphoney))
|
|
75
|
+
- (MODULES-8419) Refactor to add support for GitLab [#85](https://github.com/puppetlabs/pdksync/pull/85) ([antaflos](https://github.com/antaflos))
|
|
76
|
+
- (MODULES-7233) - Add configurable file option [#81](https://github.com/puppetlabs/pdksync/pull/81) ([eimlav](https://github.com/eimlav))
|
|
78
77
|
|
|
79
78
|
### Fixed
|
|
80
79
|
|
|
81
|
-
-
|
|
80
|
+
- (MODULES-8283) - Fix PR title overwritten in pdksync runs [#84](https://github.com/puppetlabs/pdksync/pull/84) ([eimlav](https://github.com/eimlav))
|
|
81
|
+
- (MODULES-8382) - Fix API rate limit false positive [#83](https://github.com/puppetlabs/pdksync/pull/83) ([eimlav](https://github.com/eimlav))
|
|
82
82
|
|
|
83
|
-
## [
|
|
83
|
+
## [v0.3.0](https://github.com/puppetlabs/pdksync/tree/v0.3.0) - 2018-11-15
|
|
84
84
|
|
|
85
|
-
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/
|
|
85
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.2.0...v0.3.0)
|
|
86
86
|
|
|
87
87
|
### Added
|
|
88
88
|
|
|
89
|
-
- Add
|
|
90
|
-
-
|
|
91
|
-
- \(MODULES-7021\) - Write README for pdksync [\#28](https://github.com/puppetlabs/pdksync/pull/28) ([david22swan](https://github.com/david22swan))
|
|
92
|
-
- \(MODULES-7121\) Addition of error handling inside functions [\#27](https://github.com/puppetlabs/pdksync/pull/27) ([HelenCampbell](https://github.com/HelenCampbell))
|
|
93
|
-
- \(MODULES-7085\) Notation added through the module [\#26](https://github.com/puppetlabs/pdksync/pull/26) ([david22swan](https://github.com/david22swan))
|
|
94
|
-
- \(MODULES-7005\) - Add a test for adding files and update test titles [\#25](https://github.com/puppetlabs/pdksync/pull/25) ([pmcmaw](https://github.com/pmcmaw))
|
|
95
|
-
- \(MODULES-7092\) - Read in managed\_modules.yml list [\#23](https://github.com/puppetlabs/pdksync/pull/23) ([david22swan](https://github.com/david22swan))
|
|
96
|
-
- \(MODULES-7007\) Added basic iteration to the module. [\#22](https://github.com/puppetlabs/pdksync/pull/22) ([david22swan](https://github.com/david22swan))
|
|
97
|
-
- \(MODULES-7049\) - Introduce pdk version and template url [\#21](https://github.com/puppetlabs/pdksync/pull/21) ([pmcmaw](https://github.com/pmcmaw))
|
|
98
|
-
- \(MODULES-7030\) - Introduce constants.rb [\#20](https://github.com/puppetlabs/pdksync/pull/20) ([david22swan](https://github.com/david22swan))
|
|
99
|
-
- Addition of PR creation [\#10](https://github.com/puppetlabs/pdksync/pull/10) ([HelenCampbell](https://github.com/HelenCampbell))
|
|
100
|
-
- Basic Functionality Added [\#5](https://github.com/puppetlabs/pdksync/pull/5) ([david22swan](https://github.com/david22swan))
|
|
101
|
-
- Setup of Files [\#1](https://github.com/puppetlabs/pdksync/pull/1) ([david22swan](https://github.com/david22swan))
|
|
89
|
+
- (MODULES-8231) - Add additional title info for pdksync runs [#76](https://github.com/puppetlabs/pdksync/pull/76) ([eimlav](https://github.com/eimlav))
|
|
90
|
+
- (MODULES-7695) - Add maintenance labels for PRs [#75](https://github.com/puppetlabs/pdksync/pull/75) ([eimlav](https://github.com/eimlav))
|
|
102
91
|
|
|
103
92
|
### Fixed
|
|
104
93
|
|
|
105
|
-
-
|
|
106
|
-
- Change push command to use git ruby [\#13](https://github.com/puppetlabs/pdksync/pull/13) ([HelenCampbell](https://github.com/HelenCampbell))
|
|
107
|
-
- PDK Update fix [\#8](https://github.com/puppetlabs/pdksync/pull/8) ([david22swan](https://github.com/david22swan))
|
|
94
|
+
- (MODULES-8002) - Fix bundle commands not running in correct dir [#79](https://github.com/puppetlabs/pdksync/pull/79) ([eimlav](https://github.com/eimlav))
|
|
108
95
|
|
|
96
|
+
## [0.2.0](https://github.com/puppetlabs/pdksync/tree/0.2.0) - 2018-11-02
|
|
109
97
|
|
|
98
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.1.0...0.2.0)
|
|
99
|
+
|
|
100
|
+
### Added
|
|
110
101
|
|
|
111
|
-
|
|
102
|
+
- (feat) add colourised output, fix pdk path [#68](https://github.com/puppetlabs/pdksync/pull/68) ([tphoney](https://github.com/tphoney))
|
|
103
|
+
- (CLOUD-2094) adding container modules to the list [#67](https://github.com/puppetlabs/pdksync/pull/67) ([sheenaajay](https://github.com/sheenaajay))
|
|
104
|
+
- (feat) adding git commit rake task [#63](https://github.com/puppetlabs/pdksync/pull/63) ([tphoney](https://github.com/tphoney))
|
|
105
|
+
- (FEAT) add clone_managed_modules task [#58](https://github.com/puppetlabs/pdksync/pull/58) ([tphoney](https://github.com/tphoney))
|
|
106
|
+
|
|
107
|
+
### Fixed
|
|
108
|
+
|
|
109
|
+
- Use https instead of ssh for the clone [#72](https://github.com/puppetlabs/pdksync/pull/72) ([HelenCampbell](https://github.com/HelenCampbell))
|
|
110
|
+
|
|
111
|
+
## [0.1.0](https://github.com/puppetlabs/pdksync/tree/0.1.0) - 2018-05-23
|
|
112
|
+
|
|
113
|
+
[Full Changelog](https://github.com/puppetlabs/pdksync/compare/73bf282b297781bc26562bfb51b91b4f7b1632d1...0.1.0)
|
data/Gemfile
CHANGED
|
@@ -5,9 +5,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
|
|
|
5
5
|
# Specify your gem's dependencies in pdksync.gemspec
|
|
6
6
|
gemspec
|
|
7
7
|
|
|
8
|
-
gem 'github_changelog_generator', '~> 1.15'
|
|
9
|
-
gem 'travis'
|
|
10
|
-
|
|
11
8
|
group :development do
|
|
12
9
|
gem 'rb-readline', require: true
|
|
13
10
|
end
|
|
11
|
+
|
|
12
|
+
group :rubocop do
|
|
13
|
+
gem 'rubocop', '~> 1.48.1', require: false
|
|
14
|
+
gem 'rubocop-rspec', '~> 2.19', require: false
|
|
15
|
+
gem 'rubocop-performance', '~> 1.16', require: false
|
|
16
|
+
end
|
data/README.md
CHANGED
|
@@ -21,8 +21,8 @@ Pdksync by default expects that your Puppet module repositories live on GitHub a
|
|
|
21
21
|
|
|
22
22
|
### Requirements
|
|
23
23
|
--------
|
|
24
|
-
* Ruby >= 2.
|
|
25
|
-
* Bundler
|
|
24
|
+
* Ruby >= 2.7
|
|
25
|
+
* Bundler >= 1.15
|
|
26
26
|
|
|
27
27
|
### Usage
|
|
28
28
|
----------
|
|
@@ -49,6 +49,35 @@ bundle install --path .bundle/gems/
|
|
|
49
49
|
bundle exec rake pdksync
|
|
50
50
|
```
|
|
51
51
|
|
|
52
|
+
### Github Token Permissions
|
|
53
|
+
----------
|
|
54
|
+
|
|
55
|
+
Follow the steps below to set up a Github token with the minimum level of permissions required by `pdksync`:
|
|
56
|
+
|
|
57
|
+
- Log in to your Github account and navigate to the [Personal Access Tokens](https://github.com/settings/tokens) section under `Settings -> Developer settings`
|
|
58
|
+
- Click [`Generate new token`](https://github.com/settings/tokens/new)
|
|
59
|
+
- Select the check boxes appropriate for your use case below
|
|
60
|
+
|
|
61
|
+
#### **Public Repos, No Workflow Modifications Permitted**
|
|
62
|
+
|
|
63
|
+
- [ ] **repo**
|
|
64
|
+
- [ ] repo:status
|
|
65
|
+
- [ ] repo_deployment
|
|
66
|
+
- [x] public_repo
|
|
67
|
+
- [ ] repo:invite
|
|
68
|
+
- [ ] security_events
|
|
69
|
+
- [ ] workflow
|
|
70
|
+
|
|
71
|
+
#### **Private Repos or Public Repos with Workflow Modifications Permitted**
|
|
72
|
+
|
|
73
|
+
- [x] **repo**
|
|
74
|
+
- [x] repo:status
|
|
75
|
+
- [x] repo_deployment
|
|
76
|
+
- [x] public_repo
|
|
77
|
+
- [x] repo:invite
|
|
78
|
+
- [x] security_events
|
|
79
|
+
- [x] workflow
|
|
80
|
+
|
|
52
81
|
### How it works
|
|
53
82
|
------------
|
|
54
83
|
|
|
@@ -67,7 +96,7 @@ source "https://rubygems.org"
|
|
|
67
96
|
|
|
68
97
|
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
|
|
69
98
|
|
|
70
|
-
gem 'pdksync'
|
|
99
|
+
gem 'pdksync'
|
|
71
100
|
gem 'rake'
|
|
72
101
|
```
|
|
73
102
|
|
|
@@ -137,7 +166,7 @@ Run the following commands to check that everything is working as expected:
|
|
|
137
166
|
|
|
138
167
|
```shell
|
|
139
168
|
bundle install --path .bundle/gems/
|
|
140
|
-
bundle exec rake -
|
|
169
|
+
bundle exec rake -D
|
|
141
170
|
bundle exec rake 'git:clone_gem['gem_name']'
|
|
142
171
|
```
|
|
143
172
|
Below given are the workflows for doing multi gem testing with pdksync.
|
|
@@ -188,6 +217,11 @@ The following rake tasks are available with pdksync:
|
|
|
188
217
|
- `pdksync:multigem_file_update[:gem_name, :gemfury_username]` Update Gemfile of the modules with the new gem should be pushed to Gemfury.'
|
|
189
218
|
- `pdksync:add_provision_list[:key, :provisioner, :images]` Add a provision list key to provision.yaml.
|
|
190
219
|
- `pdksync:generate_vmpooler_release_checks[:puppet_version]` Generates release checks in provision.yaml based on module compatible platforms and puppet version
|
|
220
|
+
- `pdksync:add_platform_to_metadata[:os, :version]` Add a given OS Version to the metadata
|
|
221
|
+
- `pdksync:remove_platform_from_metadata[:os, :version]` Remove a given OS Version from the metadata
|
|
222
|
+
|
|
223
|
+
|
|
224
|
+
You can run ```bundle exec rake -D``` to view the list of available rake tasks.
|
|
191
225
|
|
|
192
226
|
### Adding/Updating `provision.yaml`
|
|
193
227
|
To add/update an entry in the `provision.yaml`, run the following task:
|
data/Rakefile
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
require "pdksync/rake_tasks"
|
|
2
|
-
require "github_changelog_generator/task"
|
|
3
2
|
require "rubocop/rake_task"
|
|
4
3
|
require "rspec/core/rake_task"
|
|
5
4
|
require "bundler/gem_tasks"
|
|
@@ -11,29 +10,3 @@ end
|
|
|
11
10
|
RSpec::Core::RakeTask.new(:spec)
|
|
12
11
|
|
|
13
12
|
task :default => :spec
|
|
14
|
-
|
|
15
|
-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
|
16
|
-
config.user = "puppetlabs"
|
|
17
|
-
config.project = "pdksync"
|
|
18
|
-
# config.since_tag = '1.1.1'
|
|
19
|
-
config.future_release = "0.6.0"
|
|
20
|
-
config.exclude_labels = ["maintenance"]
|
|
21
|
-
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
|
|
22
|
-
config.add_pr_wo_labels = true
|
|
23
|
-
config.issues = false
|
|
24
|
-
config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
|
|
25
|
-
config.configure_sections = {
|
|
26
|
-
"Changed" => {
|
|
27
|
-
"prefix" => "### Changed",
|
|
28
|
-
"labels" => ["backwards-incompatible"],
|
|
29
|
-
},
|
|
30
|
-
"Added" => {
|
|
31
|
-
"prefix" => "### Added",
|
|
32
|
-
"labels" => ["feature", "enhancement"],
|
|
33
|
-
},
|
|
34
|
-
"Fixed" => {
|
|
35
|
-
"prefix" => "### Fixed",
|
|
36
|
-
"labels" => ["bugfix"],
|
|
37
|
-
},
|
|
38
|
-
}
|
|
39
|
-
end
|
data/lib/pdksync/logger.rb
CHANGED
|
@@ -7,6 +7,10 @@ class String
|
|
|
7
7
|
"\e[#{color_code}m#{self}\e[0m"
|
|
8
8
|
end
|
|
9
9
|
|
|
10
|
+
def bold
|
|
11
|
+
"\e[1m#{self}\e[22m"
|
|
12
|
+
end
|
|
13
|
+
|
|
10
14
|
def red
|
|
11
15
|
colorize(31)
|
|
12
16
|
end
|
|
@@ -46,7 +50,7 @@ module PdkSync
|
|
|
46
50
|
logger.fatal(message)
|
|
47
51
|
end
|
|
48
52
|
|
|
49
|
-
def self.
|
|
53
|
+
def self.error(message)
|
|
50
54
|
logger.error(message)
|
|
51
55
|
end
|
|
52
56
|
|
data/lib/pdksync/rake_tasks.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
require 'pdksync'
|
|
2
|
-
require '
|
|
2
|
+
require 'logger'
|
|
3
3
|
|
|
4
4
|
desc 'Run full pdksync process, clone repository, pdk update, create pr. Additional title information can be added to the title, which will be appended before the reference section.'
|
|
5
5
|
task :pdksync, [:additional_title] do |_task, args|
|
|
@@ -77,9 +77,9 @@ namespace :pdksync do
|
|
|
77
77
|
task :show_config do
|
|
78
78
|
config = PdkSync::Configuration.new
|
|
79
79
|
puts 'Please note that you can override any of the configuration by using an additional file at `$HOME/.pdksync.yml`.'.bold.red
|
|
80
|
-
puts "\nPDKSync Configuration".bold.yellow
|
|
80
|
+
puts "\nPDKSync Configuration:".bold.yellow
|
|
81
81
|
config.to_h.each do |key, value|
|
|
82
|
-
puts "- #{key}: "
|
|
82
|
+
puts "- #{key}: " + value.to_s.light_blue
|
|
83
83
|
end
|
|
84
84
|
end
|
|
85
85
|
|
data/lib/pdksync/utils.rb
CHANGED
|
@@ -5,7 +5,6 @@ require 'fileutils'
|
|
|
5
5
|
require 'pdk'
|
|
6
6
|
require 'pdksync/configuration'
|
|
7
7
|
require 'pdksync/gitplatformclient'
|
|
8
|
-
require 'colorize'
|
|
9
8
|
require 'bundler'
|
|
10
9
|
require 'octokit'
|
|
11
10
|
require 'pdk/util/template_uri'
|
|
@@ -249,7 +248,7 @@ module PdkSync
|
|
|
249
248
|
stdout, stderr, status = Open3.capture3(command)
|
|
250
249
|
end
|
|
251
250
|
PdkSync::Logger.info "\n#{stdout}\n"
|
|
252
|
-
PdkSync::Logger.
|
|
251
|
+
PdkSync::Logger.error "Unable to run command '#{command}': #{stderr}" unless status.exitstatus.zero?
|
|
253
252
|
status.exitstatus
|
|
254
253
|
else
|
|
255
254
|
# Environment cleanup required due to Ruby subshells using current Bundler environment
|
|
@@ -1092,6 +1091,10 @@ module PdkSync
|
|
|
1092
1091
|
'Ubuntu'
|
|
1093
1092
|
when %r{win}i
|
|
1094
1093
|
'Windows'
|
|
1094
|
+
when %r{rocky}i
|
|
1095
|
+
'Rocky'
|
|
1096
|
+
when %r{almalinux}i
|
|
1097
|
+
'AlmaLinux'
|
|
1095
1098
|
else
|
|
1096
1099
|
raise "Could not normalize OS value: #{os}"
|
|
1097
1100
|
end
|
data/lib/pdksync.rb
CHANGED
|
@@ -9,7 +9,6 @@ require 'pdksync/gitplatformclient'
|
|
|
9
9
|
|
|
10
10
|
require 'json'
|
|
11
11
|
require 'yaml'
|
|
12
|
-
require 'colorize'
|
|
13
12
|
require 'bundler'
|
|
14
13
|
require 'octokit'
|
|
15
14
|
require 'pdk/util/template_uri'
|
|
@@ -162,7 +161,7 @@ module PdkSync
|
|
|
162
161
|
repo_name = File.join(Utils.configuration.namespace, module_name)
|
|
163
162
|
output_path = File.join(Utils.configuration.pdksync_dir, module_name)
|
|
164
163
|
if steps.include?(:clone)
|
|
165
|
-
Utils.validate_modules_exist(client,
|
|
164
|
+
Utils.validate_modules_exist(client, [module_name])
|
|
166
165
|
Utils.clean_env(output_path) if Dir.exist?(output_path)
|
|
167
166
|
PdkSync::Logger.info 'delete module directory'
|
|
168
167
|
@git_repo = Utils.clone_directory(Utils.configuration.namespace, module_name, output_path)
|
data/managed_modules.yml
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
---
|
|
2
|
-
##
|
|
3
|
-
#- cisco_ios
|
|
2
|
+
## Content and Tooling Team
|
|
4
3
|
#- device_manager
|
|
5
|
-
#- provision
|
|
6
4
|
#- puppetlabs-accounts
|
|
7
5
|
#- puppetlabs-acl
|
|
8
6
|
#- puppetlabs-apache
|
|
@@ -10,42 +8,32 @@
|
|
|
10
8
|
#- puppetlabs-chocolatey
|
|
11
9
|
#- puppetlabs-concat
|
|
12
10
|
#- puppetlabs-docker
|
|
13
|
-
#- puppetlabs-dsc
|
|
14
|
-
#- puppetlabs-dsc_lite
|
|
15
11
|
#- puppetlabs-exec
|
|
16
12
|
#- puppetlabs-facter_task
|
|
17
13
|
#- puppetlabs-firewall
|
|
18
14
|
#- puppetlabs-haproxy
|
|
19
|
-
#- puppetlabs-helm
|
|
20
|
-
#- puppetlabs-ibm_installation_manager
|
|
21
15
|
#- puppetlabs-iis
|
|
22
16
|
#- puppetlabs-inifile
|
|
23
17
|
#- puppetlabs-java
|
|
24
18
|
#- puppetlabs-java_ks
|
|
25
19
|
#- puppetlabs-kubernetes
|
|
20
|
+
#- puppetlabs-lvm
|
|
26
21
|
#- puppetlabs-motd
|
|
22
|
+
#- puppetlabs-mount_iso
|
|
27
23
|
#- puppetlabs-mysql
|
|
24
|
+
#- puppetlabs-node_encrypt
|
|
28
25
|
#- puppetlabs-ntp
|
|
29
26
|
#- puppetlabs-package
|
|
30
|
-
#- puppetlabs-panos
|
|
31
27
|
#- puppetlabs-postgresql
|
|
32
28
|
#- puppetlabs-powershell
|
|
33
29
|
#- puppetlabs-puppet_conf
|
|
34
30
|
#- puppetlabs-reboot
|
|
35
31
|
#- puppetlabs-registry
|
|
36
|
-
#- puppetlabs-rook
|
|
37
32
|
#- puppetlabs-satellite_pe_tools
|
|
38
33
|
#- puppetlabs-scheduled_task
|
|
39
34
|
#- puppetlabs-service
|
|
40
35
|
#- puppetlabs-sqlserver
|
|
41
36
|
#- puppetlabs-stdlib
|
|
42
|
-
#- puppetlabs-tagmail
|
|
43
37
|
#- puppetlabs-tomcat
|
|
44
38
|
#- puppetlabs-vcsrepo
|
|
45
|
-
#- puppetlabs-vsphere
|
|
46
|
-
#- puppetlabs-websphere_application_server
|
|
47
39
|
#- puppetlabs-wsus_client
|
|
48
|
-
## testing only
|
|
49
|
-
#- puppetlabs-testing
|
|
50
|
-
#- puppetlabs-testing1
|
|
51
|
-
#- puppetlabs-testing2
|
data/pdksync.gemspec
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
lib = File.expand_path('../lib', __FILE__)
|
|
2
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
3
|
+
require 'pdksync/version'
|
|
3
4
|
|
|
4
5
|
Gem::Specification.new do |spec|
|
|
5
6
|
spec.name = 'pdksync'
|
|
6
|
-
spec.version =
|
|
7
|
+
spec.version = PdkSync::VERSION
|
|
7
8
|
spec.authors = ['Puppet']
|
|
8
9
|
spec.email = ['']
|
|
9
10
|
spec.summary = 'Puppet Module PDK Synchronizer'
|
|
10
11
|
spec.description = 'Utility to synchronize common files across puppet modules using PDK Update.'
|
|
11
12
|
spec.homepage = 'http://github.com/puppetlabs/pdksync'
|
|
12
13
|
spec.license = 'Apache-2.0'
|
|
13
|
-
spec.required_ruby_version = '>= 2.
|
|
14
|
+
spec.required_ruby_version = '>= 2.7'
|
|
14
15
|
|
|
15
16
|
spec.files = `git ls-files -z`.split("\x0")
|
|
16
17
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
|
@@ -29,6 +30,5 @@ Gem::Specification.new do |spec|
|
|
|
29
30
|
spec.add_runtime_dependency 'rake'
|
|
30
31
|
spec.add_runtime_dependency 'gitlab'
|
|
31
32
|
spec.add_runtime_dependency 'octokit'
|
|
32
|
-
spec.add_runtime_dependency 'colorize'
|
|
33
33
|
spec.add_runtime_dependency 'jenkins_api_client'
|
|
34
34
|
end
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
---
|
|
2
|
-
- puppetlabs/puppetlabs-
|
|
2
|
+
- puppetlabs/puppetlabs-motd
|
data/spec/pdksync_spec.rb
CHANGED
|
@@ -8,15 +8,15 @@ describe PdkSync do
|
|
|
8
8
|
before(:all) do
|
|
9
9
|
@pdksync_dir = './modules_pdksync'
|
|
10
10
|
@pdksync_gem_dir = './gems_pdksync'
|
|
11
|
-
module_name = 'puppetlabs-
|
|
12
|
-
gem_name = 'puppet-
|
|
13
|
-
@module_names = ['puppetlabs-
|
|
11
|
+
module_name = 'puppetlabs-motd'
|
|
12
|
+
gem_name = 'puppet-strings'
|
|
13
|
+
@module_names = ['puppetlabs-motd']
|
|
14
14
|
@output_path_module = "#{@pdksync_dir}/#{module_name}"
|
|
15
15
|
@output_path_gem = "#{@pdksync_gem_dir}/#{gem_name}"
|
|
16
16
|
@folder = Dir.pwd
|
|
17
17
|
# Make changes to modules_managed.yaml file
|
|
18
18
|
text = File.read('managed_modules.yml')
|
|
19
|
-
new_contents = text.gsub(%r{#- puppetlabs-
|
|
19
|
+
new_contents = text.gsub(%r{#- puppetlabs-motd$}, '- puppetlabs-motd')
|
|
20
20
|
File.open('managed_modules.yml', 'w') { |file| file.puts new_contents }
|
|
21
21
|
end
|
|
22
22
|
|
|
@@ -161,7 +161,7 @@ describe PdkSync do
|
|
|
161
161
|
allow(PdkSync::Utils).to receive(:setup_client).and_return(git_client)
|
|
162
162
|
FileUtils.rm_rf(@pdksync_gem_dir)
|
|
163
163
|
PdkSync::Utils.create_filespace_gem
|
|
164
|
-
PdkSync.main(steps: [:clone_gem], args: { gem_name: 'puppet-
|
|
164
|
+
PdkSync.main(steps: [:clone_gem], args: { gem_name: 'puppet-strings' })
|
|
165
165
|
expect(Dir.exist?(@pdksync_dir)).to be(true)
|
|
166
166
|
expect(Dir.exist?(@pdksync_gem_dir)).to be(true)
|
|
167
167
|
expect(Dir.exist?(@output_path_gem)).to be(true)
|
|
@@ -170,8 +170,8 @@ describe PdkSync do
|
|
|
170
170
|
expect { PdkSync.main(steps: [:multi_gem_testing]) }.to raise_error(RuntimeError, %r{"multi_gem_testing" requires arguments to run version_file and build_gem})
|
|
171
171
|
end
|
|
172
172
|
it 'runs a command for updating the version and building the gem' do
|
|
173
|
-
allow(Octokit).to receive(:tags).with('puppetlabs/puppet-
|
|
174
|
-
PdkSync.main(steps: [:multi_gem_testing], args: { gem_name: 'puppet-
|
|
173
|
+
allow(Octokit).to receive(:tags).with('puppetlabs/puppet-strings').and_return([{ name: '1' }])
|
|
174
|
+
PdkSync.main(steps: [:multi_gem_testing], args: { gem_name: 'puppet-strings', version_file: 'lib/puppet-strings/version.rb', build_gem: 'rake build', gem_path: 'pkg', gem_username: 'tester' })
|
|
175
175
|
expect File.exist?("#{@output_path_gem}/pkg")
|
|
176
176
|
end
|
|
177
177
|
end
|
|
@@ -179,7 +179,7 @@ describe PdkSync do
|
|
|
179
179
|
# Make changes to modules_managed.yaml file
|
|
180
180
|
Dir.chdir(@folder)
|
|
181
181
|
text = File.read('managed_modules.yml')
|
|
182
|
-
new_contents = text.gsub(%r{- puppetlabs-
|
|
182
|
+
new_contents = text.gsub(%r{- puppetlabs-motd$}, '#- puppetlabs-motd')
|
|
183
183
|
File.open('managed_modules.yml', 'w') { |file| file.puts new_contents }
|
|
184
184
|
end
|
|
185
185
|
end
|
data/spec/spec_helper.rb
CHANGED
|
@@ -45,12 +45,12 @@ def pupmods_dir
|
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
def remote_testing_repo
|
|
48
|
-
File.join(pupmods_dir, 'puppetlabs-
|
|
48
|
+
File.join(pupmods_dir, 'puppetlabs-motd.git')
|
|
49
49
|
end
|
|
50
50
|
|
|
51
51
|
# localizes the remote repo for faster testing, download once and use the local machine as the remote repo
|
|
52
52
|
def setup_fake_module
|
|
53
|
-
Git.clone('https://github.com/puppetlabs/puppetlabs-
|
|
53
|
+
Git.clone('https://github.com/puppetlabs/puppetlabs-motd.git', remote_testing_repo) unless Dir.exist?(File.join(remote_testing_repo, '.git'))
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
def destroy_fake_modules
|
data/spec/utils_spec.rb
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
require 'pdksync/utils'
|
|
3
3
|
require 'tempfile'
|
|
4
|
+
|
|
4
5
|
describe 'PdkSync::Utils' do
|
|
5
6
|
before(:all) do
|
|
6
7
|
@tmp_dir = Dir.mktmpdir('testing')
|
|
@@ -11,7 +12,7 @@ describe 'PdkSync::Utils' do
|
|
|
11
12
|
Git.open(@tmp_dir)
|
|
12
13
|
rescue ArgumentError
|
|
13
14
|
PdkSync::Utils.clone_directory('puppetlabs',
|
|
14
|
-
'puppetlabs-
|
|
15
|
+
'puppetlabs-motd', @tmp_dir)
|
|
15
16
|
end
|
|
16
17
|
end
|
|
17
18
|
|
|
@@ -21,6 +22,8 @@ describe 'PdkSync::Utils' do
|
|
|
21
22
|
|
|
22
23
|
before(:each) do
|
|
23
24
|
cloned_module
|
|
25
|
+
cloned_module.config('user.name', 'puppetlabs')
|
|
26
|
+
cloned_module.config('user.email', 'email@email.com')
|
|
24
27
|
end
|
|
25
28
|
|
|
26
29
|
after(:all) do
|
|
@@ -30,14 +33,14 @@ describe 'PdkSync::Utils' do
|
|
|
30
33
|
it '#self.clone_directory' do
|
|
31
34
|
Dir.mktmpdir do |dir|
|
|
32
35
|
PdkSync::Utils.clone_directory('puppetlabs',
|
|
33
|
-
'puppetlabs-
|
|
36
|
+
'puppetlabs-motd', dir)
|
|
34
37
|
expect(cloned_module).to be_a Git::Base
|
|
35
38
|
end
|
|
36
39
|
end
|
|
37
40
|
|
|
38
41
|
it '#self.create_commit' do
|
|
39
42
|
File.write(File.join(@tmp_dir, 'README.md'), rand(32_332))
|
|
40
|
-
expect(PdkSync::Utils.create_commit(cloned_module, 'main', 'boom')).to match(%r{
|
|
43
|
+
expect(PdkSync::Utils.create_commit(cloned_module, 'main', 'boom')).to match(%r{1 file changed})
|
|
41
44
|
end
|
|
42
45
|
|
|
43
46
|
it '#self.run_command' do
|
|
@@ -49,13 +52,13 @@ describe 'PdkSync::Utils' do
|
|
|
49
52
|
end
|
|
50
53
|
|
|
51
54
|
it '#self.return_template_ref' do
|
|
52
|
-
expect(PdkSync::Utils.return_template_ref(metadata_file)).to match(%r{
|
|
55
|
+
expect(PdkSync::Utils.return_template_ref(metadata_file)).to match(%r{heads/main-0-|tags/})
|
|
53
56
|
end
|
|
54
57
|
|
|
55
58
|
it '#self.module_templates_url' do
|
|
56
59
|
allow(Octokit).to receive(:tags).with('puppetlabs/pdk').and_return([{ name: 'v1.14.1' }])
|
|
57
60
|
url, version = PdkSync::Utils.module_templates_url(metadata_file).split('#')
|
|
58
|
-
expect(url).to eq('https://github.com/puppetlabs/pdk-templates')
|
|
61
|
+
expect(url).to eq('https://github.com/puppetlabs/pdk-templates.git')
|
|
59
62
|
expect(version).to match(%r{main})
|
|
60
63
|
end
|
|
61
64
|
|
|
@@ -107,22 +110,22 @@ describe 'PdkSync::Utils' do
|
|
|
107
110
|
it '#self.setup_client' do
|
|
108
111
|
g = double(PdkSync::GitPlatformClient)
|
|
109
112
|
expect(PdkSync::GitPlatformClient).to receive(:new).with(:github,
|
|
110
|
-
access_token: 'github-token',
|
|
113
|
+
{access_token: 'github-token',
|
|
111
114
|
api_endpoint: nil,
|
|
112
|
-
gitlab_api_endpoint: 'https://gitlab.com/api/v4').and_return(g)
|
|
115
|
+
gitlab_api_endpoint: 'https://gitlab.com/api/v4'}).and_return(g)
|
|
113
116
|
expect(PdkSync::Utils.setup_client).to eq(g)
|
|
114
117
|
end
|
|
115
118
|
|
|
116
119
|
it '#self.return_modules' do
|
|
117
120
|
allow_any_instance_of(PdkSync::Configuration).to receive(:managed_modules).and_return(File.join(fixtures_dir, 'fake_managed_modules.yaml'))
|
|
118
|
-
expect(PdkSync::Utils.return_modules).to eq(['puppetlabs/puppetlabs-
|
|
121
|
+
expect(PdkSync::Utils.return_modules).to eq(['puppetlabs/puppetlabs-motd'])
|
|
119
122
|
end
|
|
120
123
|
|
|
121
124
|
it '#self.validate_modules_exist' do
|
|
122
125
|
client = double
|
|
123
126
|
allow_any_instance_of(PdkSync::Configuration).to receive(:managed_modules).and_return(File.join(fixtures_dir, 'fake_managed_modules.yaml'))
|
|
124
|
-
allow(client).to receive(:repository?).with('puppetlabs/puppetlabs-
|
|
125
|
-
expect(PdkSync::Utils.validate_modules_exist(client, ['puppetlabs-
|
|
127
|
+
allow(client).to receive(:repository?).with('puppetlabs/puppetlabs-motd').and_return(true)
|
|
128
|
+
expect(PdkSync::Utils.validate_modules_exist(client, ['puppetlabs-motd'])).to be true
|
|
126
129
|
end
|
|
127
130
|
|
|
128
131
|
it '#self.create_filespace_gem' do
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pdksync
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.8.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-07-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -178,20 +178,6 @@ dependencies:
|
|
|
178
178
|
- - ">="
|
|
179
179
|
- !ruby/object:Gem::Version
|
|
180
180
|
version: '0'
|
|
181
|
-
- !ruby/object:Gem::Dependency
|
|
182
|
-
name: colorize
|
|
183
|
-
requirement: !ruby/object:Gem::Requirement
|
|
184
|
-
requirements:
|
|
185
|
-
- - ">="
|
|
186
|
-
- !ruby/object:Gem::Version
|
|
187
|
-
version: '0'
|
|
188
|
-
type: :runtime
|
|
189
|
-
prerelease: false
|
|
190
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
191
|
-
requirements:
|
|
192
|
-
- - ">="
|
|
193
|
-
- !ruby/object:Gem::Version
|
|
194
|
-
version: '0'
|
|
195
181
|
- !ruby/object:Gem::Dependency
|
|
196
182
|
name: jenkins_api_client
|
|
197
183
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -213,11 +199,17 @@ executables: []
|
|
|
213
199
|
extensions: []
|
|
214
200
|
extra_rdoc_files: []
|
|
215
201
|
files:
|
|
202
|
+
- ".github/pull_request_template.md"
|
|
203
|
+
- ".github/workflows/ci.yml"
|
|
204
|
+
- ".github/workflows/labeller.yml"
|
|
205
|
+
- ".github/workflows/mend.yml"
|
|
206
|
+
- ".github/workflows/nightly.yml"
|
|
207
|
+
- ".github/workflows/release.yml"
|
|
208
|
+
- ".github/workflows/release_prep.yml"
|
|
216
209
|
- ".gitignore"
|
|
217
210
|
- ".rspec"
|
|
218
211
|
- ".rubocop.yml"
|
|
219
212
|
- ".rubocop_todo.yml"
|
|
220
|
-
- ".travis.yml"
|
|
221
213
|
- CHANGELOG.md
|
|
222
214
|
- CODEOWNERS
|
|
223
215
|
- Gemfile
|
|
@@ -235,6 +227,7 @@ files:
|
|
|
235
227
|
- lib/pdksync/pullrequest.rb
|
|
236
228
|
- lib/pdksync/rake_tasks.rb
|
|
237
229
|
- lib/pdksync/utils.rb
|
|
230
|
+
- lib/pdksync/version.rb
|
|
238
231
|
- managed_modules.yml
|
|
239
232
|
- pdksync.gemspec
|
|
240
233
|
- spec/configuration_spec.rb
|
|
@@ -248,7 +241,7 @@ homepage: http://github.com/puppetlabs/pdksync
|
|
|
248
241
|
licenses:
|
|
249
242
|
- Apache-2.0
|
|
250
243
|
metadata: {}
|
|
251
|
-
post_install_message:
|
|
244
|
+
post_install_message:
|
|
252
245
|
rdoc_options: []
|
|
253
246
|
require_paths:
|
|
254
247
|
- lib
|
|
@@ -256,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
256
249
|
requirements:
|
|
257
250
|
- - ">="
|
|
258
251
|
- !ruby/object:Gem::Version
|
|
259
|
-
version: 2.
|
|
252
|
+
version: '2.7'
|
|
260
253
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
261
254
|
requirements:
|
|
262
255
|
- - ">="
|
|
@@ -264,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
264
257
|
version: '0'
|
|
265
258
|
requirements: []
|
|
266
259
|
rubygems_version: 3.1.6
|
|
267
|
-
signing_key:
|
|
260
|
+
signing_key:
|
|
268
261
|
specification_version: 4
|
|
269
262
|
summary: Puppet Module PDK Synchronizer
|
|
270
263
|
test_files:
|
data/.travis.yml
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
---
|
|
2
|
-
os: linux
|
|
3
|
-
dist: xenial
|
|
4
|
-
language: ruby
|
|
5
|
-
cache: bundler
|
|
6
|
-
before_install:
|
|
7
|
-
- bundle -v
|
|
8
|
-
script:
|
|
9
|
-
- SIMPLECOV=yes bundle exec $CHECK
|
|
10
|
-
jobs:
|
|
11
|
-
fast_finish: true
|
|
12
|
-
include:
|
|
13
|
-
- env: CHECK='rubocop'
|
|
14
|
-
rvm: 2.5
|
|
15
|
-
- env: CHECK='rspec spec'
|
|
16
|
-
rvm: 2.4
|
|
17
|
-
- env: CHECK='rspec spec'
|
|
18
|
-
rvm: 2.5
|
|
19
|
-
- env: CHECK='rspec spec'
|
|
20
|
-
rvm: 2.7
|
|
21
|
-
branches:
|
|
22
|
-
only:
|
|
23
|
-
- main
|
|
24
|
-
- "/^v\\d/"
|
|
25
|
-
- release
|
|
26
|
-
env:
|
|
27
|
-
global:
|
|
28
|
-
secure: Hk8cxtIHM6kyRBSmcWWUSXUV50E/yo3MGJf3mPphb3ORUfzqjB8FGZLSn1VCIP81y++U6pZAg8/AkvcDNME0at1wWh/ONiOwYKxAyyVfr0/5/i7a+dIj/9MX2kUT6MBKZXipbln/u5brdwBAHJccFHz7doq30Nd108KE5ucqf0ZbptJyDbpsrIturK9Hx+mde9sYd6MyNlzGJkQOhSL22Zd+ppBSf/GDpk2+yWN171oGwHDPWPE47q4nkIrWjnWy0kLCqxoM0zHIPxPES6lhudso4ofbumnRiHcr7DldReC8Rq1CUe/fhG7udGEdPN26JAREyUeD8MOwo2uQohQluHvjOMx9leF7Sbu+tk5E2bqVz5ofm0bksZUIBahUtGP+REvwVruFOH8RsvO3pQBndDKG11691UY55L9qZNaQ82cNOWbfG1nNuglH0GIpJgdhjvWuGw1he4c18u1fgQGM01xO7JEDIpYHrrjBboD3mL/iXMmvxwg35eIrlkfdgl9DTBWqKOoLi79WpkDajI+2B/ABXW4L/WKWlM041UjAs5/r3jgkbcZz1nZVbU4Wa5r/6RvIfrM/FXnaGuZcwx7VdPBmfyhV4rgM4siyJDdhqudTRsq1+Al9q3MhZcyKQLmad8ShEx+dfG9WRBoayE+piD/9xkfriqdMk5YEjH02grE=
|