beaker 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db37fef3002087da1c247d4e9fe9fc1aa9659eae3baf81381e262df37a3f53d5
-  data.tar.gz: c8fb420632fc699b6229afb4c03c4451ffd899ac4a3dd40db979f1e9d3e5d539
+  metadata.gz: 1a7f2cf603e697740aab5a108dc690a6b5dd4800c52a9678941b826e422ee5e1
+  data.tar.gz: ce8bc6743384545f0d501fd54f221928bb731a16b3e1ce30a5494563aec0c69f
 SHA512:
-  metadata.gz: bc45220ea4bfad23b108a78236911b6304a79e942bdc14343ad02f1896563ec4d1a21c9d5e9fba44f6ec267e1096d76ae6255928e1e3c365d4e881b45f86beb5
-  data.tar.gz: 583e6217c676037490c22a614a666080a4fd3a164b269684ee85c224ac1deae6b28457a4c504c78f93937a7c0bda43ad394bf95bab3232459613232ffd4b1067
+  metadata.gz: 4ec0253cd6bec780eac93937595b9f53a0be31e966123fd9c753b80661d145d226747537ca23b18aa79afcd7cc8932b83f3c8057a1f5a23cca4aa6ca332c7614
+  data.tar.gz: 5e495a3074e6fe7821bd810f7955542e130bb5673231d48c5107d138bfff7b15e22e3aacd84bd4adea66c4cfc52b20b6513b733051cf7bd4138e987e197774ec

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [6.6.0](https://github.com/voxpupuli/beaker/tree/6.6.0) (2025-03-27)
+
+**Implemented enhancements:**
+
+- Changes to add powershell commands as wmic is deprecated in windows [\#1907](https://github.com/voxpupuli/beaker/pull/1907)
+
 ## [6.5.0](https://github.com/voxpupuli/beaker/tree/6.5.0) (2025-03-18)
 
 **Implemented enhancements:**

data/lib/beaker/host/windows/group.rb

@@ -14,6 +14,20 @@ module Windows::Group
     end
   end
 
+  # using powershell commands as wmic is deprecated in windows 2025
+  def group_list_using_powershell
+    execute('cmd /c echo "" | powershell.exe "Get-LocalGroup | Select-Object -ExpandProperty Name"') do |result|
+      groups = []
+      result.stdout.each_line do |line|
+        groups << line.strip or next
+      end
+
+      yield result if block_given?
+
+      groups
+    end
+  end
+
   def group_get(name)
     execute("net localgroup \"#{name}\"") do |result|
       fail_test "failed to get group #{name}" if result.exit_code != 0

data/lib/beaker/host/windows/user.rb

@@ -14,6 +14,20 @@ module Windows::User
     end
   end
 
+  # using powershell commands as wmic is deprecated in windows 2025
+  def user_list_using_powershell
+    execute('cmd /c echo "" | powershell.exe "Get-LocalUser | Select-Object -ExpandProperty Name"') do |result|
+      users = []
+      result.stdout.each_line do |line|
+        users << line.strip or next
+      end
+
+      yield result if block_given?
+
+      users
+    end
+  end
+
   def user_get(name)
     execute("net user \"#{name}\"") do |result|
       fail_test "failed to get user #{name}" if result.exit_code != 0

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.5.0'
+    STRING = '6.6.0'
   end
 end

data/spec/beaker/host/windows/group_spec.rb

@@ -7,47 +7,66 @@ module Beaker
     end
 
     let(:instance) { WindowsGroupTest.new }
-    let(:result) { double(:result, :stdout => group_list_output) }
-    let(:group_list_output) do
-      <<~EOS
-        Name=Foo
 
+    context "Group list" do
+      let(:result) { double(:result, :stdout => group_list_output) }
+      let(:group_list_output) do
+        <<~EOS
+          Name=Foo
 
-        Name=Bar6
 
+          Name=Bar6
 
-      EOS
-    end
 
-    def add_group(group_name)
-      group_list_output << <<~EOS
-        Name=#{group_name}
+        EOS
+      end
 
+      def add_group(group_name)
+        group_list_output << <<~EOS
+          Name=#{group_name}
 
-      EOS
-    end
 
-    before do
-      expect(instance).to receive(:execute).with(/wmic group where/).and_yield(result)
-    end
+        EOS
+      end
 
-    it "gets a group_list" do
-      expect(instance.group_list).to eql(%w[Foo Bar6])
-    end
+      before do
+        expect(instance).to receive(:execute).with(/wmic group where/).and_yield(result)
+      end
 
-    it "gets groups with spaces" do
-      add_group("With Spaces")
-      expect(instance.group_list).to eql(["Foo", "Bar6", "With Spaces"])
-    end
+      it "gets a group_list" do
+        expect(instance.group_list).to eql(%w[Foo Bar6])
+      end
 
-    it "gets groups with dashes" do
-      add_group("With-Dashes")
-      expect(instance.group_list).to eql(%w[Foo Bar6 With-Dashes])
+      it "gets groups with spaces" do
+        add_group("With Spaces")
+        expect(instance.group_list).to eql(["Foo", "Bar6", "With Spaces"])
+      end
+
+      it "gets groups with dashes" do
+        add_group("With-Dashes")
+        expect(instance.group_list).to eql(%w[Foo Bar6 With-Dashes])
+      end
+
+      it "gets groups with underscores" do
+        add_group("With_Underscores")
+        expect(instance.group_list).to eql(%w[Foo Bar6 With_Underscores])
+      end
     end
 
-    it "gets groups with underscores" do
-      add_group("With_Underscores")
-      expect(instance.group_list).to eql(%w[Foo Bar6 With_Underscores])
+    context "Group list using powershell" do
+      let(:group_list_using_powershell_output) do
+        <<~EOS
+          Foo1
+          Bar5
+        EOS
+      end
+
+      let(:result1) { double(:result1, :stdout => group_list_using_powershell_output) }
+
+      it "gets a group_list using powershell" do
+        expect(instance).to receive(:execute).with(/powershell.exe "Get-LocalGroup | Select-Object -ExpandProperty Name/).and_yield(result1)
+        expect(instance.group_list_using_powershell).to eql(%w[Foo1 Bar5])
+      end
     end
   end
 end

data/spec/beaker/host/windows/user_spec.rb

@@ -5,48 +5,50 @@ class WindowsUserTest
 end
 
 describe WindowsUserTest do
-  let(:wmic_output) do
-    <<~EOS
-      Name=Administrator
+  let(:host) { double.as_null_object }
+  let(:result) { Beaker::Result.new(host, command) }
 
+  describe '#user_list' do
+    let(:command) { 'cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value' }
 
+    let(:wmic_output) do
+      <<~EOS
+        Name=Administrator
 
 
 
-      Name=bob foo
 
 
+        Name=bob foo
 
 
 
-      Name=bob-dash
 
 
+        Name=bob-dash
 
 
 
-      Name=bob.foo
 
 
+        Name=bob.foo
 
 
 
-      Name=cyg_server
 
 
+        Name=cyg_server
 
 
 
 
 
 
-    EOS
-  end
-  let(:command) { 'cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value' }
-  let(:host) { double.as_null_object }
-  let(:result) { Beaker::Result.new(host, command) }
 
-  describe '#user_list' do
+
+      EOS
+    end
+
     it 'returns user names list correctly' do
       result.stdout = wmic_output
       expect(subject).to receive(:execute).with(command).and_yield(result)
@@ -61,4 +63,20 @@ describe WindowsUserTest do
       end
     end
   end
+
+  describe "#user_list_using_powershell" do
+    let(:command) { 'cmd /c echo "" | powershell.exe "Get-LocalUser | Select-Object -ExpandProperty Name"' }
+    let(:user_list_using_powershell_output) do
+      <<~EOS
+        Administrator
+        WDAGUtilityAccount
+      EOS
+    end
+
+    it 'returns user names list correctly' do
+      result.stdout = user_list_using_powershell_output
+      expect(subject).to receive(:execute).with(command).and_yield(result)
+      expect(subject.user_list_using_powershell).to be === ["Administrator", "WDAGUtilityAccount"]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs