simp-beaker-helpers 1.18.7 → 1.18.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9e3aa05ef72a88b5b47a58fd135b79f0e18f1c8904e54d20b8795f168e163a
-  data.tar.gz: 44ebf1aa2489a831fa8b9477888a0122d3a44a0a92f175c4a5cd7ce5093eeede
+  metadata.gz: aa50a0956fc8dd2198160f50de04d9beb7550040c2bac91a9ac539a75c1cc094
+  data.tar.gz: 4de6d37c95c4484e72dbe48f3bb47e190749701e46fc48ec20e56464b31dee56
 SHA512:
-  metadata.gz: a3ccf798229dbc16ed9aceac1b9e21992b35ca23ede613343037bcb0143ab5f9785dcfe797a98d8764f83c5c85bd6e84116f2c5efd842d885905b9c2da4baac7
-  data.tar.gz: 26a69f5aa235c6074788d7103cedde8abba88df6216eb8b347456d64e488047b68aa3754d2a86f8f9b7533977d5037e37939f3a471277377ca9ca537cee789af
+  metadata.gz: f98eaa266f7b9eeb508f0c6924221a98d358d0fb7da1de34ec90b61cd79eb325cc3d2f388365bafccbc0f4d6fdad13eefbd19192631ecb42ddbb3360c46114c7
+  data.tar.gz: f3b0ced49cd92655f45378c46061e20d23a6295722d31f2a9bbeef46375b74d2b931c6ca6a3af5bad0e7cd0b04a4c0848eac98b9891b1385f0267811b50def2a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.18.8 / 2020-07-14
+* Allow the beaker version to be pinned by environment variable
+
 ### 1.18.7 / 2020-07-07
 * Fix host reference bug when switching to FIPS mode
 * Ensure that net-ssh 6+ can access older FIPS systems

data/Gemfile

@@ -13,7 +13,34 @@ gem 'bundler'
 gem 'rake'
 
 group :system_tests do
-  gem 'beaker'
+  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.17.0', '< 5.0.0'])
+
+  if "#{beaker_gem_options}".include?(':')
+    # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
+    # hash of options.
+    #
+    # Something like: BEAKER_GEM_OPTIONS=':git => "https://my.repo/beaker.git", :tag => "1.2.3"'
+    #
+    # No, this isn't robust, but it's not really an 'every day' sort of thing
+    # and safer than an `eval`
+    begin
+      gem 'beaker', Hash[
+        beaker_gem_options.split(',').map do |x| # Split passed options on k/v pairs
+          x.gsub('"', '').strip.split(/:\s|\s+=>\s+/) # Allow for either format hash keys
+        end.map do |k,v|
+          [
+            k.delete(':').to_sym, # Convert all keys to symbols
+            v.strip
+          ]
+        end
+      ] # Convert the whole thing to a valid Hash
+    rescue => e
+      raise "Invalid BEAKER_GEM_OPTIONS: '#{beaker_gem_options}' => '#{e}'"
+    end
+  else
+    gem 'beaker', beaker_gem_options
+  end
+
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.18.7'
+  VERSION = '1.18.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.7
+  version: 1.18.8
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker