beaker-puppet 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875b73fe27f2c9ad51408aeb125f0676ea37f969
-  data.tar.gz: abec417de80b055b94dc501d306b696e4c922db7
+  metadata.gz: f195bb6d82d2cf6a4cb6ff976c15df17f54b3e0f
+  data.tar.gz: 00e7a6b8fd9a31a78d545f88bbe912980be3d0e9
 SHA512:
-  metadata.gz: 701bb774daef21e191e8eb38fbebc33ba5e0e30c7294b44cd737a69371678978635a1990c486550d270c2bd14ef038a729e67c72dfb760fcb379afc0d6d89ad9
-  data.tar.gz: eda9b9ab46a82dfc3ad99aadccde76d7da3bfa25fd4b75c232312109bed904291d34e835af6fbd72e5c720da1224be04e3118f5790443c45badb0bea84f45120
+  metadata.gz: ea339a35f641981d7e9d4ad068a6cde85440f9e89402ecbd9b3410bf6d51bd76e2ff5d611eb31d5fd852f4635051a0d153cb33f882b008f5bb8d19de2f12ca13
+  data.tar.gz: cae6d89f572103b163d308a38948cea7dfb4b96467e4df93eb1b676ff83db440bf6ef51c39596a6badac38fdf2703f27d0f66a2e7cdf6a0a466c0545fa6b54a3

data/lib/beaker-puppet/install_utils/puppet_utils.rb

@@ -93,15 +93,17 @@ module Beaker
         # must be one of
         #   * :puppet_agent (you can get this version from the `aio_agent_version_fact`)
         #   * :puppet
+        #   * :puppetserver
         #
         #
-        # @param package [Symbol] the package name. must be one of :puppet_agent, :puppet
+        # @param package [Symbol] the package name. must be one of :puppet_agent, :puppet, :puppetserver
         # @param version [String] a version number or the string 'latest'
         # @returns [String|nil] the name of the corresponding puppet collection, if any
         def puppet_collection_for(package, version)
           valid_packages = [
             :puppet_agent,
-            :puppet
+            :puppet,
+            :puppetserver
           ]
 
           unless valid_packages.include?(package)
@@ -109,15 +111,20 @@ module Beaker
           end
 
           case package
-          when :puppet_agent, :puppet
+          when :puppet_agent, :puppet, :puppetserver
             version = version.to_s
             return 'puppet' if version.strip == 'latest'
 
             x, y, z = version.to_s.split('.').map(&:to_i)
             return nil if x.nil? || y.nil? || z.nil?
 
-            pc1_x = package == :puppet ? 4 : 1
-            return 'pc1' if x == pc1_x
+            pc1_x = {
+              puppet: 4,
+              puppet_agent: 1,
+              puppetserver: 2
+            }
+
+            return 'pc1' if x == pc1_x[package]
 
             # A y version >= 99 indicates a pre-release version of the next x release
             x += 1 if y >= 99

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.15.1'
+  VERSION = '1.16.0'
 end

data/setup/git/010_TestSetup.rb

@@ -22,8 +22,8 @@ test_name "Install repositories on target machines..." do
       #           host_path: ~/puppet
       #           container_path: /build/puppet
       #
-      if agent[:mount_folders]
-        mount = agent[:mount_folders][repository[:name]]
+      if host[:mount_folders]
+        mount = host[:mount_folders][repository[:name]]
         repository[:path] = "file://#{mount[:container_path]}"
       end
       repo_dir = host.tmpdir(repository[:name])

data/spec/beaker-puppet/install_utils/puppet_utils_spec.rb

@@ -203,5 +203,36 @@ describe ClassMixedWithDSLInstallUtils do
         end
       end
     end
+
+    context 'when the :puppetserver package is passed in' do
+      context 'given a valid version' do
+        {
+          '2.0.0'       => 'pc1',
+          '2.0.x'       => 'pc1',
+          '5.3.1'       => 'puppet5',
+          '5.3.x'       => 'puppet5',
+          '5.99.0'      => 'puppet6',
+          '6.1.99-foo'  => 'puppet6',
+          '6.99.99'     => 'puppet7',
+          '7.0.0'       => 'puppet7',
+        }.each do |version, collection|
+          it "returns collection '#{collection}' for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppetserver, version)).to eq(collection)
+          end
+        end
+      end
+  
+      it "returns the default, latest puppet collection given the version 'latest'" do
+        expect(subject.puppet_collection_for(:puppetserver, 'latest')).to eq('puppet')
+      end
+  
+      context 'given an invalid version' do
+        [nil, '', '0.1.0', '3.8.1', '', 'not-semver', 'not.semver.either'].each do |version|
+          it "returns a nil collection value for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppetserver, version)).to be_nil
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec