simp-beaker-helpers 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ccdf0a376a641c3380cf3007e24ad0fcdb09465f98e45fc6bac483eb897a28bf
-  data.tar.gz: d11989a7cc3be493a17ff575b8394a762f180cf4889ca2e223cfccd230ff50b9
+SHA1:
+  metadata.gz: a1d1eb122dfdfbd6989cae5cbef06ec1119865d7
+  data.tar.gz: 2ad2c18bca49cc95e2c27ee645bd9c685be371f0
 SHA512:
-  metadata.gz: d06ef5f63eae54bd6889d32b3b53069d6836ac6f8855520f4ce29f151b708e0f5a49167d3aee33cdcb1295930b3ac717a2b9277396d34adaef413e65c29bd2e9
-  data.tar.gz: 2da83080d5daabe72885096d423aa0de6ae1d5b246570f186b86bc8f70842df9c09f1bc79a0f4a9d80c2822b772d0a407ad3c16076c8eaf04262e925aa450f93
+  metadata.gz: 808ddb4239625739e2597e91808d07ab20f81e5e8cf2f9b0b294af03c32deaa121716a229cc5d18ff4aaf670398c3791adaa147f63aa1115872df8a256d5b699
+  data.tar.gz: 3bd93d0bd84f3922cf5a03a228cfc6780892b262170852c6e18f55e1e020b804c878f64b535b1b0cd6ea2adeb2eb1395d366d29f9202fd8429652eee1dac0cf1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.10.1 / 2018-02-13
+* Updated the Puppet version mapping list for Puppet 5
+* Fixed a bug in the way that the latest Puppet 5 version was being determined
+
 ### 1.10.0 / 2018-01-23
 * Add support for Puppet 5
   * Note: you need to set 'puppet_collection' to 'puppet5' to test Puppet 5 and

data/files/puppet-agent-versions.yaml

@@ -4,6 +4,16 @@
 #   - https://docs.puppet.com/puppet/latest/about_agent.html
 #
 version_mappings:
+  '5.4.0': '5.4.0'
+  '5.3.5': '5.3.5'
+  '5.3.4': '5.3.4'
+  '5.3.3': '5.3.3'
+  '5.3.2': '5.3.2'
+  '5.3.1': '5.3.1'
+  '5.3.0': '5.3.0'
+  '5.2.0': '5.2.0'
+  '5.1.0': '5.1.0'
+  '5.0.1': '5.0.1'
   '5.0.0': '5.0.0'
   '4.10.7': '1.10.7'
   '4.10.6': '1.10.6'

data/lib/simp/beaker_helpers.rb

@@ -697,6 +697,8 @@ done
       Gem::Requirement.new(puppet_version).satisfied_by?(Gem::Version.new(k))
     end
     result = _pair ? _pair.last : nil
+
+    return result
   end
 
 
@@ -708,7 +710,7 @@ done
 
     unless puppet_agent_version
       if host.options['puppet_collection'] && host.options['puppet_collection'] =~ /puppet(\d+)/
-        puppet_agent_version = latest_puppet_agent_version_for($1)
+        puppet_agent_version = latest_puppet_agent_version_for("~> #{$1}")
       else
         puppet_agent_version = (
           latest_puppet_agent_version_for(ENV.fetch('PUPPET_VERSION',nil)) ||

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -111,8 +111,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files: []
+test_files:
+- spec/acceptance/check_puppet_version_spec.rb
+- spec/acceptance/enable_fips_spec.rb
+- spec/acceptance/fixture_modules_spec.rb
+- spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/puppet5.yml
+- spec/acceptance/pki_tests_spec.rb
+- spec/acceptance/set_hieradata_on_spec.rb
+- spec/acceptance/write_hieradata_to_spec.rb
+- spec/spec_helper_acceptance.rb