r10k 2.6.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 58f78e7f2b417c01a90fda95cecea6f68038be0f6ce34647874b1f3710955a78
-  data.tar.gz: 61f99c6c4e43c855680abf8dae75a2b6077750d59ecb121f0e343207bb9efc37
+SHA1:
+  metadata.gz: 423ef3150366d325b04675995eda19cb8a0f1481
+  data.tar.gz: b00ae84fb75504d6798adececce0198a4f3fd4fd
 SHA512:
-  metadata.gz: 2c10471595015b12c3f5af303ea35e81baf43fa4d3ad483a3f47b5efa495a427d70a7706ba3c7ea5ec526d6a086138234017e6bc6a03cbb9aeb98c7beaad27a2
-  data.tar.gz: b4f5f724e5bd480d0ba52fc32d0c5d5584ea6e2724c616de1d3a60fd3c639ddbae2643990b9694999f3d497ce3197c5db241e9105c0dd9d843f696f4fcb5af83
+  metadata.gz: d8d32b5153c4400666355bda3ad4740170206a5200759caecbfecb780fca78068bab70d0eb834d434a3b463c04eb62289890d6cdf050519da861f00280b8a834
+  data.tar.gz: 4c4c83e653177423f9c4f1bb1acdfc7c7f5d4891669cd30eba9bcebc710c8fe2ee59a8775974a6425d337f67b89abbad48326a8e6c7b36a3a9df233d9b2dd258

data/.gitignore

@@ -4,6 +4,7 @@ Gemfile.lock
 .bundle
 bundle
 coverage
+locales/r10k.pot
 integration/log
 integration/junit
 integration/configs

data/.travis.yml

@@ -5,20 +5,13 @@ script: "bundle exec rspec --color --format documentation spec/unit"
 notifications:
   email: false
 sudo: false
+before_install: gem update bundler
+rvm:
+  - "2.4.0"
+  - "2.3.0"
+  - "2.2.4"
+  - "2.1.8"
+  - "2.0.0"
+  - "jruby-19mode"
 jdk:
-  - openjdk8
-before_install: gem install bundler -v '< 2' --no-document
-matrix:
-  include:
-    - stage: r10k tests
-      rvm: 2.3.0
-    - stage: r10k tests
-      rvm: 2.2.0
-    - stage: r10k tests
-      rvm: 2.1.0
-    - stage: r10k tests
-      rvm: 2.0.0
-    - stage: r10k tests
-      rvm: 1.9.3
-    - stage: r10k tests
-      rvm: jruby-19mode
+    - oraclejdk8

data/CHANGELOG.mkd

@@ -1,63 +1,50 @@
 CHANGELOG
 =========
 
-Unreleased
-----------
-
-2.6.9
-----
-
-- Don't purge root when using `puppetfile install`. [#1084](https://github.com/puppetlabs/r10k/issues/1084)
-
-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
+3.0.0
 ----
 
-### Changes
-
-(CDPE-1813) Add module deploy info to .r10k-deploy.json.
-(RK-351) Update minitar to ~> 0.9.0.
+## Changes
 
-2.6.6
-----
+### Known issues
+  - Child processes may die unexpectedly when deploying many environments
+    on Ubuntu Bionic. See
+    [RK-324](https://tickets.puppetlabs.com/browse/RK-324).
 
-### 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
 
- - Flag for overriding default branch configuration in Puppetfile
- - Plumbing for internationalization
- - Numerous test fixes and legacy docker work
-
-2.6.5
-----
+### Bug fixes
+  - More reliable pruning of refs on fetch
+  - Improved error messaging when:
+    - Unable to connect to a proxy
+    - r10k.yaml file is empty
+    - Unable to parse Puppetfile
+  - Various perfomance improvements
 
-### 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.
 
+**NOTE** - CHANGELOG is only assured to be up to date for a particular branch
+when a release is made on that branch.
+
 2.6.2
 -----
-
 ### Changes
 
 (RK-311) Yard dependency updated for security fix.

data/Gemfile

@@ -2,11 +2,12 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 gemspec
 
 group :extra do
-  gem 'rugged', '~> 0.24.0', :platforms => :ruby
+  gem 'rugged', '>= 0.24.0', '< 0.24.6', :platforms => :ruby
 end
 
 group :development do
   gem 'simplecov', '~> 0.9.1'
+  gem 'ruby-prof', :platforms => :ruby
 end
 
 if File.exists? "#{__FILE__}.local"

data/MAINTAINERS

@@ -0,0 +1,18 @@
+{
+  "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/README.mkd

@@ -17,11 +17,7 @@ implementation of Puppet [dynamic environments][workflow].
 Requirements
 ------------
 
-R10k supports the following Ruby versions:
-
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+R10k supports the Ruby versions `>= 2.0.0`.
 
 R10k requires additional components, depending on how you plan on managing
 environments and modules.

data/bin/r10k

@@ -6,12 +6,12 @@ require 'colored'
 begin
   R10K::CLI.command.run(ARGV)
 rescue Interrupt
-  $stderr.puts "Aborted!".red
+  $stderr.puts "r10k: Aborted!".red
   exit(1)
 rescue SystemExit => e
   exit(e.status)
 rescue Exception => e
-  $stderr.puts "\nError while running: #{e.inspect}".red
+  $stderr.puts "\nr10k: Runtime error: #{e.inspect}".red
   $stderr.puts e.backtrace.join("\n").red if ARGV.include? '--trace'
   exit(1)
 end

data/doc/common-patterns.mkd

@@ -8,12 +8,12 @@ specific pattern before implementing it.
 Repository Setup
 ----------------
 
-Use a [Control Repo](http://www.jeffmalnick.com/blog/2014/05/16/r10k-control-repos/)
+Use a [Control Repo](https://docs.puppet.com/pe/latest/cmgmt_control_repo.html)
 to store your `Puppetfile`.
 
 Hiera data should be in the Control repo OR as a separate source in
 `r10k.yaml`. Any `hiera.yaml` in the Control repo will be ignored on a per
-environment basis, locating it at `/etc/puppet/hiera.yaml` is prefered.
+environment basis, locating it at `/etc/puppetlabs/puppet/hiera.yaml` is prefered.
 
 Each puppet module should be contained in its own independent forge module or
 repository.

data/doc/dynamic-environments/configuration.mkd

@@ -46,10 +46,9 @@ For example:
 cachedir: '/var/cache/r10k'
 ```
 
-[prerun_command](http://docs.puppetlabs.com/references/latest/configuration.html#preruncommand)
 
 The cachedir setting defaults to `~/.r10k`. If the HOME environment variable is
-unset r10k will assume that r10k is being run with the Puppet [`prerun_command`][prerun_command]
+unset r10k will assume that r10k is being run with the Puppet [`prerun_command`](http://docs.puppetlabs.com/references/latest/configuration.html#preruncommand)
 setting and will set the cachedir default to `/root/.r10k`.
 
 ### proxy

data/doc/dynamic-environments/quickstart.mkd

@@ -95,7 +95,7 @@ Configure r10k by creating the following directory structure and file `/etc/pupp
 
 ```
 # The location to use for storing cached Git repos
-:cachedir: '/opt/puppetlabs/r10k/cache'
+:cachedir: '/var/cache/r10k'
 
 # A list of git repositories to create
 :sources:
@@ -166,8 +166,8 @@ class profile::base {
 ```
 
 Ensure that the user r10k runs as (typically root) can access the git
-repository. See the [git environment guide]
-(git-environments.mkd) for more detail.  You can test
+repository. See the [git environment guide](git-environments.mkd)
+for more detail.  You can test
 the access by using su/sudo to perform `git clone yourrepoURL` as the correct
 user.
 

data/doc/dynamic-environments/usage.mkd

@@ -60,18 +60,6 @@ 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/puppetfile.mkd

@@ -305,21 +305,3 @@ mod 'apache',
 The given 'install\_path' can be an absolute path or a path relative to the base of
 the environment. Note that r10k will exit with an error if you attempt to set the
 'path' option to a directory outside of the environment.
-
-## Environment variables (**DEPRECATED** as of 2.5.6)
-
-It is possible to set an alternate name/location for your `Puppetfile` and
-`modules` directory. This is useful if you want to control multiple environments
-and have a single location for your `Puppetfile`.
-
-Example:
-
-    PUPPETFILE=/etc/r10k.d/Puppetfile.production \
-    PUPPETFILE_DIR=/etc/puppet/modules/production \
-    /usr/bin/r10k puppetfile install
-
-NOTE: using these environment variables is not a suggested configuration, and
-have different semantics than librarian-puppet. Specifically, the PUPPETFILE_DIR
-is the environment that r10k will install modules into, and it will take full
-control over that directory and _remove any unmanaged content_. Use these
-variables with caution.

data/docker/Gemfile

@@ -0,0 +1,13 @@
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+def location_for(place)
+  if place =~ /^((?:git|https?)[:@][^#]*)#(.*)/
+    [{ :git => $1, :branch => $2, :require => false }]
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+gem 'puppet_docker_tools', *location_for(ENV['PUPPET_DOCKER_LOCATION'] || '~> 0.1.5')

data/docker/ci/build

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+set -eux
+
+PATH=$PATH:/usr/local/bin
+BUNDLER_PATH=.bundle/gems
+
+function build_and_test_image() {
+  container_name="$1"
+
+  : ===
+  : === run linter on the docker files
+  : ===
+   bundle exec puppet-docker local-lint "$container_name"
+
+  : ===
+  : === build and test $container_name
+  : ===
+  bundle exec puppet-docker build "$container_name" --no-cache --repository puppet --version "$version"
+  bundle exec puppet-docker spec "$container_name"
+}
+
+function push_image() {
+  container_name="$1"
+  container_version="$2"
+  : ===
+  : === push $container_name
+  : ===
+  bundle exec puppet-docker push "$container_name" --repository puppet --version "$container_version"
+}
+
+: ===
+: === bundle install to get ready
+: ===
+bundle install --path "$BUNDLER_PATH"
+
+: ===
+: === If we do not git pull --unshallow we get really weird results with git describe
+: ===
+git pull --unshallow
+
+: ===
+: === make sure we fetch tags for versioning
+: ===
+git fetch origin 'refs/tags/*:refs/tags/*'
+git_describe=`git describe`
+version="${git_describe%%-*}"
+
+: ===
+: === pull updated base images
+: ===
+bundle exec puppet-docker update-base-images ubuntu:16.04
+
+container_list=(r10k)
+
+: ===
+: === build and test all the images before we push anything
+: ===
+for container in "${container_list[@]}"; do
+  build_and_test_image "$container"
+done
+
+: ===
+: === push all the images
+: ===
+for container in "${container_list[@]}"; do
+  push_image "$container" "$version"
+done
+
+: ===
+: === SUCCESS
+: ===

data/docker/distelli-manifest.yml

@@ -0,0 +1,4 @@
+pe-and-platform/r10k:
+  Build:
+    - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" "$DISTELLI_DOCKER_ENDPOINT"
+    - /bin/bash -x ./ci/build

data/docker/r10k/Dockerfile

@@ -0,0 +1,41 @@
+FROM ubuntu:16.04
+
+ARG vcs_ref
+ARG build_date
+ARG version="2.6.4"
+ENV R10K_VERSION="$version"
+ENV UBUNTU_CODENAME="xenial"
+
+LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
+      org.label-schema.vendor="Puppet" \
+      org.label-schema.url="https://github.com/puppetlabs/r10k" \
+      org.label-schema.name="r10k" \
+      org.label-schema.license="Apache-2.0" \
+      org.label-schema.version="$R10K_VERSION" \
+      org.label-schema.vcs-url="https://github.com/puppetlabs/r10k" \
+      org.label-schema.vcs-ref="$vcs_ref" \
+      org.label-schema.build-date="$build_date" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.dockerfile="/Dockerfile"
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y wget ca-certificates lsb-release && \
+    wget https://apt.puppetlabs.com/puppet5-release-"$UBUNTU_CODENAME".deb && \
+    dpkg -i puppet5-release-"$UBUNTU_CODENAME".deb && \
+    rm puppet5-release-"$UBUNTU_CODENAME".deb && \
+    apt-get update && \
+    apt-get install --no-install-recommends -y puppet-agent && \
+    apt-get install --no-install-recommends -y git openssh-client && \
+    apt-get remove --purge -y wget && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN /opt/puppetlabs/puppet/bin/gem install r10k:"$R10K_VERSION"
+
+ENV PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH
+
+ENTRYPOINT ["/opt/puppetlabs/puppet/bin/r10k"]
+CMD ["help"]
+
+COPY Dockerfile /

data/docker/r10k/spec/dockerfile_spec.rb

@@ -0,0 +1,16 @@
+require 'puppet_docker_tools/spec_helper'
+
+CURRENT_DIRECTORY = File.dirname(File.dirname(__FILE__))
+
+describe 'Dockerfile' do
+  include_context 'with a docker image'
+
+  describe package('puppet-agent') do
+    it { is_expected.to be_installed }
+  end
+
+  describe file('/opt/puppetlabs/puppet/bin/r10k') do
+    it { should exist }
+    it { should be_executable }
+  end
+end