beaker 2.42.0 → 2.43.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU1MDAxYzhiZDg1YzJjZGUwMzJlYjJiM2Y4N2Y1NzY4MjFlNmFjYg==
+    NjVlYzZiNmZiMmI2MzY4YmZjY2U0YTkyNDZmMjMwMmNjMWQ3NmQzMA==
   data.tar.gz: !binary |-
-    ZDA4MzRkYjEyYWM4YmFlNDE0ZjhlNWUxZTE2YWQ4ODMxZGIxNWIzZA==
+    ZDUyMWViNjYwYWFkM2E0ZjE3OWQ5YmNjNmM0MmQ2MmNiMmEyMTdkOA==
 SHA512:
   metadata.gz: !binary |-
-    YWRlM2Q5ZjRkZmI0YTNmYTFlMTlhMDJhNmMzNTQxOWMwYWI0ODQ0OTZiN2M0
-    MzY4NGNhNDYxNWM0YjQ5MDcxYWQ4ZjI3MzU3YmRiNWI1ZTk5ODJiOTIxZjUw
-    NzBhODljYzBhOWRhZWRjNTZmOTJiMjVkYjdmMDMwYTNjZTg5M2Y=
+    MDcxNDk4NTUwYzc2NGI1MDE3NmM4NjAyMzA5ZmM1MDY2MDYwZGY3N2I5MmIy
+    ZTRjNmY2YWY0YjEwMDU1OTQ4OWU2NzMyNDE4OTgwNTlmMTcwZWU1ZmE3MTMx
+    YThiNDk2OGVjM2U0ZDUxZThmM2Q0N2MxNmY3YzU5NDVlYTQ2NTQ=
   data.tar.gz: !binary |-
-    YzEyMDM5M2VlNDZlMjI2NDVjMWZhN2NkMWIwMDI0ZjljNGI5MjQ3OGZhZGMz
-    OGVlOGYyMjM4YWMzODBmMjc5ZjViNDNmZTk4MDg5NWQyNmIzMmE3NmIzNGQz
-    ZGEyZWQ1NmQxY2QzNDRmMzA2Yzc3YzAwYWNjNDBlMDU2MTg3ZWU=
+    NTUzOWNhYjI5MzU2YjE1ODk5YzZjY2IxZDBmYzY4MWFmYTJkZGRmMTU2NWYw
+    YjAyZjU2MGNkMDFmM2Y2ZjE0YzFjZjAwOTQ3NTc5Mzg3YzY1MmU5MTUzOTVj
+    NWZhMDQ0NmRjOGUwM2IwM2ViNTlmMzVmYmQwY2UyOGM4ODEyYWY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 23 May, 2016 (67b70d4a)](#LATEST)
+* [LATEST - 1 Jun, 2016 (83bf4f46)](#LATEST)
+* [2.42.0 - 23 May, 2016 (c245fef7)](#2.42.0)
 * [2.41.0 - 10 May, 2016 (17c745bd)](#2.41.0)
 * [2.40.0 - 18 Apr, 2016 (0a7b948a)](#2.40.0)
 * [2.39.0 - 6 Apr, 2016 (5976e103)](#2.39.0)
@@ -118,7 +119,160 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 23 May, 2016 (67b70d4a)
+### <a name = "LATEST">LATEST - 1 Jun, 2016 (83bf4f46)
+
+* (GEM) update beaker version to 2.43.0 (83bf4f46)
+
+* Merge pull request #1128 from puppetlabs/maint/master/update-shell-docs (81f6ab97)
+
+
+```
+Merge pull request #1128 from puppetlabs/maint/master/update-shell-docs
+
+(maint) Fix documentation example for shell
+```
+* Merge pull request #1132 from kevpl/docs_vagrant_reconcile (1ec62530)
+
+
+```
+Merge pull request #1132 from kevpl/docs_vagrant_reconcile
+
+(MAINT) cleaned up vagrant hypervisor docs
+```
+* Merge pull request #1113 from james-powis/BKR-758_fix-bitvise-ssh (3df2a046)
+
+
+```
+Merge pull request #1113 from james-powis/BKR-758_fix-bitvise-ssh
+
+(BKR-758) Fix Bitvise SSH issues and Various vagrant versions not forwarding ssh properly
+```
+* (MAINT) cleaned up vagrant hypervisor docs (ad442334)
+
+
+```
+(MAINT) cleaned up vagrant hypervisor docs
+
+[skip ci]
+```
+* (maint) Fix documentation example for shell (323a5296)
+
+
+```
+(maint) Fix documentation example for shell
+
+Shell cannot accept a host, so update inline docs accordingly.
+```
+* Merge pull request #1125 from kevpl/maint_docs_installation_clarify (75d6244f)
+
+
+```
+Merge pull request #1125 from kevpl/maint_docs_installation_clarify
+
+(MAINT) clarifying between install docs
+```
+* Merge pull request #1123 from kevpl/maint_docs_filebug_rm (c6a02b25)
+
+
+```
+Merge pull request #1123 from kevpl/maint_docs_filebug_rm
+
+(MAINT) rm File-a-Beaker-Bug doc, redundant
+```
+* Merge pull request #1127 from kevpl/maint_docs_maintainers_consolidate (746f571f)
+
+
+```
+Merge pull request #1127 from kevpl/maint_docs_maintainers_consolidate
+
+(MAINT) clarify beaker maintainers
+```
+* Merge pull request #1124 from kevpl/maint_docs_readme_01 (dbd4c1cf)
+
+
+```
+Merge pull request #1124 from kevpl/maint_docs_readme_01
+
+(MAINT) added overview to main README
+```
+* (MAINT) clarify beaker maintainers (a9a9fb9a)
+
+
+```
+(MAINT) clarify beaker maintainers
+
+[skipci]
+```
+* Merge pull request #1126 from tvpartytonight/maint_add_front_page_links (8540111a)
+
+
+```
+Merge pull request #1126 from tvpartytonight/maint_add_front_page_links
+
+(maint) Add front page link for Getting Started guide
+```
+* (maint) Add front page link for Getting Started guide (74fe4247)
+
+* (MAINT) clarifying between install docs (bbe3e500)
+
+
+```
+(MAINT) clarifying between install docs
+
+[skip ci]
+```
+* (MAINT) added overview to main README (c0987a67)
+
+* (MAINT) rm File-a-Beaker-Bug doc, redundant (c9af7dd7)
+
+* Merge pull request #1122 from pinkypie/BKR-811 (6b586915)
+
+
+```
+Merge pull request #1122 from pinkypie/BKR-811
+
+(BKR-811) Adding documentation for the confine method.
+```
+* Merge pull request #1121 from pinkypie/BKR-718 (8659c9d8)
+
+
+```
+Merge pull request #1121 from pinkypie/BKR-718
+
+(BKR-718) Check the available rake method
+```
+* (BKR-811) Adding documentation for the confine method. (bf7921a7)
+
+* (BKR-718) - Check the available rake method for the version of, rake to avoid deprecation errors/warnings. (2d98d384)
+
+* (BKR-758) Fix Bitvise SSH issues and (1f9c6efd)
+
+
+```
+(BKR-758) Fix Bitvise SSH issues and
+
+correct various vagrant versions not forwarding ssh properly
+
+petems - Add logic for PSWindows
+petems - Replace host make command with mkdir_p helper
+petems - Remove resolv.conf code
+    Could fix this with Windows specific stuff later, but leaving it out for now
+joshsouza - Correct SSH config's HostName when connecting to Windows hosts (not using local port mapping)
+joshsouza - Correct hieraconf to be hiera_config in puppet lookup
+
+explicitly forwarding ssh
+james-powis - forwarding ssh explicitly for windows
+
+    due to regression bugs in vagrant versions 1.6.2, 1.6.3, 1.6.4, 1.7.3+
+    this causes ssh vagrant@#{SUT} to fail to map to ssh -p 2222
+    vagrant@localhost. Explicitly setting absolutely ensures ssh forwarding
+    functions.
+
+james-powis - fixing bitvise on windows
+```
+### <a name = "2.42.0">2.42.0 - 23 May, 2016 (c245fef7)
+
+* (HISTORY) update beaker history for gem release 2.42.0 (c245fef7)
 
 * (GEM) update beaker version to 2.42.0 (67b70d4a)
 

data/MAINTAINERS.md

@@ -0,0 +1,21 @@
+# Reviewers/Maintainers For Beaker
+
+Beaker is maintained by Puppet's Quality Engineering (QE) Team. These people
+will be reviewing & merging PRs to the project.
+In particular, our current Beaker maintainers are:
+
+| Name           | Github                                              | Email                |
+|:--------------:|:---------------------------------------------------:|:--------------------:|
+| Kevin Imber    | [kevpl](https://github.com/kevpl)                   | <ki@puppet.com>      |
+| Tony Vu        | [tvpartytonight](https://github.com/tvpartytonight) | <tony.vu@puppet.com> |
+| Sarah Thompson | [pinkypie](https://github.com/pinkypie)             | <sarah@puppet.com>   |
+
+# Reviewers/Maintainers For Specific Areas of Beaker
+
+For code to land in these specific areas of Beaker the following owners must provide review and :+1:
+
+ Code | Owners
+:-------:|:----------:
+Beaker::Hypervisor::Docker | [Richard Pijnenburg (electrical)](https://github.com/electrical)
+FreeBSD | [Peter Souter (petems)](https://github.com/petems)
+OpenBSD | [Matt Dainty (bodgit)](https://github.com/bodgit)

data/README.md

@@ -1,41 +1,39 @@
 # Beaker
 
-Puppet Labs cloud enabled acceptance testing tool.
+Beaker is an acceptance testing harness for Puppet PE and other Puppet Projects.  It can also be used as a virtual machine provisioner - setting up machines, running any configuration on those machines and then exiting.
+
+Beaker runs tests written in Ruby with an additional DSL API.  This gives you access to all standard Ruby along with acceptance testing specific commands.
 
 # Installation
 
 See [Beaker Installation](docs/Beaker-Installation.md).
 
-#Documentation
+# Documentation
 
 Documentation for Beaker can be found in this repository in [the docs/ folder](docs/README.md).
 
+The [Getting Started](docs/How-To-Beaker.md) is a great place to start for new Beaker users.
+
 #Beaker Libraries
 
 Beaker functionality has been extended through the use of libraries available as gems. See the
 [complete list](docs/Beaker-Libraries.md) for available gems. See the [beaker-template documentation](https://github.com/puppetlabs/beaker-template/blob/master/README.md) for documentation on creating beaker-libraries.
 
-#Beaker API
+# Beaker API
 
 [RubyDoc Beaker Documentation Server](http://rubydoc.info/github/puppetlabs/beaker/frames)
 
-#License
+# License
 
 See [LICENSE](LICENSE) file.
 
-#Support & Issues
+# Support & Issues
 
 Please log tickets and issues at our [Beaker Issue Tracker](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR).  In addition there is an active #puppet-dev channel on Freenode.
 
 For additional information on filing tickets, please check out our [CONTRIBUTOR doc](CONTRIBUTING.md),
 and for ticket lifecycle information, checkout our [ticket process doc](docs/meta/ticket_process.md).
 
-#Maintainers
-
-Beaker is maintained by Puppet's Quality Engineering (QE) Team. In particular, our current Beaker maintainers are:
+# Maintainers
 
-| Name           | Email                |
-|:--------------:|:--------------------:|
-| Kevin Imber    | <ki@puppet.com>      |
-| Tony Vu        | <tony.vu@puppet.com> |
-| Sarah Thompson | <sarah@puppet.com>   |
+For information on project maintainers, please check out our [MAINTAINERS doc](MAINTAINERS.md).

data/docs/README.md

@@ -2,11 +2,10 @@
 
 ## Beaker Info
 
-* [Beaker Owners & Reviewers](Beaker-Owners-and-Reviewers.md)
-* [How to install](Beaker-Installation.md)
+* [MAINTAINERS](/MAINTAINERS.md)
+* [Installing Beaker](Beaker-Installation.md)
 * [How to Beaker](How-To-Beaker.md)
   * [Overview](Overview.md)
-  * [Beaker Installation](Beaker-Installation.md)
   * [Creating A Test Environment](Creating-A-Test-Environment.md)
     * [Roles, What Are They?](Roles-What-Are-They.md)
     * Supported Virtualization Techniques
@@ -25,8 +24,10 @@
   * [Running Masterless Beaker](Beaker-with-Masterless-Puppet.md)
   * [Types, Puppet 4, & The All-In-One Agent](Types,-Puppet-4,-and-the-All-In-One-Agent.md)
   * [The Beaker DSL](The-Beaker-DSL.md)
-    * [Shared Options for Executing Beaker Commands](Shared-Options-for-Executing-Beaker-Commands.md)
     * [Beaker DSL on rdoc.info](http://rdoc.info/github/puppetlabs/beaker/master/Beaker/DSL)
+    * [How the confine method works](dsl/confine.md)
+    * [Platform Specific Tag Confines](dsl/platform_specific_tag_confines.md)
+    * [Shared Options for Executing Beaker Commands](Shared-Options-for-Executing-Beaker-Commands.md)
   * [Let's Write a Test!](Lets-Write-a-Test.md)
   * [Access The Live Test Console with Pry](Access-the-Live-Test-Console-with-Pry.md)
   * [Test Tagging](Beaker-Test-Tagging.md)

data/docs/dsl/confine.md

@@ -0,0 +1,76 @@
+# Confine
+
+## How does it work?
+
+The confine method will limit the hosts the testcase is run against. You can pass in either :to or :except
+to control how the criteria is applied (**:to** will apply the criteria to the hosts in order to find a match,
+**:except** will apply the criteria to the hosts, and return those hosts that do not match). The default behaviour
+is that the **TestCase#hosts** array is modified to only contain the hosts that match (or don't match) the criteria.
+
+Full method documentation here:
+
+* [confine](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Structure#confine-instance_method) 
+
+## How does the optional Array<Host> parameter work?
+
+However, if you pass in the optional Array<Host> to the method, the criteria will be applied to this hosts array
+(not **TestCase#hosts**). Subsequently, any of the hosts contained in **TestCase#hosts** that were not included in the Array<Host>
+passed to the method, will remain in **TestCase#hosts**. But any hosts that were filtered out by the criteria match 
+will be overwritten.
+
+Take the following example:
+
+    HOSTS:
+      ubuntu_master:
+        roles:
+        - master
+        - database
+        - dashboard
+        - classifier
+        platform: ubuntu-14.04-amd64
+        hypervisor: vcloud
+        template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
+      centos7_agent:
+        roles:
+        - agent
+        - frictionless
+        platform: el-7-x86_64
+        template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
+        hypervisor: vcloud
+      ubuntu_agent:
+        roles:
+        - agent
+        - frictionless
+        platform: ubuntu-14.04-amd64
+        template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
+        hypervisor: vcloud
+
+
+Using the following confine:
+
+`confine :to, { :platform => 'el-7-x86_64' }, agents`
+
+We will end up with a **TestCase#hosts** array with two hosts, one agent and one master.
+
+Since we passed in the 'agents' host array to the method, the criteria (:platform => 'el-7-x86_64') will be applied
+to this set of hosts. Only one agent matches this criteria (centos7_agent). Since the master host (ubuntu_master) was not
+included in the 'agents' host array when the criteria match was performed, it will remain in **TestCase#hosts**. But only one agent
+remains after the criteria match.
+
+`confine :except, { :platform => 'el-7-x86_64' }, agents`
+
+Will also return two hosts, one agent and one master. But it will be the other agent (ubuntu_agent) as its platform does not match
+'el-7-x86_64'.
+
+`confine :to, { :platform => 'el-7-x86_64' }`
+
+Will return one host (centos7_agent). Because no Array<Host> was passed to the confine method, the criteria match
+is being applied directly to **TestCase#hosts** (which contains all hosts).
+
+`confine :except, { :platform => 'el-7-x86_64' }`
+
+Will return two hosts (ubuntu_master and ubuntu_agent). 
+
+In order to limit the hosts to only the ubuntu agent, you would need to use:
+
+`confine :to, { :platform => 'ubuntu-14.04-amd64', :role => 'agent' }`

data/docs/hypervisors/vagrant.md

@@ -1,7 +1,90 @@
-When using the Vagrant Hypervisor, beaker can mount specific local directories as synced_folders inside the vagrant box.
-This is done by using the 'mount_folders' option in the nodeset file.
+# Vagrant
 
-Example hosts file:
+Vagrant's slogan is "development environments made easy". They provide an
+abstraction on top of a VM or cloud provider that allows you to manage
+hosts and their provisioning. [Their Site](https://www.vagrantup.com/).
+
+# Getting Started
+
+### Requirements
+
+A prerequisite for using the vagrant hypervisor with beaker is that the
+**Vagrant 1.7+** package needs to installed - 
+see [downloads.vagrantup.com](http://downloads.vagrantup.com/) for downloads.
+
+Currently, we provide a suite of pre-built, publicly available vagrant boxes for
+use in constructing tests: [Puppet Labs Vagrant Boxes](https://vagrantcloud.com/puppetlabs/).
+You can use these boxes easily by pulling one of our
+[Example Vagrant Hosts Files](Example-Vagrant-Hosts-Files.md).
+
+### Setup a Vagrant Hosts File
+
+A vm is identified by `box` or `box_url` in the config file.  No snapshot name
+is required as the vm is reverted back to original state post testing using
+`vagrant destroy --force`.
+
+**Example Vagrant hosts file**
+
+    HOSTS:
+      ubuntu-1404-x64:
+        roles:
+          - master
+          - agent
+          - dashboard
+          - cloudpro
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+
+VagrantFiles are created per host configuration file.  They can be found in the
+`.vagrant/beaker_vagrant_files` directory of the current working directory in a
+subdirectory named after the host configuration file.
+
+    > beaker --hosts sample.cfg
+    > cd .vagrant/beaker_vagrant_files; ls
+    sample.cfg
+    > cd sample.c
+
+Below are details of vagrants features as they're supported through beaker. If
+you'd like to see more examples of vagrant hosts files, checkout our
+[vagrant hosts file examples doc](vagrant_hosts_file_examples.md).
+
+# Vagrant-Specific Hosts File Settings
+
+### Running With a GUI
+
+It is possible to have the VirtualBox VM run with a GUI (i.e. non-headless mode)
+by specifying ``vb_gui`` of any non-nil value in the config file, i.e.:
+
+**Example Vagrant hosts file with vb_gui**
+
+    HOSTS:
+      ubuntu-1404-x64:
+        roles:
+          - master
+          - agent
+          - dashboard
+          - cloudpro
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+        vb_gui: true
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+
+### Mounting Local Folders
+
+When using the Vagrant Hypervisor, beaker can mount specific local directories
+as synced_folders inside the vagrant box. This is done by using the
+`mount_folders` option in the nodeset file.
+
+**Example hosts file**
 
     HOSTS:
       ubuntu-1404-x64-master:
@@ -34,7 +117,5 @@ Example hosts file:
       nfs_server: none
       consoleport: 443
 
-In the above beaker will mount the folders ./ to /vagrant/folder1 and the folder /tmp to /vagrant/tmp
-
-## Supported Virtualization Providers ##
-* [Vagrant](Vagrant-Support.md)
+In the above beaker will mount the folders `./` to `/vagrant/folder1` and the
+folder `/tmp` to `/vagrant/tmp`.

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

@@ -110,10 +110,8 @@ module Beaker
         #     end
         #
         # @example Using TestCase helpers from within a test.
-        #     agents.each do |agent|
-        #       shell('cat /etc/puppet/puppet.conf') do |result|
-        #         assert_match result.stdout, /server = #{master}/, 'WTF Mate'
-        #       end
+        #     shell('cat /etc/puppet/puppet.conf') do |result|
+        #       assert_match result.stdout, /server = #{master}/, 'WTF Mate'
         #     end
         #
         # @return [Result]   An object representing the outcome of *command*.

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

@@ -290,7 +290,12 @@ module Beaker
 
               # Certain install paths may not create the config dirs/files needed
               host.mkdir_p host['puppetpath'] unless host[:type] =~ /aio/
-              on host, "echo '' >> #{host.puppet['hiera_config']}"
+
+              if ((host['platform'] =~ /windows/) and not host.is_cygwin?)
+                # Do nothing
+              else
+                on host, "echo '' >> #{host.puppet['hiera_config']}"
+              end
             end
           end
 

data/lib/beaker/host/windows/file.rb

@@ -27,8 +27,6 @@ module Windows::File
     when :bitvise
       # swap out separators
       network_path = path.gsub('\\', scp_separator)
-      # pull off drive prefix since base BitVise dir is '/'
-      network_path.gsub('C:', '')
     when :openssh
       path
     else

data/lib/beaker/host_prebuilt_steps.rb

@@ -293,7 +293,11 @@ module Beaker
     def get_domain_name(host)
       domain = nil
       search = nil
-      resolv_conf = host.exec(Command.new("cat /etc/resolv.conf")).stdout
+      if ((host['platform'] =~ /windows/) and not host.is_cygwin?)
+        resolv_conf = host.exec(Command.new('type C:\Windows\System32\drivers\etc\hosts')).stdout
+      else
+        resolv_conf = host.exec(Command.new("cat /etc/resolv.conf")).stdout
+      end
       resolv_conf.each_line { |line|
         if line =~ /^\s*domain\s+(\S+)/
           domain = $1
@@ -322,6 +326,8 @@ module Beaker
     def set_etc_hosts(host, etc_hosts)
       if host['platform'] =~ /freebsd/
         host.echo_to_file(etc_hosts, '/etc/hosts')
+      elsif ((host['platform'] =~ /windows/) and not host.is_cygwin?)
+        host.exec(Command.new("echo '#{etc_hosts}' >> C:\\Windows\\System32\\drivers\\etc\\hosts"))
       else
         host.exec(Command.new("echo '#{etc_hosts}' >> /etc/hosts"))
       end

data/lib/beaker/hypervisor/vagrant.rb

@@ -42,6 +42,10 @@ module Beaker
         end
 
         if /windows/i.match(host['platform'])
+          #due to a regression bug in versions of vagrant 1.6.2, 1.6.3, 1.6.4, >= 1.7.3 ssh fails to forward 
+          #automatically (note <=1.6.1, 1.6.5, 1.7.0 - 1.7.2 are uneffected)
+          #Explicitly setting SSH port forwarding due to this bug
+          v_file << "    v.vm.network :forwarded_port, guest: 22, host: 2222, id: 'ssh', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
           v_file << "    v.vm.guest = :windows\n"

data/lib/beaker/tasks/rake_task.rb

@@ -59,7 +59,9 @@ module Beaker
 
       # @private
       def define(args, &task_block)
-        desc "Run Beaker Acceptance" unless ::Rake.application.last_comment
+        # Depending on the version of rake, either last_description or last_comment will be available.
+        desc "Run Beaker Acceptance" unless (::Rake.application.respond_to?(:last_description) ? ::Rake.application.last_description : ::Rake
+                                                                                                                                .application.last_comment)
         task name, *args do |_, task_args|
           RakeFileUtils.__send__(:verbose, verbose) do
             task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.42.0'
+    STRING = '2.43.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.42.0
+  version: 2.43.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -473,6 +473,7 @@ files:
 - Gemfile
 - HISTORY.md
 - LICENSE
+- MAINTAINERS.md
 - README.md
 - Rakefile
 - acceptance/config/acceptance-options.rb
@@ -579,15 +580,12 @@ files:
 - docs/Argument-Processing-and-Precedence.md
 - docs/Beaker-Installation.md
 - docs/Beaker-Libraries.md
-- docs/Beaker-Owners-and-Reviewers.md
 - docs/Beaker-Recipes.md
 - docs/Beaker-Test-Tagging.md
 - docs/Beaker-with-Masterless-Puppet.md
 - docs/Creating-A-Test-Environment.md
 - docs/Docker-Support.md
 - docs/EC2-Support.md
-- docs/Example-Vagrant-Hosts-Files.md
-- docs/File-a-Beaker-Bug.md
 - docs/Google-Compute-Engine-Support.md
 - docs/How-To-Beaker.md
 - docs/How-To-Use-User-Password-Authentication-with-Beaker.md
@@ -603,8 +601,8 @@ files:
 - docs/The-Command-Line.md
 - docs/Types,-Puppet-4,-and-the-All-In-One-Agent.md
 - docs/VMWare-Fusion-Support.md
-- docs/Vagrant-Support.md
 - docs/beaker-vs.-beaker-rspec.md
+- docs/dsl/confine.md
 - docs/dsl/platform_specific_tag_confines.md
 - docs/hosts/README.md
 - docs/hosts/cisco.md
@@ -612,6 +610,7 @@ files:
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
 - docs/hypervisors/vagrant.md
+- docs/hypervisors/vagrant_hosts_file_examples.md
 - docs/meta/README.md
 - docs/meta/ticket_process.md
 - docs/runner/test_suites.md

data/docs/Beaker-Owners-and-Reviewers.md

@@ -1,16 +0,0 @@
-# Reviewers/Maintainers For Beaker
-For the majority of Beaker new code will be reviewed and merged by these owners.
-
-|Owners|
-|:------:|
-|[Alice Nodelman (anodelman)](https://github.com/anodelman)|
-|[Kevin Imber (kevpl)](https://github.com/kevpl)|
-
-# Reviewers/Maintainers For Specific Areas of Beaker
-For code to land in these specific areas of Beaker the following owners must provide review and :+1:
-
- Code | Owners
-:-------:|:----------:
-Beaker::Hypervisor::Docker | [Richard Pijnenburg (electrical)](https://github.com/electrical)
-FreeBSD | [Peter Souter (petems)](https://github.com/petems)
-OpenBSD | [Matt Dainty (bodgit)](https://github.com/bodgit)

data/docs/File-a-Beaker-Bug.md

@@ -1,3 +0,0 @@
-Something wrong?  Need a new feature?  File Beaker bugs here:
-
-[beaker jira ticket tracker](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR).

data/docs/Vagrant-Support.md

@@ -1,47 +0,0 @@
-For testing against local Vagrant boxes.  As a prerequisite the **Vagrant 1.7+** package needs to installed - see <a href = "http://downloads.vagrantup.com/">downloads.vagrantup.com</a> for downloads.
-
-Currently, we provide a suite of pre-built, publicly available vagrant boxes for use in constructing tests: <a href = "https://vagrantcloud.com/puppetlabs/">Puppet Labs Vagrant Boxes</a>.  You can use these boxes easily by pulling one of our [Example Vagrant Hosts Files](Example-Vagrant-Hosts-Files.md).  
-
-The vm is identified by `box` or `box_url` in the config file.  No snapshot name is required as the vm is reverted back to original state post testing using `vagrant destroy --force`.
-
-### example Vagrant hosts file ###
-    HOSTS:
-      ubuntu-1404-x64:
-        roles:
-          - master
-          - agent
-          - dashboard
-          - cloudpro
-        platform: ubuntu-1404-x86_64
-        hypervisor: vagrant
-        box: puppetlabs/ubuntu-14.04-64-nocm
-        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
-    CONFIG:
-      nfs_server: none
-      consoleport: 443
-
-VagrantFiles are created per host configuration file.  They can be found in the `.vagrant/beaker_vagrant_files` directory of the current working directory in a subdirectory named after the host configuration file.
-
-    > beaker --hosts sample.cfg
-    > cd .vagrant/beaker_vagrant_files; ls
-    sample.cfg
-    > cd sample.c
-
-It is possible to have the VirtualBox VM run with a GUI (i.e. non-headless mode) by specifying ``vb_gui`` of any non-nil value in the config file, i.e.:
-
-### example Vagrant hosts file with vb_gui ###
-    HOSTS:
-      ubuntu-1404-x64:
-        roles:
-          - master
-          - agent
-          - dashboard
-          - cloudpro
-        platform: ubuntu-1404-x86_64
-        hypervisor: vagrant
-        box: puppetlabs/ubuntu-14.04-64-nocm
-        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
-        vb_gui: true
-    CONFIG:
-      nfs_server: none
-      consoleport: 443