beaker-hostgenerator 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cffe5912a503822a925f9e1442701d3935e0d106deea0fb57cc20399d886f76c
-  data.tar.gz: 3a97d63b689e750cbc63576ce7bb76efc744fc896c8611a45384d132b3898773
+  metadata.gz: cf00cc05f0e3ca58dca040282af0693ec00b828f4f581d36fbd67fc3d2cbbb46
+  data.tar.gz: 15171038dc29db2e7177ab8b5fa850b65e907d0dcf77ae97174c9b6c998093a2
 SHA512:
-  metadata.gz: 7d8a2b02519162fa3ba8487d106eaac8b9c50c2e82540ed81698f26780ceee19483ac212a34a0de61ccc79c0cc531d2b9aec0fa7a86a37c44f85bc46e901b678
-  data.tar.gz: e26ad509ca449ea8e3758d7ba721bf241dcbe3167eb80fcc69664cd34cc225c8a3d0e4842006d067d74f5cf1bfc1e235e741a6536107cdf6cf114b418118e3cd
+  metadata.gz: 9a55d6ec141b6364cca5ab04a915ff128893f68e75d53515500e1275bdc4b8d1474549a430ea208098a31d3e7c171535a59edcbe217af0618c9b99d956e57db7
+  data.tar.gz: e106b154758ef3633b9054e0534a0534e4970d97493b25c6e55ca9d3b50d0c357df96fde3014f51a56d8b77c26f5abe7af1f979a9191baf4980b0a1ad265b66e

data/lib/beaker-hostgenerator/data.rb

@@ -13,7 +13,7 @@ module BeakerHostGenerator
   # `include BeakerHostGenerator::Data` and then `<function>()`.
   module Data
     module_function
-
+    MASTER_PE_VERSION=2019.4
     PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
 
     def pe_version
@@ -41,7 +41,16 @@ module BeakerHostGenerator
         ''
       end
 
-      pe_branch = Gem::Version.new($1) < Gem::Version.new('2019.4') || version =~ /#{base_regex}-rc\d+\Z/ ? $1 : 'master'
+      if(Gem::Version.new($1) < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
+        pe_branch = $1
+      else
+        #Is this a Master PEZ build?
+        if(version =~ /.*(PEZ|pez)_.*/)
+          pe_branch = "master/feature"
+        else
+          pe_branch = 'master'
+        end
+      end
 
       return sprintf(source, ("#{pe_branch}" || ''))
     end

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.2.0'
+    STRING = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest