beaker-pe 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQyMzM2ZjYxMWQxOGQwNjk4MDI3MmQ3ZWE5MTk2N2U2ODE0ZDljYQ==
+    N2ZiYmY3MTRjNTEyMThjYmY4NDllZmVjNGYxMDkwYWIwYjlhZDJjZQ==
   data.tar.gz: !binary |-
-    N2E2OGVlZmY5MjRjZTE2NmEwMTU5MDYyZThmMTEyM2E5ZDcwYmE5Ng==
+    ZjAxYzc5NzY2NzBmMTk1ZGQwNTFhZDI2NDhiZjE0N2Y1NDE3MGU3Mw==
 SHA512:
   metadata.gz: !binary |-
-    ODJlZWViYWFkYWE1NGY3ZjE2OGJlYjU1ZGU1ZWJkODMwMTk2M2Y3MjBkOTc2
-    YmFlYzRjYTc5NGM5Y2NiYTAwNWFhZGM4MWU1ZjkzMDBlMDE3MGZmN2UxYmJj
-    NGVkMmJkZmEwYWE1NjhjNmQ1ZGFkYmJlNzJhZDljN2E2YWRmYzI=
+    NThlZmY0MDAzOTIxNDYwOWI0ODE2NjIzNWRjMTBjNTg5ODEyMzRhNDZjMjQ0
+    MzFjYjQwOWQyMWIyMmRkOTRjZGRjZTA4YTAxZWY5NzhhN2I4MTQ0MWJmYzdm
+    OGRiMGFhZGVlODZiMjRmMDc4ODY3NGY2ODk5MzMyMTc4ODMyMmM=
   data.tar.gz: !binary |-
-    MmIzOTYxYzY0ZGY5MzgyYTlkMzc3NjJiMjhiMjljNzY2ZDVmOGRiMWM0MmFl
-    ZWFkMWVjOWY2MGM0YTdhNDU2OWFhMTBhOTJmYWY3OGU3NWM1OTVjNGY4N2Y2
-    NTRlMjlkYTlkNGM5Yjc2NDQwYWRmMmRiMGQ4NjE5MGJiOGZkNTQ=
+    M2JjNTUxNmY0ZTlkMTQ0YjU2MzFhMTY3MjFmM2NjMGE4YTk4ZDlhNDFhZWFj
+    MTk3ZjBiOTM4ZGY0NDFiZDhmNDNmODQwYjUyODE2OGYyOGU0NjgyZDRjYjhm
+    MjUyMzMyNDMyYjQyMWZhYjkzMDYzZDQ1MzQ5NjgxYmE4NDkzMzM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 4 Oct, 2016 (bab690e0)](#LATEST)
+* [LATEST - 6 Oct, 2016 (24d8b969)](#LATEST)
+* [1.2.0 - 4 Oct, 2016 (7362ab78)](#1.2.0)
 * [1.1.0 - 29 Sep, 2016 (5b9f2600)](#1.1.0)
 * [1.0.0 - 26 Sep, 2016 (84a5b56b)](#1.0.0)
 * [0.12.0 - 16 Sep, 2016 (81e5a0b0)](#0.12.0)
@@ -20,7 +21,53 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 4 Oct, 2016 (bab690e0)
+### <a name = "LATEST">LATEST - 6 Oct, 2016 (24d8b969)
+
+* (GEM) update beaker-pe version to 1.3.0 (24d8b969)
+
+* Merge pull request #32 from cthorn42/main/master/PE-17359_fix_windows_frictionless_upgrade (8feaaf0f)
+
+
+```
+Merge pull request #32 from cthorn42/main/master/PE-17359_fix_windows_frictionless_upgrade
+
+PE-17359 Fix windows frictionless upgrades
+```
+* Merge pull request #33 from tvpartytonight/BKR-953 (e53e018a)
+
+
+```
+Merge pull request #33 from tvpartytonight/BKR-953
+
+(BKR-953) Stop including the dsl at the top level
+```
+* (BKR-953) Stop including the dsl at the top level (12823a51)
+
+
+```
+(BKR-953) Stop including the dsl at the top level
+
+To reload the beaker dsl after adding modules to it, beaker-pe had just
+included the module into the top level namespace. This resulted in
+errors loading in other libraries not expecting the dsl to be loaded at
+the top level. This commit changes that inclusion mechanism to be safe
+from namespace collisions.
+```
+* PE-17359 Fix windows frictionless upgrades (883e4df5)
+
+
+```
+PE-17359 Fix windows frictionless upgrades
+
+There was an error with my previous PR. PE 2016.2.1 to PE 2016.4.0
+were failing because the PE 2016.2.1 install of the windows agent
+would attempt to install via frictionless, and not with the old msi
+method.
+This PR fixes this.
+```
+### <a name = "1.2.0">1.2.0 - 4 Oct, 2016 (7362ab78)
+
+* (HISTORY) update beaker-pe history for gem release 1.2.0 (7362ab78)
 
 * (GEM) update beaker-pe version to 1.2.0 (bab690e0)
 

data/lib/beaker-pe.rb

@@ -22,8 +22,13 @@ end
 # Boilerplate DSL inclusion mechanism:
 # First we register our module with the Beaker DSL
 Beaker::DSL.register( Beaker::DSL::PE )
-# Then we have to re-include our amended DSL in the TestCase,
-# because in general, the DSL is included in TestCase far
-# before test files are executed, so our amendments wouldn't
-# come through otherwise
-include Beaker::DSL
+
+# Second,We need to reload the DSL, but before we had reloaded
+# it in the global namespace, which result in errors colliding
+# with other gems rightfully not expecting beaker's dsl to
+# be available at the global level.
+module Beaker
+  class TestCase
+    include Beaker::DSL
+  end
+end

data/lib/beaker-pe/install/pe_utils.rb

@@ -425,8 +425,8 @@ module Beaker
           end
 
           install_hosts.each do |host|
-            #windows agents from 4.0 -> 2016.1.2 were only installable via aio method
-            is_windows_msi_and_aio = (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.3.0') && !version_is_less(host['pe_ver'], '3.99') && !(host['roles'].include?('frictionless'))))
+            #windows agents from 4.0 -> 2016.1.2 were only installable via the aio method
+            is_windows_msi_and_aio = (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.3.0') && !version_is_less(host['pe_ver'], '3.99')))
 
             if agent_only_check_needed && hosts_agent_only.include?(host) || is_windows_msi_and_aio
               host['type'] = 'aio'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.2.0'
+        STRING = '1.3.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec