beaker-answers 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMyZWM0NjM4ZmZlZGI0MWU1MDYzYWNlNGEyN2Y4ZGNkOWFhNGU2Mw==
+    N2E3NGQwNjgwMWZjOWY1MDVjNWU3MWI5MjNmN2NhZDgzNjU5Mjk5ZA==
   data.tar.gz: !binary |-
-    YmZhOWYwOTg5OTc4ODFjN2Q1YTQxN2M4YjNhNGY5OWVjYjc2MjA2Yw==
+    ZmI5ODg4YWNhYTNkZmVhOTRjNDBiMjhkOThjNjZjMzU3MjVkMWU5Mg==
 SHA512:
   metadata.gz: !binary |-
-    NWI0ZDlhM2JlNTE5MWU4MzFkMmNhNzU0YTcwZjhhMWYxYzlhMjUzZjM3YTM1
-    MTAwODYwM2RmOGZjYjlmNzgwM2MyMzYxZTFkMzRhMmQ5NDQ0MDU2OTg0NTMx
-    MmE4Y2ZmZDhhYWQ3ODY5Zjk5MzJjMjg5NDIxZDMwODhiYzY5YTE=
+    ZGQ1MmM3ZTE1YTlhNTM0ZWY5OTFlMjNhN2JlZTM0OWNhNzMzZDJhZTllZDli
+    YmMyYTVlZTBiMTQ3MTk4ZWQxOWRiYjhhMDdjYTNmZWIxZTVlNTcwZjlkMjgy
+    YzhjODZjZGVhOTUzMjJkYjM4MzkyZjc2OTI0NTk3OTNkZGY3ZTU=
   data.tar.gz: !binary |-
-    NGViOGVjZGU2MzNhYzY2NDZiMzM5OGU4MDA1NzdkZWQ1YTYwNjRmYmU5M2Ey
-    YjU4NDJlNmEwNDc4NDU5MjcxNGQ3N2Q2MDc1OGUwOWM0MWFiZTgxMzc4MTg1
-    NzcwY2Q1MTQyNmJmMjIzNDViOTJhZjY5MzE5NDBlZWJjZmVkZTk=
+    MzczOWY2ZWJlY2Q5ZmU1NTViY2RkOTg0YjE0YTVkNDQwNGY3NGVkZWYzZTA5
+    ZWM0ZmUxYTY5MmNlMzkzMmYzYmI2ODYzOTc4MDAzMDE5ZjQzZjRmNzQ5ZGM4
+    YzExNDkyODY1OWIzYWIyMGYxNDM4NmM1NDNiYjE1YTY0ODAxYTc=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 12 Feb, 2016 (3577bbf2)](#LATEST)
+* [LATEST - 28 Apr, 2016 (32ef620e)](#LATEST)
+* [0.4.0 - 12 Feb, 2016 (96d0d7cf)](#0.4.0)
 * [0.3.2 - 10 Nov, 2015 (f699c033)](#0.3.2)
 * [0.3.1 - 2 Nov, 2015 (e5922067)](#0.3.1)
 * [0.3.0 - 22 Oct, 2015 (0c56067d)](#0.3.0)
@@ -10,7 +11,36 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 12 Feb, 2016 (3577bbf2)
+### <a name = "LATEST">LATEST - 28 Apr, 2016 (32ef620e)
+
+* (GEM) update beaker-answers version to 0.4.1 (32ef620e)
+
+* Merge pull request #11 from tvpartytonight/BKR-763 (554f0405)
+
+
+```
+Merge pull request #11 from tvpartytonight/BKR-763
+
+(BKR-763) Supply only necessary answers on upgrade
+```
+* (BKR-763) Supply only necessary answers on upgrade (5b1e9782)
+
+
+```
+(BKR-763) Supply only necessary answers on upgrade
+
+Previous to this commit, answer files were generated in full during
+upgrade scenarios; this does not match the user workflow or what is
+documented for upgrades, so we should only supply answers needed. The
+answers `create` method now checks the `:type` in options and creates a
+separate branch of `Answers` named `Upgrade`.
+
+This change only affects PE 3.8 and higher; all lower versions will
+continue to produce an entire answers file.
+```
+### <a name = "0.4.0">0.4.0 - 12 Feb, 2016 (96d0d7cf)
+
+* (HISTORY) update beaker-answers history for gem release 0.4.0 (96d0d7cf)
 
 * (GEM) update beaker-answers version to 0.4.0 (3577bbf2)
 

data/lib/beaker-answers/answers.rb

@@ -4,6 +4,7 @@ module BeakerAnswers
   class Answers
 
     DEFAULT_ANSWERS =  StringifyHash.new.merge({
+      :q_install                                     => 'y',
       :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
       :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',
       :q_puppet_enterpriseconsole_smtp_port          => 25,
@@ -47,6 +48,12 @@ module BeakerAnswers
       BeakerAnswers.constants.select {|c| BeakerAnswers.const_get(c).is_a?(Class) && BeakerAnswers.const_get(c).respond_to?(:pe_version_matcher)}
     end
 
+    # Determine the list of supported upgrade PE versions, return as an array
+    # @return [Array<String>] An array of the supported versions
+    def self.supported_upgrade_versions
+      BeakerAnswers.constants.select {|c| BeakerAnswers.const_get(c).is_a?(Class) && BeakerAnswers.const_get(c).respond_to?(:upgrade_version_matcher)}
+    end
+
     # When given a Puppet Enterprise version, a list of hosts and other
     # qualifying data this method will return the appropriate object that can be used
     # to generate answer file data.
@@ -58,6 +65,15 @@ module BeakerAnswers
     # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
     #   data.
     def self.create version, hosts, options
+      # if :upgrade is detected, then we return the simpler upgrade answers
+      if options[:type] == :upgrade
+        self.supported_upgrade_versions.each do |upgrade_version_class|
+          if BeakerAnswers.const_get(upgrade_version_class).send(:upgrade_version_matcher) =~ version
+            return BeakerAnswers.const_get(upgrade_version_class).send(:new, version, hosts, options)
+          end
+        end
+        warn 'Only upgrades to version 3.8 and above generate specific upgrade answers. Defaulting to full answers.'
+      end
 
       # finds all potential version classes
       # discovers new version classes as they are added, no more crazy case statement

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.4.0'
+    STRING = '0.4.1'
   end
 end

data/lib/beaker-answers/versions/upgrade.rb

@@ -0,0 +1,19 @@
+module BeakerAnswers
+  # In the case of upgrades, we lay down a much simpler file
+  class Upgrade < Answers
+
+    def self.upgrade_version_matcher
+      /\A2015\.[123]|\A2016\.[1234]/
+    end
+
+    def generate_answers
+      the_answers = {}
+      @hosts.each do |host|
+        the_answers[host.name] = {:q_install => answer_for(@options, :q_install)}
+        # merge custom host answers if available
+        the_answers[host.name] = the_answers[host.name].merge(host[:custom_answers]) if host[:custom_answers]
+      end
+      the_answers
+    end
+  end
+end

data/lib/beaker-answers/versions/upgrade38.rb

@@ -0,0 +1,31 @@
+module BeakerAnswers
+  # In the case of upgrades, we lay down a much simpler file
+  class Upgrade38 < Upgrade
+
+    def self.upgrade_version_matcher
+      /\A3\.8/
+    end
+
+    def generate_answers
+      the_answers = super
+      the_answers.map do |hostname, answers|
+        # First check to see if there is a host option for this setting
+        # and skip to the next object if it is already defined.
+        if the_answers[hostname][:q_enable_future_parser]
+          next
+        # Check now if it was set in the global options.
+        elsif @options[:answers] && @options[:answers][:q_enable_future_parser]
+          the_answers[hostname][:q_enable_future_parser] = @options[:answers][:q_enable_future_parser]
+          next
+        # If we didn't set it on a per host or global option basis, set it to
+        # 'y' here. We could have possibly set it in the DEFAULT_ANSWERS, but it
+        # is unclear what kind of effect that might have on all the other answers
+        # that rely on it defaulting to 'n'.
+        else
+          the_answers[hostname][:q_enable_future_parser] = 'y'
+        end
+      end
+      the_answers
+    end
+  end
+end

data/spec/beaker-answers/beaker-answers_spec.rb

@@ -29,6 +29,35 @@ describe BeakerAnswers do
     end
   end
 
+  context 'when we are upgrading to a version > 3.8' do
+    supported_general_upgrade_versions = [ '2015.1.0',
+                                           '2016.1.0',
+                                           '2016.2.1']
+    supported_general_upgrade_versions.each do |version|
+      it "the version #{version} generates general upgrade answers" do
+        @ver = version
+        options[:type] = :upgrade
+        expect( answers ).to be_a_kind_of BeakerAnswers::Upgrade
+      end
+    end
+  end
+
+  it 'generates upgrade38 answers when type is upgrade and the version 3.8' do
+    @ver = '3.8.3'
+    options[:type] = :upgrade
+    expect( answers ).to be_a_kind_of BeakerAnswers::Upgrade38
+  end
+
+  it 'generates 2016.2 answers for 2016.2 hosts' do
+    @ver = '2016.2.0'
+    expect( answers ).to be_a_kind_of BeakerAnswers::Version20162
+  end
+
+  it 'generates 2016.1 answers for 2016.1 hosts' do
+    @ver = '2016.1.0'
+    expect( answers ).to be_a_kind_of BeakerAnswers::Version20161
+  end
+
   it 'generates 2015.3 answers for 2015.3 hosts' do
     @ver = '2015.3.0'
     expect( answers ).to be_a_kind_of BeakerAnswers::Version20153
@@ -319,6 +348,99 @@ describe BeakerAnswers::Version40 do
   end
 end
 
+describe BeakerAnswers::Upgrade do
+
+  let( :options )     { StringifyHash.new }
+  let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
+  let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                  basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                  basic_hosts[2]['roles'] = ['database', 'agent']
+                  basic_hosts }
+  let( :answers )     { BeakerAnswers::Answers.create(@ver, hosts, options.merge({:type => :upgrade}) ) }
+
+  before :each do
+    @ver = '2015.3'
+    @answers = answers.answers
+  end
+
+  context 'when per host custom answers are provided for the master and dashboard' do
+    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                    basic_hosts[0][:custom_answers] = { :q_custom0 => '0LOOK' }
+                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                    basic_hosts[1][:custom_answers] = { :q_custom1 => 'LOOKLOOK',
+                                                        :q_custom2 => "LOOK3"}
+                    basic_hosts[2]['roles'] = ['database', 'agent']
+                    basic_hosts }
+
+    it 'adds those custom answers to the master' do
+      expect( @answers['vm1'][:q_custom0] ).to be === '0LOOK'
+      expect( @answers['vm1'][:q_install] ).to eq('y')
+      expect( @answers['vm1'].size).to eq(2)
+    end
+
+    it 'adds custom answers to the dashboard' do
+      expect( @answers['vm2'][:q_custom1] ).to be === 'LOOKLOOK'
+      expect( @answers['vm2'][:q_custom2] ).to be === 'LOOK3'
+      expect( @answers['vm2'][:q_install] ).to eq('y')
+      expect( @answers['vm2'].size).to eq(3)
+    end
+
+    it 'does not add custom answers for the database' do
+      expect(@answers['vm3'][:q_install]).to eq('y')
+      expect(@answers['vm3'].length).to eq(1)
+    end
+  end
+
+  context 'when no custom answers are provided' do
+    it "each answer should have only one key for :q_install" do
+      @answers.each do |vmname, answer|
+        expect(answer[:q_install]).to eq('y')
+        expect(answer.length).to eq(1)
+      end
+    end
+  end
+end
+
+describe BeakerAnswers::Upgrade38 do
+
+  let( :options )     { StringifyHash.new }
+  let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
+  let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                  basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                  basic_hosts[2]['roles'] = ['database', 'agent']
+                  basic_hosts }
+  let( :answers )     { BeakerAnswers::Answers.create(@ver, hosts, options.merge({:type => :upgrade}) ) }
+
+  before :each do
+    @ver = '3.8'
+    @answers = answers.answers
+  end
+
+  context 'when no special answers are provided' do
+    it "each answer should have only two keys" do
+      @answers.each do |vmname, answer|
+        expect(answer[:q_install]).to eq('y')
+        expect(answer[:q_enable_future_parser]).to eq('y')
+        expect(answer.length).to eq(2)
+      end
+    end
+  end
+
+  context 'when we set :q_enable_future_parser in global options' do
+    let( :options ) {
+      options = StringifyHash.new
+      options[:answers] = { :q_enable_future_parser => 'thefutureparser!!!'}
+      options
+    }
+    it 'sets that parser option from the global options' do
+      @answers.each do |vmname, answer|
+        expect(answer[:q_enable_future_parser]).to eq('thefutureparser!!!')
+      end
+    end
+
+  end
+end
+
 describe BeakerAnswers::Version20153 do
   let( :options )     { StringifyHash.new }
   let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -186,6 +186,8 @@ files:
 - lib/beaker-answers.rb
 - lib/beaker-answers/answers.rb
 - lib/beaker-answers/version.rb
+- lib/beaker-answers/versions/upgrade.rb
+- lib/beaker-answers/versions/upgrade38.rb
 - lib/beaker-answers/versions/version20.rb
 - lib/beaker-answers/versions/version20153.rb
 - lib/beaker-answers/versions/version20161.rb