beaker 4.28.1 → 4.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2503ed24d90847be18c7fd19b77a560ccc36adfc62c0d05c572db54ae459ac9d
-  data.tar.gz: e1a48af6ec7c6a987e68fef2e2d8d66938ea6a0386261e055a3f44f152bf593d
+  metadata.gz: dbfaa8f41aaa3ee0ef3400002bed63eccc4bbf4a1057b047f85610fbb30fa677
+  data.tar.gz: 942d0e998c84ca98160a49da29608010c8ec42d4c1a175946ff5d31a69f0a991
 SHA512:
-  metadata.gz: 70a874fb028a529662d75b41aed961799d24c9f1e2f4ecc787526f14fdb2171841decdbcc0949a703a5f6740a97265468e563420e532bf8ae57c6eb217d98e47
-  data.tar.gz: 2f59f3355f90fb02c0ced17550d7acb70075a6e604b4dfb53c616c312d630df3bcce87d5036eef45f44cc0ee5b2bf31974d4e53b37ba975735420bc6ca77ca97
+  metadata.gz: 78f4703fbd41da566acc7a674f3694c7d756bfae560f5ff8c00dbc240db7725de3ccc40c01e2c412564ea56d0f94eac8573b8d98c5b1a743b52890bc8341ccf0
+  data.tar.gz: a605d125585bf3ddc1dab03216b8056c9aadb26d662074bb15e96594ca3868c08552c06b25a767449af3c31d3099f6f00599274eb2c229995711311a1d11e799

data/.github/workflows/test.yml

@@ -15,6 +15,7 @@ jobs:
           - "2.5"
           - "2.6"
           - "2.7"
+          - "3.0"
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -20,6 +20,12 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 - Fixed - for any bug fixes.
 - Security - in case of vulnerabilities.
 
+# [4.29.0](https://github.com/voxpupuli/beaker/compare/4.28.1...4.29.0) - 19-05-2021
+
+### Added
+
+- Ruby 3.0 support
+
 # [4.28.1](https://github.com/voxpupuli/beaker/compare/4.28.0...4.28.1) - 03-10-2021
 
 ### Fixed

data/beaker.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'pry-byebug', '~> 3.9'
   # pry-byebug can have issues with native readline libs so add rb-readline
   s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
+  s.add_runtime_dependency 'rexml'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '>= 5.0'

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -107,12 +107,11 @@ module Beaker
           logger.notify "  and saving to #{dst}"
           logger.notify "  using command: #{wget_command}"
 
-          #in ruby 1.9+ we can upgrade this to popen3 to gain access to the subprocess pid
-          result = `#{wget_command} 2>&1`
-          result.each_line do |line|
+          stdout_and_stderr_str, status = Open3.capture2e(wget_command)
+          stdout_and_stderr_str.each_line do |line|
             logger.debug(line)
           end
-          if $?.to_i != 0
+          unless status.success?
             raise "Failed to fetch_remote_dir '#{url}' (exit code #{$?})"
           end
           dst

data/lib/beaker/platform.rb

@@ -6,11 +6,12 @@ module Beaker
     PLATFORMS = /^(alpine|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
-      { :debian => { "buster"  => "10",
-                     "stretch" => "9",
-                     "jessie"  => "8",
-                     "wheezy"  => "7",
-                     "squeeze" => "6",
+      { :debian => { "bullseye"  => "11",
+                     "buster"    => "10",
+                     "stretch"   => "9",
+                     "jessie"    => "8",
+                     "wheezy"    => "7",
+                     "squeeze"   => "6",
                    },
         :ubuntu => { "focal"   => "2004",
                      "eoan"    => "1910",

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.28.1'
+    STRING = '4.29.0'
   end
 end

data/spec/beaker/dsl/helpers/web_helpers_spec.rb

@@ -89,6 +89,7 @@ describe ClassMixedWithDSLHelpers do
   describe "#fetch_http_dir" do
     let( :logger) { double("Beaker::Logger", :notify => nil , :debug => nil ) }
     let( :result) { double(:each_line => []) }
+    let( :status) { double('Process::Status', success?: true) }
 
     before do
       fetch_allows
@@ -97,8 +98,7 @@ describe ClassMixedWithDSLHelpers do
     describe "given valid arguments" do
 
       it "returns basename of first argument concatenated to second." do
-        expect(subject).to receive(:`).with(/^wget.*/).ordered { result }
-        expect($?).to receive(:to_i).and_return(0)
+        expect(Open3).to receive(:capture2e).with(/^wget.*/).ordered { result }.and_return(['', status])
         result = subject.fetch_http_dir "#{url}/beep", destdir
         expect(result).to eq("#{destdir}/beep")
       end

data/spec/beaker/platform_spec.rb

@@ -67,6 +67,11 @@ module Beaker
 
     context 'with_version_codename' do
 
+      it "can convert debian-11-xxx to debian-bullseye-xxx" do
+        @name = 'debian-11-xxx'
+        expect( platform.with_version_codename ).to be === 'debian-bullseye-xxx'
+      end
+
       it "can convert debian-7-xxx to debian-wheezy-xxx" do
         @name = 'debian-7-xxx'
         expect( platform.with_version_codename ).to be === 'debian-wheezy-xxx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.28.1
+  version: 4.29.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
@@ -703,7 +717,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!