r10k 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e5c32f14eddc3386bb26d91697fcce47f1a3bc
-  data.tar.gz: 94d053fc19eb6cc38561571193e05a205613a444
+  metadata.gz: 2e316da30e6d2243053c1dbcfd77b1035119a2dc
+  data.tar.gz: 1e7389b26a3ed22b5aad90d913fa56f5d015fe8e
 SHA512:
-  metadata.gz: abb8f5c18eff9074b2b66c2121cd3b74d5205536a78e9bfe8e50afd0c3fd02e34cbcee16e03a30e601bfa05af63b40163373a5970712accda38d43cee542a527
-  data.tar.gz: 4b4238d221dd262c5b86c939b228221e01989fbfc8bbe88bd1eda0afd0d7792e9de1548729730fa90031bc68498dc827e7cbd9b75af52cb8d1c2c37088a5a9a8
+  metadata.gz: 19d33447cf4ea83af051fe1edda24b84631c3b03160c02594d857799825665f13edbb23727be187f2ae102e4fc57cdcf889e55e564c423306b3e3b45ac6e471e
+  data.tar.gz: a0b7bdb7c82df31ad3afe81ceff091e023137a17dfaec775cd6dad3d0ca29da449bc6d21197e442109519ce65e2dab5f63db2982df5da543c61efb7da2665852

data/.gitattributes

@@ -0,0 +1 @@
+docker/r10k/*               text  eol=lf

data/CHANGELOG.mkd

@@ -1,5 +1,19 @@
 CHANGELOG
 =========
+2.6.5
+----
+
+## Bug Fix
+
+(RK-324) Fix Ruby pipe bug affecting Ubuntu
+
+2.6.4
+----
+
+## Changes
+
+Numerous test fixes.
+
 2.6.3
 ----
 ## Changes

data/azure-pipelines.yml

@@ -0,0 +1,72 @@
+pool:
+  # self-hosted agent on Windows 10 1709 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
+  name: Default
+
+variables:
+  BUILD_REPOSITORY: 127.0.0.1
+
+steps:
+- powershell: |
+    $line = '=' * 80
+    Write-Host "$line`nWindows`n$line`n"
+    Get-ComputerInfo |
+      select WindowsProductName, WindowsVersion, OsHardwareAbstractionLayer |
+      Out-String |
+      Write-Host
+    #
+    # Azure
+    #
+    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
+    bundle --version
+    #
+    # Environment
+    #
+    Write-Host "`n`n$line`nEnvironment`n$line`n"
+    Get-ChildItem Env: | % { Write-Host "$($_.Key): $($_.Value)"  }
+  displayName: Diagnostic Host Information
+  name: hostinfo
+- powershell: |
+    . ./docker/ci/build.ps1
+    Invoke-ContainerBuildSetup
+  displayName: Prepare Build Environment
+  name: build_prepare
+- powershell: |
+    . ./docker/ci/build.ps1
+    Build-Container -Name r10k -Repository $ENV:BUILD_REPOSITORY
+  displayName: Build r10k
+  name: build_r10k
+- powershell: |
+    . ./docker/ci/build.ps1
+    Invoke-ContainerTest -Name r10k -Repository $ENV:BUILD_REPOSITORY
+  displayName: Test r10k
+  name: test_r10k
+- task: PublishTestResults@2
+  displayName: Publish r10k test results
+  inputs:
+    testResultsFormat: 'JUnit'
+    testResultsFiles: 'docker/**/TEST-*.xml'
+    testRunTitle: r10k Test Results
+- powershell: |
+    . ./docker/ci/build.ps1
+    Clear-ContainerBuilds
+  displayName: Container Cleanup
+  condition: always()

data/docker/.rspec

@@ -0,0 +1,3 @@
+--format RspecJunitFormatter
+--out TEST-rspec.xml
+--format documentation

data/docker/Gemfile

@@ -0,0 +1,14 @@
+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
+
+gem 'puppet_docker_tools', *location_for(ENV['PUPPET_DOCKER_LOCATION'] || '~> 0.2')
+gem 'rspec_junit_formatter'

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" --no-latest
+  bundle exec puppet-docker spec "$container_name" --image "puppet/$container_name:$version"
+}
+
+function push_image() {
+  container_name="$1"
+  container_version="$2"
+  : ===
+  : === push $container_name
+  : ===
+  bundle exec puppet-docker push "$container_name" --repository puppet --version "$container_version" --no-latest
+}
+
+: ===
+: === 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/ci/build.ps1

@@ -0,0 +1,38 @@
+$ErrorActionPreference = 'Stop'
+
+function Get-CurrentDirectory
+{
+  $thisName = $MyInvocation.MyCommand.Name
+  [IO.Path]::GetDirectoryName((Get-Content function:$thisName).File)
+}
+
+# installs gems for build and test and grabs base images
+function Invoke-ContainerBuildSetup
+{
+  Push-Location (Get-CurrentDirectory)
+  bundle install --path '.bundle/gems'
+  bundle exec puppet-docker update-base-images ubuntu:16.04
+  Pop-Location
+}
+
+function Build-Container($Name, $Repository = '127.0.0.1')
+{
+  Push-Location (Join-Path (Get-CurrentDirectory) '..')
+  bundle exec puppet-docker local-lint $Name
+  bundle exec puppet-docker build $Name --no-cache --repository $Repository --build-arg namespace=$Repository
+  Pop-Location
+}
+
+function Invoke-ContainerTest($Name, $Repository = '127.0.0.1')
+{
+  Push-Location (Join-Path (Get-CurrentDirectory) '..')
+  bundle exec puppet-docker spec $Name --image $Repository/$Name
+  Pop-Location
+}
+
+# removes any temporary containers / images used during builds
+function Clear-ContainerBuilds
+{
+  docker container prune --force
+  docker image prune --filter "dangling=true" --force
+}

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,24 @@
+require 'puppet_docker_tools/spec_helper'
+
+CURRENT_DIRECTORY = File.dirname(File.dirname(__FILE__))
+
+describe 'Dockerfile' do
+  include_context 'with a docker image'
+  include_context 'with a docker container' do
+    def docker_run_options
+      '--entrypoint /bin/bash'
+    end
+  end
+
+  describe 'uses the correct version of Ubuntu' do
+    it_should_behave_like 'a running container', 'cat /etc/lsb-release', nil, 'Ubuntu 16.04'
+  end
+
+  describe 'has puppet-agent installed' do
+    it_should_behave_like 'a running container', 'dpkg -l puppet-agent', 0
+  end
+
+  describe 'has /opt/puppetlabs/puppet/bin/r10k' do
+    it_should_behave_like 'a running container', 'stat -L /opt/puppetlabs/puppet/bin/r10k', 0, 'Access: \(0755\/\-rwxr\-xr\-x\)'
+  end
+end

data/lib/r10k/util/subprocess/runner/posix.rb

@@ -28,15 +28,15 @@ class R10K::Util::Subprocess::Runner::POSIX < R10K::Util::Subprocess::Runner
 
     @stdout_pump = R10K::Util::Subprocess::Runner::Pump.new(@stdout_r)
     @stderr_pump = R10K::Util::Subprocess::Runner::Pump.new(@stderr_r)
-    @stdout_pump.start
-    @stderr_pump.start
-
     pid = fork do
       exec_r.close
       execute_child(exec_w)
     end
 
     exec_w.close
+    @stdout_pump.start
+    @stderr_pump.start
+
     execute_parent(exec_r, pid)
 
     @result

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.6.4'
+  VERSION = '2.6.5'
 end

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.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -160,6 +160,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -169,6 +170,7 @@ files:
 - MAINTAINERS
 - README.mkd
 - Rakefile
+- azure-pipelines.yml
 - bin/r10k
 - doc/common-patterns.mkd
 - doc/dynamic-environments.mkd
@@ -185,6 +187,13 @@ files:
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
 - doc/updating-your-puppetfile.mkd
+- docker/.rspec
+- docker/Gemfile
+- docker/ci/build
+- docker/ci/build.ps1
+- docker/distelli-manifest.yml
+- docker/r10k/Dockerfile
+- docker/r10k/spec/dockerfile_spec.rb
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
@@ -512,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment