r10k 2.3.1 → 2.4.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gettext-setup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +181,7 @@ files:
 - Gemfile
 - LICENSE
 - README.mkd
+- Rakefile
 - bin/r10k
 - doc/common-patterns.mkd
 - doc/dynamic-environments.mkd
@@ -171,6 +200,7 @@ files:
 - doc/updating-your-puppetfile.mkd
 - integration/Gemfile
 - integration/README.mkd
+- integration/Rakefile
 - integration/configs/README.mkd
 - integration/configs/pe/centos-5-64mda
 - integration/configs/pe/centos-6-64mda
@@ -213,22 +243,6 @@ files:
 - integration/scripts/setup_r10k_env_ubuntu1004.sh
 - integration/scripts/setup_r10k_env_ubuntu1204.sh
 - integration/scripts/setup_r10k_env_ubuntu1404.sh
-- integration/test_run_scripts/README.mkd
-- integration/test_run_scripts/all_tests-rugged-pe-centos6.sh
-- integration/test_run_scripts/all_tests-rugged-pe-rhel7.sh
-- integration/test_run_scripts/all_tests-rugged-pe-sles11.sh
-- integration/test_run_scripts/all_tests-rugged-pe-ubuntu1204.sh
-- integration/test_run_scripts/all_tests-rugged-pe-ubuntu1404.sh
-- integration/test_run_scripts/all_tests-shellgit-pe-centos6.sh
-- integration/test_run_scripts/all_tests-shellgit-pe-rhel7.sh
-- integration/test_run_scripts/all_tests-shellgit-pe-sles11.sh
-- integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1204.sh
-- integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1404.sh
-- integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh
-- integration/test_run_scripts/command_line/all_tests-pe-centos6.sh
-- integration/test_run_scripts/git_source/all_tests-pe-centos6.sh
-- integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh
-- integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh
 - integration/tests/Puppetfile/HTTPS_PROXY_effects_git_source.rb
 - integration/tests/Puppetfile/HTTP_PROXY_effects_forge_source.rb
 - integration/tests/README.mkd
@@ -256,6 +270,8 @@ files:
 - integration/tests/git_source/negative/neg_git_unauthorized_https.rb
 - integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb
 - integration/tests/git_source/negative/neg_git_unicode_branch.rb
+- integration/tests/purging/content_not_purged_at_root.rb
+- integration/tests/purging/default_purging.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb
 - integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb
@@ -392,6 +408,7 @@ files:
 - lib/r10k/util/subprocess/subprocess_error.rb
 - lib/r10k/util/symbolize_keys.rb
 - lib/r10k/version.rb
+- locales/config.yaml
 - r10k.gemspec
 - r10k.yaml.example
 - spec/fixtures/empty/.empty
@@ -402,6 +419,14 @@ files:
 - spec/fixtures/unit/puppetfile/argument-error/Puppetfile
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile
+- spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
+- spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
+- spec/fixtures/unit/util/purgeable/managed_one/expected_1
+- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
+- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
+- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
+- spec/fixtures/unit/util/purgeable/managed_two/expected_2
+- spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2
 - spec/fixtures/unit/util/subprocess/runner/no-execute.sh
 - spec/integration/git/rugged/bare_repository_spec.rb
 - spec/integration/git/rugged/thin_repository_spec.rb
@@ -483,6 +508,7 @@ files:
 - spec/unit/util/attempt_spec.rb
 - spec/unit/util/commands_spec.rb
 - spec/unit/util/exec_env_spec.rb
+- spec/unit/util/purgeable_spec.rb
 - spec/unit/util/setopts_spec.rb
 - spec/unit/util/subprocess/result_spec.rb
 - spec/unit/util/subprocess/runner/posix_spec.rb
@@ -516,3 +542,4 @@ signing_key:
 specification_version: 4
 summary: Puppet environment and module deployment
 test_files: []
+has_rdoc: 

data/integration/test_run_scripts/README.mkd

@@ -1,5 +0,0 @@
-Test Run Scripts
-===========================
-
-This folder contains shell scripts for running automated tests locally on your personal machine. The scripts are
-organized by test suite.

data/integration/test_run_scripts/all_tests-rugged-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=rugged
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-rugged-pe-rhel7.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=rugged
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/redhat-7-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-rugged-pe-sles11.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=rugged
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/sles-11-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1204.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=rugged
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/ubuntu-1204-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1404.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=rugged
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/ubuntu-1404-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-shellgit-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-shellgit-pe-rhel7.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/redhat-7-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-shellgit-pe-sles11.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/sles-11-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1204.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/ubuntu-1204-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1404.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/ubuntu-1404-64mda \
-  --debug \
-  --tests tests \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "basic_functionality" ]; then
-  cd ../../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests/basic_functionality \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/command_line/all_tests-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "command_line" ]; then
-  cd ../../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests/command_line \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/git_source/all_tests-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "git_source" ]; then
-  cd ../../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests/git_source \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib

data/integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "basic_workflow" ]; then
-  cd ../../../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
-export GIT_PROVIDER=shellgit
-
-beaker \
-  --preserve-hosts onfail \
-  --config configs/pe/centos-6-64mda \
-  --debug \
-  --tests tests/user_scenario/basic_workflow \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib