beaker 2.18.3 → 2.19.0

data/spec/mocks.rb

@@ -77,12 +77,14 @@ module FakeHost
 
   def self.create(name = 'fakevm', platform = 'redhat-version-arch', options = {})
     options_hash = Beaker::Options::OptionsHash.new.merge(options)
+    options_hash[:logger] = RSpec::Mocks::Double.new('logger').as_null_object
     host = Beaker::Host.create(name, { 'platform' => Beaker::Platform.new(platform) } , options_hash)
     host.extend(MockedExec)
     host
   end
 
   module MockedExec
+
     def self.extended(other)
       other.instance_eval do
         send(:instance_variable_set, :@commands, [])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.18.3
+  version: 2.19.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -248,6 +248,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: beaker-answers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: stringify-hash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +418,7 @@ files:
 - acceptance/fixtures/module/spec/spec_helper_acceptance.rb
 - acceptance/fixtures/module/tests/init.pp
 - acceptance/fixtures/module/vendor/bundle/ruby/gems.txt
+- acceptance/lib/beaker/acceptance/install_utils.rb
 - acceptance/pre_suite/README.md
 - acceptance/pre_suite/pe/install.rb
 - acceptance/pre_suite/puppet_gem/install.rb
@@ -397,6 +426,7 @@ files:
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/host.rb
+- acceptance/tests/foss_utils/clone_git_repo_on.rb
 - acceptance/tests/hypervisor/communication.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke.rb
@@ -404,14 +434,6 @@ files:
 - bin/beaker
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
-- lib/beaker/answers.rb
-- lib/beaker/answers/version20.rb
-- lib/beaker/answers/version28.rb
-- lib/beaker/answers/version30.rb
-- lib/beaker/answers/version32.rb
-- lib/beaker/answers/version34.rb
-- lib/beaker/answers/version38.rb
-- lib/beaker/answers/version40.rb
 - lib/beaker/cli.rb
 - lib/beaker/command.rb
 - lib/beaker/command_factory.rb
@@ -434,6 +456,7 @@ files:
 - lib/beaker/dsl/install_utils/pe_defaults.rb
 - lib/beaker/dsl/install_utils/pe_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
+- lib/beaker/dsl/install_utils/windows_utils.rb
 - lib/beaker/dsl/outcomes.rb
 - lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
@@ -519,7 +542,6 @@ files:
 - lib/beaker/test_case.rb
 - lib/beaker/test_suite.rb
 - lib/beaker/version.rb
-- spec/beaker/answers_spec.rb
 - spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
@@ -536,6 +558,7 @@ files:
 - spec/beaker/dsl/install_utils/pe_defaults_spec.rb
 - spec/beaker/dsl/install_utils/pe_utils_spec.rb
 - spec/beaker/dsl/install_utils/puppet_utils_spec.rb
+- spec/beaker/dsl/install_utils/windows_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb

data/lib/beaker/answers.rb

@@ -1,143 +0,0 @@
-module Beaker
-  # This class provides methods for generating PE answer file
-  # information.
-  class Answers
-
-    DEFAULT_ANSWERS =  Beaker::Options::OptionsHash.new.merge({
-      :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',
-      :q_puppetdb_password                           => '~!@#$%^*-/ aZ',
-      :q_puppetmaster_enterpriseconsole_port         => 443,
-      :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
-      :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
-      :q_puppet_enterpriseconsole_database_name      => 'console',
-      :q_puppet_enterpriseconsole_database_user      => 'mYc0nS03u3r',
-      :q_database_root_password                      => '=ZYdjiP3jCwV5eo9s1MBd',
-      :q_database_root_user                          => 'pe-postgres',
-      :q_database_export_dir                         => '/tmp',
-      :q_puppetdb_database_name                      => 'pe-puppetdb',
-      :q_puppetdb_database_user                      => 'mYpdBu3r',
-      :q_database_port                               => 5432,
-      :q_puppetdb_port                               => 8081,
-      :q_classifier_database_user                    => 'DFGhjlkj',
-      :q_database_name                               => 'pe-classifier',
-      :q_classifier_database_password                => '~!@#$%^*-/ aZ',
-      :q_activity_database_user                      => 'adsfglkj',
-      :q_activity_database_name                      => 'pe-activity',
-      :q_activity_database_password                  => '~!@#$%^*-/ aZ',
-      :q_rbac_database_user                          => 'RbhNBklm',
-      :q_rbac_database_name                          => 'pe-rbac',
-      :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
-      :q_install_update_server                       => 'y',
-      :q_exit_for_nc_migrate                         => 'n',
-      :q_enable_future_parser                        => 'n',
-      :q_pe_check_for_updates                        => 'n',
-    })
-
-    # 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
-    # @param [Array<Beaker::Host>] hosts An array of host objects.
-    # @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
-      case version
-      when /\A(4\.0|2015)/
-        return Version40.new(version, hosts, options)
-      when /\A3\.99/
-        return Version40.new(version, hosts, options)
-      when /\A3\.8/
-        return Version38.new(version, hosts, options)
-      when /\A3\.7/
-        return Version34.new(version, hosts, options)
-      when /\A3\.4/
-        return Version34.new(version, hosts, options)
-      when /\A3\.[2-3]/
-        return Version32.new(version, hosts, options)
-      when /\A3\.1/
-        return Version30.new(version, hosts, options)
-      when /\A3\.0/
-        return Version30.new(version, hosts, options)
-      when /\A2\.8/
-        return Version28.new(version, hosts, options)
-      when /\A2\.0/
-        return Version20.new(version, hosts, options)
-      else
-        raise NotImplementedError, "Don't know how to generate answers for #{version}"
-      end
-    end
-
-    # The answer value for a provided question.  Use the user answer when available, otherwise return the default
-    # @param [Hash] options options for answer file
-    # @option options [Symbol] :answer Contains a hash of user provided question name and answer value pairs.
-    # @param [String] default Should there be no user value for the provided question name return this default
-    # @return [String] The answer value
-    def answer_for(options, q, default = nil)
-      answer = DEFAULT_ANSWERS[q]
-      # check to see if there is a value for this in the provided options
-      if options[:answers] && options[:answers][q]
-        answer = options[:answers][q]
-      end
-      # use the default if we don't have anything
-      if not answer
-        answer = default
-      end
-      answer
-    end
-
-    # When given a Puppet Enterprise version, a list of hosts and other
-    # qualifying data this method will return a hash (keyed from the hosts)
-    # of default Puppet Enterprise answer file data hashes.
-    #
-    # @param [String] version Puppet Enterprise version to generate answer data for
-    # @param [Array<Beaker::Host>] hosts An array of host objects.
-    # @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 initialize(version, hosts, options)
-      @version = version
-      @hosts = hosts
-      @options = options
-    end
-
-    # Generate the answers hash based upon version, host and option information
-    def generate_answers
-      raise "This should be handled by subclasses!"
-    end
-
-    # Access the answers hash for this version, host and option information.  If the answers
-    # have not yet been calculated, generate them.
-    # @return [Hash] A hash of answers keyed by host.name
-    def answers
-      @answers ||= generate_answers
-    end
-
-    # This converts a data hash provided by answers, and returns a Puppet
-    # Enterprise compatible answer file ready for use.
-    #
-    # @param [Beaker::Host] host Host object in question to generate the answer
-    #   file for.
-    # @return [String] a string of answers
-    # @example Generating an answer file for a series of hosts
-    #   hosts.each do |host|
-    #     answers = Beaker::Answers.new("2.0", hosts, "master")
-    #     create_remote_file host, "/mypath/answer", answers.answer_string(host, answers)
-    #  end
-    def answer_string(host)
-      answers[host.name].map { |k,v| "#{k}=#{v}" }.join("\n")
-    end
-
-  end
-
-  [ 'version40', 'version34', 'version32', 'version30', 'version28', 'version20' ].each do |lib|
-    require "beaker/answers/#{lib}"
-  end
-end

data/lib/beaker/answers/version20.rb

@@ -1,120 +0,0 @@
-module Beaker
-  # This class provides answer file information for PE version 2.0
-  #
-  # @api private
-  class Version20 < Answers
-    # Return answer data for a host
-    #
-    # @param [Beaker::Host] host Host to return data for
-    # @param [Beaker::Host] master Host object representing the master
-    # @param [Beaker::Host] dashboard Host object representing the dashboard
-    # @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 host_answers(host, master, dashboard, options)
-      return nil if host['platform'] =~ /windows/
-
-      agent_a = {
-        :q_install => 'y',
-        :q_puppetagent_install => 'y',
-        :q_puppet_cloud_install => 'y',
-        :q_puppet_symlinks_install => 'y',
-        :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host.to_s,
-        :q_puppetagent_server => master.to_s,
-
-        # Disable console and master by default
-        # This will be overridden by other blocks being merged in
-        :q_puppetmaster_install => 'n',
-        :q_puppet_enterpriseconsole_install => 'n',
-      }
-
-      master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-      master_a = {
-        :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master.to_s,
-        :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
-        :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-        :q_puppetmaster_forward_facts => 'y',
-      }
-
-      dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
-      dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-      smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
-      smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
-      smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
-      smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
-      auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-      auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-      console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-      console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-      console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-      console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-      console_a = {
-        :q_puppet_enterpriseconsole_install => 'y',
-        :q_puppet_enterpriseconsole_database_install => 'y',
-        :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
-        :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-        :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_name => console_database_name,
-        :q_puppet_enterpriseconsole_database_user => console_database_user,
-        :q_puppet_enterpriseconsole_database_root_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
-        :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
-        :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-        :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-        :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-        :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-        :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-        :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-      }
-
-      console_a[:q_puppet_enterpriseconsole_auth_user] = console_a[:q_puppet_enterpriseconsole_auth_user_email]
-
-      if smtp_password and smtp_username
-        console_a.merge!({
-                           :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                           :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                           :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
-                         })
-      end
-
-      answers = agent_a.dup
-      if host == master
-        answers.merge! master_a
-      end
-
-      if host == dashboard
-        answers.merge! console_a
-      end
-
-      return answers
-    end
-
-    # Return answer data for all hosts.
-    #
-    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
-    #   data.
-    def generate_answers
-      the_answers = {}
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      master = only_host_with_role(@hosts, 'master')
-      @hosts.each do |h|
-        the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if the_answers[h.name] && h[:custom_answers]
-          the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
-        end
-        h[:answers] = the_answers[h.name]
-      end
-      return the_answers
-    end
-  end
-end

data/lib/beaker/answers/version28.rb

@@ -1,121 +0,0 @@
-module Beaker
-  # This class provides answer file information for PE version 2.8
-  #
-  # @api private
-  class Version28 < Answers
-
-    # Return answer data for a host
-    #
-    # @param [Beaker::Host] host Host to return data for
-    # @param [Beaker::Host] master Host object representing the master
-    # @param [Beaker::Host] dashboard Host object representing the dashboard
-    # @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 host_answers(host, master, dashboard, options)
-      return nil if host['platform'] =~ /windows/
-
-      agent_a = {
-        :q_install => 'y',
-        :q_puppetagent_install => 'y',
-        :q_puppet_cloud_install => 'y',
-        :q_puppet_symlinks_install => 'y',
-        :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host.to_s,
-        :q_puppetagent_server => master.to_s,
-
-        # Disable console and master by default
-        # This will be overridden by other blocks being merged in
-        :q_puppetmaster_install => 'n',
-        :q_puppet_enterpriseconsole_install => 'n',
-      }
-
-      master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-      master_a = {
-        :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master.to_s,
-        :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
-        :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-        :q_puppetmaster_forward_facts => 'y',
-      }
-
-      dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
-      dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-      smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
-      smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
-      smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
-      smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
-      auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-      auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-      console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-      console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-      console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-      console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-      console_a = {
-        :q_puppet_enterpriseconsole_install => 'y',
-        :q_puppet_enterpriseconsole_database_install => 'y',
-        :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
-        :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-        :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_name => console_database_name,
-        :q_puppet_enterpriseconsole_database_user => console_database_user,
-        :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
-        :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
-        :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-        :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-        :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-        :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-        :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-        :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-      }
-
-      console_a[:q_puppet_enterpriseconsole_auth_user] = console_a[:q_puppet_enterpriseconsole_auth_user_email]
-
-      if smtp_password and smtp_username
-        console_a.merge!({
-                           :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                           :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                           :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
-                         })
-      end
-
-      answers = agent_a.dup
-      if host == master
-        answers.merge! master_a
-      end
-
-      if host == dashboard
-        answers.merge! console_a
-      end
-
-      return answers
-    end
-
-    # Return answer data for all hosts.
-    #
-    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
-    #   data.
-    def generate_answers
-      the_answers = {}
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      master = only_host_with_role(@hosts, 'master')
-      @hosts.each do |h|
-        the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if the_answers[h.name] && h[:custom_answers]
-          the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
-        end
-        h[:answers] = the_answers[h.name]
-      end
-      return the_answers
-    end
-
-  end
-end