beaker-pe 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzM1MzU5ODE2MzczZmI2YjY1NDcxZWZjNjVmMzY0ZmYwMzU4MmM4NA==
+    ZTA3NWI0NmU2ZjExNGQ5OTk2MWQxZDYxYTJiMzU1MjI1OWYxMjhmNw==
   data.tar.gz: !binary |-
-    MDdhOTQ0YjUyMmIzZjMzNmQ3OGIwZjRiZTE5MWNkODM1N2NkMDQxMQ==
+    YjBmZTAyNDc5ZjRlNjk1M2RhMjcxYmQ1Y2Q4ZmM3MWVhODZlNGY0MA==
 SHA512:
   metadata.gz: !binary |-
-    Y2Q4MDJmYmUyNjFiYWQ2NjZhMDFjZGExNDAwMWFiOGFmM2RlZTczYmMzOGM0
-    MzMzMWEzMDkwNDYwNWUxNjI2MzNmZjk3OWE4MDBlYWJmYWI1MGM3YzY1Zjk5
-    ZDk1NmViOGIwMzI1OWNhMDZhYzg4ZGEyZDRhMjE0YTIwMTdiMjk=
+    ZDY5N2JhNmVmZjE2ZmFiNTNmOTk5MzBiNjlhY2QwYzgyZmNmZDk3ZWYwNTM5
+    OTU0ZmM3MGE5NThhNTFjMTQwYjUzMDM3MTI1MmFkNjUzMzA0ZDJhZTkyMjAy
+    Y2RiZGQ0Zjk3YjZkMTc5ZjY2NDJiZjIxOWQ5ODRkNWM2OGFjMjU=
   data.tar.gz: !binary |-
-    YmM5NmY0Nzk3NjQzNDU2MmZmMGRlMzFmOTk1YWU0MmY4NzliMTU4YTRlZTJi
-    YmFlYzI0MTk1ZTBmYTNiZGQxOGViMWFjNjUyZGI4MGU2MzgzYjkyZGYzOWI3
-    MWEwMzQ1ZGJmNWMwMmZlOGRlZTNmOWUzM2M5NWIzYzZkMGU3MDE=
+    NmJhMDhmZmRhZTA3MzczNDRjYzA5YjExMDc4MDcxMjQwY2NmM2NjNWZhNjRj
+    ZWYxMjYwMDUxNDA3OTcwZWE4NTlkYmIzNDg1YjdmNjk1YmE1YzRlNGMyMTY0
+    M2U4ZWVlYjEzMGMyYzZhOWQ0YWU3MGUzMjIwNTQ4MmI0MWMzN2Y=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 16 Nov, 2016 (9d6d30e0)](#LATEST)
+* [LATEST - 22 Nov, 2016 (4b812f78)](#LATEST)
+* [1.6.0 - 16 Nov, 2016 (0da1b64c)](#1.6.0)
 * [1.5.0 - 7 Nov, 2016 (24d78992)](#1.5.0)
 * [1.4.0 - 11 Oct, 2016 (6becdbb2)](#1.4.0)
 * [1.3.0 - 6 Oct, 2016 (97f781bb)](#1.3.0)
@@ -24,7 +25,32 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 16 Nov, 2016 (9d6d30e0)
+### <a name = "LATEST">LATEST - 22 Nov, 2016 (4b812f78)
+
+* (GEM) update beaker-pe version to 1.6.1 (4b812f78)
+
+* Merge pull request #39 from james-stocks/BKR-967 (2d17d83f)
+
+
+```
+Merge pull request #39 from james-stocks/BKR-967
+
+Revert "(BKR-967) Add :disable_analytics option"
+```
+* Revert "(BKR-967) Add :disable_analytics option" (a9fdaacb)
+
+
+```
+Revert "(BKR-967) Add :disable_analytics option"
+
+This reverts commit c9e25658e8cd282e1676d723131946268e308579.
+
+This commit is not useful because it is blocking analytics from the console host;
+but analytics are sent from the user browser and not the console host.
+```
+### <a name = "1.6.0">1.6.0 - 16 Nov, 2016 (0da1b64c)
+
+* (HISTORY) update beaker-pe history for gem release 1.6.0 (0da1b64c)
 
 * (GEM) update beaker-pe version to 1.6.0 (9d6d30e0)
 

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

@@ -1,12 +1,9 @@
 [ 'aio_defaults', 'pe_defaults', 'puppet_utils', 'windows_utils' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}"
 end
-require "beaker/host_prebuilt_steps"
 require "beaker-answers"
 require "timeout"
 require "json"
-require "beaker-pe/options/presets"
-
 module Beaker
   module DSL
     module InstallUtils
@@ -25,7 +22,6 @@ module Beaker
         include PEDefaults
         include PuppetUtils
         include WindowsUtils
-        include HostPrebuiltSteps
 
         # Version of PE when we switched from legacy installer to MEEP.
         MEEP_CUTOVER_VERSION = '2016.2.0'
@@ -713,12 +709,6 @@ module Beaker
           install_pe_on(hosts, options)
         end
 
-        def disable_analytics(hosts)
-          logger.info("Disabling analytics on dashboard host(s)")
-          set_etc_hosts(hosts, "127.0.0.1\tgoogle-analytics.com\n")
-          set_etc_hosts(hosts, "127.0.0.1\twww.google-analytics.com\n")
-        end
-
         def check_puppetdb_status_endpoint(host)
           if version_is_less(host['pe_ver'], '2016.1.0')
             return true
@@ -788,8 +778,6 @@ module Beaker
         #   options, refer to {#do_install} documentation
         #
         def install_pe_on(install_hosts, opts)
-          opts = pe_presets.merge(opts)
-
           confine_block(:to, {}, install_hosts) do
             sorted_hosts.each do |host|
               #process the version files if necessary
@@ -807,11 +795,6 @@ module Beaker
                 host['pe_ver'] ||= Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || opts[:pe_dir], opts[:pe_version_file])
               end
             end
-
-            if opts[:disable_analytics] then
-              disable_analytics(dashboard)
-            end
-
             do_install sorted_hosts, opts
           end
         end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.6.0'
+        STRING = '1.6.1'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'beaker'
-require 'beaker-pe/options/presets'
 
 class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::InstallUtils
@@ -284,7 +283,6 @@ describe ClassMixedWithDSLInstallUtils do
       context 'the do_higgs_install' do
         it 'submits the correct installer cmd to invoke Higgs' do
           prep_host(host)
-          allow( subject ).to receive( :options ).and_return( {} )
           subject.do_higgs_install(host, opts)
         end
       end
@@ -307,7 +305,6 @@ describe ClassMixedWithDSLInstallUtils do
       context 'the do_higgs_install' do
         it 'submits the correct installer cmd to invoke Higgs' do
           prep_host(host)
-          allow( subject ).to receive( :options ).and_return( {} )
           subject.do_higgs_install(host, opts)
         end
       end
@@ -892,7 +889,6 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :options ).and_return( {} )
       #create answers file per-host, except windows
       allow( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ )
       #run installer on all hosts
@@ -948,7 +944,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :sleep ).and_return( true )
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :options ).and_return( {} )
 
       #run higgs installer command
       expect( subject ).to receive( :on ).with( hosts[0],
@@ -964,7 +959,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :sleep ).and_return( true )
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :options ).and_return( {} )
 
       #run higgs installer command
       expect( subject ).to receive( :on ).with( hosts[0],
@@ -983,35 +977,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :options ).and_return( {} )
       allow( subject ).to receive( :hosts ).and_return( hosts_sorted )
       allow( subject ).to receive( :do_install ).and_return( true )
-      allow( subject ).to receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( hosts, pe_presets )
-      subject.install_pe
-    end
-
-    it 'blocks analytics by default' do
-      allow( subject ).to receive( :options ).and_return( {} )
-      allow( subject ).to receive( :hosts ).and_return( hosts_sorted )
-      allow( subject ).to receive( :do_install ).and_return( true )
-      allow( subject ).to receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( hosts, pe_presets )
-      subject.install_pe
-    end
-
-    it 'blocks analytics when disable_analytics is true' do
-      allow( subject ).to receive( :options ).and_return( {:disable_analytics => true} )
-      allow( subject ).to receive( :hosts ).and_return( hosts_sorted )
-      allow( subject ).to receive( :do_install ).and_return( true )
-      allow( subject ).to receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( hosts, {:disable_analytics => true} )
-      subject.install_pe
-    end
-
-    it 'does not block analytics when disable_analytics is false' do
-      allow( subject ).to receive( :options ).and_return( {:disable_analytics => false} )
-      allow( subject ).to receive( :hosts ).and_return( hosts_sorted )
-      allow( subject ).to receive( :do_install ).and_return( true )
-      expect( subject ).to_not receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( hosts, {:disable_analytics => false} )
+      expect( subject ).to receive( :do_install ).with( hosts, {} )
       subject.install_pe
     end
 
@@ -1023,8 +989,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :hosts ).and_return( hosts_sorted )
       allow( subject ).to receive( :options ).and_return( {} )
       allow( subject ).to receive( :do_install ).and_return( true )
-      allow( subject ).to receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( hosts, pe_presets )
+      expect( subject ).to receive( :do_install ).with( hosts, {} )
       subject.install_pe
       hosts.each do |h|
         expect( h['pe_ver'] ).to be === '2.8'
@@ -1033,10 +998,8 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'can act upon a single host' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :options ).and_return( {} )
       allow( subject ).to receive( :sorted_hosts ).and_return( [hosts[0]] )
-      allow( subject ).to receive( :set_etc_hosts )
-      expect( subject ).to receive( :do_install ).with( [hosts[0]], pe_presets )
+      expect( subject ).to receive( :do_install ).with( [hosts[0]], {} )
       subject.install_pe_on(hosts[0], {})
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -191,7 +191,6 @@ files:
 - lib/beaker-pe.rb
 - lib/beaker-pe/install/pe_utils.rb
 - lib/beaker-pe/options/pe_version_scraper.rb
-- lib/beaker-pe/options/presets.rb
 - lib/beaker-pe/pe-client-tools/config_file_helper.rb
 - lib/beaker-pe/pe-client-tools/executable_helper.rb
 - lib/beaker-pe/pe-client-tools/install_helper.rb

data/lib/beaker-pe/options/presets.rb

@@ -1,9 +0,0 @@
-# Generates an OptionsHash of preset values for Beaker options relating to PE
-#
-# @return [OptionsHash] The supported arguments in an OptionsHash
-def pe_presets
-  h = Beaker::Options::OptionsHash.new
-  h.merge({
-    :disable_analytics => true,
-  })
-end