answers.rb in beaker-answers-0.4.2

- old
+ new

@@ -2,11 +2,10 @@
   # This class provides methods for generating PE answer file
   # information.
   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,
       :q_puppet_enterpriseconsole_smtp_use_tls       => 'n',
       :q_verify_packages                             => 'y',
@@ -46,16 +45,10 @@
     # @return [Array<String>] An array of the supported versions
     def self.supported_versions
       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.
     #
     # @param [String] version Puppet Enterprise version to generate answer data for
@@ -63,18 +56,9 @@
     # @param [Hash] options options for answer files
     # @option options [Symbol] :type Should be one of :upgrade or :install.
     # @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
       version_classes = self.supported_versions
       version_classes.each do |vc|