r10k 3.8.0 → 3.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/docker.yml +4 -1
  3. data/.github/workflows/release.yml +3 -2
  4. data/.github/workflows/rspec_tests.yml +1 -1
  5. data/.travis.yml +8 -1
  6. data/CHANGELOG.mkd +10 -0
  7. data/CODEOWNERS +1 -1
  8. data/doc/common-patterns.mkd +1 -0
  9. data/doc/dynamic-environments/configuration.mkd +90 -43
  10. data/doc/dynamic-environments/usage.mkd +7 -7
  11. data/doc/puppetfile.mkd +23 -3
  12. data/docker/Gemfile +1 -1
  13. data/docker/Makefile +4 -3
  14. data/docker/docker-compose.yml +18 -0
  15. data/docker/r10k/Dockerfile +1 -1
  16. data/docker/r10k/docker-entrypoint.sh +0 -1
  17. data/docker/r10k/release.Dockerfile +1 -1
  18. data/docker/spec/dockerfile_spec.rb +26 -32
  19. data/integration/tests/git_source/git_source_repeated_remote.rb +2 -2
  20. data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb +2 -1
  21. data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb +2 -1
  22. data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb +1 -1
  23. data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb +2 -1
  24. data/lib/r10k/action/deploy/display.rb +9 -3
  25. data/lib/r10k/action/deploy/environment.rb +36 -14
  26. data/lib/r10k/cli/deploy.rb +5 -3
  27. data/lib/r10k/environment/base.rb +1 -1
  28. data/lib/r10k/environment/git.rb +17 -2
  29. data/lib/r10k/environment/name.rb +22 -4
  30. data/lib/r10k/environment/svn.rb +11 -2
  31. data/lib/r10k/environment/with_modules.rb +1 -1
  32. data/lib/r10k/git/rugged/credentials.rb +22 -15
  33. data/lib/r10k/module/forge.rb +15 -3
  34. data/lib/r10k/module/git.rb +24 -23
  35. data/lib/r10k/module/local.rb +1 -1
  36. data/lib/r10k/module/svn.rb +14 -11
  37. data/lib/r10k/settings.rb +6 -1
  38. data/lib/r10k/source/base.rb +5 -0
  39. data/lib/r10k/source/git.rb +4 -1
  40. data/lib/r10k/source/hash.rb +4 -2
  41. data/lib/r10k/source/svn.rb +5 -1
  42. data/lib/r10k/util/setopts.rb +33 -12
  43. data/lib/r10k/version.rb +1 -1
  44. data/locales/r10k.pot +22 -18
  45. data/r10k.gemspec +1 -1
  46. data/spec/unit/action/deploy/display_spec.rb +4 -0
  47. data/spec/unit/action/deploy/environment_spec.rb +111 -10
  48. data/spec/unit/environment/git_spec.rb +16 -0
  49. data/spec/unit/environment/name_spec.rb +28 -0
  50. data/spec/unit/environment/svn_spec.rb +12 -0
  51. data/spec/unit/git/rugged/credentials_spec.rb +10 -0
  52. data/spec/unit/module/forge_spec.rb +6 -0
  53. data/spec/unit/module/git_spec.rb +1 -1
  54. data/spec/unit/module_spec.rb +59 -9
  55. data/spec/unit/util/setopts_spec.rb +25 -1
  56. metadata +5 -11
  57. data/azure-pipelines.yml +0 -87
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.8.0
4
+ version: 3.9.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: 2021-02-16 00:00:00.000000000 Z
11
+ date: 2021-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: colored2
@@ -28,22 +28,16 @@ dependencies:
28
28
  name: cri
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - '='
32
32
  - !ruby/object:Gem::Version
33
33
  version: 2.15.10
34
- - - "<"
35
- - !ruby/object:Gem::Version
36
- version: 3.0.0
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
40
37
  requirements:
41
- - - ">="
38
+ - - '='
42
39
  - !ruby/object:Gem::Version
43
40
  version: 2.15.10
44
- - - "<"
45
- - !ruby/object:Gem::Version
46
- version: 3.0.0
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: log4r
49
43
  requirement: !ruby/object:Gem::Requirement
@@ -214,7 +208,6 @@ files:
214
208
  - LICENSE
215
209
  - README.mkd
216
210
  - Rakefile
217
- - azure-pipelines.yml
218
211
  - bin/r10k
219
212
  - doc/common-patterns.mkd
220
213
  - doc/dynamic-environments.mkd
@@ -236,6 +229,7 @@ files:
236
229
  - docker/Gemfile
237
230
  - docker/Makefile
238
231
  - docker/README.md
232
+ - docker/docker-compose.yml
239
233
  - docker/r10k/Dockerfile
240
234
  - docker/r10k/adduser.sh
241
235
  - docker/r10k/docker-entrypoint.d/10-analytics.sh
data/azure-pipelines.yml DELETED
@@ -1,87 +0,0 @@
1
- # Don't run Azure when a branch is updated, only when a PR is updated.
2
- # Prevents double builds when a PR is made from the main repo and not a fork.
3
- trigger: none
4
- pr:
5
- autoCancel: true
6
- branches:
7
- include:
8
- - '*'
9
-
10
- pool:
11
- # self-hosted agent on Windows 10 1903 environment
12
- # includes newer Docker engine with LCOW enabled, new build of LCOW image
13
- # includes Ruby 2.5, Go 1.10, Node.js 10.10
14
- name: Default
15
-
16
- variables:
17
- NAMESPACE: puppet
18
- CONTAINER_NAME: r10k
19
- CONTAINER_BUILD_PATH: .
20
- LINT_IGNORES:
21
- DOCKER_BUILDKIT: 1
22
- BUILD_OPTIONS: --build-arg alpine_version=3.9
23
-
24
- workspace:
25
- clean: resources
26
-
27
- steps:
28
- - checkout: self # self represents the repo where the initial Pipelines YAML file was found
29
- clean: true # whether to fetch clean each time
30
-
31
- - powershell: |
32
- $gemfile = Join-Path -Path (Get-Location) -ChildPath 'docker/Gemfile'
33
- $gempath = Join-Path -Path (Get-Location) -ChildPath 'docker/.bundle/gems'
34
- bundle config --local gemfile $gemfile
35
- bundle config --local path $gempath
36
- bundle install --with test
37
- displayName: Fetch Dependencies
38
- timeoutInMinutes: 1
39
- name: fetch_deps
40
-
41
- - powershell: |
42
- . "$(bundle show pupperware)/ci/build.ps1"
43
- Write-HostDiagnostics
44
- displayName: Diagnostic Host Information
45
- timeoutInMinutes: 2
46
- name: hostinfo
47
-
48
- - powershell: |
49
- . "$(bundle show pupperware)/ci/build.ps1"
50
- Lint-Dockerfile -Name $ENV:CONTAINER_NAME -Ignore ($ENV:LINT_IGNORES -split ' ')
51
- displayName: Lint $(CONTAINER_NAME) Dockerfile
52
- timeoutInMinutes: 1
53
- name: lint_dockerfile
54
-
55
- - powershell: |
56
- . "$(bundle show pupperware)/ci/build.ps1"
57
- Build-Container -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE -PathOrUri $ENV:CONTAINER_BUILD_PATH -AdditionalOptions ($ENV:BUILD_OPTIONS -split ' ')
58
- displayName: Build $(CONTAINER_NAME) Container
59
- timeoutInMinutes: 5
60
- name: build_container
61
-
62
- - powershell: |
63
- . "$(bundle show pupperware)/ci/build.ps1"
64
- Initialize-TestEnv
65
- displayName: Prepare Test Environment
66
- name: test_prepare
67
-
68
- - powershell: |
69
- . "$(bundle show pupperware)/ci/build.ps1"
70
- Invoke-ContainerTest -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE
71
- displayName: Test $(CONTAINER_NAME)
72
- timeoutInMinutes: 5
73
- name: test_container
74
-
75
- - task: PublishTestResults@2
76
- displayName: Publish $(CONTAINER_NAME) test results
77
- inputs:
78
- testResultsFormat: 'JUnit'
79
- testResultsFiles: 'docker/TEST-*.xml'
80
- testRunTitle: $(CONTAINER_NAME) Test Results
81
-
82
- - powershell: |
83
- . "$(bundle show pupperware)/ci/build.ps1"
84
- Clear-BuildState -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE
85
- displayName: Container Cleanup
86
- timeoutInMinutes: 4
87
- condition: always()