vagrant-serverspec 1.5.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf819c978e49dc770304f6e13a05114333290b9ffdb93d396cbf43586dabe825
-  data.tar.gz: d5b709e909e1c0390ee0ce6150b7c8c24b6749b3cd0d9d8b03feb5b6ab757d14
+  metadata.gz: 8c288ccbd9b65da16a59f54f59cd12c3fa85425fa22821aae9162e2a3404f424
+  data.tar.gz: 541eaab6e7a32ce102d4c3b959fa7cf4f9c039959b6b31ae6e90e701587c6726
 SHA512:
-  metadata.gz: 0f29e2e30ccfd2260dcd637afc6a653e2aa567a2c154240228c95c74abb24bbde9ff5aec3daeb0bd5a636e6ada3d814381316d2fd0b31294d41aa3fdf4688c46
-  data.tar.gz: b6eae77de546da3570a0b3e30eb299ed2b78adf514adb5702b0aa0b35af721a7cbbc2c941ada26e807e51638a4a90ba6b7381c60be89b2d4c90d4a66a15b582b
+  metadata.gz: bd9a2765198cb98ac0f67d6c2abfbef1f8394ff79827f3088b3de6d5f7212d31a215c87910edc7f3a9e74cbf4681a7476dd07123252b4ce7be75bebdc0cd0f9e
+  data.tar.gz: 6f94bf95e45b0682f57d0f597248fb5163b3de0445635d6ad03d24695fe30dbe145acb0f9d709ae96f8faa4da221bedb6b6c0f10ec72f395c34e585adf1fc6cd

data/.gitignore

@@ -9,4 +9,9 @@
 .bundle
 pkg
 tags
-Gemfile.lock
+Gemfile.lock
+vendor/
+
+# test output
+rspec_html_reports/
+rspec.xml

data/{test/ubuntu/.rspec → .rspec}

@@ -1,2 +1,3 @@
+--require spec_helper
 --color
 --format documentation

data/CHANGELOG.md

@@ -1,17 +1,59 @@
-### v 1.5.1 Mar 02, 2020 
+
+### v 2.0.0 Nov 04, 2026
+
+Major version: the plugin now targets Vagrant 2.4.x / Ruby 3.x. Closes all open
+Dependabot alerts (bundler 1.x, activesupport 5.2).
+
+**Breaking**
+* Requires Ruby >= 3.0 (Vagrant 2.4.x supports Ruby 3.0 - 3.4).
+* `html_output` now uses RSpec's built-in HTML formatter. The report is still
+  written to `rspec_html_reports/overview.html`, but it looks different from the
+  old `rspec_html_formatter` report. That gem is unmaintained and crashes on
+  Ruby >= 3.2 (`File.exists?` was removed), so it is dropped together with its
+  `activesupport` dependency.
+* Dropped unused runtime dependencies: `activesupport`, `os`.
+* Dropped `bundler ~> 1.17` development dependency.
+
+**Dependencies**
+* serverspec `~> 2.43`
+* winrm `~> 2.3, >= 2.3.9` (range accepted by Vagrant 2.4.x)
+* rspec_junit_formatter `~> 0.6`
+* rake `~> 13.0` (development)
+* Gemfile: Vagrant is installed from rubygems.org (`~> 2.4`) instead of `git://github.com/hashicorp/vagrant`
+
+**Fixes**
+* Docker provider: the SSH ProxyCommand through the host VM was never enabled
+  because the provider class name was compared with `'DockerProvider'` instead
+  of `VagrantPlugins::DockerProvider::Provider`.
+
+**Tooling**
+* Added an RSpec unit test suite (`spec/`) and a GitHub Actions workflow that
+  runs it on Ruby 3.1 - 3.4, builds the gem, installs it into Vagrant and
+  validates the sample Vagrantfile.
+* Gem publish workflow now runs on `v*` tags, uses `ruby/setup-ruby`
+  (`actions/setup-ruby` is archived) and publishes through RubyGems trusted
+  publishing (OIDC) instead of a stored API key.
+
+### v 1.5.3 (unreleased)
+* fix: SSH Proxy command with Docker is only used when the host VM is enabled
+
+### v 1.5.2 Oct 02, 2020
+* Add 'exclude_pattern' option
+
+### v 1.5.1 Mar 02, 2020
 * Security, update rake build dependency version to 12.3.3
 
-### v 1.5.0 Nov 25, 2019 
-* Add a new junit formatter 
+### v 1.5.0 Nov 25, 2019
+* Add a new junit formatter
 
 ### v 1.4.0 Nov 1, 2019 (not released)
 * Fix vagrant-serverspec dependencies to work with Vagrant 2.2.6
 
 ### v 1.3.0 Sep 24, 2017
-* Add new options 'error_no_spec_files' to avoid error when no rspec conf files was found 
+* Add new options 'error_no_spec_files' to avoid error when no rspec conf files was found
 
 ### v 1.2.0 Mar 27, 2017
-* Provide compatibility with vagrant 1.9.2 
+* Provide compatibility with vagrant 1.9.2
 * Updated .gemspec to the recommended winrm version 2.x
 * Updated WinRM::Connection instead of WinRM::WebService
 * Updated `WINDOWS_README.md`

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :development do
-  gem 'vagrant', git: 'git://github.com/hashicorp/vagrant', tag: 'v2.2.6'
+  # Vagrant is published on rubygems.org since 2.3.x; no need to pull it from git anymore.
+  gem 'vagrant', '~> 2.4', '>= 2.4.0'
 end
-
-gemspec

data/README.md

@@ -6,6 +6,10 @@
 > **vagrant-serverspec is a [vagrant][vagrant] plugin that implements
 > [serverspec][serverspec] as a provisioner.**
 
+## Requirements
+
+* Vagrant 2.4.x (Ruby 3.0 - 3.4). For Vagrant 2.2.x use vagrant-serverspec 1.5.x.
+
 ## Installing
 ### Standard way
 First, install the plugin.
@@ -24,7 +28,7 @@ C:\HashiCorp\Vagrant\embedded\bin\gem.bat build vagrant-serverspec.gemspec
 ```
 after that install plugin from filesystem
 ```shell
-vagrant plugin install ./vagrant-serverspec-0.5.0.gem
+vagrant plugin install ./vagrant-serverspec-2.0.0.gem
 ```
 
 ## Example Usage
@@ -48,7 +52,7 @@ Vagrant.configure('2') do |config|
     spec.exclude_pattern = 'but_not_*_spec.rb'
     # disable error if no specfile was found ( useful with dynamic specfile retrieving through another provisionner like Ansible Galaxy => specfiles can be saved into ansible role repository for example ). Default: true
     spec.error_no_spec_files = false
-    # save result into html an report, saved into a 'rspec_html_reports' directory. Default: false
+    # save result into an html report (RSpec's built-in html formatter), written to 'rspec_html_reports/overview.html'. Default: false
     spec.html_output = true
     # save result into junit xml report, default file name is 'rspec.xml'
     spec.junit_output = true
@@ -65,7 +69,7 @@ You may want to override standard settings; a file named `spec_helper.rb` is usu
 # set :disable_sudo, true
 
 # Set environment variables
-# set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
+# set :env, :LANG => 'C', :LC_MESSAGES => 'C'
 
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'
@@ -90,8 +94,16 @@ describe port(22) do
 end
 ```
 
-##Testing Docker Containers on OSX
-On OSX the Vagrant docker provider runs a Boot2Docker VM, then launches your docker container on that VM. Vagrant does SSH Proxying to send the commands through that VM and have them reach the Docker Container. Vagrant serverspec handles this the same way by getting the container host VM infromation and proxying the commands to the machine through an SSH Proxy. This functionality was introduced in this [PR](https://github.com/vvchik/vagrant-serverspec/pull/17) 
+## Docker Provider
+
+When using the [Docker provider](https://www.vagrantup.com/docs/providers/docker), Vagrant allows to either use the local Docker Engine
+or to spin up an [Host VM](https://www.vagrantup.com/docs/providers/docker/basics#host-vm) to host the Docker Engine.
+
+Vagrant serverspec handles both cases, in particular the Host VM by getting its informations and proxying the commands to the container through an SSH Proxy.
+This functionality was introduced in this [PR](https://github.com/vvchik/vagrant-serverspec/pull/17).
+
+The SSH Proxy is used when the attribute [`force_host_vm`](https://www.vagrantup.com/docs/providers/docker/configuration#force_host_vm) is set to true
+(auto-detected by Vagrant by default, or defined in your `Vagrantfile`).
 
 ## Additional informations
 
@@ -124,6 +136,17 @@ vagrant-serverspec aims to adhere to [Semantic Versioning 2.0.0][semver].
 * Source hosted at [GitHub][repo]
 * Report issues/questions/feature requests on [GitHub Issues][issues]
 
+Running the test suite:
+
+```shell
+bundle install
+bundle exec rspec
+```
+
+Releasing: bump `lib/vagrant-serverspec/version.rb` and `CHANGELOG.md`, merge to
+`master`, then push a `vX.Y.Z` tag. GitHub Actions publishes the gem to
+rubygems.org via trusted publishing and creates the GitHub release.
+
 Pull requests are very welcome! Make sure your patches are well tested.
 Ideally create a topic branch for every separate change you make. For
 example:
@@ -136,8 +159,8 @@ example:
 
 ## Authors
 
-Original Idea [Jeremy Voorhis][jvoorhis] (<jvoorhis@gmail.com>).  
-Current version author and maintainer [Vladimir Babchynskyy][vvchik] (<vvchik@gmail.com>)  
+Original Idea [Jeremy Voorhis][jvoorhis] (<jvoorhis@gmail.com>).
+Current version author and maintainer [Vladimir Babchynskyy][vvchik] (<vvchik@gmail.com>)
 and a growing community of [contributors][contributors].
 
 ## License

data/Rakefile

@@ -1,5 +1,6 @@
-require 'bundler/gem_helper'
+require 'bundler/gem_tasks'   # build, install, release (used by rubygems/release-gem in CI)
+require 'rspec/core/rake_task'
 
-namespace :gem do
-  Bundler::GemHelper.install_tasks
-end
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/vagrant-serverspec/plugin.rb

@@ -4,8 +4,8 @@ require 'pathname'
 require 'winrm'
 require 'net/ssh'
 require 'net/ssh/proxy/command'
-require 'os'
- module VagrantPlugins
+
+module VagrantPlugins
   module ServerSpec
     class Plugin < Vagrant.plugin('2')
       name 'serverspec'

data/lib/vagrant-serverspec/provisioner.rb

@@ -4,6 +4,8 @@
 module VagrantPlugins
   module ServerSpec
     class Provisioner < Vagrant.plugin('2', :provisioner)
+      HTML_REPORT_DIR = 'rspec_html_reports'.freeze
+
       def initialize(machine, config)
         super
         @spec_files = config.spec_files
@@ -15,7 +17,6 @@ module VagrantPlugins
 
       def provision
         if machine.config.vm.communicator == :winrm
-          username = machine.config.winrm.username
           winrm_info = VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(@machine)
           set :backend, :winrm
           set :os, :family => 'windows'
@@ -55,7 +56,7 @@ module VagrantPlugins
           host = machine.ssh_info[:host]
           options = Net::SSH::Config.for(host)
 
-          options[:proxy]         = setup_provider_proxy if use_jump_provider?
+          options[:proxy]         = setup_provider_proxy if use_proxy?
           options[:user]          = machine.ssh_info[:username]
           options[:port]          = machine.ssh_info[:port]
           options[:keys]          = machine.ssh_info[:private_key_path]
@@ -80,9 +81,12 @@ module VagrantPlugins
           require 'rspec'
 
           if config.html_output_format
-            require 'rspec_html_formatter'
+            # RSpec's built-in HTML formatter. The third-party rspec_html_formatter
+            # gem used before 2.0 is unmaintained and does not run on Ruby >= 3.2.
+            require 'fileutils'
+            FileUtils.mkdir_p(HTML_REPORT_DIR)
 
-            rconfig.add_formatter "RspecHtmlFormatter"
+            rconfig.add_formatter 'html', File.join(HTML_REPORT_DIR, 'overview.html')
           end
 
           if config.junit_output_format
@@ -124,22 +128,11 @@ module VagrantPlugins
         Net::SSH::Proxy::Command.new("ssh #{proxy_options} -i #{key_path} -p #{port} #{username}@#{host} nc %h %p")
       end
 
-      def use_jump_provider?
-        jump_providers = [
-          {
-           name:      "DockerProvider",
-           platforms: ["mac"]
-          }
-        ]
-        current_provider_class = machine.provider.class.name.to_s
+      def use_proxy?
+        # Vagrant's Docker provider class is VagrantPlugins::DockerProvider::Provider
+        return false unless machine.provider.class.name.to_s.include?('DockerProvider')
 
-        jump_providers.any? do |jump_provider|
-          if current_provider_class.include? jump_provider[:name]
-            jump_provider[:platforms].any? do |platform|
-              OS.send("#{platform}?")
-            end
-          end
-        end
+        machine.provider.config.force_host_vm ? true : false
       end
     end
   end

data/lib/vagrant-serverspec/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServerSpec
-    VERSION = '1.5.2'
+    VERSION = '2.0.0'
   end
 end

data/spec/config_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+require 'tmpdir'
+
+describe VagrantPlugins::ServerSpec::Config do
+  subject(:config) { described_class.new }
+
+  let(:machine) { double('machine') }
+
+  around do |example|
+    Dir.mktmpdir('vagrant-serverspec') do |dir|
+      Dir.chdir(dir) do
+        FileUtils.mkdir_p('spec')
+        File.write('spec/a_spec.rb', '')
+        File.write('spec/b_spec.rb', '')
+        File.write('spec/skip_me_spec.rb', '')
+        example.run
+      end
+    end
+  end
+
+  describe 'defaults' do
+    before { config.finalize! }
+
+    it 'has no spec files' do
+      expect(config.spec_files).to eq([])
+    end
+
+    it 'enables error_no_spec_files' do
+      expect(config.error_no_spec_files_found).to be(true)
+    end
+
+    it 'disables html and junit output' do
+      expect(config.html_output_format).to be(false)
+      expect(config.junit_output_format).to be(false)
+      expect(config.junit_output_format_file_name).to be(false)
+    end
+
+    it 'fails validation because there are no spec files' do
+      result = config.validate(machine)
+      expect(result['serverspec provisioner']).to include('You must list at least one spec file')
+    end
+  end
+
+  describe '#pattern=' do
+    it 'globs the matching files' do
+      config.pattern = 'spec/*_spec.rb'
+      config.finalize!
+
+      expect(config.spec_pattern).to eq('spec/*_spec.rb')
+      expect(config.spec_files).to contain_exactly('spec/a_spec.rb', 'spec/b_spec.rb', 'spec/skip_me_spec.rb')
+    end
+
+    it 'passes validation when files exist' do
+      config.pattern = 'spec/*_spec.rb'
+      config.finalize!
+
+      expect(config.validate(machine)).to eq('serverspec provisioner' => [])
+    end
+
+    it 'reports missing files' do
+      config.spec_files = ['spec/does_not_exist_spec.rb']
+      config.finalize!
+
+      errors = config.validate(machine)['serverspec provisioner']
+      expect(errors.join).to include('spec/does_not_exist_spec.rb')
+    end
+  end
+
+  describe '#exclude_pattern=' do
+    it 'removes excluded files from the list' do
+      config.pattern = 'spec/*_spec.rb'
+      config.exclude_pattern = 'spec/skip_*_spec.rb'
+      config.finalize!
+
+      expect(config.spec_excluded_files).to eq(['spec/skip_me_spec.rb'])
+      expect(config.spec_files).to contain_exactly('spec/a_spec.rb', 'spec/b_spec.rb')
+    end
+  end
+
+  describe '#error_no_spec_files=' do
+    it 'accepts booleans only' do
+      config.error_no_spec_files = false
+      config.error_no_spec_files = 'yes'
+      config.finalize!
+      expect(config.error_no_spec_files_found).to be(false)
+    end
+
+    it 'returns nil from validate when disabled' do
+      config.error_no_spec_files = false
+      config.finalize!
+      expect(config.validate(machine)).to be_nil
+    end
+  end
+
+  describe 'output formats' do
+    it 'accepts html_output and junit_output flags' do
+      config.html_output = true
+      config.junit_output = true
+      config.finalize!
+      expect(config.html_output_format).to be(true)
+      expect(config.junit_output_format).to be(true)
+    end
+
+    it 'ignores non-boolean values' do
+      config.html_output = 'true'
+      config.junit_output = 1
+      config.finalize!
+      expect(config.html_output_format).to be(false)
+      expect(config.junit_output_format).to be(false)
+    end
+
+    it 'accepts only .xml junit file names' do
+      config.junit_output_file = 'report.txt'
+      config.finalize!
+      expect(config.junit_output_format_file_name).to be(false)
+
+      config.junit_output_file = 'report.xml'
+      expect(config.junit_output_format_file_name).to eq('report.xml')
+    end
+  end
+end

data/spec/provisioner_spec.rb

@@ -0,0 +1,241 @@
+require 'spec_helper'
+require 'tmpdir'
+
+describe VagrantPlugins::ServerSpec::Provisioner do
+  let(:ssh_info) do
+    {
+      host: '192.0.2.10',
+      port: 2222,
+      username: 'vagrant',
+      private_key_path: ['/tmp/insecure_private_key'],
+      password: nil,
+    }
+  end
+
+  let(:provider_config) { double('provider_config', force_host_vm: false) }
+  let(:provider)        { double('provider', config: provider_config) }
+  let(:vm_config)       { double('vm_config', communicator: :ssh) }
+  let(:machine_config)  { double('machine_config', vm: vm_config) }
+  let(:machine) do
+    double('machine', config: machine_config, ssh_info: ssh_info, provider: provider)
+  end
+
+  let(:config) do
+    VagrantPlugins::ServerSpec::Config.new.tap do |c|
+      c.pattern = 'spec/*_spec.rb'
+      c.finalize!
+    end
+  end
+
+  let(:rspec_config) { double('rspec_config') }
+  let(:runner_status) { 0 }
+
+  subject(:provisioner) { described_class.new(machine, config) }
+
+  around do |example|
+    Dir.mktmpdir('vagrant-serverspec') do |dir|
+      Dir.chdir(dir) do
+        FileUtils.mkdir_p('spec')
+        File.write('spec/one_spec.rb', '')
+        File.write('spec/two_spec.rb', '')
+        File.write('spec/exclude_me_spec.rb', '')
+        example.run
+      end
+    end
+  end
+
+  before do
+    # Never let the provisioner touch the RSpec runtime that executes this suite.
+    allow(RSpec).to receive(:clear_examples)
+    allow(RSpec).to receive(:configure).and_yield(rspec_config)
+    allow(RSpec::Core::Runner).to receive(:run).and_return(runner_status)
+    allow(rspec_config).to receive(:add_formatter)
+
+    # Start from a clean Specinfra ssh connection state.
+    Specinfra::Backend::Ssh.instance.set_config(:ssh, nil)
+  end
+
+  def provider_class(name)
+    klass = Class.new
+    allow(klass).to receive(:name).and_return(name)
+    klass
+  end
+
+  describe 'ssh backend' do
+    before { allow(provider).to receive(:class).and_return(provider_class('VagrantPlugins::ProviderVirtualBox::Provider')) }
+
+    it 'configures specinfra from machine.ssh_info and runs the spec files' do
+      provisioner.provision
+
+      expect(Specinfra.configuration.backend).to eq(:ssh)
+      expect(Specinfra.configuration.host).to eq('192.0.2.10')
+
+      opts = Specinfra.configuration.ssh_options
+      expect(opts[:user]).to eq('vagrant')
+      expect(opts[:port]).to eq(2222)
+      expect(opts[:keys]).to eq(['/tmp/insecure_private_key'])
+      expect(opts).not_to have_key(:proxy)
+
+      expect(RSpec::Core::Runner).to have_received(:run)
+        .with(a_collection_containing_exactly('spec/one_spec.rb', 'spec/two_spec.rb', 'spec/exclude_me_spec.rb'))
+    end
+
+    it 'honours exclude_pattern' do
+      config.exclude_pattern = 'spec/exclude_*_spec.rb'
+      config.finalize!
+
+      provisioner.provision
+
+      expect(RSpec::Core::Runner).to have_received(:run)
+        .with(a_collection_containing_exactly('spec/one_spec.rb', 'spec/two_spec.rb'))
+    end
+
+    it 'clears the examples before running' do
+      provisioner.provision
+      expect(RSpec).to have_received(:clear_examples)
+    end
+
+    it 'closes a stale specinfra ssh connection' do
+      stale = double('ssh', close: nil)
+      Specinfra::Backend::Ssh.instance.set_config(:ssh, stale)
+
+      provisioner.provision
+
+      expect(stale).to have_received(:close)
+      expect(Specinfra::Backend::Ssh.instance.get_config(:ssh)).to be_nil
+    end
+
+    it 'uses SUDO_PASSWORD from the environment' do
+      begin
+        ENV['SUDO_PASSWORD'] = 's3cret'
+        provisioner.provision
+        expect(Specinfra.configuration.sudo_password).to eq('s3cret')
+      ensure
+        ENV.delete('SUDO_PASSWORD')
+        set :sudo_password, nil
+      end
+    end
+
+    context 'when the suite fails' do
+      let(:runner_status) { 1 }
+
+      it 'raises ServerSpecFailed' do
+        expect { provisioner.provision }.to raise_error(Vagrant::Errors::ServerSpecFailed)
+      end
+
+      it 'raises ServerSpecFailedHtml with html output' do
+        config.html_output = true
+        expect { provisioner.provision }.to raise_error(Vagrant::Errors::ServerSpecFailedHtml)
+      end
+
+      it 'raises ServerSpecFailedJunit with junit output' do
+        config.junit_output = true
+        expect { provisioner.provision }.to raise_error(Vagrant::Errors::ServerSpecFailedJunit)
+      end
+
+      it 'raises ServerSpecFailedHtmlJunit with both outputs' do
+        config.html_output = true
+        config.junit_output = true
+        expect { provisioner.provision }.to raise_error(Vagrant::Errors::ServerSpecFailedHtmlJunit)
+      end
+    end
+
+    context 'formatters' do
+      it 'adds the built-in html formatter writing to rspec_html_reports/overview.html' do
+        config.html_output = true
+        provisioner.provision
+        expect(rspec_config).to have_received(:add_formatter).with('html', 'rspec_html_reports/overview.html')
+        expect(File).to be_directory('rspec_html_reports')
+      end
+
+      it 'adds the junit formatter with the default file name' do
+        config.junit_output = true
+        provisioner.provision
+        expect(rspec_config).to have_received(:add_formatter).with('RSpecJUnitFormatter', 'rspec.xml')
+      end
+
+      it 'adds the junit formatter with a custom file name' do
+        config.junit_output = true
+        config.junit_output_file = 'reports/out.xml'
+        provisioner.provision
+        expect(rspec_config).to have_received(:add_formatter).with('RSpecJUnitFormatter', 'reports/out.xml')
+      end
+    end
+
+    context 'no spec files' do
+      it 'raises ServerSpecFilesNotFound when the pattern matches nothing' do
+        config.pattern = 'spec/nothing_here_*.rb'
+        config.finalize!
+        expect { provisioner.provision }.to raise_error(Vagrant::Errors::ServerSpecFilesNotFound)
+      end
+
+      it 'does not raise when error_no_spec_files is false' do
+        config.pattern = 'spec/nothing_here_*.rb'
+        config.error_no_spec_files = false
+        config.finalize!
+        expect { provisioner.provision }.not_to raise_error
+        expect(RSpec::Core::Runner).to have_received(:run).with([])
+      end
+    end
+  end
+
+  describe 'docker provider with host VM' do
+    let(:host_vm_ssh_info) do
+      { host: '10.0.0.5', port: 22, username: 'docker', private_key_path: ['/tmp/host_vm_key'] }
+    end
+    let(:host_vm)  { double('host_vm', ssh_info: host_vm_ssh_info) }
+
+    before do
+      allow(provider).to receive(:class).and_return(provider_class('VagrantPlugins::DockerProvider::Provider'))
+      allow(provider).to receive(:host_vm).and_return(host_vm)
+    end
+
+    it 'adds an ssh ProxyCommand through the host VM when force_host_vm is set' do
+      allow(provider_config).to receive(:force_host_vm).and_return(true)
+
+      provisioner.provision
+
+      proxy = Specinfra.configuration.ssh_options[:proxy]
+      expect(proxy).to be_a(Net::SSH::Proxy::Command)
+      expect(proxy.command_line_template).to include('-i /tmp/host_vm_key -p 22 docker@10.0.0.5 nc %h %p')
+    end
+
+    it 'does not use a proxy when force_host_vm is false' do
+      provisioner.provision
+      expect(Specinfra.configuration.ssh_options).not_to have_key(:proxy)
+    end
+  end
+
+  describe 'winrm backend' do
+    let(:vm_config) { double('vm_config', communicator: :winrm) }
+    let(:winrm_config) { double('winrm', username: 'vagrant', password: 'vagrant', timeout: 1800) }
+    let(:machine_config) { double('machine_config', vm: vm_config, winrm: winrm_config) }
+
+    before do
+      allow(provider).to receive(:class).and_return(provider_class('VagrantPlugins::HyperV::Provider'))
+      allow(VagrantPlugins::CommunicatorWinRM::Helper).to receive(:winrm_info)
+        .with(machine).and_return(host: '192.0.2.20', port: 5985)
+    end
+
+    after do
+      # Leave a clean ssh backend for the other examples.
+      set :backend, :ssh
+      Specinfra.configuration.winrm = nil
+    end
+
+    it 'configures a WinRM connection for specinfra' do
+      provisioner.provision
+
+      expect(Specinfra.configuration.backend).to eq(:winrm)
+      expect(Specinfra.configuration.os).to include(family: 'windows')
+
+      conn = Specinfra.configuration.winrm
+      expect(conn).to be_a(WinRM::Connection)
+      opts = conn.instance_variable_get(:@connection_opts)
+      expect(opts[:endpoint]).to eq('http://192.0.2.20:5985/wsman')
+      expect(opts[:user]).to eq('vagrant')
+      expect(opts[:password]).to eq('vagrant')
+      expect(opts[:operation_timeout]).to eq(1800)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'vagrant'
+require 'vagrant-serverspec'
+# Vagrant loads these lazily from the plugin's config/provisioner blocks.
+require 'vagrant-serverspec/config'
+require 'vagrant-serverspec/provisioner'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.order = :random
+  Kernel.srand config.seed
+end
+
+# Vagrant's communicators are only loaded when a machine is created;
+# the provisioner's winrm code path needs the real helper.
+require Vagrant.source_root.join('plugins/communicators/winrm/helper').to_s

data/vagrant-serverspec.gemspec

@@ -12,19 +12,26 @@ Gem::Specification.new do |gem|
   gem.description   = "vagrant-serverspec is a Vagrant plugin that integrates serverspec into your workflow."
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.metadata = {
+    'homepage_uri'    => gem.homepage,
+    'source_code_uri' => gem.homepage,
+    'changelog_uri'   => "#{gem.homepage}/blob/master/CHANGELOG.md",
+    'bug_tracker_uri' => "#{gem.homepage}/issues",
+  }
+
+  # Vagrant 2.4.x supports Ruby 3.0 - 3.4
+  gem.required_ruby_version = '>= 3.0'
+
+  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('test/', '.github/') }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'serverspec', '~> 2.30', '>= 2.30'
+  gem.add_runtime_dependency 'serverspec', '~> 2.43'
 
-  #add only dependencies for winrm without nokogiri
-  gem.add_runtime_dependency 'winrm', '~> 2.1', '>= 2.1'
-  gem.add_runtime_dependency 'os', '~> 0.9.6'
-  gem.add_runtime_dependency 'rspec_html_formatter', '~> 0.3', '>= 0.3.1'
-  gem.add_runtime_dependency 'rspec_junit_formatter', '~> 0.4'
-  gem.add_runtime_dependency 'activesupport', '~> 5.2.3', '>= 5.2'
+  # Keep winrm in the range accepted by Vagrant 2.4.x (>= 2.3.9, < 3.0)
+  gem.add_runtime_dependency 'winrm', '~> 2.3', '>= 2.3.9'
+  # HTML output uses RSpec's built-in html formatter (no extra gem needed).
+  gem.add_runtime_dependency 'rspec_junit_formatter', '~> 0.6'
 
-  gem.add_development_dependency 'bundler', '~> 1.17.3', '>= 1.17'
-  gem.add_development_dependency "rake", ">= 12.3.3"
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rspec', '~> 3.12'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serverspec
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Voorhis
 - Vladimir Babchynskyy
 - 'community contributors: https://github.com/vvchik/vagrant-serverspec/graphs/contributors'
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2026-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -18,142 +18,76 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.30'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '2.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.30'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '2.43'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-- !ruby/object:Gem::Dependency
-  name: rspec_html_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 2.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '3.12'
 description: vagrant-serverspec is a Vagrant plugin that integrates serverspec into
   your workflow.
 email:
@@ -162,8 +96,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/gempush.yml"
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -177,26 +111,19 @@ files:
 - lib/vagrant-serverspec/provisioner.rb
 - lib/vagrant-serverspec/version.rb
 - locales/en.yml
-- test/Docker/.rspec
-- test/Docker/Docker_Vagrantfile
-- test/Docker/Vagrantfile
-- test/Docker/sample_spec.rb
-- test/Docker/spec_helper.rb
-- test/ubuntu/.rspec
-- test/ubuntu/Vagrantfile
-- test/ubuntu/exclude_this_spec.rb
-- test/ubuntu/sample_spec.rb
-- test/ubuntu/spec_helper.rb
-- test/windows/.rspec
-- test/windows/sample_spec.rb
-- test/windows/spec_helper.rb
-- test/windows/vagrantfile
+- spec/config_spec.rb
+- spec/provisioner_spec.rb
+- spec/spec_helper.rb
 - vagrant-serverspec.gemspec
 homepage: https://github.com/vvchik/vagrant-serverspec
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/vvchik/vagrant-serverspec
+  source_code_uri: https://github.com/vvchik/vagrant-serverspec
+  changelog_uri: https://github.com/vvchik/vagrant-serverspec/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/vvchik/vagrant-serverspec/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,29 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A Vagrant plugin that executes serverspec
-test_files:
-- test/Docker/.rspec
-- test/Docker/Docker_Vagrantfile
-- test/Docker/Vagrantfile
-- test/Docker/sample_spec.rb
-- test/Docker/spec_helper.rb
-- test/ubuntu/.rspec
-- test/ubuntu/Vagrantfile
-- test/ubuntu/exclude_this_spec.rb
-- test/ubuntu/sample_spec.rb
-- test/ubuntu/spec_helper.rb
-- test/windows/.rspec
-- test/windows/sample_spec.rb
-- test/windows/spec_helper.rb
-- test/windows/vagrantfile
+test_files: []

data/.github/workflows/gempush.yml

@@ -1,44 +0,0 @@
-name: Ruby Gem
-
-on:
-  #pull_request:
-  #  branches:
-  #    - master
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-
-   # - name: Publish to GPR
-   #   run: |
-   #     mkdir -p $HOME/.gem
-   #     touch $HOME/.gem/credentials
-   #     chmod 0600 $HOME/.gem/credentials
-   #     printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-   #     gem build *.gemspec
-   #     gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-   #   env:
-   #     GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
-   #     OWNER: username
-
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/test/Docker/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/test/Docker/Docker_Vagrantfile

@@ -1,13 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "mitchellh/boot2docker"
-
-  config.vm.provider "virtualbox" do |v|
-    # On VirtualBox, we don't have guest additions or a functional vboxsf
-    # in TinyCore Linux, so tell Vagrant that so it can be smarter.
-    v.check_guest_additions = false
-    v.functional_vboxsf     = false
-    v.customize ["modifyvm", :id, "--memory", "1024"]
-  end
-
-  config.nfs.functional = false
-end

data/test/Docker/Vagrantfile

@@ -1,17 +0,0 @@
-Vagrant.configure('2') do |config|
-  config.vm.provider "docker" do |d|
-    d.vagrant_vagrantfile = "./Docker_Vagrantfile"
-    d.image = "jjhughes57/docker-vagrant-ubuntu"
-    d.has_ssh = true
-  end
-
-  config.vm.provision :shell, inline: <<-EOF
-    sudo apt-get install -y vim
-    touch /tmp/testfile
-  EOF
-
-  config.vm.provision :serverspec do |spec|
-    spec.pattern = '*_spec.rb'
-    #Specinfra.configuration.sudo_password = 'vagrant'
-  end
-end

data/test/Docker/sample_spec.rb

@@ -1,9 +0,0 @@
-require_relative 'spec_helper'
-
-describe package('vim') do
-  it { should be_installed }
-end
-
-describe file('/tmp/testfile') do
-  it { should be_file }
-end

data/test/Docker/spec_helper.rb

@@ -1,13 +0,0 @@
-#require 'serverspec'
-#require 'net/ssh'
-
-#set :backend, :ssh
-
-# Disable sudo
-# set :disable_sudo, true
-
-# Set environment variables
-# set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
-
-# Set PATH
-# set :path, '/sbin:/usr/local/sbin:$PATH'

data/test/ubuntu/Vagrantfile

@@ -1,15 +0,0 @@
-Vagrant.configure('2') do |config|
-  config.vm.box = 'precise64'
-  config.vm.box_url = 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-amd64-disk1.box'
-
-  config.vm.provision :shell, inline: <<-EOF
-    sudo ufw allow 22
-    yes | sudo ufw enable
-  EOF
-
-  config.vm.provision :serverspec do |spec|
-    spec.pattern = '*_spec.rb'
-    spec.exclude_pattern = 'exclude_*_spec.rb'
-    #Specinfra.configuration.sudo_password = 'vagrant'
-  end
-end

data/test/ubuntu/exclude_this_spec.rb

@@ -1,6 +0,0 @@
-context 'excluded spec file' do
-  it 'should not run' do
-    raise
-  end
-end
-

data/test/ubuntu/sample_spec.rb

@@ -1,14 +0,0 @@
-require_relative 'spec_helper'
-
-describe package('ufw') do
-  it { should be_installed }
-end
-
-describe service('ufw') do
-  it { should be_enabled }
-  it { should be_running }
-end
-
-describe port(22) do
-  it { should be_listening }
-end

data/test/ubuntu/spec_helper.rb

@@ -1,13 +0,0 @@
-#require 'serverspec'
-#require 'net/ssh'
-
-#set :backend, :ssh
-
-# Disable sudo
-# set :disable_sudo, true
-
-# Set environment variables
-# set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
-
-# Set PATH
-# set :path, '/sbin:/usr/local/sbin:$PATH'

data/test/windows/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/test/windows/sample_spec.rb

@@ -1,36 +0,0 @@
-require_relative 'spec_helper'
-
-#describe file('C:\\programdata\\chocolatey\\bin\\console.exe') do
-#  it { should be_file }
-#end
-
-describe windows_feature('Web-Server') do
-  it{ should be_installed.by("powershell") }
-end
-
-#describe windows_registry_key(
-#  'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\advanced') do
-#  it { should have_property_value('Hidden', :type_dword,'1') }
-#end
-
-describe command('Get-ExecutionPolicy') do
-  its(:stdout) { should match /RemoteSigned/ }
-  #its(:stderr) { should match /stderr/ }
-  its(:exit_status) { should eq 0 }
-end
-
-#describe iis_website('Default Website') do
-#  it{ should have_site_bindings(80) }
-#end
-
-describe port(80) do
-  it { should be_listening }
-end
-
-describe file('C:\Windows\system32\telnet.exe') do
-  it { should be_file }
-end
-
-describe windows_feature('TelnetClient') do
-  it{ should be_installed.by("powershell") }
-end

data/test/windows/spec_helper.rb

@@ -1,13 +0,0 @@
-#require 'serverspec'
-#require 'pathname'
-#require 'winrm'
-#set :backend, :winrm
-#set :os, :family => 'windows'
-
-#user = 'vagrant'
-#pass = 'vagrant'
-##endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
-#endpoint = "http://10.128.139.116:5985/wsman"
-#winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-#winrm.set_timeout 300 # 5 minutes max timeout for any operation
-#Specinfra.configuration.winrm = winrm

data/test/windows/vagrantfile

@@ -1,58 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.require_version ">= 1.6.2"
-
-Vagrant.configure("2") do |config|
-    config.vm.define "windows"
-    config.vm.box = "windows"
-    config.vm.communicator = "winrm"
-
-    # Admin user name and password
-    config.winrm.username = "vagrant"
-    config.winrm.password = "vagrant"
-
-    config.vm.guest = :windows
-    config.vm.communicator = "winrm"
-    config.windows.halt_timeout = 15
-
-    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
-    config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct: true
-
-    config.vm.provider "hyperv" do |v, override|
-
-	end
-
-    config.vm.provider :virtualbox do |v, override|
-        #v.gui = true
-        v.customize ["modifyvm", :id, "--memory", 2048]
-        v.customize ["modifyvm", :id, "--cpus", 2]
-        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
-    end
-
-    config.vm.provider :vmware_fusion do |v, override|
-        #v.gui = true
-        v.vmx["memsize"] = "2048"
-        v.vmx["numvcpus"] = "2"
-        v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-        v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-        v.vmx["RemoteDisplay.vnc.port"] = "5900"
-        v.vmx["scsi0.virtualDev"] = "lsisas1068"
-    end
-
-    config.vm.provider :vmware_workstation do |v, override|
-        #v.gui = true
-        v.vmx["memsize"] = "2048"
-        v.vmx["numvcpus"] = "2"
-        v.vmx["ethernet0.virtualDev"] = "vmxnet3"
-        v.vmx["RemoteDisplay.vnc.enabled"] = "false"
-        v.vmx["RemoteDisplay.vnc.port"] = "5900"
-        v.vmx["scsi0.virtualDev"] = "lsisas1068"
-    end
-
-
-  config.vm.provision :serverspec do |spec|
-    spec.pattern = '*_spec.rb'
-    end
-
-end