beaker 3.0.0 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTM3MzM5ZWIzNmQzNTkzODEwZTM2OTg2M2M2NTI5ODk5MjhiOGZjOA==
+    OGZiYTYwMjI3N2RiZDBkMzc4NzhjODAzYzg1YjU3ZjJmMjZjMzVjMg==
   data.tar.gz: !binary |-
-    ODE2OTZiYTc0NmVhNTEwMzE0YjkwY2NiMzBlZjkyMDAzYzYzM2U0Mg==
+    MTA1OTM1YTM3NTUyNGZiZTNiNDJkMTQ1MzRkYTAyMmYxZTUwZGJiMw==
 SHA512:
   metadata.gz: !binary |-
-    MWRiOWIwMTg5MTg3MTIwN2NmMTU5NzcwMDQ4ODQ4ZmZkNzBkZmI4YjI2ZDJk
-    M2NlOGIwODQ3YjE4MDkwODZjNTQ4NDdhOGNjNmYzMjE0MjhkZGNlMWZkNjUw
-    MGVmOTlkY2MyMDNlZTgxMDExNjE0ZWQxZDRlMWE1NmYxY2Y2MmY=
+    ZGUxODBmZjhhMzQ3YzVkNDViYjU1MWYyMjk3NTdmNmQzMzdiOWZmNTIxMThl
+    NjliMDRiNmU0ZDQwN2Q2MjJlZjdlZjJjMzQ3OTY3MzI4NTlkZGY0YzRhYWI5
+    ZjQ1ZDAwZDBlNGI0NmY0MTRkYTJiODBiMjI4NWQ2MGZmOWY1MjA=
   data.tar.gz: !binary |-
-    NjA1OTNhMDVhYzEzNjIzOWM5ODgzNDYyYzNkZWFiMmZiZjVhMmQ2M2I4OGJl
-    Y2JmMzIwNzdhMjAzNWM1ZmM0OGM3M2Y4NDMyZTExZGZkZWZmOTdjYjQyYjUz
-    OGRhODQyM2I0NjAzMmY3MTg1NTFhY2E3YWQzYjIyMWY4N2FhOWU=
+    MDZkZjY4ZmMyZTdmNTkzNTFmZjI3YTU0ZWZlZDBlZmJlNzY0MmI2YTRjZmJi
+    MGVmY2I3NGU2MjllYTUxMDNhZTI3MzljMTNkMWUyM2E3YWUyODZlMDU2MDZl
+    YzYwMDFkZGRiZGVjMTkxYmRkYmZkYzBlYTg3NzM2ZDA0ZDE3NDQ=

data/acceptance/pre_suite/pe/install.rb

@@ -1 +1,3 @@
-install_pe
+# require beaker-pe to load in the additional DSL methods
+require 'beaker-pe'
+install_pe

data/beaker.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = Gem::Requirement.new('>= 2.2.5')
+
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'

data/docs/how_to/upgrade_from_2_to_3.md

@@ -5,6 +5,12 @@ any changes that you might need to move from beaker 2.y to 3.0. To test out
 beaker 3.0.0, we recommend implementing the strategy outlined [here](test_arbitrary_beaker_versions.md) 
 to ensure this new major release does not break your existing testing.
 
+## Ruby version 1.9.3 no longer supported
+
+Official support for 1.9.3 has been eol'd since Feb 2015; the beaker 3.0.0 release
+drops support for ruby 1.9.3 and will not install with ruby 1.9.3. We suggest using
+ruby >= 2.2.5, as that is the version we currently test and support at Puppet.
+
 ## Locally Cached Files
 
 This is a change of the `:cache_files_locally` preset from `true` to `false`.
@@ -72,5 +78,7 @@ needed to use beaker-pe with beaker 3.0:
 
 1. put a dependency on beaker-pe in your Gemfile as a sibling to your beaker
   requirement (make sure beaker-pe is >= 1.0)
-2. put a `require 'beaker-pe'` statement where you'd like to use beaker-pe-specific
-  functionality
+2. That's it! Beaker itself will still `require 'beaker-pe'`, so making sure that it is specified
+  in your project's Gemfile is the only code change you will need to make. Please note that this
+  is only supported with the `beaker-pe` gem; other beaker libraries will need an explicit `require`
+  in your test setup.

data/lib/beaker.rb

@@ -46,4 +46,13 @@ module Beaker
     # do nothing
   end
 
+  # If beaker-pe is available, pull it in. The gem beaker-pe will need to be
+  # specified in the project Gemfile independent of beaker itself. If not available,
+  # catch LoadError and continue.
+  begin
+    require 'beaker-pe'
+  rescue LoadError
+    # do nothing
+  end
+
 end

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

@@ -21,7 +21,7 @@ module Mac::Exec
   #   (from {#ssh_service_restart})
   def ssh_permit_user_environment
     ssh_config_file = '/etc/sshd_config'
-    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /osx-10\.*11/
+    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /osx-10\.*(11|12)/
 
     exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> #{ssh_config_file}"))
     ssh_service_restart()

data/lib/beaker/hypervisor/vmpooler.rb

@@ -163,7 +163,11 @@ module Beaker
             raise "Vmpooler.provision - requested VM templates #{request_payload.keys} not available"
           end
         else
-          raise "Vmpooler.provision - response from pooler not ok. Requested host set #{request_payload.keys} not available in pooler.\n#{parsed_response}"
+          if response.code == '401'
+            raise "Vmpooler.provision - response from pooler not ok. Vmpooler token not authorized to make request.\n#{parsed_response}"
+          else
+            raise "Vmpooler.provision - response from pooler not ok. Requested host set #{request_payload.keys} not available in pooler.\n#{parsed_response}"
+          end
         end
       rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
         @logger.debug "Failed vmpooler provision: #{e.class} : #{e.message}"

data/lib/beaker/platform.rb

@@ -21,7 +21,8 @@ module Beaker
                      "precise" => "1204",
                      "lucid"   => "1004",
                    },
-        :osx =>    { "elcapitan" => "1011",
+        :osx =>    { "sierra"    => "1012",
+                     "elcapitan" => "1011",
                      "yosemite"  => "1010",
                      "mavericks" => "109",
                    }

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.0.0'
+    STRING = '3.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -764,7 +764,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='