(BKR-1500) Dependency Cleanup (#55)

* (BKR-1500) Move Leftover EZBake stuff from beaker

* (BKR-1500) Move Windows install_utils from beaker

* (BKR-1500) Move facter_helpers and puppet/facter wrappers from beaker

* (BKR-1500) Move clone_git_repo_on_test.rb from beaker

Since this functionality is in beaker-puppet, its tests belong here too.

Also removes a redundant install_utils from beaker-puppet acceptance and updates the install_package_on method in foss_utils to support platform SLES (which was updated in the redunadnt acceptance install_utils).

* (BKR-1500) `require 'beaker-puppet'` in test cases

Since beaker no longer automatically includes beaker-puppet, we must explicitly include it in all test cases.

* (BKR-1500) Restructure DSL extension module to conform to template standards

Note that this doesn't follow beaker-template format exactly, due to unanticipated namespace conflicts in test_case.

* (BKR-496) Cleanup of #tmpdir_on

* (BKR-1500) Add beaker-vmpooler dependency for local acceptance testing

* (BKR-1500) Pin Beaker requirement to ~>4.0

And document this in README.

Author: Dakta

Gemfile

@@ -16,7 +16,7 @@ end
 
 
 group :test do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.24')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
   gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.4.0')
 end
 

README.md

@@ -9,6 +9,27 @@ of beaker, please do, we would love any help that you'd like to provide.
 
 # How Do I Use This?
 
+## With Beaker 3.x
+
+This library is included as a dependency of Beaker 3.x versions and is automatically included, so there's nothing to do.
+
+## With Beaker 4.x
+
+As of Version 1.0 of `beaker-puppet`, the minimum supported version of beaker is Version 4.0. If you use `ENV['BEAKER_VERSION']`, you will have to ensure that this is compatible, and that if you are using a local Git repository it is up to date.
+
+As of beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
+
+~~~ruby
+# Gemfile
+gem 'beaker', '~>4.0'
+gem 'beaker-puppet', '~>1.0'
+# project.gemspec
+s.add_runtime_dependency 'beaker', '~>4.0'
+s.add_runtime_dependency 'beaker-puppet', '~>1.0'
+~~~
+
+For DSL Extension Libraries, you must also ensure that you `require` the library in your test files. You can do this manually in individual test files or in a test helper (if you have one). You can [use `Bundler.require()`](https://bundler.io/v1.16/guides/groups.html) to require the library automatically.
+
 ### Right Now? (beaker 3.x)
 
 At this point, beaker-puppet is included in beaker, so you don't have to _do_

acceptance/lib/beaker/acceptance/install_utils.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 hosts.each do |host|
   install_puppet_from_gem(host, {:version => '3.8.7'})
   unless host['platform'] =~ /windows/

acceptance/pre_suite/gem/install.rb

@@ -1,7 +1,5 @@
-begin
-  require 'beaker/acceptance/install_utils'
-  extend Beaker::Acceptance::InstallUtils
-end
+require 'beaker-puppet'
+
 test_name 'Puppet git pre-suite'
 
 install = [
@@ -10,8 +8,6 @@
   'puppet#3.8.7'
 ]
 
-SourcePath  = Beaker::DSL::InstallUtils::SourcePath
-
 PACKAGES = {
   :redhat => [
     'git',

acceptance/pre_suite/git/install.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 # the version is required on windows
 # all versions are required for osx
 install_puppet({

acceptance/pre_suite/pkg/install.rb

@@ -1,3 +1,5 @@
 # Beaker Acceptance Tests: puppet
 
 Tests that depend upon Puppet being installed on the SUTs.
+
+As of Beaker 4.0, you must `require 'beaker-puppet'` in each of these test files in order to access beaker-puppet DSL extensions.

acceptance/tests/README.md

@@ -0,0 +1,43 @@
+require 'beaker-puppet'
+
+confine :except, :platform => /^solaris-10/
+
+test_name 'Clone from git' do
+
+  PACKAGES = {
+    :redhat => [
+      'git',
+    ],
+    :debian => [
+      ['git', 'git-core'],
+    ],
+    :solaris_11 => [
+      ['git', 'developer/versioning/git'],
+    ],
+    :solaris_10 => [
+      'coreutils',
+      'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
+      'git',
+    ],
+    :windows => [
+      'git',
+    ],
+    :sles => [
+      'git-core',
+    ]
+  }
+
+
+  install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+
+  # implicitly tests build_giturl() and lookup_in_env()
+  hosts.each do |host|
+    on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
+    testdir = host.tmpdir(File.basename(__FILE__))
+
+    step 'should be able to successfully clone a git repo' do
+      results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
+      assert_match( %r{From.*github\.com[:/]puppetlabs/hiera}, result.output, 'Did not find clone')
+    end
+  end
+end

acceptance/tests/clone_git_repo_on_test.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 test_name "puppet install smoketest"
 
 step 'puppet install smoketest: verify \'facter --help\' can be successfully called on all hosts'

acceptance/tests/install_smoke_test.rb

@@ -1,3 +1,5 @@
+require 'beaker-puppet'
+
 test_name "validate host stubbing behavior"
 
 def get_hosts_file(host)