Merge pull request #1073 from kevpl/bkr308_beaker_pe_create

(BKR-308) moved PE-specific functionality to beaker-pe

Gemfile

@@ -1,22 +1,3 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-scooter_version = ENV['SCOOTER_VERSION']
-if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
-  if scooter_version
-    gem 'scooter', *location_for(scooter_version)
-  else
-    gem 'scooter', '~> 2.0'
-  end
-end
-
 gemspec

beaker.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
+  s.add_runtime_dependency 'beaker-pe', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

lib/beaker/dsl.rb

@@ -3,6 +3,7 @@
   require "beaker/dsl/#{lib}"
 end
 
+require 'beaker-pe'
 module Beaker
   # This is a catch all module for including Puppetlabs home grown testing
   # DSL. This module is mixed into {Beaker::TestCase} and can be
@@ -79,5 +80,10 @@ module DSL
     include Beaker::DSL::Helpers
     include Beaker::DSL::InstallUtils
     include Beaker::DSL::Patterns
+    include Beaker::DSL::PE
+
+    def self.register(helper_module)
+      include helper_module
+    end
   end
 end

lib/beaker/dsl/install_utils.rb

@@ -1,13 +1,14 @@
-[ 'foss', 'pe', 'puppet', 'ezbake', 'module' ].each do |lib|
+[ 'foss', 'puppet', 'ezbake', 'module' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}_utils"
 end
+require "beaker/dsl/install_utils/pe_defaults"
 
 module Beaker
   module DSL
     # Collection of installation methods and support
     module InstallUtils
       include DSL::InstallUtils::PuppetUtils
-      include DSL::InstallUtils::PEUtils
+      include DSL::InstallUtils::PEDefaults
       include DSL::InstallUtils::FOSSUtils
       include DSL::InstallUtils::ModuleUtils
       include DSL::InstallUtils::EZBakeUtils

lib/beaker/options.rb

@@ -1,3 +1,3 @@
-%w(validator options_hash presets command_line_parser options_file_parser hosts_file_parser pe_version_scraper parser).each do |lib|
+%w(validator options_hash presets command_line_parser options_file_parser hosts_file_parser parser).each do |lib|
   require "beaker/options/#{lib}"
 end