r10k 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6dfe2e3855040213486ec3ac3bf7bf6a9ea18b84
-  data.tar.gz: 139a09c327d96882971c78c6547aef55cce41ac4
+SHA256:
+  metadata.gz: ee2321098498b77bffaa8f677200b8018aafe342ed5662968dfdb02a02abcf23
+  data.tar.gz: 36335f878adfa601735d9955a9ad02ec599ac9c88962bad34dd8b15f6ab1afa9
 SHA512:
-  metadata.gz: 45038a55ecf4b3488e7ede4a027eb707ec63d50707c02bfdff703c305bbdad955875a9484f89082ef31f30f5cde27c24937bba92d8bca8e56610a1729c9e01f9
-  data.tar.gz: d2a82738b8a8d1f8b266c0f56b1a5b48bd0b3440fb336133b7795c260e049c838e4617967471f5a20892cbe5c010049c65dc26e6cacf3229d7f0678d0a320d26
+  metadata.gz: 0ab62dc0d0b640502071052d5c0d3528ce61ef85f803a5abe21c1f31708847eb8c26c70e7e31873541ad0740240468b4cd860c9335bf6bf66f31188f0f6d9752
+  data.tar.gz: 5e5bc2f3179172cb5d48a4c9f6f52594fb32131bc5b0ec63e176dde3c200e8948ce88622530ddbbefed9c6e0625dc310f9d77d2a3f7da96a7ed43394e5d672fb

data/.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Tag and release
+
+on:
+  push:
+    branches:
+      - master
+      - 2.6.x
+    paths:
+      - 'lib/r10k/version.rb'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@1.17.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
+          DEFAULT_BUMP: patch
+          WITH_V: false
+          # Uncomment this if the tag and version file become out-of-sync and
+          # you need to tag at a specific version.
+          # CUSTOM_TAG:
+      - name: Build gem
+        uses: scarhand/actions-ruby@master
+        with:
+          args: build *.gemspec
+      - name: Publish gem
+        uses: scarhand/actions-ruby@master
+        env:
+          RUBYGEMS_AUTH_TOKEN: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        with:
+          args: push *.gem
+

data/CHANGELOG.mkd

@@ -1,10 +1,26 @@
 CHANGELOG
 =========
 
+2.6.8
+----
+
+### Changes
+
+(RK-357) Restrict gettext and fast_gettext versions for compatibility with Ruby 2.4.
+(RK-358) Update puppet_forge to ~> 2.3.0.
+
+2.6.7
+----
+
+### Changes
+
+(CDPE-1813) Add module deploy info to .r10k-deploy.json.
+(RK-351) Update minitar to ~> 0.9.0.
+
 2.6.6
 ----
 
-## Changes
+### Changes
 
  - Flag for overriding default branch configuration in Puppetfile
  - Plumbing for internationalization
@@ -13,25 +29,27 @@ CHANGELOG
 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.
 
 2.6.2
 -----
+
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

data/CODEOWNERS

@@ -0,0 +1 @@
+* @puppetlabs/puppetserver-maintainers

data/integration/Rakefile

@@ -44,8 +44,8 @@ EOS
 
   t.add_env do |env|
     env.name = 'pe_dist_dir'
-    env.message = 'The location to download PE from example "http://enterprise.delivery.puppetlabs.net/20XX.X/ci-ready"'
-    ENV['pe_dist_dir'] ||= "http://enterprise.delivery.puppetlabs.net/#{ENV['PE_FAMILY']}/ci-ready"
+    env.message = 'The location to download PE from, for example "https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/20XX.X/ci-ready"'
+    ENV['pe_dist_dir'] ||= "https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/#{ENV['PE_FAMILY']}/ci-ready"
   end
 
   t.add_env do |env|

data/lib/r10k/version.rb

@@ -1,3 +1,6 @@
 module R10K
-  VERSION = '2.6.7'
+  # When updating to a new major (X) or minor (Y) version, include `#major` or
+  # `#minor` (respectively) in your commit message to trigger the appropriate
+  # release. Otherwise, a new patch (Z) version will be released.
+  VERSION = '2.6.8'
 end

data/r10k.gemspec

@@ -28,9 +28,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge', '~> 2.2.8'
+  s.add_dependency 'puppet_forge', '~> 2.3.0'
 
-  s.add_dependency 'gettext-setup', '~> 0.5'
+  s.add_dependency 'gettext-setup', '~>0.24'
+  # These two pins narrow what is allowed by gettext-setup,
+  # to preserver compatability with Ruby 2.4
+  s.add_dependency 'fast_gettext', '~> 1.1.0'
+  s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
 
   s.add_development_dependency 'rspec', '~> 3.1'
 

data/test

@@ -1 +1 @@
-integration
+./integration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -72,28 +72,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: fast_gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -160,13 +194,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
+- CODEOWNERS
 - CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
-- MAINTAINERS
 - README.mkd
 - Rakefile
 - bin/r10k
@@ -207,15 +242,6 @@ files:
 - integration/pre-suite/10_git_config.rb
 - integration/pre-suite/20_pe_r10k.rb
 - integration/pre-suite/README.mkd
-- integration/scripts/README.mkd
-- integration/scripts/setup_r10k_env_centos5.sh
-- integration/scripts/setup_r10k_env_centos6.sh
-- integration/scripts/setup_r10k_env_rhel7.sh
-- integration/scripts/setup_r10k_env_sles11.sh
-- integration/scripts/setup_r10k_env_sles12.sh
-- integration/scripts/setup_r10k_env_ubuntu1004.sh
-- integration/scripts/setup_r10k_env_ubuntu1204.sh
-- integration/scripts/setup_r10k_env_ubuntu1404.sh
 - integration/tests/Puppetfile/HTTP_PROXY_affects_forge_source.rb
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
@@ -511,8 +537,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment

data/MAINTAINERS

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
-  "issues": "https://tickets.puppet.com/browse/RK",
-  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-code-manager-maintainers", 
-  "people": [
-    {
-      "github": "andersonmills",
-      "email": "anderson@puppet.com",
-      "name": "Anderson Mills"
-    },
-    {
-      "github": "scotje",
-      "email": "jesse@puppet.com",
-      "name": "Jesse Scott"
-    }
-  ]
-}

data/integration/scripts/README.mkd

@@ -1,86 +0,0 @@
-Scripts
-=======
-
-This folder contains helper scripts for setting up manual testing environments
-using [Beaker](https://github.com/puppetlabs/beaker) configuration files. The
-environments created by these scripts have "r10k" fully configured along with
-a Git repository with a valid "production" environment.
-
-These scripts are specific to the Puppet Labs environment and will not work in
-other environments without alteration!
-
-## Prerequisites
-
-To utilize this test scripts you will need to have Ruby 1.9.3 or greater
-installed on your system along with Bundler. Also, the scripts utilize the
-"vmpooler" for virtual machine creation. Access to the "vmpooler" machines
-require having valid SSH private keys located on your local computer. Speak
-with a QA team member for more information on where to find the necessary
-SSH keys.
-
-## Usage
-
-The scripts are written in Bash and should run on any Linux or Mac system as
-long as the prerequisites mentioned above are satisfied.
-
-### Cloning
-
-First you will need to clone the "[r10k](https://github.com/puppetlabs/r10k)" repository on your local machine:
-
-```bash
-git clone git@github.com:puppetlabs/r10k.git
-```
-
-### Executing Script
-
-Navigate to the integration tests "scripts" folder of the "r10k" repository
-clone:
-
-```bash
-cd r10k/integration/scripts
-```
-
-There are separate scripts for each supported platform. Select a desired
-platform and execute the script:
-
-```bash
-bash setup_r10k_env_centos6.sh
-```
-
-## Connecting to Machines
-
-The setup process takes about 10 minutes to complete. Once finished Beaker
-will report that all tests have been run successfully. The output log will
-list the machines created. The Puppet master will have a name ending with
-"-master" which you can scrape from the Beaker console output. Example:
-
-```
-a9lrs93vnujsrrg.delivery.puppetlabs.net (centos-6-x86_64-master) executed in 1.26 seconds
-```
-
-The FQDN of the Puppet master ("a9lrs93vnujsrrg.delivery.puppetlabs.net" in the
-above example) will be printed to the left of the machine tag. The machine tag
-is a combination of the platform and role of the virtual machine.
-
-Now that you have the FQDN you can connect to the machine using SSH:
-
-```bash
-ssh -i private_key root@a9lrs93vnujsrrg.delivery.puppetlabs.net
-```
-
-*Note:* The correct SSH private key needs to be installed on your local machine
-first. Speak with a QA representative to get the correct key for "vmpooler"
-machines.
-
-## Configuration Details
-
-Now that you have successfully connected to the Puppet master you can begin
-manual testing. The script has configured Git on the Puppet master to provide
-a working "production" environment for "r10k" testing. The Git repository
-serving the Puppet environments is located at "/git_repos/environments.git".
-There is a Git clone of the remote repository located at "/root/environments".
-
-When performing manual "r10k" testing you should utilize the Git clone
-repository located at "/root/environments". The "r10k" configuration file
-"/etc/puppetlabs/r10k/r10k.yaml" is already configured to use the remote Git
-repository for deployments.

data/integration/scripts/setup_r10k_env_centos5.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
-export GIT_PROVIDER=shellgit
-
-bundle install --path .bundle/gems
-
-bundle exec beaker \
-  --preserve-hosts always \
-  --config configs/pe/centos-5-64mda \
-  --debug \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib
-
-rm -rf .bundle

data/integration/scripts/setup_r10k_env_centos6.sh

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

data/integration/scripts/setup_r10k_env_rhel7.sh

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

data/integration/scripts/setup_r10k_env_sles11.sh

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

data/integration/scripts/setup_r10k_env_sles12.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
-export GIT_PROVIDER=shellgit
-
-bundle install --path .bundle/gems
-
-bundle exec beaker \
-  --preserve-hosts always \
-  --config configs/pe/sles-12-64mda \
-  --debug \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib
-
-rm -rf .bundle

data/integration/scripts/setup_r10k_env_ubuntu1004.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-SCRIPT_PATH=$(pwd)
-BASENAME_CMD="basename ${SCRIPT_PATH}"
-SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
-
-if [ $SCRIPT_BASE_PATH = "scripts" ]; then
-  cd ../
-fi
-
-export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
-export GIT_PROVIDER=shellgit
-
-bundle install --path .bundle/gems
-
-bundle exec beaker \
-  --preserve-hosts always \
-  --config configs/pe/ubuntu-1004-64mda \
-  --debug \
-  --keyfile ~/.ssh/id_rsa-acceptance \
-  --pre-suite pre-suite \
-  --load-path lib
-
-rm -rf .bundle

data/integration/scripts/setup_r10k_env_ubuntu1204.sh

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

data/integration/scripts/setup_r10k_env_ubuntu1404.sh

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