beaker 2.43.0 → 2.44.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjVlYzZiNmZiMmI2MzY4YmZjY2U0YTkyNDZmMjMwMmNjMWQ3NmQzMA==
+    NzkwYzhjYjQ1MzhmOWIxMTQ0MmNmNmE1Mjk3ZjEzYWFlMjhjMTQzMQ==
   data.tar.gz: !binary |-
-    ZDUyMWViNjYwYWFkM2E0ZjE3OWQ5YmNjNmM0MmQ2MmNiMmEyMTdkOA==
+    MmI4ZTk0ZmEwMjkxYjRhZjlmZGNiMzljZmZlZmM2NzkxZTY3NmJjNQ==
 SHA512:
   metadata.gz: !binary |-
-    MDcxNDk4NTUwYzc2NGI1MDE3NmM4NjAyMzA5ZmM1MDY2MDYwZGY3N2I5MmIy
-    ZTRjNmY2YWY0YjEwMDU1OTQ4OWU2NzMyNDE4OTgwNTlmMTcwZWU1ZmE3MTMx
-    YThiNDk2OGVjM2U0ZDUxZThmM2Q0N2MxNmY3YzU5NDVlYTQ2NTQ=
+    YmY4YTg1ZWEyNjE0OTMwYjZiNjQ3YWM0YzU3YTlhNGMzNDAxMWUzNjgyOWVh
+    MWM2MWQ3N2UzZDBiNDhiMDY5NGI2MWYzOTNlYjhhYWVkMTBkNTFmYjFiM2Zl
+    MWU5ZGMwOGZhNDBhMDk3ZDE0OGU0YmY3ZTE5N2QzZTk2NGU4Y2M=
   data.tar.gz: !binary |-
-    NTUzOWNhYjI5MzU2YjE1ODk5YzZjY2IxZDBmYzY4MWFmYTJkZGRmMTU2NWYw
-    YjAyZjU2MGNkMDFmM2Y2ZjE0YzFjZjAwOTQ3NTc5Mzg3YzY1MmU5MTUzOTVj
-    NWZhMDQ0NmRjOGUwM2IwM2ViNTlmMzVmYmQwY2UyOGM4ODEyYWY=
+    ZjlhNzg0OGJmOTM3YTkzZGU1YTQ1YjZkODE5ZGZjMGY5ODMxYjRjMDRhNjY1
+    OTE3ZGRjZTEwNzcxMmU4MmNmYjZjNTc2YTBmMjM4NDVjMGI2M2RkMjU3N2Nh
+    NzMxY2ViMzcxMThjODllYjVjM2E1ZDc5NGVhYzk5YjM5NTlhY2Y=

data/Gemfile

@@ -1,3 +1,21 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
+
+# This section of the gemspec is for Puppet CI; it will pull in
+# a supported beaker library for testing to overwrite the gemspec if
+# a corresponding ENV var is found. Currently, the only supported lib
+# is beaker-pe, which can be injected into the dependencies when the
+# following ENV vars are defined: BEAKER_PE_PR_AUTHOR,
+# BEAKER_PE_PR_COMMIT, BEAKER_PE_PR_REPO_URL. These correspond to the
+# ghprb variables ghprbPullAuthorLogin, ghprbActualCommit,
+# and ghprbAuthorRepoGitUrl respectively. In the "future", we should
+# make this a standard format so we can pull in more than predefined
+# variables.
+
+if ENV['BEAKER_PE_PR_REPO_URL']
+  lib = ENV['BEAKER_PE_PR_REPO_URL'].match(/\/([^\/]+)\.git$/)[1]
+  author = ENV['BEAKER_PE_PR_AUTHOR']
+  ref = ENV['BEAKER_PE_PR_COMMIT']
+  gem lib, :git => "git@github.com:#{author}/#{lib}.git", :branch => ref
+end

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 1 Jun, 2016 (83bf4f46)](#LATEST)
+* [LATEST - 9 Jun, 2016 (0d267d3d)](#LATEST)
+* [2.43.0 - 1 Jun, 2016 (777469ca)](#2.43.0)
 * [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)
@@ -119,7 +120,85 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Jun, 2016 (83bf4f46)
+### <a name = "LATEST">LATEST - 9 Jun, 2016 (0d267d3d)
+
+* (GEM) update beaker version to 2.44.0 (0d267d3d)
+
+* Merge pull request #1138 from s12v/patch-1 (b612c0d3)
+
+
+```
+Merge pull request #1138 from s12v/patch-1
+
+Update docker.md
+```
+* Merge pull request #1136 from kevpl/docs_hypervisor_lxc_link (605cdc33)
+
+
+```
+Merge pull request #1136 from kevpl/docs_hypervisor_lxc_link
+
+(MAINT) added LXC hypervisor fork link
+```
+* Merge pull request #1139 from tvpartytonight/BKR-822 (30f39c60)
+
+
+```
+Merge pull request #1139 from tvpartytonight/BKR-822
+
+(BKR-822) Ensure env options applied to bkr commands with #on
+```
+* (BKR-822) Ensure env options applied to bkr commands with #on (1b16c967)
+
+
+```
+(BKR-822) Ensure env options applied to bkr commands with #on
+
+In commit f78c2db, we neglected to ensure that an environment passed in
+through the options specified by #on overrides the environment specified
+in the Beaker::Command object. This change ensures that #on checks for
+the environment in its own options to override the command options.
+```
+* Merge pull request #1134 from tvpartytonight/BKR-813 (c8830026)
+
+
+```
+Merge pull request #1134 from tvpartytonight/BKR-813
+
+(BKR-813) Add support for beaker lib PR testing
+```
+* (MAINT) Fix examples in docker.md (262758ec)
+
+* (MAINT) added LXC hypervisor fork link (695ab33e)
+
+
+```
+(MAINT) added LXC hypervisor fork link
+
+[skip ci]
+```
+* Merge pull request #1131 from kevpl/docs_hypervisor_rearrange (f6459cb1)
+
+
+```
+Merge pull request #1131 from kevpl/docs_hypervisor_rearrange
+
+(MAINT) moved non-conflicting hypervisor docs into hypervisor folder
+```
+* (BKR-813) Add support for beaker lib PR testing (2870d467)
+
+
+```
+(BKR-813) Add support for beaker lib PR testing
+
+This change allows for Beaker's CI to detect PR testing from beaker-pe
+and pull in that branch for additional testing.
+```
+* (MAINT) moved non-conflicting hypervisor docs into hypervisor folder (03346d9a)
+
+### <a name = "2.43.0">2.43.0 - 1 Jun, 2016 (777469ca)
+
+* (HISTORY) update beaker history for gem release 2.43.0 (777469ca)
 
 * (GEM) update beaker version to 2.43.0 (83bf4f46)
 

data/docs/README.md

@@ -8,16 +8,7 @@
   * [Overview](Overview.md)
   * [Creating A Test Environment](Creating-A-Test-Environment.md)
     * [Roles, What Are They?](Roles-What-Are-They.md)
-    * Supported Virtualization Techniques
-      * [VMWare Fusion](VMWare-Fusion-Support.md)
-      * [EC2](EC2-Support.md)
-      * [vSphere](vSphere-Support.md)
-      * [Vagrant](Vagrant-Support.md)
-        * [Example Vagrant Hosts Files](Example-Vagrant-Hosts-Files.md)
-      * [Google Compute Engine](Google-Compute-Engine-Support.md)
-      * [Docker Support](Docker-Support.md)
-      * [Openstack](Openstack-Support.md)
-      * [Solaris](Solaris-Support.md)
+    * [Supported Virtualization Techniques - Hypervisor Docs](hypervisors)
   * [The Command Line](The-Command-Line.md)
   * [Argument Processing and Precedence](Argument-Processing-and-Precedence.md)
     * [How To Use User/Password Authentication with Beaker](How-To-Use-User-Password-Authentication-with-Beaker.md)

data/docs/hypervisors/README.md

@@ -5,4 +5,21 @@ hypervisor's implementation.
 
 If you don't see a file here for a hypervisor, then it's either not yet documented
 (feel free to help us out here!), or it should conform to our normal hypervisor
-assumptions.
+assumptions.
+
+# External Hypervisors
+
+There are a number of community-supported hypervisors that have not been added to
+Beaker itself. The reason for this is that we're looking to decrease Beaker's
+dependency footprint, and hypervisors are one of the places where we can often
+increase the load across all Beaker uses to benefit a small group that uses a
+particular hypervisor.
+
+In order to offset this, we've made a listing of forks below that support other
+hypervisors not included in Beaker. Please check them out if you'd
+like to use their hypervisor, hopefully it'll save you from spending time
+trying to support a new hypervisor yourself.
+
+| Hypervisor | Fork                                               |
+|:----------:|:--------------------------------------------------:|
+| LXC        | [ashish1099](https://github.com/ashish1099/beaker) |

data/docs/{Docker-Support.md → hypervisors/docker.md}

@@ -41,10 +41,10 @@ By default the docker container just runs an sshd which is adequate for 'puppet
 
     HOSTS:
       ubuntu-12-10:
-      platform: ubuntu-12.10-x64
-      image: ubuntu:12.10
-      hypervisor: docker
-      docker_cmd: '["/sbin/init"]'
+        platform: ubuntu-12.10-x64
+        image: ubuntu:12.10
+        hypervisor: docker
+        docker_cmd: '["/sbin/init"]'
     CONFIG:
       type: foss
 
@@ -53,10 +53,10 @@ Unless the image configuration changes you might want to keep the Docker image f
 
     HOSTS:
       ubuntu-12-10:
-      platform: ubuntu-12.10-x64
-      image: ubuntu:12.10
-      hypervisor: docker
-      docker_preserve_image: true
+        platform: ubuntu-12.10-x64
+        image: ubuntu:12.10
+        hypervisor: docker
+        docker_preserve_image: true
     CONFIG:
       type: foss
 

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

@@ -69,7 +69,12 @@ module Beaker
               end
               command_object = Command.new(command.to_s, [], cmd_opts)
             elsif command.is_a? Command
-              command_object = command
+              if opts[:environment]
+                command_object = command.clone
+                command_object.environment = opts[:environment]
+              else
+                command_object = command
+              end
             else
               msg = "DSL method `on` can only be called with a String or Beaker::Command"
               msg << " object as the command parameter, not #{command.class}."

data/lib/beaker/version.rb

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

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

@@ -42,6 +42,25 @@ describe ClassMixedWithDSLHelpers do
       subject.on( host, 'ls ~/.bin', :environment => {:HOME => '/tmp/test_home' } )
     end
 
+    describe 'with a beaker command object passed in as the command argument' do
+      let( :command ) { Beaker::Command.new('commander command', [], :environment => {:HOME => 'default'}) }
+
+      it 'overwrites the command environment with the environment specified in #on' do
+        expect( host ).to receive( :exec ) do |command|
+          expect(command.environment).to eq({:HOME => 'override'})
+        end
+        subject.on( host, command, :environment => {:HOME => 'override'})
+      end
+
+      it 'uses the command environment if there is no overriding argument in #on' do
+        expect( host ).to receive( :exec ) do |command|
+          expect(command.environment).to eq({:HOME => 'default'})
+        end
+        subject.on( host, command )
+      end
+
+    end
+
     it 'if the host is a String Object, finds the matching hosts with that String as role' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.43.0
+  version: 2.44.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -584,23 +584,17 @@ files:
 - 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/Google-Compute-Engine-Support.md
 - docs/How-To-Beaker.md
 - docs/How-To-Use-User-Password-Authentication-with-Beaker.md
 - docs/How-to-Write-a-Beaker-Test-for-a-Module.md
 - docs/Lets-Write-a-Test.md
-- docs/Openstack-Support.md
 - docs/Overview.md
 - docs/README.md
 - docs/Roles-What-Are-They.md
 - docs/Shared-Options-for-Executing-Beaker-Commands.md
-- docs/Solaris-Support.md
 - docs/The-Beaker-DSL.md
 - docs/The-Command-Line.md
 - docs/Types,-Puppet-4,-and-the-All-In-One-Agent.md
-- docs/VMWare-Fusion-Support.md
 - docs/beaker-vs.-beaker-rspec.md
 - docs/dsl/confine.md
 - docs/dsl/platform_specific_tag_confines.md
@@ -609,12 +603,18 @@ files:
 - docs/hosts/eos.md
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
+- docs/hypervisors/docker.md
+- docs/hypervisors/ec2.md
+- docs/hypervisors/google_compute_engine.md
+- docs/hypervisors/openstack.md
+- docs/hypervisors/solaris.md
 - docs/hypervisors/vagrant.md
 - docs/hypervisors/vagrant_hosts_file_examples.md
+- docs/hypervisors/vmware_fusion.md
+- docs/hypervisors/vsphere.md
 - docs/meta/README.md
 - docs/meta/ticket_process.md
 - docs/runner/test_suites.md
-- docs/vSphere-Support.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
 - lib/beaker/cli.rb