r10k 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6281d4bfac7643c0d48ac1b282c7d6f8e957c8a9
-  data.tar.gz: a72916e0b6cad77bd8e4936c3aa2ead9c2841656
+  metadata.gz: 86a62176969a42b8de330d9f940f8a70b2ddde34
+  data.tar.gz: 630a698650dd7633ea5af47c01d2da9e3b4bbce9
 SHA512:
-  metadata.gz: 6d39ac8d7dac530a97728cfcf264d5f2e17f5649331b9638b3b11ec599f2f5701b0b7a6567f6994af082880e55d265fda84138439bc4539abe2a59045f89cdfe
-  data.tar.gz: e91d47a1ebe85a73731b8b9068931f17b9358ce523d6519c81eaa16cc4ff27b014127e78a2a558c5892e7cc1cce21f51984110ca53fd73d81641d8f653388b4b
+  metadata.gz: 88539ba2554f8a4cd81e768598aa242907d59ac1a1cfffcf5a192f9e4b8e2458beece89673615be5336f3d02478cf0ebd2d55d2f372f4bfe864a070cf598f20c
+  data.tar.gz: cac1fc4ca0ac0b9c8b9ec6aabcb8a1d3596ddfad2e551649895144bcf9458469850641ed9e42a441138c429ba0072482365d8fde2d425b349f136d0af003db38

data/.gitattributes

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

data/CHANGELOG.mkd

@@ -1,6 +1,20 @@
 CHANGELOG
 =========
 
+3.0.3
+----
+
+## Bug Fixes
+
+(RK-324) Fix Ruby pipe bug affecting Ubuntu
+
+3.0.2
+----
+
+## Changes
+
+Minor test fixes.
+
 3.0.1
 ----
 
@@ -41,6 +55,12 @@ Ruby >= 2.3 official and documented.
   - Various perfomance improvements
 
 
+2.6.5
+----
+
+## Bug Fix
+
+(RK-324) Fix Ruby pipe bug affecting Ubuntu
 
 2.6.4
 ----

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

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

data/docker/ci/build

@@ -17,7 +17,7 @@ function build_and_test_image() {
   : === 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"
+  bundle exec puppet-docker spec "$container_name" --image "puppet/$container_name:$version"
 }
 
 function push_image() {

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/r10k/spec/dockerfile_spec.rb

@@ -4,13 +4,21 @@ 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 package('puppet-agent') do
-    it { is_expected.to be_installed }
+  describe 'has puppet-agent installed' do
+    it_should_behave_like 'a running container', 'dpkg -l puppet-agent', 0
   end
 
-  describe file('/opt/puppetlabs/puppet/bin/r10k') do
-    it { should exist }
-    it { should be_executable }
+  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 = '3.0.2'
+  VERSION = '3.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 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,8 +187,10 @@ 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