beaker-vagrant 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 154ebba6c17dc68f57b621fb7e1896338e1ef28929c1361f222e9940c73bd097
-  data.tar.gz: cdf03f01121a62a23921a0e670c0b97953e14d7e30e0f9c5a512965d564266cb
+  metadata.gz: ad3e004b7c1a2dd497d2e1e6a2ad657888f9197349385c458d359c034cca393f
+  data.tar.gz: 90307a775cd0d87ab5c45a46906379610358009794ef5b092b9b4b428d4e4a8f
 SHA512:
-  metadata.gz: acb440935020af6d780eb9a509e436a81161bce38798a015f414f40b7c2e10bdab30f0665ac621b295f79e191118726b82fa43d6f002c9f1422d2b313ea3a3de
-  data.tar.gz: 7e1d0efb4fe556d3c377a6dbb886edda06f6fdc83cdc3c84bb8dcf9e51f900d48e043890043e5f8d7cfc11c0b872ca2129e919c5ab90f183b0dabed92ec93916
+  metadata.gz: 3bf0e47364ea0fff8c2f6b14bd5f1a0f6829b3426861fcac23c27deb23b829e5bf499d2d1152fc27629c3b62a2628bdd9d243cf6768e88c832143817abec9d87
+  data.tar.gz: 4d172b71383ef108ecd3026d2f6374c765e4f4c3aca53c5f4097769575cc7a1339fed1ad7dbb64ec77b758722beb86d5f9022619ca42cd37e4500eeff2180a2f

data/.rubocop.yml

@@ -1,4 +1,4 @@
 ---
 inherit_from: .rubocop_todo.yml
 inherit_gem:
-  beaker: rubocop.yml
+  voxpupuli-rubocop: rubocop.yml

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [1.2.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.2.0) (2023-04-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.1.0...1.2.0)
+
+**Implemented enhancements:**
+
+- Allow beaker 4 again [\#75](https://github.com/voxpupuli/beaker-vagrant/pull/75) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Switch to voxpupuli-rubocop + Rake task from voxpupuli-rubocop [\#69](https://github.com/voxpupuli/beaker-vagrant/pull/69) ([bastelfreak](https://github.com/bastelfreak))
+
+## [1.1.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.1.0) (2023-04-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.0.0...1.1.0)
+
+**Implemented enhancements:**
+
+- Use Bundler to clean the environment [\#73](https://github.com/voxpupuli/beaker-vagrant/pull/73) ([ekohl](https://github.com/ekohl))
+- Switch to voxpupuli-rubocop [\#72](https://github.com/voxpupuli/beaker-vagrant/pull/72) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.0.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.0.0) (2023-03-27)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/0.7.1...1.0.0)

data/Rakefile

@@ -48,16 +48,9 @@ task test: 'test:spec'
 task default: :test
 
 begin
-  require 'rubocop/rake_task'
+  require 'voxpupuli/rubocop/rake'
 rescue LoadError
   # RuboCop is an optional group
-else
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    # These make the rubocop experience maybe slightly less terrible
-    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
-    # Use Rubocop's Github Actions formatter if possible
-    task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
-  end
 end
 
 begin

data/beaker-vagrant.gemspec

@@ -27,11 +27,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 1.48.1'
-  s.add_development_dependency 'rubocop-performance'
-  s.add_development_dependency 'rubocop-rake'
-  s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.1'
 
-  s.add_runtime_dependency 'beaker', '~> 5'
+  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -181,7 +181,7 @@ module Beaker
       return unless Dir.exist?(@vagrant_path)
 
       ssh_config = Dir.chdir(@vagrant_path) do
-        stdout, _, status = Open3.capture3(@vagrant_env, 'vagrant', 'ssh-config', host.name)
+        stdout, _, status = with_unbundled_env { Open3.capture3(@vagrant_env, 'vagrant', 'ssh-config', host.name) }
         raise "Failed to 'vagrant ssh-config' for #{host.name}" unless status.success?
 
         Tempfile.create do |f|
@@ -207,7 +207,7 @@ module Beaker
       @vagrant_path = File.expand_path(File.join('.vagrant', 'beaker_vagrant_files',
                                                  'beaker_' + File.basename(options[:hosts_file])))
       @vagrant_file = File.expand_path(File.join(@vagrant_path, 'Vagrantfile'))
-      @vagrant_env = { 'RUBYLIB' => '', 'RUBYOPT' => '' }
+      @vagrant_env = {}
     end
 
     def configure(opts = {})
@@ -261,12 +261,14 @@ module Beaker
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
         retries ||= 0
-        Open3.popen3(@vagrant_env, "vagrant #{args}") do |stdin, stdout, stderr, wait_thr|
-          while line = stdout.gets
-            @logger.info(line)
-          end
+        with_unbundled_env do
+          Open3.popen3(@vagrant_env, "vagrant #{args}") do |stdin, stdout, stderr, wait_thr|
+            while line = stdout.gets
+              @logger.info(line)
+            end
 
-          raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}" unless wait_thr.value.success?
+            raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}" unless wait_thr.value.success?
+          end
         end
       rescue StandardError => e
         if e.to_s =~ /WinRM/m
@@ -306,5 +308,13 @@ module Beaker
     def set_host_default_ip(host)
       host['ip'] ||= randip(host.host_hash[:hypervisor]) # use the existing ip, otherwise default to a random ip
     end
+
+    def with_unbundled_env(&block)
+      if defined?(::Bundler)
+        Bundler.with_unbundled_env(&block)
+      else
+        yield
+      end
+    end
   end
 end

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '1.0.0'
+  VERSION = '1.2.0'
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -433,8 +433,7 @@ module Beaker
           vagrant.instance_variable_set(:@vagrant_path, dir)
           state = double('state')
           allow(state).to receive(:success?).and_return(true)
-          allow(Open3).to receive(:capture3).with({ 'RUBYLIB' => '', 'RUBYOPT' => '' }, 'vagrant', 'ssh-config',
-                                                  name).and_return([out, '', state])
+          allow(Open3).to receive(:capture3).with({}, 'vagrant', 'ssh-config', name).and_return([out, '', state])
 
           vagrant.set_ssh_config(host, 'root')
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -76,21 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.48.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,61 +90,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: beaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: For use for the Beaker acceptance testing tool
 email: voxpupuli@groups.io
 executables: