r10k 3.10.0 → 3.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (93) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +0 -10
  3. data/CHANGELOG.mkd +33 -0
  4. data/README.mkd +6 -0
  5. data/doc/dynamic-environments/configuration.mkd +25 -7
  6. data/doc/dynamic-environments/usage.mkd +26 -0
  7. data/doc/puppetfile.mkd +18 -5
  8. data/integration/Rakefile +2 -0
  9. data/integration/tests/basic_functionality/basic_deployment.rb +176 -0
  10. data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb +15 -13
  11. data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb +3 -3
  12. data/integration/tests/user_scenario/complex_workflow/multi_env_remove_re-add.rb +3 -3
  13. data/integration/tests/user_scenario/complex_workflow/multi_env_unamanaged.rb +3 -3
  14. data/lib/r10k/action/base.rb +1 -1
  15. data/lib/r10k/action/deploy/deploy_helpers.rb +4 -0
  16. data/lib/r10k/action/deploy/display.rb +1 -1
  17. data/lib/r10k/action/deploy/environment.rb +19 -9
  18. data/lib/r10k/action/deploy/module.rb +41 -11
  19. data/lib/r10k/action/puppetfile/check.rb +7 -5
  20. data/lib/r10k/action/puppetfile/install.rb +22 -16
  21. data/lib/r10k/action/puppetfile/purge.rb +12 -9
  22. data/lib/r10k/action/runner.rb +40 -4
  23. data/lib/r10k/action/visitor.rb +3 -0
  24. data/lib/r10k/cli/deploy.rb +5 -0
  25. data/lib/r10k/cli/puppetfile.rb +0 -1
  26. data/lib/r10k/content_synchronizer.rb +16 -4
  27. data/lib/r10k/environment/bare.rb +4 -7
  28. data/lib/r10k/environment/base.rb +64 -11
  29. data/lib/r10k/environment/plain.rb +16 -0
  30. data/lib/r10k/environment/with_modules.rb +6 -10
  31. data/lib/r10k/environment.rb +1 -0
  32. data/lib/r10k/errors.rb +5 -0
  33. data/lib/r10k/git/rugged/credentials.rb +77 -0
  34. data/lib/r10k/git/stateful_repository.rb +8 -0
  35. data/lib/r10k/git.rb +3 -0
  36. data/lib/r10k/initializers.rb +14 -7
  37. data/lib/r10k/logging.rb +78 -1
  38. data/lib/r10k/module/base.rb +42 -1
  39. data/lib/r10k/module/definition.rb +64 -0
  40. data/lib/r10k/module/forge.rb +11 -2
  41. data/lib/r10k/module/git.rb +23 -1
  42. data/lib/r10k/module/local.rb +6 -3
  43. data/lib/r10k/module/svn.rb +11 -0
  44. data/lib/r10k/module.rb +20 -2
  45. data/lib/r10k/module_loader/puppetfile/dsl.rb +8 -3
  46. data/lib/r10k/module_loader/puppetfile.rb +109 -28
  47. data/lib/r10k/puppetfile.rb +11 -13
  48. data/lib/r10k/settings/definition.rb +1 -1
  49. data/lib/r10k/settings.rb +89 -1
  50. data/lib/r10k/source/yaml.rb +1 -1
  51. data/lib/r10k/util/purgeable.rb +6 -2
  52. data/lib/r10k/util/setopts.rb +2 -0
  53. data/lib/r10k/util/subprocess.rb +1 -0
  54. data/lib/r10k/version.rb +1 -1
  55. data/locales/r10k.pot +168 -68
  56. data/r10k.gemspec +2 -0
  57. data/r10k.yaml.example +28 -0
  58. data/spec/fixtures/unit/action/r10k_logging.yaml +12 -0
  59. data/spec/fixtures/unit/puppetfile/forge-override/Puppetfile +8 -0
  60. data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile +10 -0
  61. data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new +10 -0
  62. data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file +1 -0
  63. data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/{managed_subdir_2 → subdir_allowlisted_2}/ignored_1 +0 -0
  64. data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir +1 -0
  65. data/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir +1 -0
  66. data/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file +1 -0
  67. data/spec/integration/util/purageable_spec.rb +41 -0
  68. data/spec/r10k-mocks/mock_env.rb +3 -0
  69. data/spec/r10k-mocks/mock_source.rb +7 -3
  70. data/spec/unit/action/deploy/environment_spec.rb +96 -30
  71. data/spec/unit/action/deploy/module_spec.rb +217 -51
  72. data/spec/unit/action/puppetfile/check_spec.rb +17 -5
  73. data/spec/unit/action/puppetfile/install_spec.rb +42 -36
  74. data/spec/unit/action/puppetfile/purge_spec.rb +15 -17
  75. data/spec/unit/action/runner_spec.rb +132 -9
  76. data/spec/unit/environment/bare_spec.rb +13 -0
  77. data/spec/unit/environment/base_spec.rb +30 -17
  78. data/spec/unit/environment/git_spec.rb +2 -2
  79. data/spec/unit/environment/plain_spec.rb +8 -0
  80. data/spec/unit/environment/svn_spec.rb +4 -3
  81. data/spec/unit/environment/with_modules_spec.rb +3 -2
  82. data/spec/unit/git/rugged/credentials_spec.rb +29 -0
  83. data/spec/unit/git/stateful_repository_spec.rb +5 -0
  84. data/spec/unit/module/base_spec.rb +54 -8
  85. data/spec/unit/module/forge_spec.rb +51 -4
  86. data/spec/unit/module/git_spec.rb +67 -9
  87. data/spec/unit/module/svn_spec.rb +35 -5
  88. data/spec/unit/module_loader/puppetfile_spec.rb +108 -33
  89. data/spec/unit/module_spec.rb +12 -1
  90. data/spec/unit/puppetfile_spec.rb +33 -3
  91. data/spec/unit/settings_spec.rb +43 -2
  92. data/spec/unit/util/purgeable_spec.rb +22 -11
  93. metadata +31 -3
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.10.0
4
+ version: 3.13.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-07-15 00:00:00.000000000 Z
11
+ date: 2021-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: colored2
@@ -128,6 +128,20 @@ dependencies:
128
128
  - - "<"
129
129
  - !ruby/object:Gem::Version
130
130
  version: 3.3.0
131
+ - !ruby/object:Gem::Dependency
132
+ name: jwt
133
+ requirement: !ruby/object:Gem::Requirement
134
+ requirements:
135
+ - - "~>"
136
+ - !ruby/object:Gem::Version
137
+ version: 2.2.3
138
+ type: :runtime
139
+ prerelease: false
140
+ version_requirements: !ruby/object:Gem::Requirement
141
+ requirements:
142
+ - - "~>"
143
+ - !ruby/object:Gem::Version
144
+ version: 2.2.3
131
145
  - !ruby/object:Gem::Dependency
132
146
  name: rspec
133
147
  requirement: !ruby/object:Gem::Requirement
@@ -263,6 +277,7 @@ files:
263
277
  - integration/tests/Puppetfile/HTTP_PROXY_affects_forge_source.rb
264
278
  - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
265
279
  - integration/tests/README.mkd
280
+ - integration/tests/basic_functionality/basic_deployment.rb
266
281
  - integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
267
282
  - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
268
283
  - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
@@ -355,6 +370,7 @@ files:
355
370
  - lib/r10k/environment/base.rb
356
371
  - lib/r10k/environment/git.rb
357
372
  - lib/r10k/environment/name.rb
373
+ - lib/r10k/environment/plain.rb
358
374
  - lib/r10k/environment/svn.rb
359
375
  - lib/r10k/environment/with_modules.rb
360
376
  - lib/r10k/errors.rb
@@ -388,6 +404,7 @@ files:
388
404
  - lib/r10k/logging/terminaloutputter.rb
389
405
  - lib/r10k/module.rb
390
406
  - lib/r10k/module/base.rb
407
+ - lib/r10k/module/definition.rb
391
408
  - lib/r10k/module/forge.rb
392
409
  - lib/r10k/module/git.rb
393
410
  - lib/r10k/module/local.rb
@@ -451,20 +468,28 @@ files:
451
468
  - spec/fixtures/unit/action/r10k_forge_auth.yaml
452
469
  - spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml
453
470
  - spec/fixtures/unit/action/r10k_generate_types.yaml
471
+ - spec/fixtures/unit/action/r10k_logging.yaml
454
472
  - spec/fixtures/unit/action/r10k_puppet_path.yaml
455
473
  - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
456
474
  - spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
457
475
  - spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile
476
+ - spec/fixtures/unit/puppetfile/forge-override/Puppetfile
458
477
  - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
459
478
  - spec/fixtures/unit/puppetfile/load-error/Puppetfile
460
479
  - spec/fixtures/unit/puppetfile/name-error/Puppetfile
461
480
  - spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
462
481
  - spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
482
+ - spec/fixtures/unit/puppetfile/various-modules/Puppetfile
483
+ - spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
463
484
  - spec/fixtures/unit/util/purgeable/managed_one/expected_1
464
- - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_subdir_2/ignored_1
485
+ - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
486
+ - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
465
487
  - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
466
488
  - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
489
+ - spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir
490
+ - spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
467
491
  - spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
492
+ - spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
468
493
  - spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3
469
494
  - spec/fixtures/unit/util/purgeable/managed_two/expected_2
470
495
  - spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2
@@ -476,6 +501,7 @@ files:
476
501
  - spec/integration/git/shellgit/thin_repository_spec.rb
477
502
  - spec/integration/git/shellgit/working_repository_spec.rb
478
503
  - spec/integration/git/stateful_repository_spec.rb
504
+ - spec/integration/util/purageable_spec.rb
479
505
  - spec/matchers/exit_with.rb
480
506
  - spec/matchers/match_realpath.rb
481
507
  - spec/r10k-mocks.rb
@@ -506,9 +532,11 @@ files:
506
532
  - spec/unit/cli_spec.rb
507
533
  - spec/unit/deployment/config_spec.rb
508
534
  - spec/unit/deployment_spec.rb
535
+ - spec/unit/environment/bare_spec.rb
509
536
  - spec/unit/environment/base_spec.rb
510
537
  - spec/unit/environment/git_spec.rb
511
538
  - spec/unit/environment/name_spec.rb
539
+ - spec/unit/environment/plain_spec.rb
512
540
  - spec/unit/environment/svn_spec.rb
513
541
  - spec/unit/environment/with_modules_spec.rb
514
542
  - spec/unit/errors/formatting_spec.rb