beaker 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f50bf08da3941bdb936808fbf3239d476331a4d2f842ed073a565ed3cd19040
-  data.tar.gz: a75ef8fd5402e0113683d1609057a659022812ed67abfaa1f0c41cace52db742
+  metadata.gz: a57ed9140c38bb9b99f44eccf0f30a892213eb1e7014ded3cbb424bebc3ec26b
+  data.tar.gz: 25e1254d10f91d1deb9d28780cac16871b57ff570bd67978df38666a961592bc
 SHA512:
-  metadata.gz: 7428fcbccda27a250f1d224ede4f6431e854a91f8e9ab64c690a1dd4b2fc5a2b7850793d764e8ca885d5b3d654c36b2e9409d8928320b20acdb55003b843c1ae
-  data.tar.gz: 8cd11c359dfe66ddb64de2762296f261cbc71ad39d95e3c9c92f1825bd0389f6a2b979826e4372c8a1cc0de36ea7b503910206cb97d0031b5be16bfcfe9358c8
+  metadata.gz: a7d2bab439fbe31b20df6417453e66bb5e148489c605946c11f1f3ac2eb637c4bfe4a2d2ac81420866184c1fa491825e1918ae84c56f3b9c446aa0eae76d6d4c
+  data.tar.gz: 41b577a099d6441fe6c95d8fe8a6c6885ca9d8276ae09b1d98e2efa5f8a5c050f2e7e94313e10d3397c42e3fab8c792e93af1d47843812150dd5c6389afdc289

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [6.1.0](https://github.com/voxpupuli/beaker/tree/6.1.0) (2024-06-04)
+
+**Implemented enhancements:**
+
+- Add package logic for Amazon Linux 2 [\#1887](https://github.com/voxpupuli/beaker/pull/1884) ([mhashizume](https://github.com/joshcooper))
+
 ## [6.0.0](https://github.com/voxpupuli/beaker/tree/6.0.0) (2024-05-24)
 
 **Breaking changes:**

data/lib/beaker/host/unix/pkg.rb

@@ -85,7 +85,7 @@ module Unix::Pkg
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
-    when /amazon-7|centos|redhat|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       name = "#{name}-#{version}" if version
       execute("yum -y #{cmdline_args} install #{name}", opts)
     when /ubuntu|debian/
@@ -167,7 +167,7 @@ module Unix::Pkg
       execute("zypper --non-interactive rm #{name}", opts)
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
-    when /amazon-7|centos|redhat|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)
     when /ubuntu|debian/
       execute("apt-get purge #{cmdline_args} -y #{name}", opts)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.0.0'
+    STRING = '6.1.0'
   end
 end

data/spec/beaker/host/unix/pkg_spec.rb

@@ -161,7 +161,7 @@ module Beaker
         expect(instance.install_package(pkg)).to eq "hello"
       end
 
-      it "uses yum on amazon linux 2" do
+      it "uses yum on misnamed amazon linux 7" do
         @opts = { 'platform' => "amazon-7-is-me" }
         pkg = 'amazon_package'
         expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
@@ -169,6 +169,14 @@ module Beaker
         expect(instance.install_package(pkg)).to eq "hello"
       end
 
+      it "uses yum on amazon linux 2" do
+        @opts = { 'platform' => "amazon-2-is-me" }
+        pkg = 'amazon_package'
+        expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+        expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+        expect(instance.install_package(pkg)).to eq "hello"
+      end
+
       it "uses pacman on archlinux" do
         @opts = { 'platform' => 'archlinux-is-me' }
         pkg = 'archlinux_package'
@@ -281,7 +289,7 @@ module Beaker
 
       it 'Amazon Linux 2 uses yum' do
         @platform = platform
-        @version = '7'
+        @version = '2'
         package_file = 'test_123.yay'
         expect(instance).to receive(:execute).with(/^yum.*#{package_file}$/)
         instance.install_local_package(package_file)

data/spec/helpers.rb

@@ -124,6 +124,7 @@ module PlatformHelpers
 
   REDHATPLATFORMS = %w[
     amazon-2023
+    amazon-2
     fedora
     el-
     centos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs