beaker 3.6.0 → 3.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmVmMDI1YTVjZDNjZmM4ODI2MGUzOTBiNDg2YmVlMDMwZGQyY2M2Mg==
+    MmUyMTFlZTE2NmY5N2U0NTEzNzc1ZDVmNjBjYzY1OWI5NWRmOTc5Yg==
   data.tar.gz: !binary |-
-    OWExZDNiOGU2NmRkNGJjYTM3MjlhZGRlODk3M2NiYzBjYTE3NmZkZA==
+    NjllMDQyODRjZjM2YTZiM2ZiMmM5ZTc4NWJkZTliNjliMGI4ZmU0Mw==
 SHA512:
   metadata.gz: !binary |-
-    YmRmNjhhMWYzZTEzZTk3ZDRiNTEzMzkwYjE3NzBmZDgzOGQzY2I0NTI4OGUy
-    ZjNmN2ZhNjM5ZDI0ZDY3YTRjOGJhMWRmMjViZWM3YzY0Y2QzNTE4ZjIxYzI4
-    NTQ1ZjU4YzVhMjAwMjUxMjY1Y2VlZmFmZDUzMjU1MGNiZGIwYzY=
+    NGNiNTg1MWQzZTIwNmNhMGQwNmNmMzlkNWRlNjU5OTRlMzBmMmYzMGRkMDkz
+    NDMzZTRmNzk1ZTdhMmVhZTg5ODIwOTg4NmMwZTJlZDUyOTMxNDcwZmE3MjJi
+    YWU1NzVhMjRlZDA3ZTcwYTdkMDJhYTBmM2UzNGI5NjBjODY3ZjM=
   data.tar.gz: !binary |-
-    YjA4NjRjYjVjMzEyMzg1ZTk2YWEwMDdhYzU1NTU2NjdlZjY1ZjNlN2EwMzc3
-    MWJlMzE4MGQ5Mzc1N2QxZDQ3YjU0M2U5Nzk3MjE1YWI5YWZhMmE4MzA5MjI2
-    ZjhlYTJjNGRiMTc4YTQzOTlmOTE4N2NhYTQwMjFjNzUxMDQwMGE=
+    OGVjNmEzMjQ0OWYwM2M0NDk2NWEzY2Q4N2ZhMGUxNmYxOGNhNGVjMmYyYTdj
+    Nzg4ZGFjZmRiMTIzYTZlYjVlZmY2ZTdkNTU4NjM2Yjk3Zjc4OTQ0ZTc0YTdl
+    NWUwYjc0NTZhNTg4NTdkZTMyNmQ4ZmJlMThmODFhNmIwYWQ3OWM=

data/beaker.gemspec

@@ -33,9 +33,6 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'minitar', '~> 0.5.4'
-  s.add_runtime_dependency 'json', '~> 1.8'
-  ## json: will stay <2.0 while aws-sdk-v1 is in use
-  ## aws-sdk-2 doesn't require json, so we can give this up when we move
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '3.3.0.beta1'
@@ -53,6 +50,7 @@ Gem::Specification.new do |s|
   # Run time dependencies that are Beaker libraries
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
+  s.add_runtime_dependency 'beaker-facter', '~> 0.0'
   s.add_runtime_dependency 'beaker-hostgenerator'
 
   # Optional provisioner specific support

data/docs/how_to/hosts/archlinux.md

@@ -0,0 +1,43 @@
+# Arch Linux
+
+> Arch Linux is an independently developed, i686/x86-64 general-purpose GNU/Linux distribution that strives to provide the latest stable versions of most software by following a rolling-release model. The default installation is a minimal base system, configured by the user to only add what is purposely required.
+**Source: https://wiki.archlinux.org/index.php/Arch_Linux**
+
+# Installation
+
+## Specifying a version to install
+
+> Arch Linux strives to maintain the latest stable release versions of its software as long as systemic package breakage can be reasonably avoided.
+**Source: https://wiki.archlinux.org/index.php/Arch_Linux**
+
+Since Arch is a rolling release, the Puppet version installed by Pacman will always be the latest avaliable release from the upstream.
+
+Because of this, it's not possible to specify a specific version with any of the Puppet install helper methods, and a warning will be shown if it is attempted.
+
+Because the Arch version will always be latest, it will always be Puppet 4+ with the AIO packaging, so it's advised to specify this in the config:
+
+```
+CONFIG:
+  log_level: verbose
+  type: aio
+```
+
+## Versioning
+
+Arch doesn't really have the idea of a release version, as it's a rolling update.
+
+For coventions sake, it's advised to put the date of creation of your Arch VM in the name of your SUT, so you know roughly when the VM is cut from:
+
+```
+HOSTS:
+  archlinux-2016.02.02-amd64:
+    roles:
+      - master
+    platform: archlinux-2016.02.02-amd64
+    box: terrywang/archlinux
+    box_version: 1.0.0
+    hypervisor: vagrant
+CONFIG:
+  log_level: verbose
+  type: aio
+```

data/docs/how_to/install_puppet.md

@@ -0,0 +1,88 @@
+# How To Install Puppet
+
+This doc will guide you through the process of installing Puppet Agent using
+beaker's DSL helpers.
+
+Note that this is not a complete documentation of the process, but a general
+overview. There will be specific hiccups for particular platforms and special
+cases. These are not all included at this point. The idea is that as we come
+upon them, we will now have a place to document those details, so that we can
+over time bring this to 100% completeness.
+
+# First Things First: What Do You Want to Install?
+
+If you understand [beaker's roles](https://github.com/puppetlabs/beaker/blob/master/docs/concepts/roles_what_are_they.md)
+and just want the shortcuts to installing Open Source Puppet across your testing
+environment, then you should go to our "High Level Shortcuts" section below.
+
+If you'd like to only install Puppet Agents, please checkout our "Puppet Agent
+Installs" section for more information.
+
+# High Level Shortcuts
+
+The
+[`install_puppet_on`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_on-instance_method)
+method is a wrapper on our installing Puppet behavior that allows you to pass in
+which hosts in particular you'd like to install Puppet on as well as specifying
+the options used yourself. Please checkout the Rubydocs linked above for more
+info on this method.
+
+The
+[`install_puppet`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet-instance_method)
+is deprecated. It's a shortcut method that just calls `install_puppet_on`
+passing the entire hosts array and global options hash. You can get the same
+using this code in your pre-suite:
+
+```ruby
+install_puppet_on(hosts, options)
+```
+
+Note that both of the high level methods will call the `install_puppet_agent_on`
+method to install released Puppet Agent versions for your agent Systems Under
+Test (SUTs). Please checkout our "Released Open Source Puppet Agents" section
+below for more information on this method.
+
+# Puppet Agent Installs
+
+There are a number of Puppet Agents that you could be installing. There aren't
+only an ever-growing number of versions, but you can get Puppet Agent from a
+number of locations.
+
+If you'd like to install the Puppet Agent that comes with your particular Puppet
+Enterprise (PE) install, then please skip to our "PE Promoted Agent Installs"
+section below.
+
+For our different Open Source variants, check out the sections just below, which
+differentiate between released & development Puppet Agent versions.
+
+### Released Open Source Puppet Agents
+
+To install a released version of Puppet Agent, beaker provides the
+[`install_puppet_agent_on`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_on-instance_method)
+method. Please checkout the Rubydocs for more info on this method.
+
+### Development Open Source Puppet Agents
+
+To install a development build of Puppet Agent, beaker provides the
+[`install_puppet_agent_dev_repo_on`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_dev_repo_on-instance_method)
+method. Please checkout the Rubydocs for more info on this method.
+
+### PE Promoted Agent Installs
+
+If you're using this method, then you're going to be downloading the installer
+from a URL configured like so:
+
+```ruby
+http://pm.puppetlabs.com/puppet-agent/#{ pe_version }/#{ puppet_agent_version }/repos
+```
+
+`pe_version` is a variable that you can provide using either the host or global
+property `:pe_ver`. This is usually done in the hosts file, and will default to
+`4.0.0-rc1` if nothing is specified.
+
+`puppet_agent_version` is a variable you can provide the value of through the
+same methods as `pe_version` above. It will default to `latest`.
+
+Beaker's DSL method to install from this location is
+[`install_puppet_agent_pe_promoted_repo_on`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_pe_promoted_repo_on-instance_method).
+Follow the link to get API-level docs on this method for more info.

data/lib/beaker/dsl/helpers.rb

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-[ 'facter', 'host', 'puppet', 'test', 'tk', 'web', 'hocon' ].each do |lib|
+[ 'host', 'puppet', 'test', 'tk', 'web', 'hocon' ].each do |lib|
       require "beaker/dsl/helpers/#{lib}_helpers"
 end
 
-require "beaker-hiera"
+require 'beaker-hiera'
+require 'beaker-facter'
 module Beaker
   module DSL
 
@@ -23,7 +24,6 @@ module Beaker
     #
     #
     module Helpers
-      include Beaker::DSL::Helpers::FacterHelpers
       include Beaker::DSL::Helpers::HostHelpers
       include Beaker::DSL::Helpers::PuppetHelpers
       include Beaker::DSL::Helpers::TestHelpers
@@ -31,6 +31,7 @@ module Beaker
       include Beaker::DSL::Helpers::WebHelpers
       include Beaker::DSL::Helpers::HoconHelpers
       include Beaker::DSL::Helpers::Hiera
+      include Beaker::DSL::Helpers::Facter
     end
   end
 end

data/lib/beaker/dsl/helpers/puppet_helpers.rb

@@ -9,6 +9,23 @@ module Beaker
       # for these methods to execute correctly
       module PuppetHelpers
 
+        # Return the regular expression pattern for an IPv4 address
+        def ipv4_regex
+          return /(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/
+        end
+
+        # Return the IP address that given hostname returns when resolved on
+        # the given host.
+        #
+        # @ param [Host] host One object that acts like a Beaker::Host
+        # @ param [String] hostname The hostname to perform a DNS resolution on
+        #
+        # @return [String, nil] An IP address, or nil.
+        def resolve_hostname_on(host, hostname)
+          match = curl_on(host, "--verbose #{hostname}", :accept_all_exit_codes => true).stderr.match(ipv4_regex)
+          return match ? match[0] : nil
+        end
+
         # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -606,7 +623,9 @@ module Beaker
           #use global options hash
           primary_forge_name = 'forge.puppetlabs.com'
           forge_host ||= options[:forge_host]
-          @forge_ip ||= Resolv.getaddress(forge_host)
+          forge_ip = resolve_hostname_on(machine, forge_host)
+          raise "Failed to resolve forge host '#{forge_host}'" unless forge_ip
+          @forge_ip ||= forge_ip
           block_on machine do | host |
             stub_hosts_on(host, {primary_forge_name => @forge_ip}, {primary_forge_name => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']})
           end
@@ -625,7 +644,9 @@ module Beaker
           #use global options hash
           primary_forge_name = 'forge.puppetlabs.com'
           forge_host ||= options[:forge_host]
-          @forge_ip ||= Resolv.getaddress(forge_host)
+          forge_ip = resolve_hostname_on(host, forge_host)
+          raise "Failed to resolve forge host '#{forge_host}'" unless forge_ip
+          @forge_ip ||= forge_ip
           with_host_stubbed_on( host, {primary_forge_name => @forge_ip}, {primary_forge_name => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']}, &block )
         end
 

data/lib/beaker/dsl/install_utils/foss_defaults.rb

@@ -83,6 +83,23 @@ module Beaker
             'distmoduledir'     => '/etc/puppet/modules',
             'sitemoduledir'     => '/usr/share/puppet/modules',
           },
+          'archlinux' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppetlabs/puppet',
+            'puppetconfdir'     => '/etc/puppetlabs/puppet',
+            'puppetvardir'      => '/opt/puppetlabs/puppet/cache',
+            'puppetbin'         => '/usr/bin/puppet',
+            'puppetbindir'      => '/usr/bin',
+            'privatebindir'     => '/usr/bin',
+            'hieralibdir'       => '/var/lib/hiera',
+            'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
+            'hierabindir'       => '/usr/bin',
+            'hieradatadir'      => '/etc/puppetlabs/code/hiera',
+            'hieraconf'         => '/etc/hiera.yaml',
+            'distmoduledir'     => '/etc/puppetlabs/code/modules',
+            'sitemoduledir'     => '/usr/share/puppet/modules',
+          },
           'windows' => { #cygwin windows
             'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
@@ -144,6 +161,8 @@ module Beaker
               platform = 'mac'
             when /pswindows/
               platform = 'pswindows'
+            when /archlinux/
+              platform = 'archlinux'
             else
               platform = 'windows'
             end

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -280,6 +280,8 @@ module Beaker
                 install_puppet_from_openbsd_packages_on(host, opts)
               elsif host['platform'] =~ /freebsd/
                 install_puppet_from_freebsd_ports_on(host, opts)
+              elsif host['platform'] =~ /archlinux/
+                install_puppet_from_pacman_on(host, opts)
               else
                 if opts[:default_action] == 'gem_install'
                   opts[:version] ||= '~> 3.x'
@@ -769,6 +771,27 @@ module Beaker
           end
         end
 
+        # Installs Puppet and dependencies from Arch Linux Pacman
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts The host to install packages on
+        # @param [Hash{Symbol=>String}] opts An options hash
+        # @option opts [String] :version The version of Puppet to install (shows warning)
+        #
+        # @return nil
+        # @api private
+        def install_puppet_from_pacman_on(hosts, opts)
+          if (opts[:version])
+            # Arch is rolling release, only the latest package versions are supported
+            logger.warn "If you wish to choose a specific Puppet version, use `install_puppet_from_gem_on('~> 3.*')`"
+          end
+
+          block_on hosts do |host|
+            host.install_package('puppet')
+
+            configure_type_defaults_on(host)
+          end
+        end
+
         # Installs Puppet and dependencies from gem on provided host(s)
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,

data/lib/beaker/host/unix/exec.rb

@@ -166,7 +166,7 @@ module Unix::Exec
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])/
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
@@ -188,7 +188,7 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /debian|ubuntu|cumulus|huaweios/
+    when /debian|ubuntu|cumulus|huaweios|archlinux/
       directory = create_tmpdir_on(self)
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))

data/lib/beaker/host/unix/pkg.rb

@@ -45,6 +45,8 @@ module Unix::Pkg
         end
       when /openbsd/
         result = execute("pkg_info #{name}", opts) { |result| result }
+      when /archlinux/
+        result = execute("pacman -Q #{name}", opts) { |result| result }
       else
         raise "Package #{name} cannot be queried on #{self}"
     end
@@ -128,6 +130,8 @@ module Unix::Pkg
         rescue
           retry
         end
+      when /archlinux/
+        execute("pacman -S --noconfirm #{cmdline_args} #{name}", opts)
       else
         raise "Package #{name} cannot be installed on #{self}"
     end
@@ -169,6 +173,8 @@ module Unix::Pkg
         execute("pkgrm -n #{cmdline_args} #{name}", opts)
       when /aix/
         execute("rpm #{cmdline_args} -e #{name}", opts)
+      when /archlinux/
+        execute("pacman -R --noconfirm #{cmdline_args} #{name}", opts)
       else
         raise "Package #{name} cannot be installed on #{self}"
     end
@@ -394,7 +400,8 @@ module Unix::Pkg
     when /^(solaris)$/
       release_path_end, release_file = solaris_puppet_agent_dev_package_info(
         puppet_collection, puppet_agent_version, opts )
-    when /^(sles|aix|el)$/
+    when /^(sles|aix|el|centos|oracle|redhat|scientific)$/
+      variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
       arch = 'ppc' if variant == 'aix' && arch == 'power'
       release_path_end = "#{variant}/#{version}/#{puppet_collection}/#{arch}"
       release_file = "puppet-agent-#{puppet_agent_version}-1.#{variant}#{version}.#{arch}.rpm"

data/lib/beaker/host_prebuilt_steps.rb

@@ -15,6 +15,7 @@ module Beaker
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
+    ARCHLINUX_PACKAGES = ['curl', 'ntp']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
@@ -114,6 +115,8 @@ module Beaker
           check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
         when host['platform'] =~ /solaris-1[1-9]/
           check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
+        when host['platform'] =~ /archlinux/
+          check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco_/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -269,8 +272,12 @@ module Beaker
     def get_domain_name(host)
       domain = nil
       search = nil
-      if ((host['platform'] =~ /windows/) and not host.is_cygwin?)
-        resolv_conf = host.exec(Command.new('type C:\Windows\System32\drivers\etc\hosts')).stdout
+      if host['platform'] =~ /windows/
+        if host.is_cygwin?
+          resolv_conf = host.exec(Command.new("cat /cygdrive/c/Windows/System32/drivers/etc/hosts")).stdout
+        else
+          resolv_conf = host.exec(Command.new('type C:\Windows\System32\drivers\etc\hosts')).stdout
+        end
       else
         resolv_conf = host.exec(Command.new("cat /etc/resolv.conf")).stdout
       end
@@ -406,15 +413,17 @@ module Beaker
         elsif host['platform'] =~ /solaris-11/
           host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), {:pty => true} )
           host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
-        elsif not host.is_powershell?
-          host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
-        else
+        elsif host.is_cygwin?
+          host.exec(Command.new("sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"), {:pty => true})
+        elsif host.is_powershell?
           logger.warn("Attempting to enable root login non-supported platform: #{host.name}: #{host['platform']}")
+        else
+          host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
         end
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
+        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})

data/lib/beaker/hypervisor/vagrant.rb

@@ -188,6 +188,12 @@ module Beaker
 
       @logger.debug "configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)"
       @hosts.each do |host|
+        if host[:platform] =~ /windows/
+          @logger.debug "skip ssh hacks on windows box #{host[:name]}"
+          set_ssh_config host, host['user']
+          next
+        end
+
         default_user = host['user']
 
         set_ssh_config host, 'vagrant'
@@ -234,5 +240,30 @@ module Beaker
       end
     end
 
+    def self.cpus(host, options)
+      case
+      when host['vagrant_cpus']
+        host['vagrant_cpus']
+      when options['vagrant_cpus']
+        options['vagrant_cpus']
+      else
+        '1'
+      end
+    end
+
+    def self.memsize(host, options)
+      case
+      when host['vagrant_memsize']
+        host['vagrant_memsize']
+      when options['vagrant_memsize']
+        options['vagrant_memsize']
+      else
+        if host['platform'] =~ /windows/
+          '2048'
+        else
+          '1024'
+        end
+      end
+    end
   end
 end

data/lib/beaker/hypervisor/vagrant_fusion.rb

@@ -11,7 +11,7 @@ class Beaker::VagrantFusion < Beaker::Vagrant
 
   def self.provider_vfile_section(host, options)
     "    v.vm.provider :vmware_fusion do |v|\n" +
-    "      v.vmx['memsize'] = '#{options['vagrant_memsize'] ||= '1024'}'\n" +
+    "      v.vmx['memsize'] = '#{memsize(host, options)}'\n" +
     "    end\n"
   end
 end

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -14,36 +14,12 @@ class Beaker::VagrantLibvirt < Beaker::Vagrant
 
   def self.provider_vfile_section(host, options)
     "    v.vm.provider :libvirt do |node|\n" +
-      "      node.cpus = #{cpu(host, options)}\n" +
-      "      node.memory = #{memory(host, options)}\n" +
+      "      node.cpus = #{cpus(host, options)}\n" +
+      "      node.memory = #{memsize(host, options)}\n" +
       build_options_str(options) +
       "    end\n"
   end
 
-  def self.cpu(host, options)
-    return @cpu unless @cpu.nil?
-    @cpu = case
-    when host['vagrant_cpus']
-      host['vagrant_cpus']
-    when options['vagrant_cpus']
-      options['vagrant_cpus']
-    else
-      '1'
-    end
-  end
-
-  def self.memory(host, options)
-    return @memory unless @memory.nil?
-    @memory = case
-    when host['vagrant_memsize']
-      host['vagrant_memsize']
-    when options['vagrant_memsize']
-      options['vagrant_memsize']
-    else
-      '512'
-    end
-  end
-
   def self.build_options_str(options)
     other_options_str = ''
     if options['libvirt']

data/lib/beaker/hypervisor/vagrant_parallels.rb

@@ -9,7 +9,7 @@ class Beaker::VagrantParallels < Beaker::Vagrant
         provider_section  = ""
         provider_section << "    v.vm.provider :parallels do |prl|\n"
         provider_section << "      prl.optimize_power_consumption = false\n"
-        provider_section << "      prl.memory = '#{options['vagrant_memsize'] ||= '1024'}'\n"
+        provider_section << "      prl.memory = '#{memsize(host,options)}'\n"
         provider_section << "      prl.update_guest_tools = false\n" if options[:prl_update_guest_tools] == 'disable'
         provider_section << "    end\n"
 

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -17,12 +17,9 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
 
   def self.provider_vfile_section(host, options)
     # Allow memory and CPUs to be set at a per node level or overall, and take the most specific setting
-    host_memory = host['vagrant_memsize'] ? host['vagrant_memsize'] : (options['vagrant_memsize'] ? options['vagrant_memsize'] : 1024)
-    host_cpus = host['vagrant_cpus'] ? host['vagrant_cpus'] : (options['vagrant_cpus'] ? options['vagrant_cpus'] : 1)
-
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{host_memory}', '--cpus', '#{host_cpus}']\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}']\n"
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support

data/lib/beaker/hypervisor/vagrant_workstation.rb

@@ -7,7 +7,7 @@ class Beaker::VagrantWorkstation < Beaker::Vagrant
 
   def self.provider_vfile_section(host, options)
     "    v.vm.provider :vmware_workstation do |v|\n" +
-    "      v.vmx['memsize'] = '#{options['vagrant_memsize'] ||= '1024'}'\n" +
+    "      v.vmx['memsize'] = '#{memsize(host,options)}'\n" +
     "    end\n"
   end
 end

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "jessie"  => "8",
@@ -65,6 +65,7 @@ module Beaker
     # * cumulus
     # * f5
     # * netscaler
+    # * archlinux
     def initialize(name)
       if name !~ PLATFORMS
         raise ArgumentError, "Unsupported platform name #{name}"

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.6.0'
+    STRING = '3.7.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -376,10 +376,8 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#stub_forge_on' do
     it 'stubs forge.puppetlabs.com with the value of `forge`' do
-      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :resolve_hostname_on ).and_return ( '127.0.0.1' )
       host = make_host('my_host', {})
-      expect( Resolv ).to receive( :getaddress ).
-        with( 'my_forge.example.com' ).and_return( '127.0.0.1' )
       expect( subject ).to receive( :stub_hosts_on ).
         with( host, {'forge.puppetlabs.com' => '127.0.0.1'}, {'forge.puppetlabs.com' => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']} )
 

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -466,6 +466,13 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppet
       end
     end
+    context 'on archlinux' do
+      let(:platform) { Beaker::Platform.new('archlinux-2015.09.01-x86_84') }
+      it 'installs' do
+        expect(hosts[0]).to receive(:install_package).with('puppet')
+        subject.install_puppet
+      end
+    end
     context 'on debian' do
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }

data/spec/beaker/host/unix/pkg_spec.rb

@@ -97,7 +97,7 @@ module Beaker
         expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
- 
+
       it "checks correctly on fedora" do
         @opts = {'platform' => 'fedora-is-me'}
         pkg = 'fedora_package'
@@ -177,6 +177,14 @@ module Beaker
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
+      it "checks correctly on archlinux" do
+        @opts = {'platform' => 'archlinux-is-me'}
+        pkg = 'archlinux_package'
+        expect( Beaker::Command ).to receive(:new).with("pacman -Q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
+
       it "returns false for el-4" do
         @opts = {'platform' => 'el-4-is-me'}
         pkg = 'el-4_package'
@@ -233,6 +241,14 @@ module Beaker
           expect( instance.install_package(pkg) ).to be == "hello"
         end
       end
+
+      it "uses pacman on archlinux" do
+        @opts = {'platform' => 'archlinux-is-me'}
+        pkg = 'archlinux_package'
+        expect( Beaker::Command ).to receive(:new).with("pacman -S --noconfirm  #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.install_package(pkg) ).to be == "hello"
+      end
     end
 
     describe '#uninstall_package' do
@@ -266,6 +282,29 @@ module Beaker
       end
     end
 
+    describe '#puppet_agent_dev_package_info' do
+      puppet_collection = 'PC1'
+      puppet_agent_version = '1.2.3'
+      platforms = { 'solaris-10-x86_64' => ["solaris/10/#{puppet_collection}", "puppet-agent-#{puppet_agent_version}-1.i386.pkg.gz"],
+                    'solaris-11-x86_64' => ["solaris/11/#{puppet_collection}", "puppet-agent@#{puppet_agent_version},5.11-1.i386.p5p"],
+                    'sles-11-x86_64' => ["sles/11/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.sles11.x86_64.rpm"],
+                    'aix-5.3-power' => ["aix/5.3/#{puppet_collection}/ppc", "puppet-agent-#{puppet_agent_version}-1.aix5.3.ppc.rpm"],
+                    'el-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                    'centos-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                    'oracle-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                    'redhat-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                    'scientific-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"]
+                  }
+      platforms.each do |p, v|
+        it "accomodates platform #{p} without erroring" do
+          platform = Beaker::Platform.new(p)
+          @opts = {'platform' => platform}
+          allow( instance ).to receive(:link_exists?).and_return(true)
+          expect( instance.puppet_agent_dev_package_info( puppet_collection, puppet_agent_version, { :download_url => 'http://trust.me' } )).to eq(v)
+        end
+      end
+    end
+
     describe '#upgrade_package' do
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         it "calls the correct apt-get incantation for #{platform}" do

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -43,7 +43,7 @@ describe Beaker do
 
   # Non-cygwin Windows
   it_should_behave_like 'enables_root_login', 'windows', [
-    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
+    "sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"
   ], true
 
   # FreeBSD
@@ -403,22 +403,69 @@ describe Beaker do
   context 'get_domain_name' do
     subject { dummy_class.new }
 
-    it "can find the domain for a host" do
-      host = make_host('name', { :stdout => "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" } )
+    shared_examples 'find domain name' do
+      it "finds the domain name" do
+        expect( subject.get_domain_name( host ) ).to be === "labs.lan"
+      end
+    end
 
-      expect( Beaker::Command ).to receive( :new ).with( "cat /etc/resolv.conf" ).once
+    context "on windows" do
+      let(:host) { make_host( 'name', {
+        :platform => 'windows',
+        :is_cygwin => cygwin,
+        :stdout => "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11",
+      } ) }
 
-      expect( subject.get_domain_name( host ) ).to be === "labs.lan"
+      context "with cygwin" do
+        let(:cygwin) { true }
+        before(:each) do
+          expect( Beaker::Command ).to receive( :new ).with( "cat /cygdrive/c/Windows/System32/drivers/etc/hosts" ).once
+        end
+        include_examples 'find domain name'
+      end
 
+      context "without cygwin" do
+        let(:cygwin) { false }
+        before(:each) do
+          expect( Beaker::Command ).to receive( :new ).with( 'type C:\Windows\System32\drivers\etc\hosts' ).once
+        end
+        include_examples 'find domain name'
+      end
     end
 
-    it "can find the search for a host" do
-      host = make_host('name', { :stdout => "search labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" } )
+    context "on other platforms" do
+      let(:host) { make_host( 'name', {
+        :platform => 'centos',
+        :stdout => stdout,
+      } ) }
+
+      before(:each) do
+        expect( Beaker::Command ).to receive( :new ).with( "cat /etc/resolv.conf" ).once
+      end
+
+      context "with a domain entry" do
+        let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
+
+        include_examples 'find domain name'
+      end
 
-      expect( Beaker::Command ).to receive( :new ).with( "cat /etc/resolv.conf" ).once
+      context "with a search entry" do
+        let(:stdout) { "search labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
+
+        include_examples 'find domain name'
+      end
 
-      expect( subject.get_domain_name( host ) ).to be === "labs.lan"
+      context "with a both a domain and a search entry" do
+        let(:stdout) { "domain labs.lan\nsearch d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
+        include_examples 'find domain name'
+      end
+
+      context "with a both a domain and a search entry, the search entry first" do
+        let(:stdout) { "search foo.example.net\ndomain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
+
+        include_examples 'find domain name'
+      end
     end
   end
 

data/spec/beaker/hypervisor/vagrant_libvirt_spec.rb

@@ -41,7 +41,7 @@ describe Beaker::VagrantLibvirt do
 
     it "can specify the memory as an integer" do
       expect( @vagrantfile.split("\n").map(&:strip) )
-        .to include('node.memory = 512')
+        .to include('node.memory = 1024')
     end
 
     it "can specify the number of cpus" do

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -147,25 +147,32 @@ EOF
       expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"/)
     end
 
-    it "generates a valid windows config" do
-      path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-      @hosts[0][:platform] = 'windows'
-
-      vagrant.make_vfile( @hosts )
+    context "when generating a windows config" do
+      before do
+        path = vagrant.instance_variable_get( :@vagrant_path )
+        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+        @hosts[0][:platform] = 'windows'
 
-      generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+        vagrant.make_vfile( @hosts )
 
-      match = generated_file.match(/v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/)
-      expect( match ).to_not be_nil,'Should have proper port for RDP'
+        @generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+      end
 
-      match = generated_file.match(/v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/)
-      expect( match ).to_not be_nil, "Should have proper port for WinRM"
+      it 'has the proper port forwarding for RDP' do
+        expect( @generated_file ).to match /v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/
+      end
 
-      match = generated_file.match(/v.vm.guest = :windows/)
-      expect( match ).to_not be_nil, 'Should correctly identify guest OS so Vagrant can act accordingly'
+      it 'has the proper port forwarding for WinRM' do
+        expect( @generated_file ).to match /v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/
+      end
 
+      it 'configures the guest type to windows' do
+        expect( @generated_file ).to match /v.vm.guest = :windows/
+      end
 
+      it 'sets a non-default memsize' do
+        expect( @generated_file ).to match /'--memory', '2048',/
+      end
     end
 
     it "uses the memsize defined per vagrant host" do
@@ -382,7 +389,7 @@ EOF
       it "raises an error if no Vagrantfile is present" do
         File.delete( vagrant.instance_variable_get( :@vagrant_file ) )
         @hosts.each do |host|
-          expect{ vagrant.get_ip_from_vagrant_file(host.name) }.to raise_error
+          expect{ vagrant.get_ip_from_vagrant_file(host.name) }.to raise_error RuntimeError, /No vagrant file found/
         end
       end
     end
@@ -424,6 +431,42 @@ EOF
 
     end
 
+    describe "provisioning and cleanup on windows" do
+      before :each do
+        expect( vagrant ).to receive( :vagrant_cmd ).with( "up" ).once
+        @hosts.each do |host|
+          host_prev_name = host['user']
+          expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
+          expect( vagrant ).not_to receive( :copy_ssh_to_root ).with( host, options ).once
+          expect( vagrant ).not_to receive( :set_ssh_config ).with( host, host_prev_name ).once
+        end
+        expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+      end
+
+      it "can provision a set of hosts" do
+        options = vagrant.instance_variable_get( :@options )
+        expect( vagrant ).to receive( :make_vfile ).with( @hosts, options ).once
+        expect( vagrant ).to receive( :vagrant_cmd ).with( "destroy --force" ).never
+        vagrant.provision
+      end
+
+      it "destroys an existing set of hosts before provisioning" do
+        vagrant.make_vfile( @hosts )
+        expect( vagrant ).to receive( :vagrant_cmd ).with( "destroy --force" ).once
+        vagrant.provision
+      end
+
+      it "can cleanup" do
+        expect( vagrant ).to receive( :vagrant_cmd ).with( "destroy --force" ).once
+        expect( FileUtils ).to receive( :rm_rf ).once
+
+        vagrant.provision
+        vagrant.cleanup
+
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,20 +136,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +262,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-facter
+  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: beaker-hostgenerator
   requirement: !ruby/object:Gem::Requirement
@@ -534,6 +534,7 @@ files:
 - docs/how_to/change_terminal_output_coloring.md
 - docs/how_to/confine.md
 - docs/how_to/hosts/README.md
+- docs/how_to/hosts/archlinux.md
 - docs/how_to/hosts/cisco.md
 - docs/how_to/hosts/eos.md
 - docs/how_to/hypervisors/README.md
@@ -548,6 +549,7 @@ files:
 - docs/how_to/hypervisors/vagrant_libvirt.md
 - docs/how_to/hypervisors/vmware_fusion.md
 - docs/how_to/hypervisors/vsphere.md
+- docs/how_to/install_puppet.md
 - docs/how_to/platform_specific_tag_confines.md
 - docs/how_to/preserve_hosts.md
 - docs/how_to/rake_tasks.md
@@ -577,7 +579,6 @@ files:
 - lib/beaker/dsl.rb
 - lib/beaker/dsl/assertions.rb
 - lib/beaker/dsl/helpers.rb
-- lib/beaker/dsl/helpers/facter_helpers.rb
 - lib/beaker/dsl/helpers/hocon_helpers.rb
 - lib/beaker/dsl/helpers/host_helpers.rb
 - lib/beaker/dsl/helpers/puppet_helpers.rb
@@ -687,7 +688,6 @@ files:
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
 - spec/beaker/dsl/ezbake_utils_spec.rb
-- spec/beaker/dsl/helpers/facter_helpers_spec.rb
 - spec/beaker/dsl/helpers/host_helpers_spec.rb
 - spec/beaker/dsl/helpers/puppet_helpers_spec.rb
 - spec/beaker/dsl/helpers/test_helpers_spec.rb

data/lib/beaker/dsl/helpers/facter_helpers.rb

@@ -1,57 +0,0 @@
-module Beaker
-  module DSL
-    module Helpers
-      # Methods that help you interact with your facter installation, facter must be installed
-      # for these methods to execute correctly
-      #
-      module FacterHelpers
-
-        # @!macro [new] common_opts
-        #   @param [Hash{Symbol=>String}] opts Options to alter execution.
-        #   @option opts [Boolean] :silent (false) Do not produce log output
-        #   @option opts [Array<Fixnum>] :acceptable_exit_codes ([0]) An array
-        #     (or range) of integer exit codes that should be considered
-        #     acceptable.  An error will be thrown if the exit code does not
-        #     match one of the values in this list.
-        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
-        #     exit codes as passing.
-        #   @option opts [Boolean] :dry_run (false) Do not actually execute any
-        #     commands on the SUT
-        #   @option opts [String] :stdin (nil) Input to be provided during command
-        #     execution on the SUT.
-        #   @option opts [Boolean] :pty (false) Execute this command in a pseudoterminal.
-        #   @option opts [Boolean] :expect_connection_failure (false) Expect this command
-        #     to result in a connection failure, reconnect and continue execution.
-        #   @option opts [Hash{String=>String}] :environment ({}) These will be
-        #     treated as extra environment variables that should be set before
-        #     running the command.
-        #
-
-        # Get a facter fact from a provided host
-        #
-        # @param [Host, Array<Host>, String, Symbol] host    One or more hosts to act upon,
-        #                            or a role (String or Symbol) that identifies one or more hosts.
-        # @param [String] name The name of the fact to query for
-        # @!macro common_opts
-        #
-        # @return String The value of the fact 'name' on the provided host
-        # @raise  [FailTest] Raises an exception if call to facter fails
-        def fact_on(host, name, opts = {})
-          result = on host, facter(name, opts)
-          if result.kind_of?(Array)
-            result.map { |res| res.stdout.chomp }
-          else
-            result.stdout.chomp
-          end
-        end
-
-        # Get a facter fact from the default host
-        # @see #fact_on
-        def fact(name, opts = {})
-          fact_on(default, name, opts)
-        end
-
-      end
-    end
-  end
-end

data/spec/beaker/dsl/helpers/facter_helpers_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-
-class ClassMixedWithDSLHelpers
-  include Beaker::DSL::Helpers
-  include Beaker::DSL::Wrappers
-  include Beaker::DSL::Roles
-  include Beaker::DSL::Patterns
-
-  def logger
-    RSpec::Mocks::Double.new('logger').as_null_object
-  end
-
-end
-
-describe ClassMixedWithDSLHelpers do
-  let( :command ){ 'ls' }
-  let( :host )   { double.as_null_object }
-  let( :result ) { Beaker::Result.new( host, command ) }
-
-  let( :master ) { make_host( 'master',   :roles => %w( master agent default)    ) }
-  let( :agent )  { make_host( 'agent',    :roles => %w( agent )           ) }
-  let( :custom ) { make_host( 'custom',   :roles => %w( custom agent )    ) }
-  let( :dash )   { make_host( 'console',  :roles => %w( dashboard agent ) ) }
-  let( :db )     { make_host( 'db',       :roles => %w( database agent )  ) }
-  let( :hosts )  { [ master, agent, dash, db, custom ] }
-
-
-  describe '#fact_on' do
-    it 'retrieves a fact on a single host' do
-      result.stdout = "family\n"
-      expect( subject ).to receive(:facter).with('osfamily',{}).once
-      expect( subject ).to receive(:on).and_return(result)
-
-      expect( subject.fact_on('host','osfamily') ).to be === result.stdout.chomp
-    end
-
-    it 'retrieves an array of facts from multiple hosts' do
-      allow( subject ).to receive( :hosts ).and_return( hosts )
-      times = hosts.length
-      result.stdout = "family\n"
-      hosts.each do |host|
-        expect( host ).to receive(:exec).and_return(result)
-      end
-
-      expect( subject.fact_on(hosts,'osfamily') ).to be === [result.stdout.chomp] * hosts.length
-
-    end
-  end
-
-  describe '#fact' do
-    it 'delegates to #fact_on with the default host' do
-      allow( subject ).to receive(:hosts).and_return(hosts)
-      expect( subject ).to receive(:fact_on).with(master,"osfamily",{}).once
-
-      subject.fact('osfamily')
-    end
-  end
-
-end