beaker-rspec 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a58c97806394e14f2fc4f4fa0a27900f2ea9908f07da1fc8174d636417ae22
-  data.tar.gz: 45d7fad9ce9a2e485d5789e2a64d159e38afef385a23c20adffe4e32171d734c
+  metadata.gz: 33c490e0e39f5a1263d21542547d9c9d0e80defea9b501c52592452944ba3482
+  data.tar.gz: 791e80f9306912dc43317015c1a3298bf604fe26df17c2cb815f6fe9264f5df0
 SHA512:
-  metadata.gz: 71934f035cc3a5346488f645f242d9f9f986fcbe3a16a53b77fb6ff4b653b6410a5f83910138bc8f7864c692bd1ced213135ca8a44681d59cfba276a76151042
-  data.tar.gz: e19961095e61def903797bb74df5e1a2fc31cbc3e489ab5298a0c58f4de413a60b7c51d5686a32f94a8d8164b115e810196d4d9b254885cb9bf31956153ef378
+  metadata.gz: b810b5bcf3313d1c4f554a98e4b09f6ac3c9312dba23766a064c4154159e469d761997e78b66a1bc1f2754a37a87d15a335d6c7067095d0b4f46d49a3f0f6722
+  data.tar.gz: ceec62d51cf7e9ca136a0836f2981e5e4ac43d116ffa04d10e31d56b849f75a3f5396b537c7e362a425a855a31176b91aee12cf0c3f513f9fd62a07ca0c65387

data/.github/workflows/test.yml

@@ -3,6 +3,9 @@ name: Test
 on:
   - pull_request
 
+env:
+  BEAKER_HYPERVISOR: docker
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,3 +30,5 @@ jobs:
           bundler-cache: true
       - name: Verify gem builds
         run: bundle exec gem build beaker-rspec.gemspec
+      - name: Run acceptance tests
+        run: bundle exec rake beaker

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [7.1.0](https://github.com/voxpupuli/beaker-rspec/tree/7.1.0) (2022-01-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-rspec/compare/7.0.0...7.1.0)
+
+**Implemented enhancements:**
+
+- Reduce beaker-pe to a development dependendency [\#109](https://github.com/voxpupuli/beaker-rspec/pull/109) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Add acceptance tests to CI; drop beaker-pe development dependency [\#110](https://github.com/voxpupuli/beaker-rspec/pull/110) ([ekohl](https://github.com/ekohl))
+
 ## [7.0.0](https://github.com/voxpupuli/beaker-rspec/tree/7.0.0) (2021-11-03)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-rspec/compare/6.3.0...7.0.0)

data/Gemfile

@@ -10,20 +10,18 @@ def location_for(place, fake_version = nil)
   end
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-
-if beaker_version
+if (beaker_version = ENV['BEAKER_VERSION'])
   gem 'beaker', *location_for(beaker_version)
-else
-  gem 'beaker'
 end
 
-# For running the spec/acceptance/example_spec.rb
-gem 'beaker-vagrant'
-
-# Dependencies for CI acceptance testing; TODO: fix CI so this can be removed
-gem 'beaker-hostgenerator'
-gem 'beaker-vmpooler', '~> 1.3'
+case ENV['BEAKER_HYPERVISOR']
+when 'docker'
+  gem 'beaker-docker'
+when 'vagrant', 'vagrant_libvirt'
+  gem 'beaker-vagrant'
+when 'vmpooler'
+  gem 'beaker-vmpooler', '~> 1.3'
+end
 
 group :release do
   gem 'github_changelog_generator', '>= 1.16.4', require: false if RUBY_VERSION >= '2.5'

data/Rakefile

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-task default: [:changelog]
+require 'beaker-rspec/rake_task'
+
+task default: :beaker
 
 begin
   require 'rubygems'

data/beaker-rspec.gemspec

@@ -28,9 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'thin'
 
-  # Dependency for example spec/acceptance tests
-  s.add_runtime_dependency 'beaker-pe'
-
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '> 3.0'
   s.add_runtime_dependency 'rspec', '~> 3.0'

data/lib/beaker-rspec/version.rb

@@ -1,5 +1,5 @@
 module BeakerRSpec
   module Version
-    STRING = '7.0.0'
+    STRING = '7.1.0'
   end
 end

data/spec/acceptance/example_spec.rb

@@ -12,8 +12,8 @@ describe "ignore" do
     self.hosts = hosts
   end
 
-  example "access options hash" do
-    install_pe
+  example "use DSL method" do
+    echo_on hosts, 'Hello World!'
   end
 
   example "access the logger" do

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-# if you need DSL extension libraries, it appears that they have to be loaded before the RSpec shim
-require "beaker-pe"
-
-ENV['RS_SETFILE'] ||= 'sample.cfg'
+ENV['RS_SETFILE'] ||= 'centos8-64'
 
 require "beaker-rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: beaker-pe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  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
@@ -180,7 +166,6 @@ files:
 - lib/beaker-rspec/rake_task.rb
 - lib/beaker-rspec/spec_helper.rb
 - lib/beaker-rspec/version.rb
-- sample.cfg
 - spec/acceptance/example_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/voxpupuli/beaker-rspec
@@ -205,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: RSpec bindings for beaker

data/sample.cfg

@@ -1,28 +0,0 @@
-HOSTS:
-  ubuntu-10-04-4-x64-master:
-    roles:
-      - master
-      - agent
-      - dashboard
-      - database
-    platform: ubuntu-10.04-amd64
-    hypervisor: vagrant
-    box: ubuntu-server-10044-x64-vbox4210
-    box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210.box
-    ip: 192.168.20.20
-    distmoduledir: .
-    pe_dir: http://enterprise.delivery.puppetlabs.net/3.1/ci-ready/
-  ubuntu-10-04-4-x64-agent:
-    roles:
-      - agent
-    platform: ubuntu-10.04-amd64
-    hypervisor: vagrant
-    box: ubuntu-server-10044-x64-vbox4210
-    box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210.box
-    ip: 192.168.21.21
-    distmoduledir: .
-    pe_dir: http://enterprise.delivery.puppetlabs.net/3.1/ci-ready/
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  type: git