r10k 3.3.3 → 3.5.2

data/spec/unit/source/hash_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'r10k/source'
+
+describe R10K::Source::Hash do
+
+  describe '.valid_environments_hash?' do
+    it "rejects strings" do
+      expect(R10K::Source::Hash.valid_environments_hash?('200 OK'))
+        .to eq false
+    end
+  end
+
+  let(:environments_hash) do
+    {
+      'production' => {
+        'remote'  => 'https://git.example.com/puppet/control-repo.git',
+        'ref'     => 'release-141',
+        'modules' => {
+          'puppetlabs-stdlib' => '6.1.0',
+          'puppetlabs-ntp' => '8.1.0',
+          'example-myapp1' => {
+            'git' => 'https://git.example.com/puppet/example-myapp1.git',
+            'ref' => 'v1.3.0'
+          }
+        }
+      },
+      'development' => {
+        'remote'  => 'https://git.example.com/puppet/control-repo.git',
+        'ref'     => 'master',
+        'modules' => {
+          'puppetlabs-stdlib' => '6.1.0',
+          'puppetlabs-ntp' => '8.1.0',
+          'example-myapp1' => {
+            'git' => 'https://git.example.com/puppet/example-myapp1.git',
+            'ref' => 'v1.3.1'
+          }
+        }
+      }
+    }
+  end
+
+  describe "with a prefix" do
+    subject do
+      described_class.new('hashsource', '/some/nonexistent/dir',
+                          prefix: 'prefixed', environments: environments_hash)
+    end
+
+    it "prepends environment names with a prefix" do
+      environments = subject.environments
+      expect(environments[0].dirname).to eq 'prefixed_production'
+      expect(environments[1].dirname).to eq 'prefixed_development'
+    end
+  end
+end

data/spec/unit/source/yaml_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'r10k/source'
+
+describe R10K::Source::Yaml do
+
+  let(:environments_hash) do
+    {
+      'production' => {
+        'remote'  => 'https://git.example.com/puppet/control-repo.git',
+        'ref'     => 'release-141',
+        'modules' => {
+          'puppetlabs-stdlib' => '6.1.0',
+          'puppetlabs-ntp' => '8.1.0',
+          'example-myapp1' => {
+            'git' => 'https://git.example.com/puppet/example-myapp1.git',
+            'ref' => 'v1.3.0'
+          }
+        }
+      },
+      'development' => {
+        'remote'  => 'https://git.example.com/puppet/control-repo.git',
+        'ref'     => 'master',
+        'modules' => {
+          'puppetlabs-stdlib' => '6.1.0',
+          'puppetlabs-ntp' => '8.1.0',
+          'example-myapp1' => {
+            'git' => 'https://git.example.com/puppet/example-myapp1.git',
+            'ref' => 'v1.3.1'
+          }
+        }
+      }
+    }
+  end
+
+  describe "with valid yaml file" do
+    it "produces environments" do
+      allow(YAML).to receive(:load_file).with('/envs.yaml').and_return(environments_hash)
+      source = described_class.new('yamlsource', '/some/nonexistent/dir', config: '/envs.yaml')
+      expect(source.environments.map(&:name)).to contain_exactly('production', 'development')
+    end
+  end
+end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.5.2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.6
+        version: 2.15.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.10
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.15.6
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -161,6 +201,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/pull_request_template.md"
+- ".github/workflows/docker.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -168,7 +211,6 @@ files:
 - CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
-- MAINTAINERS
 - README.mkd
 - Rakefile
 - azure-pipelines.yml
@@ -193,10 +235,11 @@ files:
 - docker/Gemfile
 - docker/Makefile
 - docker/README.md
-- docker/distelli-manifest.yml
 - docker/r10k/Dockerfile
+- docker/r10k/adduser.sh
 - docker/r10k/docker-entrypoint.d/10-analytics.sh
 - docker/r10k/docker-entrypoint.sh
+- docker/r10k/release.Dockerfile
 - docker/spec/dockerfile_spec.rb
 - docker/spec/fixtures/Puppetfile
 - integration/Gemfile
@@ -221,15 +264,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
@@ -319,10 +353,12 @@ files:
 - lib/r10k/deployment.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/environment.rb
+- lib/r10k/environment/bare.rb
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/name.rb
 - lib/r10k/environment/svn.rb
+- lib/r10k/environment/with_modules.rb
 - lib/r10k/errors.rb
 - lib/r10k/errors/formatting.rb
 - lib/r10k/feature.rb
@@ -372,8 +408,12 @@ files:
 - lib/r10k/settings/uri_definition.rb
 - lib/r10k/source.rb
 - lib/r10k/source/base.rb
+- lib/r10k/source/exec.rb
 - lib/r10k/source/git.rb
+- lib/r10k/source/hash.rb
 - lib/r10k/source/svn.rb
+- lib/r10k/source/yaml.rb
+- lib/r10k/source/yamldir.rb
 - lib/r10k/svn.rb
 - lib/r10k/svn/remote.rb
 - lib/r10k/svn/working_dir.rb
@@ -496,8 +536,11 @@ files:
 - spec/unit/settings/uri_definition_spec.rb
 - spec/unit/settings_spec.rb
 - spec/unit/source/base_spec.rb
+- spec/unit/source/exec_spec.rb
 - spec/unit/source/git_spec.rb
+- spec/unit/source/hash_spec.rb
 - spec/unit/source/svn_spec.rb
+- spec/unit/source/yaml_spec.rb
 - spec/unit/source_spec.rb
 - spec/unit/svn/remote_spec.rb
 - spec/unit/svn/working_dir_spec.rb
@@ -532,8 +575,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/docker/distelli-manifest.yml

@@ -1,9 +0,0 @@
-pe-and-platform/r10k:
-  PreBuild:
-    - make lint
-  Build:
-    - make build PUPPERWARE_ANALYTICS_STREAM=production
-    - make test
-  AfterBuildSuccess:
-    - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" "$DISTELLI_DOCKER_ENDPOINT"
-    - make publish

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