beaker-rspec 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c46429320ae5aa83876303c5dd74b4e616bf6b6baf6b675a425b535c7faa282
-  data.tar.gz: f71fe4b5b8026cddc415701f66238feb7a9109026facf8595c534e44de6a1a07
+  metadata.gz: 8d0a7f04c69a6173d2ce221249d63d8cc7f89921c60b150625c2a07d2d959bd8
+  data.tar.gz: 0634aaf5431a951b2c9a8b2114471aa8f997392edfc5b3895fa0d46a6d5a00fd
 SHA512:
-  metadata.gz: dea35921662d220f1d704305a549cb460f22bd18dbb0d9464b3e8a9302ea0607a7593658c702008e240a7782af85b09b70f9172f37351d9678ec363a0fc0bf09
-  data.tar.gz: 281cdf66ea2dcf41471c48b64b9e03d18089ebdcf396ea9325676687eb50505815b67852aef2a359b6145e4278957b0da56d3b1f170e4d8522436335f47c6096
+  metadata.gz: 1767b40fff985cc37a7c13ad032bf908d76e9a3829ddb29f01cd61c6048b7151bcfa573998434d2f40bf73ae11f8cec67fb9153546591cfb75c843b36651d089
+  data.tar.gz: 17732231fb3ed5fb615b74c45b83eaa7e7af4ce85bb8826612d06f5e215d22ce30e6062ec1a9c8d30cdb8f02bb31c299b95f30bb9a9ae762b570416ad9f21bfa

data/.github/workflows/release.yml

@@ -7,14 +7,14 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.3
+      - name: Install Ruby 3.4
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
           bundler: 'none'
       - name: Build gem
         run: gem build --strict --verbose *.gemspec

data/.github/workflows/test.yml

@@ -1,3 +1,4 @@
+---
 name: Test
 
 on:
@@ -11,28 +12,29 @@ env:
   BEAKER_HYPERVISOR: docker
 
 jobs:
-  rubocop:
-    runs-on: ubuntu-latest
+  rubocop_and_matrix:
+    runs-on: ubuntu-24.04
+    outputs:
+      ruby: ${{ steps.ruby.outputs.versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
+      - id: ruby
+        uses: voxpupuli/ruby-version@v1
+
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    needs: rubocop_and_matrix
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.7"
-          - "3.0"
-          - "3.1"
-          - "3.2"
-          - "3.3"
+        ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +50,7 @@ jobs:
 
   tests:
     needs:
-      - rubocop
+      - rubocop_and_matrix
       - build
     runs-on: ubuntu-latest
     name: Test suite

data/.rubocop_todo.yml

@@ -1,18 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-05-28 09:46:46 UTC using RuboCop version 1.63.5.
+# on 2025-05-27 12:15:34 UTC using RuboCop version 1.75.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/beaker-rspec/helpers/serverspec.rb'
-
 # Offense count: 1
 Naming/AccessorMethodName:
   Exclude:
@@ -34,14 +27,6 @@ Naming/MethodParameterName:
   Exclude:
     - 'lib/beaker-rspec/beaker_shim.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be_a, be_kind_of
-RSpec/ClassCheck:
-  Exclude:
-    - 'spec/acceptance/example_spec.rb'
-
 # Offense count: 3
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
@@ -75,10 +60,12 @@ Style/AndOr:
   Exclude:
     - 'lib/beaker-rspec/helpers/serverspec.rb'
 
-# Offense count: 7
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
+# SupportedStylesForClasses: ~, nested, compact
+# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/beaker-rspec/helpers/serverspec.rb'
@@ -88,7 +75,7 @@ Style/ClassVars:
   Exclude:
     - 'lib/beaker-rspec/helpers/serverspec.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -97,23 +84,6 @@ Style/Documentation:
     - 'lib/beaker-rspec.rb'
     - 'lib/beaker-rspec/helpers/serverspec.rb'
 
-# Offense count: 10
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'Gemfile'
-    - 'beaker-rspec.gemspec'
-    - 'lib/beaker-rspec.rb'
-    - 'lib/beaker-rspec/beaker_shim.rb'
-    - 'lib/beaker-rspec/helpers/serverspec.rb'
-    - 'lib/beaker-rspec/rake_task.rb'
-    - 'lib/beaker-rspec/spec_helper.rb'
-    - 'lib/beaker-rspec/version.rb'
-    - 'spec/acceptance/example_spec.rb'
-    - 'spec/spec_helper.rb'
-
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [8.3.0](https://github.com/voxpupuli/beaker-rspec/tree/8.3.0) (2025-05-27)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-rspec/compare/8.2.0...8.3.0)
+
+**Implemented enhancements:**
+
+- Use the backend variable inside the loop [\#145](https://github.com/voxpupuli/beaker-rspec/pull/145) ([ekohl](https://github.com/ekohl))
+- Remove redundant Specinfra::Runner.run definition [\#144](https://github.com/voxpupuli/beaker-rspec/pull/144) ([ekohl](https://github.com/ekohl))
+- Remove unused get\_windows\_cmd method [\#143](https://github.com/voxpupuli/beaker-rspec/pull/143) ([ekohl](https://github.com/ekohl))
+- Add Ruby 3.4 to CI / generate matrix automatically [\#142](https://github.com/voxpupuli/beaker-rspec/pull/142) ([bastelfreak](https://github.com/bastelfreak))
+- Vagrant: Add options to configure memsize/cpu cores [\#139](https://github.com/voxpupuli/beaker-rspec/pull/139) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- fakefs: Allow 3.x [\#146](https://github.com/voxpupuli/beaker-rspec/pull/146) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [8.2.0](https://github.com/voxpupuli/beaker-rspec/tree/8.2.0) (2024-05-28)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-rspec/compare/8.1.0...8.2.0)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 def location_for(place, fake_version = nil)

data/beaker-rspec.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $:.push File.expand_path('lib', __dir__)
 require 'beaker-rspec/version'
 
@@ -18,14 +20,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Testing dependencies
-  s.add_development_dependency 'fakefs', '>= 0.6', '< 3'
+  s.add_development_dependency 'fakefs', '>= 0.6', '< 4'
   s.add_development_dependency 'minitest', '~> 5.4'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 4.0', '< 7'
-  s.add_runtime_dependency 'rspec', '~> 3.0'
-  s.add_runtime_dependency 'serverspec', '~> 2'
-  s.add_runtime_dependency 'specinfra', '~> 2'
+  s.add_dependency 'beaker', '>= 4.0', '< 7'
+  s.add_dependency 'rspec', '~> 3.0'
+  s.add_dependency 'serverspec', '~> 2'
+  s.add_dependency 'specinfra', '~> 2'
 end

data/lib/beaker-rspec/beaker_shim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beaker'
 
 module BeakerRSpec

data/lib/beaker-rspec/helpers/serverspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'serverspec'
 require 'specinfra'
 require 'specinfra/backend/powershell/script_helper'
@@ -79,38 +81,13 @@ module Specinfra::Helper::Os
     Specinfra::Helper::DetectOs.subclasses.each do |c|
       res = c.detect
       if res
-        res[:arch] ||= Specinfra.backend.run_command('uname -m').stdout.strip
+        res[:arch] ||= backend.run_command('uname -m').stdout.strip
         return res
       end
     end
   end
 end
 
-class Specinfra::CommandFactory
-  class << self
-    # Force creation of a windows command
-    def get_windows_cmd(meth, *args)
-      action, resource_type, subaction = breakdown(meth)
-      method =  action
-      method += "_#{subaction}" if subaction
-
-      common_class = Specinfra::Command
-      base_class = common_class.const_get(:Base)
-      os_class = common_class.const_get(:Windows)
-      version_class = os_class.const_get(:Base)
-      command_class = version_class.const_get(resource_type.to_camel_case)
-
-      command_class = command_class.create
-      unless command_class.respond_to?(method)
-        raise NotImplementedError,
-              "#{method} is not implemented in #{command_class}"
-      end
-
-      command_class.send(method, *args)
-    end
-  end
-end
-
 module Specinfra
   # Rewrite the runner to use the appropriate backend based upon platform information
   class Runner
@@ -132,18 +109,6 @@ module Specinfra
         run(meth, *args)
       end
     end
-
-    def self.run(meth, *args)
-      backend = Specinfra.backend
-      cmd = Specinfra.command.get(meth, *args)
-      backend = Specinfra.backend
-      ret = backend.run_command(cmd)
-      if meth.to_s.start_with?('check')
-        ret.success?
-      else
-        ret
-      end
-    end
   end
 end
 

data/lib/beaker-rspec/rake_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:beaker) do |c|

data/lib/beaker-rspec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beaker-rspec/beaker_shim'
 require 'beaker-rspec/helpers/serverspec'
 include BeakerRSpec::BeakerShim
@@ -32,6 +34,8 @@ RSpec.configure do |c|
     debug: ENV['BEAKER_DEBUG'] || ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil),
     destroy: ENV['BEAKER_DESTROY'] || ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil),
     optionsfile: ENV['BEAKER_OPTIONS_FILE'] || ENV['BEAKER_options_file'] || ENV.fetch('RS_OPTIONS_FILE', nil),
+    vagrant_memsize: ENV.fetch('BEAKER_VAGRANT_MEMSIZE', nil),
+    vagrant_cpus: ENV.fetch('BEAKER_VAGRANT_CPUS', nil),
   }.compact
   # combine defaults and env_vars to determine overall options
   options = defaults.merge(env_vars)

data/lib/beaker-rspec/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module BeakerRSpec
   module Version
-    STRING = '8.2.0'
+    STRING = '8.3.0'
   end
 end

data/lib/beaker-rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BeakerRSpec
   require 'beaker'
 

data/spec/acceptance/example_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'ignore' do
@@ -21,7 +23,7 @@ describe 'ignore' do
   end
 
   example 'access the options' do
-    expect(options).to be_kind_of(Hash)
+    expect(options).to be_a(Hash)
   end
 
   example 'create a beaker dsl::step' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
-ENV['RS_SETFILE'] ||= 'centos8-64'
+# frozen_string_literal: true
+
+ENV['RS_SETFILE'] ||= 'centos9-64'
 
 require 'beaker-rspec'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -19,7 +18,7 @@ dependencies:
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +28,7 @@ dependencies:
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +165,6 @@ homepage: https://github.com/voxpupuli/beaker-rspec
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: RSpec bindings for beaker
 test_files: []