r10k 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32980c97963f0d5bb6515fcdd0482f19607bb7dd
-  data.tar.gz: a6797080cc3652fbcddf7a4b8433a9d8443d6fdd
+  metadata.gz: a32b4ab214210ba825f405bd3272d15693c253b7
+  data.tar.gz: 8a6ff6f3dc4ea0d1a1ad7d50bf23a2ead7a2d805
 SHA512:
-  metadata.gz: 65f2fd216db51e69dcbd799b707f25b96329de64679f598bdfdb35fa25762b65d35ee1e891086366f383a78174ec0e0c06ff2b1f30502dace98d923613bcfe86
-  data.tar.gz: c2ff647aa4e140eef64e49256a2812aee64a5293e8ed0a4bf40341d0efb109c4ab5a5382cce824e05fe2a8d65f2a5de97d6a08341855897eb59975c0136f1172
+  metadata.gz: c18d09be0beed3f7da6323fa76ceea9093bd69899664e617a4035a8c4de76b92f632ba94f1ab5edd6b17f9443ecbe5dcb71114b737b1213043e468c44d24c210
+  data.tar.gz: 604ded22aa744ebac83ef3d39991e84ced2c589627f05ae26bf9afe3ae92ecd58ac962d49a0b9efc96dbf43a8da1934155f2feb35dea9bb15917b66de1910af0

data/.travis.yml

@@ -8,7 +8,7 @@ notifications:
   email: false
 sudo: false
 jdk:
-    - oraclejdk8
+  - openjdk8
 before_install: gem install bundler -v '< 2' --no-document
 matrix:
   include:
@@ -23,17 +23,8 @@ matrix:
     - stage: r10k container tests
       language: ruby
       rvm: 2.5.5
-      env:
-        - DOCKER_COMPOSE_VERSION=1.24.0
       script:
         - |
           set -ex
-          sudo rm /usr/local/bin/docker-compose
-          curl --location https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname --kernel-name`-`uname --machine` > docker-compose 
-          chmod +x docker-compose
-          sudo mv docker-compose /usr/local/bin
-          cd docker
-          make lint
-          make build
-          make test
+          cd docker && make lint build test
           set +x

data/CHANGELOG.mkd

@@ -1,98 +1,122 @@
 CHANGELOG
 =========
 
+3.3.1
+-----
+
+### Changes
+
+  - Updated thread pool error handling and logging
+
 3.3.0
 -----
 
-## New Feature
+### New Feature
 
-Adds support for installing modules concurrently
+  - Adds support for installing modules concurrently
 
-## Bug Fixes
+### Bug Fixes
 
-(RK-343) Pins CRI dependency to 2.15.6 to resolve regression in options
+  - (RK-343) Pins CRI dependency to 2.15.6 to resolve regression in options
 parsing.
 
+3.2.1
+----
+
+### Changes
+
+  - Flag for overriding default branch configuration in Puppetfile
+  - Plumbing for internationalization
+  - Numerous test fixes and legacy docker work
+
 3.2.0
 -----
 
-## New Feature
+### Changes
 
-Add support for running `puppet generate types`
+  - Add support for running `puppet generate types`
 
 3.1.1
 -----
 
-## Bug Fixes
+### Changes
 
-(RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
+  - (RK-335) Postrun `modifiedenvs` doesn't include environment prefixes
 
 3.1.0
 -----
 
-## New Feature
+### Changes
+
+  - Substitute environments acted on in postrun command.
 
-Substitute environments acted on in postrun command.
+    Now post run commands that contain the string "$modifiedenvs"
+    (eg. ["/usr/local/bin/my-postrun-cmd", "--verbose", "$modifiedenvs"])
+    will have the string substituted with a space separated list
+    of environments acted upon (either a single environment if
+    specified on the command line or all environments).
 
-Now post run commands that contain the string "$modifiedenvs"
-(eg. ["/usr/local/bin/my-postrun-cmd", "--verbose", "$modifiedenvs"])
-will have the string substituted with a space separated list
-of environments acted upon (either a single environment if
-specified on the command line or all environments).
+    Specifically this should allow users to easily wrap
+    `puppet generate types` and matches the terminology used
+    in g10k.
 
-Specifically this should allow users to easily wrap
-`puppet generate types` and matches the terminology used
-in g10k.
+    Many thanks to @raphink for the contribution.
 
-Many thanks to @raphink for the contribution.
+3.0.4
+----
+
+### Changes
 
+ - Flag for overriding default branch configuration in Puppetfile
+ - Plumbing for internationalization
+ - Numerous test fixes and legacy docker work
 
 3.0.3
 ----
 
-## Bug Fixes
+### Changes
 
-(RK-324) Fix Ruby pipe bug affecting Ubuntu
+  - (RK-324) Fix Ruby pipe bug affecting Ubuntu
 
 3.0.2
 ----
 
-## Changes
+### Changes
 
-Minor test fixes.
+  - Minor test fixes.
 
 3.0.1
 ----
 
-## Changes
+### Changes
 
 Because of dependency issues R10K 3.0.0 required Ruby >= 2.3
 rather than the reported 2.0. This release makes the requirement of
 Ruby >= 2.3 official and documented.
 
-(#853) ([RK-327](https://tickets.puppetlabs.com/browse/RK-327) Uninitialized Constant Cri::Error
-  When resolving the Cri dependency >= 2.13 R10K would fail with an
-  uninitialized constant error. Thanks to @ostavnaas for the bug report,
-  @ddfreyne for the fix, and @baurmatt for the review.
+  - (#853) ([RK-327](https://tickets.puppetlabs.com/browse/RK-327) Uninitialized Constant Cri::Error
+    When resolving the Cri dependency >= 2.13 R10K would fail with an
+    uninitialized constant error. Thanks to @ostavnaas for the bug report,
+    @ddfreyne for the fix, and @baurmatt for the review.
 
 
 3.0.0
 ----
 
-## Changes
+### Changes
 
-### Known issues
+#### Known issues
   - Child processes may die unexpectedly when deploying many environments
     on Ubuntu Bionic. See
     [RK-324](https://tickets.puppetlabs.com/browse/RK-324).
 
-### Backwards breaking changes
+#### Backwards breaking changes
   - Drop support for Ruby < 2.0
   - Remove support for PUPPETFILE and PUPPETFILE_DIR environment variables
     when running the `puppetfile` action, please use flags instead.
   - Fail when duplicate module definitions in Puppetfile
 
-### Bug fixes
+#### Bug fixes
   - More reliable pruning of refs on fetch
   - Improved error messaging when:
     - Unable to connect to a proxy
@@ -100,24 +124,32 @@ Ruby >= 2.3 official and documented.
     - Unable to parse Puppetfile
   - Various perfomance improvements
 
+2.6.6
+----
+
+### Changes
+  - Flag for overriding default branch configuration in Puppetfile
+  - Plumbing for internationalization
+  - Numerous test fixes and legacy docker work
 
 2.6.5
 ----
 
-## Bug Fix
+### Bug Fix
 
 (RK-324) Fix Ruby pipe bug affecting Ubuntu
 
 2.6.4
 ----
 
-## Changes
+### Changes
 
 Numerous test fixes.
 
 2.6.3
 ----
-## Changes
+
+### Changes
 
 Update specs with new error string.
 
@@ -126,6 +158,7 @@ when a release is made on that branch.
 
 2.6.2
 -----
+
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

data/CODEOWNERS

@@ -0,0 +1 @@
+/docker/ @puppetlabs/pupperware

data/README.mkd

@@ -105,12 +105,6 @@ Getting help
   * Mailing lists: [puppet-users](https://groups.google.com/forum/#!forum/puppet-users)
   * Q&A: [Puppet Ask](https://ask.puppetlabs.com/questions/)
 
-
-More information
-----------------
-
-The original impetus for r10k is explained at http://somethingsinistral.net/blog/rethinking-puppet-deployment/
-
 Contributors
 ------------
 

data/azure-pipelines.yml

@@ -1,80 +1,80 @@
+# Don't run Azure when a branch is updated, only when a PR is updated.
+# Prevents double builds when a PR is made from the main repo and not a fork.
+trigger: none
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
+
 pool:
-  # self-hosted agent on Windows 10 1709 environment
+  # self-hosted agent on Windows 10 1903 environment
   # includes newer Docker engine with LCOW enabled, new build of LCOW image
-  # includes Ruby 2.5, Go 1.10, Node.js 10.10, hadolint
+  # includes Ruby 2.5, Go 1.10, Node.js 10.10
   name: Default
 
 variables:
   NAMESPACE: puppet
+  CONTAINER_NAME: r10k
+  CONTAINER_BUILD_PATH: .
+  LINT_IGNORES: DL3008 DL3018 DL4000 DL4001 DL3028
+
+workspace:
+  clean: resources
 
 steps:
-- checkout: self
-  clean: true
+- checkout: self  # self represents the repo where the initial Pipelines YAML file was found
+  clean: true  # whether to fetch clean each time
+
 - powershell: |
-    $line = '=' * 80
-    Write-Host "$line`nWindows`n$line`n"
-    Get-ComputerInfo |
-      select WindowsProductName, WindowsVersion, OsHardwareAbstractionLayer |
-      Out-String |
-      Write-Host
-    #
-    # Azure
-    #
-    $assetTag = Get-WmiObject -class Win32_SystemEnclosure -namespace root\CIMV2 |
-      Select -ExpandProperty SMBIOSAssetTag
-    if ($assetTag -eq '7783-7084-3265-9085-8269-3286-77')
-    {
-      Write-Host "`n`n$line`nAzure`n$line`n"
-      Invoke-RestMethod -Headers @{'Metadata'='true'} -URI http://169.254.169.254/metadata/instance?api-version=2017-12-01 -Method Get |
-        ConvertTo-Json -Depth 10 |
-        Write-Host
-    }
-    #
-    # Docker
-    #
-    Write-Host "`n`n$line`nDocker`n$line`n"
-    docker version
-    docker images
-    docker info
-    sc.exe qc docker
-    #
-    # Ruby
-    #
-    Write-Host "`n`n$line`nRuby`n$line`n"
-    ruby --version
-    gem --version
-    gem env
-    bundle --version
-    #
-    # Environment
-    #
-    Write-Host "`n`n$line`nEnvironment`n$line`n"
-    Get-ChildItem Env: | % { Write-Host "$($_.Key): $($_.Value)"  }
+    $gemfile = Join-Path -Path (Get-Location) -ChildPath 'docker/Gemfile'
+    $gempath = Join-Path -Path (Get-Location) -ChildPath 'docker/.bundle/gems'
+    bundle config --local gemfile $gemfile
+    bundle config --local path $gempath
+    bundle install
+  displayName: Fetch Dependencies
+  name: fetch_deps
+
+- powershell: |
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Write-HostDiagnostics
   displayName: Diagnostic Host Information
   name: hostinfo
+
 - powershell: |
-    . ./docker/ci/build.ps1
-    Lint-Dockerfile -Path ./docker/r10k/Dockerfile
-  displayName: Lint r10k Dockerfile
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Lint-Dockerfile -Name $ENV:CONTAINER_NAME -Ignore ($ENV:LINT_IGNORES -split ' ')
+  displayName: Lint $(CONTAINER_NAME) Dockerfile
   name: lint_dockerfile
+
+- powershell: |
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Build-Container -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE -PathOrUri $ENV:CONTAINER_BUILD_PATH
+  displayName: Build $(CONTAINER_NAME) Container
+  name: build_container
+
 - powershell: |
-    . ./docker/ci/build.ps1
-    Build-Container -Namespace $ENV:NAMESPACE
-  displayName: Build r10k Container
-  name: build_r10k_container
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Initialize-TestEnv
+  displayName: Prepare Test Environment
+  name: test_prepare
+
 - powershell: |
-    . ./docker/ci/build.ps1
-    Invoke-ContainerTest -Namespace $ENV:NAMESPACE
-  displayName: Test r10k
-  name: test_r10k
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Invoke-ContainerTest -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE
+  displayName: Test $(CONTAINER_NAME)
+  name: test_container
+
 - task: PublishTestResults@2
-  displayName: Publish r10k test results
+  displayName: Publish $(CONTAINER_NAME) test results
   inputs:
     testResultsFormat: 'JUnit'
     testResultsFiles: 'docker/TEST-*.xml'
-    testRunTitle: r10k Test Results
+    testRunTitle: $(CONTAINER_NAME) Test Results
+
 - powershell: |
-    . ./docker/ci/build.ps1
-    Clear-ContainerBuilds -Name r10k
+    . "$(bundle show pupperware)/ci/build.ps1"
+    Clear-BuildState -Name $ENV:CONTAINER_NAME -Namespace $ENV:NAMESPACE
   displayName: Container Cleanup
+  timeoutInMinutes: 3
   condition: always()

data/doc/dynamic-environments/usage.mkd

@@ -60,6 +60,18 @@ Update a single environment and force an update of modules:
 This will update the given environment and update all contained modules. This is
 useful if you want to make sure that a given environment is fully up to date.
 
+- - -
+
+Update a single environment and specify a default branch override:
+
+    r10k deploy environment my_working_environment --puppetfile --default-branch-override default_branch_override
+
+This will update the given environment and update all contained modules, overrideing 
+the :default_branch entry in the Puppetfile of each module. This is used primarily to allow
+automated r10k solutions using the control_branch pattern with a temporary branch deployment to 
+ensure the deployment is pushed to the correct module repository branch. Note that the :default_branch
+is only ever utilized if the desired ref cannot be located.
+
 ### Deploying modules
 
 Update a single module across all environments:

data/doc/faq.mkd

@@ -151,4 +151,9 @@ modulepath = internal-modules:modules
 
 #### What does the name mean?
 
-It's explained in [this blog post](http://somethingsinistral.net/blog/rethinking-puppet-deployment/#addendum).
+It’s called R10K because I’m terrible at names. When I started working on R10K
+I couldn’t come up with a decent name. While trying to come up with something
+clever, I recalled that Randall Munroe wrote a bot for [controlling IRC chatter](http://blog.xkcd.com/2008/01/14/robot9000-and-xkcd-signal-attacking-noise-in-chat/),
+and gave it the most generic name he could think of - Robot 9000. Since I just
+needed a name, any name, I decided to go with an equally generic name by
+incrementing the robot index.

data/docker/Gemfile

@@ -1,18 +1,8 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-def location_for(place, fake_version = nil)
-  if place =~ /^((?:git|https?)[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
+source "https://rubygems.org"
 
 gem 'rspec'
 gem 'rspec_junit_formatter'
 gem 'pupperware',
-  :git => 'https://github.com/puppetlabs/pupperware.git',
-  :ref => 'master',
-  :glob => 'gem/*.gemspec'
+    :git => 'https://github.com/puppetlabs/pupperware.git',
+    :branch => 'master',
+    :glob => 'gem/*.gemspec'