beaker 7.2.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dca3fb90db4e3194bdfa41f3a445f855c392ec3cd132244f871626edd3b2dd87
-  data.tar.gz: 14ddd5155906b74ee138228b6dc3dfb70ff0118835eaedb90b9bc1f49a09080c
+  metadata.gz: ddee4c17a106c817361dc58a101c0c98d6dba0a1eddab7f865856059eab87bdb
+  data.tar.gz: 4248053a457d1c41469bd825d4eef81b1ab2673ac6d30e8fd9ad292f2a4ead3d
 SHA512:
-  metadata.gz: 28053a4ec06806e583e812aca81e284ec840f366d262fce57f612964a9c5e506ee479c5e75c8e4818994ce9dc9c6fb287c1bf97665b72270437b653b554650a8
-  data.tar.gz: d70f5e46253a31a7b5228d66c20d539da33b220f5b1c673066f9c6ac382deca36b68fff307192c5f973c1fadf3c56bf1ffa0f434fd454053db9d9069b3ef05be
+  metadata.gz: f6471b11f4aa7b5dd6e78313d042cdb79bec4d4c15d6c18aff840bbd5e52deab4feb0c9b1a3acce934bf577a12b47688b7e8934a28d6619a7e149c4263ec8638
+  data.tar.gz: fb14fbffb4397d853e8cc048b4498af7b7cc96825d208356205caaf067f3e13a7dd9e4d27f97b43217c3948aec69f30233485b33e46ed5bca9ca0fdac600c7e8

data/.github/workflows/test.yml

@@ -20,12 +20,12 @@ jobs:
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: '4.0'
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
       - id: ruby
-        uses: voxpupuli/ruby-version@v1
+        uses: voxpupuli/ruby-version@v2
 
   test:
     name: "Ruby ${{ matrix.ruby }}"
@@ -52,10 +52,14 @@ jobs:
         run: bundle exec rake acceptance
 
   tests:
+    if: always()
     needs:
       - rubocop_and_matrix
       - test
     runs-on: ubuntu-24.04
     name: Test suite
     steps:
-      - run: echo Test suite completed
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.79.2.
+# using RuboCop version 1.81.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
@@ -127,7 +127,7 @@ Performance/ZipWithoutBlock:
   Exclude:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
 
-# Offense count: 17
+# Offense count: 18
 RSpec/AnyInstance:
   Exclude:
     - 'spec/beaker/host/windows/file_spec.rb'
@@ -158,7 +158,7 @@ RSpec/Eq:
   Exclude:
     - 'spec/beaker/logger_spec.rb'
 
-# Offense count: 232
+# Offense count: 230
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 44
@@ -184,6 +184,7 @@ RSpec/InstanceVariable:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
 
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
 RSpec/IteratedExpectation:
   Exclude:
     - 'spec/beaker/dsl/helpers/host_helpers_spec.rb'
@@ -204,17 +205,25 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/beaker/host/windows/pkg_spec.rb'
     - 'spec/beaker/options/hosts_file_parser_spec.rb'
 
+# Offense count: 4
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/beaker/dsl/test_tagging_spec.rb'
+    - 'spec/beaker/host/unix/pkg_spec.rb'
+    - 'spec/beaker/host_prebuilt_steps_spec.rb'
+    - 'spec/beaker/logger_spec.rb'
+
 # Offense count: 1
 RSpec/MultipleDescribes:
   Exclude:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
 
-# Offense count: 140
+# Offense count: 141
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 16
 
-# Offense count: 497
+# Offense count: 500
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -231,7 +240,7 @@ RSpec/NoExpectationExample:
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/subcommand_options_parser_spec.rb'
 
-# Offense count: 58
+# Offense count: 60
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/ReceiveMessages:
   Exclude:
@@ -257,8 +266,8 @@ RSpec/RepeatedExample:
     - 'spec/beaker/logger_spec.rb'
 
 # Offense count: 14
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
@@ -277,7 +286,7 @@ RSpec/SpecFilePathFormat:
     - 'spec/beaker/host/windows/user_spec.rb'
     - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
-# Offense count: 176
+# Offense count: 178
 RSpec/SubjectStub:
   Exclude:
     - 'spec/beaker/dsl/assertions_spec.rb'
@@ -302,7 +311,7 @@ RSpec/UnspecifiedException:
     - 'spec/beaker/host_spec.rb'
     - 'spec/beaker/test_suite_spec.rb'
 
-# Offense count: 87
+# Offense count: 75
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [7.3.0](https://github.com/voxpupuli/beaker/tree/7.3.0) (2026-01-06)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/7.2.2...7.3.0)
+
+**Implemented enhancements:**
+
+- Remove `--force-yes` from apt commands [\#1982](https://github.com/voxpupuli/beaker/pull/1982) ([bwitt](https://github.com/bwitt))
+- Lazily create options and state storage [\#1977](https://github.com/voxpupuli/beaker/pull/1977) ([ekohl](https://github.com/ekohl))
+- Add Ruby 4.0 support [\#1976](https://github.com/voxpupuli/beaker/pull/1976) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- Allow `retry_on` to work for host array [\#1983](https://github.com/voxpupuli/beaker/pull/1983) ([bwitt](https://github.com/bwitt))
+
 ## [7.2.2](https://github.com/voxpupuli/beaker/tree/7.2.2) (2025-12-19)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/7.2.1...7.2.2)

data/acceptance/tests/base/dsl/helpers/host_helpers/retry_on_test.rb

@@ -24,10 +24,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
     assert_equal "", result.stdout
   end
 
-  step "#retry_on CURRENTLY fails when provided a host array" do
-    # NOTE: would expect this to work across hosts, or be better documented and
-    #       to raise Beaker::Host::CommandFailure
-
+  step "#retry_on works when provided a host array" do
     remote_tmpdir = default.tmpdir
     remote_script_file = File.join(remote_tmpdir, "test.sh")
 
@@ -36,8 +33,13 @@ test_name "dsl::helpers::host_helpers #retry_on" do
       create_remote_file_from_fixture("retry_script", host, remote_tmpdir, "test.sh")
     end
 
-    assert_raises NoMethodError do
-      retry_on hosts, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
+    results = retry_on hosts, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
+
+    assert_kind_of Array, results
+    assert_equal hosts.length, results.length
+    results.each do |result|
+      assert_equal 0, result.exit_code
+      assert_equal "", result.stdout
     end
   end
 end

data/beaker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '>= 2.4', '< 4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.0.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
 
   # Run time dependencies
   # Required for Ruby 3.3+ support
@@ -33,6 +33,17 @@ Gem::Specification.new do |s|
   s.add_dependency 'minitest', '>= 5.4', '< 7'
   s.add_dependency 'rexml', '~> 3.2', '>= 3.2.5'
 
+  # readline is a bundled gem since Ruby 4
+  s.add_dependency 'readline', '~> 0.0.4'
+
+  # YAML::PStore depends on pstore, which is a bundled gem since Ruby 4
+  # https://github.com/ruby/yaml/issues/69
+  s.add_dependency 'pstore', '< 1'
+
+  # net-ssh needs logger
+  # https://github.com/net-ssh/net-ssh/pull/984
+  s.add_dependency 'logger', '< 2'
+
   # net-ssh compatibility with ed25519 keys
   s.add_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
   s.add_dependency 'ed25519', '>= 1.2', '<2.0'

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

@@ -557,25 +557,30 @@ module Beaker
           retry_interval        = option_retry_interval == 0 ? 1 : option_retry_interval
           verbose               = true.to_s == opts[:verbose]
 
-          log_prefix = host.log_prefix
-          logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command}"
-          logger.debug "  Trying command #{max_retries} times."
-          logger.debug ".", add_newline: false
-
-          result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
-          num_retries = 0
-          until desired_exit_codes.include?(result.exit_code)
-            sleep retry_interval
-            result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
-            num_retries += 1
+          block_opts = {}
+          block_opts[:run_in_parallel] = opts[:run_in_parallel] if opts.key?(:run_in_parallel)
+
+          block_on host, block_opts do |single_host|
+            log_prefix = single_host.log_prefix
+            logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command}"
+            logger.debug "  Trying command #{max_retries} times."
             logger.debug ".", add_newline: false
-            if (num_retries > max_retries)
-              logger.debug "  Command \`#{command}\` failed."
-              fail("Command \`#{command}\` failed.")
+
+            result = on(single_host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
+            num_retries = 0
+            until desired_exit_codes.include?(result.exit_code)
+              sleep retry_interval
+              result = on(single_host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
+              num_retries += 1
+              logger.debug ".", add_newline: false
+              if (num_retries > max_retries)
+                logger.debug "  Command \`#{command}\` failed."
+                fail("Command \`#{command}\` failed.")
+              end
             end
+            logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command} ostensibly successful."
+            result
           end
-          logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command} ostensibly successful."
-          result
         end
 
         # FIX: this should be moved into host/platform

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

@@ -96,7 +96,7 @@ module Unix::Pkg
     when /ubuntu|debian/
       name = "#{name}=#{version}" if version
       update_apt_if_needed
-      execute("apt-get install --force-yes #{cmdline_args} -y #{name}", opts)
+      execute("apt-get install #{cmdline_args} -y #{name}", opts)
     when /solaris-11/
       if opts[:acceptable_exit_codes]
         opts[:acceptable_exit_codes] << 4
@@ -204,7 +204,7 @@ module Unix::Pkg
       execute("yum -y #{cmdline_args} update #{name}", opts)
     when /ubuntu|debian/
       update_apt_if_needed
-      execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}", opts)
+      execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y #{name}", opts)
     when /solaris-11/
       if opts[:acceptable_exit_codes]
         opts[:acceptable_exit_codes] << 4

data/lib/beaker/subcommand.rb

@@ -10,9 +10,6 @@ module Beaker
 
     def initialize(*args)
       super
-      FileUtils.mkdir_p(SubcommandUtil::CONFIG_DIR)
-      FileUtils.touch(SubcommandUtil::SUBCOMMAND_OPTIONS) unless SubcommandUtil::SUBCOMMAND_OPTIONS.exist?
-      FileUtils.touch(SubcommandUtil::SUBCOMMAND_STATE) unless SubcommandUtil::SUBCOMMAND_STATE.exist?
       @cli = Beaker::CLI.new
     end
 
@@ -83,13 +80,13 @@ module Beaker
 
       @cli.parse_options
 
+      # TODO: use options_storage?
       options_to_write = SubcommandUtil.sanitize_options_for_save(@cli.configured_options)
 
       @cli.logger.notify 'Writing configured options to disk'
-      File.write(SubcommandUtil::SUBCOMMAND_OPTIONS, options_to_write.to_yaml)
+      SubcommandUtil::SUBCOMMAND_OPTIONS.write(options_to_write.to_yaml)
       @cli.logger.notify "Options written to #{SubcommandUtil::SUBCOMMAND_OPTIONS}"
 
-      state = YAML::Store.new(SubcommandUtil::SUBCOMMAND_STATE)
       state.transaction do
         state['provisioned'] = false
       end
@@ -108,7 +105,6 @@ module Beaker
         return
       end
 
-      state = YAML::Store.new(SubcommandUtil::SUBCOMMAND_STATE)
       SubcommandUtil.error_with('Provisioned SUTs detected. Please destroy and reprovision.') if state.transaction { state['provisioned'] }
 
       @cli.parse_options
@@ -125,7 +121,6 @@ module Beaker
 
       # should we only update the options here with the new host? Or update the settings
       # with whatever new flags may have been provided with provision?
-      options_storage = YAML::Store.new(SubcommandUtil::SUBCOMMAND_OPTIONS)
       options_storage.transaction do
         @cli.logger.notify 'updating HOSTS key in subcommand_options'
         options_storage['HOSTS'] = cleaned_hosts
@@ -197,7 +192,6 @@ module Beaker
 
       @cli.logger.notify 'updating HOSTS key in subcommand_options'
       hosts = SubcommandUtil.sanitize_options_for_save(@cli.combined_instance_and_options_hosts)
-      options_storage = YAML::Store.new(SubcommandUtil::SUBCOMMAND_OPTIONS)
       options_storage.transaction do
         options_storage['HOSTS'] = hosts
       end
@@ -214,7 +208,6 @@ module Beaker
         return
       end
 
-      state = YAML::Store.new(SubcommandUtil::SUBCOMMAND_STATE)
       SubcommandUtil.error_with('Please provision an environment') unless state.transaction { state['provisioned'] }
 
       @cli.parse_options
@@ -226,5 +219,23 @@ module Beaker
         state.delete('provisioned')
       end
     end
+
+    no_commands do
+      private
+
+      def state
+        @state ||= begin
+          FileUtils.mkdir_p(SubcommandUtil::CONFIG_DIR)
+          YAML::Store.new(SubcommandUtil::SUBCOMMAND_STATE)
+        end
+      end
+
+      def options_storage
+        @options_storage ||= begin
+          FileUtils.mkdir_p(SubcommandUtil::CONFIG_DIR)
+          YAML::Store.new(SubcommandUtil::SUBCOMMAND_OPTIONS)
+        end
+      end
+    end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.2.2'
+    STRING = '7.3.0'
   end
 end

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

@@ -241,6 +241,23 @@ describe ClassMixedWithDSLHelpers do
       result_given = subject.retry_on(host, command, opts)
       expect(result_given.exit_code).to be === 0
     end
+
+    it 'operates correctly when host is an array' do
+      result.stdout = 'stdout'
+      result.stderr = 'stderr'
+      result.exit_code = 0
+
+      opts = {
+        :max_retries => 5,
+        :retry_interval => 0.0001,
+      }
+
+      allow(subject).to receive(:on).and_return(result)
+      expect(subject).to receive(:on).exactly(hosts.length).times
+
+      results = subject.retry_on(hosts, command, opts)
+      expect(results).to eq(Array.new(hosts.length, result))
+    end
   end
 
   describe "shell" do

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

@@ -139,7 +139,7 @@ module Beaker
         it "uses apt-get for #{platform}" do
           @opts = { 'platform' => platform }
           pkg = 'pkg'
-          expect(Beaker::Command).to receive(:new).with("apt-get install --force-yes  -y #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+          expect(Beaker::Command).to receive(:new).with("apt-get install  -y #{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
@@ -209,7 +209,7 @@ module Beaker
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         it "calls the correct apt-get incantation for #{platform}" do
           @opts = { 'platform' => platform }
-          expect(Beaker::Command).to receive(:new).with("apt-get install -o Dpkg::Options::='--force-confold'  -y --force-yes pkg", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+          expect(Beaker::Command).to receive(:new).with("apt-get install -o Dpkg::Options::='--force-confold'  -y pkg", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
           expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
           expect(instance.upgrade_package('pkg')).to eq "hello"
         end

data/spec/beaker/subcommand_spec.rb

@@ -7,101 +7,97 @@ module Beaker
       described_class.new
     end
 
+    let(:mock_state) { double(YAML::Store) }
+    let(:mock_options_storage) { double(YAML::Store) }
+
     describe '#initialize' do
       it 'creates a cli object' do
         expect(subcommand.cli).to be_instance_of(Beaker::CLI)
       end
+    end
 
-      describe 'File operation initialization for subcommands' do
-        it 'checks to ensure subcommand file resources exist' do
+    describe '#state' do
+      it 'ensures the parent directory exists' do
+        FakeFS.without do
           expect(FileUtils).to receive(:mkdir_p).with(SubcommandUtil::CONFIG_DIR)
-          expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
-          expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
-          subcommand
+          expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE)
+          subcommand.send(:state)
         end
+      end
+    end
 
-        it 'touches the files when they do not exist' do
+    describe '#options_storage' do
+      it 'ensures the parent directory exists' do
+        FakeFS.without do
           expect(FileUtils).to receive(:mkdir_p).with(SubcommandUtil::CONFIG_DIR)
-          allow(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(false)
-          allow(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(false)
-          expect(FileUtils).to receive(:touch).with(SubcommandUtil::SUBCOMMAND_OPTIONS)
-          expect(FileUtils).to receive(:touch).with(SubcommandUtil::SUBCOMMAND_STATE)
-          subcommand
+          expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_OPTIONS)
+          subcommand.send(:options_storage)
         end
       end
     end
 
     context 'ensure that beaker options can be passed through' do
-      let(:beaker_options_list) do
-        %w[
-          options-file
-          helper
-          load-path
-          tests
-          pre-suite
-          post-suite
-          pre-cleanup
-          provision
-          preserve-hosts
-          preserve-state
-          root-keys
-          keyfile
-          timeout
-          install
-          modules
-          quiet
-          color
-          color-host-output
-          log-level
-          log-prefix
-          dry-run
-          fail-mode
-          ntp
-          repo-proxy
-          package-proxy
-          validate
-          collect-perf-data
-          parse-only
-          tag
-          exclude-tags
-          xml-time-order
-          debug-errors
-          exec_manual_tests
-          test-tag-exclude
-          test-tag-and
-          test-tag-or
-          xml
-          type
-          debug
-        ]
-      end
-
-      let(:yaml_store_mock) { double('yaml_store_mock') }
-
-      it 'does not error with valid beaker options' do
+      beaker_options_list = %w[
+        options-file
+        helper
+        load-path
+        tests
+        pre-suite
+        post-suite
+        pre-cleanup
+        provision
+        preserve-hosts
+        preserve-state
+        root-keys
+        keyfile
+        timeout
+        install
+        modules
+        quiet
+        color
+        color-host-output
+        log-level
+        log-prefix
+        dry-run
+        fail-mode
+        ntp
+        repo-proxy
+        package-proxy
+        validate
+        collect-perf-data
+        parse-only
+        tag
+        exclude-tags
+        xml-time-order
+        debug-errors
+        exec_manual_tests
+        test-tag-exclude
+        test-tag-and
+        test-tag-or
+        xml
+        type
+        debug
+      ]
+
+      describe 'does not error with valid beaker option' do
         beaker_options_list.each do |option|
-          allow_any_instance_of(Beaker::CLI).to receive(:parse_options)
-          allow_any_instance_of(Beaker::CLI).to receive(:configured_options).and_return({})
-
-          allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
-          allow(yaml_store_mock).to receive(:transaction).and_yield
-          allow(yaml_store_mock).to receive(:[]=).with('provisioned', false)
-          allow(File).to receive(:open)
-          allow_any_instance_of(Beaker::Logger).to receive(:notify).twice
-          expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
-          expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
-
-          expect { described_class.start(['init', '--hosts', 'centos', "--#{option}"]) }.not_to output(/ERROR/).to_stderr
+          it option do
+            allow_any_instance_of(Beaker::CLI).to receive(:parse_options)
+            allow_any_instance_of(Beaker::CLI).to receive(:configured_options).and_return({})
+
+            allow_any_instance_of(described_class).to receive(:state).and_return(mock_state)
+            allow(mock_state).to receive(:transaction).and_yield
+            allow(mock_state).to receive(:[]=).with('provisioned', false)
+            allow(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:write)
+            allow_any_instance_of(Beaker::Logger).to receive(:notify).twice
+
+            expect { described_class.start(['init', '--hosts', 'centos', "--#{option}"]) }.not_to output(/ERROR/).to_stderr
+          end
         end
       end
 
       it "errors with a bad option here" do
-        allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
-        allow(yaml_store_mock).to receive(:transaction).and_yield
-        allow(yaml_store_mock).to receive(:[]=).with('provisioned', false)
-        expect(File).not_to receive(:open)
-        expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
-        expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
+        expect(SubcommandUtil::SUBCOMMAND_OPTIONS).not_to receive(:write)
         expect { described_class.start(['init', '--hosts', 'centos', '--bad-option']) }.to output(/ERROR/).to_stderr
       end
     end
@@ -109,7 +105,6 @@ module Beaker
     describe '#init' do
       let(:cli) { subcommand.cli }
       let(:mock_options) { { :timestamp => 'noon', :other_key => 'cordite' } }
-      let(:yaml_store_mock) { double('yaml_store_mock') }
 
       before do
         allow(cli).to receive(:parse_options)
@@ -117,34 +112,34 @@ module Beaker
       end
 
       it 'calculates options and writes them to disk and deletes the' do
-        allow(File).to receive(:open)
-        allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
-        allow(yaml_store_mock).to receive(:transaction).and_yield
-        expect(yaml_store_mock).to receive(:[]=).with('provisioned', false)
+        expect(subcommand).to receive(:state).and_return(mock_state).twice
+        expect(mock_state).to receive(:transaction).and_yield
+        expect(mock_state).to receive(:[]=).with('provisioned', false)
+        expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:write).with({ 'other_key' => 'cordite' }.to_yaml)
         subcommand.init
-        expect(mock_options).not_to have_key(:timestamp)
       end
 
       it 'requires hosts flag' do
+        pending 'this was relying on FakeFS raising an exception'
         expect { subcommand.init }.to raise_error(NotImplementedError)
       end
     end
 
     describe '#provision' do
       let(:cli) { subcommand.cli }
-      let(:yaml_store_mock) { double('yaml_store_mock') }
       let(:host_hash) { { 'mynode.net' => { :name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64') } } }
       let(:cleaned_hosts) { double }
       let(:yielded_host_hash) { double }
       let(:yielded_host_name) { double }
-      let(:network_manager) { double('network_manager') }
+      let(:network_manager) { double(Beaker::NetworkManager) }
       let(:hosts) { double('hosts') }
       let(:hypervisors) { double('hypervisors') }
       let(:options) { double('options') }
 
       it 'provisions the host and saves the host info' do
-        expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
-        allow(yaml_store_mock).to receive(:[]).and_return(false)
+        allow(subcommand).to receive(:state).and_return(mock_state)
+        expect(mock_state).to receive(:transaction).and_yield
+        expect(mock_state).to receive(:[]).with('provisioned').and_return(false)
         allow(cli).to receive(:preserve_hosts_file).and_return("/path/to/ho")
         allow(cli).to receive(:network_manager).and_return(network_manager)
         allow(cli).to receive(:options).and_return(options)
@@ -157,13 +152,14 @@ module Beaker
         expect(SubcommandUtil).to receive(:sanitize_options_for_save).and_return(cleaned_hosts)
         expect(cleaned_hosts).to receive(:each).and_yield(yielded_host_name, yielded_host_hash)
         expect(yielded_host_hash).to receive(:[]=).with('provision', false)
-        expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_OPTIONS).and_return(yaml_store_mock)
+        allow(subcommand).to receive(:options_storage).and_return(mock_options_storage)
 
-        expect(yaml_store_mock).to receive(:transaction).and_yield.exactly(3).times
-        expect(yaml_store_mock).to receive(:[]=).with('HOSTS', cleaned_hosts)
-        expect(yaml_store_mock).to receive(:[]=).with('hosts_preserved_yaml_file', "/path/to/hosts")
+        expect(mock_options_storage).to receive(:transaction).and_yield
+        expect(mock_options_storage).to receive(:[]=).with('HOSTS', cleaned_hosts)
+        expect(mock_options_storage).to receive(:[]=).with('hosts_preserved_yaml_file', "/path/to/hosts")
 
-        expect(yaml_store_mock).to receive(:[]=).with('provisioned', true)
+        expect(mock_state).to receive(:transaction).and_yield
+        expect(mock_state).to receive(:[]=).with('provisioned', true)
         subcommand.provision
       end
 
@@ -182,11 +178,10 @@ module Beaker
 
       let(:cleaned_hosts) { double }
       let(:host_hash) { { 'mynode.net' => { :name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64') } } }
-      let(:yaml_store_mock) { double('yaml_store_mock') }
 
       it 'calls execute! when no resource is given' do
-        expect_any_instance_of(Pathname).not_to receive(:directory?)
-        expect_any_instance_of(Pathname).not_to receive(:exist?)
+        allow_any_instance_of(Pathname).to receive(:exist?).and_return(false)
+        allow_any_instance_of(Pathname).to receive(:directory?).and_return(false)
         expect(subcommand.cli).to receive(:execute!).once
         expect { subcommand.exec }.not_to raise_error
       end
@@ -255,15 +250,14 @@ module Beaker
       end
 
       it 'updates the subcommand_options file with new host info if `preserve-state` is set' do
-        allow(yaml_store_mock).to receive(:[]).and_return(false)
         allow(subcommand).to receive(:options).and_return('preserve-state' => true)
 
         expect(subcommand.cli).to receive(:parse_options).and_return(subcommand.cli)
         expect(subcommand.cli).to receive(:combined_instance_and_options_hosts).and_return(host_hash)
         expect(SubcommandUtil).to receive(:sanitize_options_for_save).and_return(cleaned_hosts)
-        expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_OPTIONS).and_return(yaml_store_mock)
-        expect(yaml_store_mock).to receive(:transaction).and_yield.once
-        expect(yaml_store_mock).to receive(:[]=).with('HOSTS', cleaned_hosts)
+        expect(subcommand).to receive(:options_storage).and_return(mock_options_storage).twice
+        expect(mock_options_storage).to receive(:transaction).and_yield.once
+        expect(mock_options_storage).to receive(:[]=).with('HOSTS', cleaned_hosts)
         expect(subcommand.cli.logger).to receive(:notify)
 
         subcommand.exec('tests')
@@ -280,8 +274,7 @@ module Beaker
     context 'destroy' do
       let(:cli) { subcommand.cli }
       let(:mock_options) { { :timestamp => 'noon', :other_key => 'cordite' } }
-      let(:yaml_store_mock) { double('yaml_store_mock') }
-      let(:network_manager) { double('network_manager') }
+      let(:network_manager) { double(Beaker::NetworkManager) }
 
       it 'calls destroy and updates the yaml store' do
         allow(cli).to receive(:parse_options)
@@ -289,10 +282,10 @@ module Beaker
         allow(cli).to receive(:network_manager).and_return(network_manager)
         expect(network_manager).to receive(:cleanup)
 
-        expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
-        allow(yaml_store_mock).to receive(:transaction).and_yield
-        allow(yaml_store_mock).to receive(:[]).with('provisioned').and_return(true)
-        allow(yaml_store_mock).to receive(:delete).with('provisioned').and_return(true)
+        allow(subcommand).to receive(:state).and_return(mock_state)
+        expect(mock_state).to receive(:transaction).and_yield.twice
+        expect(mock_state).to receive(:[]).with('provisioned').and_return(true)
+        expect(mock_state).to receive(:delete).with('provisioned').and_return(true)
         expect(SubcommandUtil).to receive(:error_with).with("Please provision an environment").exactly(0).times
         subcommand.destroy
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.3.0
 platform: ruby
 authors:
 - Puppet
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
@@ -698,7 +740,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []