beaker-rspec 2.2.0 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjcyM2MxN2Y0M2ZkMzM1ODczZTA2YTI0NWYxNGM2MGJmNjQ0ZDZmZg==
+    MDBkNzdhMjMxZjI5Njk4N2UwYjQwZDk0MWI2ODJiNGY3N2JlMWQ2MA==
   data.tar.gz: !binary |-
-    MThhOGQ2ZjBhY2I2NDdjZWRkOTA5NzQ1NmVmN2M5YTlkYjNlOWI4MA==
+    ZWQwOWU4NmNjNmJjNTZlODNlOWZmMWU5YTU2MTJlZDY1YTIwMDFhOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTM2NzgwNTk4YWEwY2UzZjIxODJlODNhMGY0OTg0ZDg0MmEyMzk4OWVhYzg1
-    YTZiZWQ1YzA1OGZjYzk2NjBlOGRjNDU3NGE3NjNkYjllZmIxZDcxYmE4Mjg3
-    ZmY2OGMyM2VjNjg3YzY5ZGZiYjllYjA5MzNkOTY3NGFmZDJjYTE=
+    OGY2OGUzMTdlOGUwM2RiNWQxNTNkYzkwZTI0NzU5YjU4Yzk2ODU3ZGI2ZDVm
+    ODA4NDRhMzdiNjA1M2EzZDVlNTYxNmQ5NjgyOTNmMDllNzk2NjlhMGZkYjUw
+    Mjg2NDk4M2UzMmVlZjg1MmZhZjA5ZmJlZTY0YmRkMTFkMzQ5MjA=
   data.tar.gz: !binary |-
-    MzZkZDk4ZjlhN2MxODkzMzhmZjMyNjMzNmY4MzVlMDE5ODQ5ODJkNzMzYmZj
-    YmYzZmIxYzE3OTU2OTY2MTgxZDNkZDcxNTAzMjdjNDRkYjJhYTc2ZjEzZDc2
-    N2ZiNTdhOWViNDMwYzM1ZTUwMWI1YjRlZmQxYjRmNDUzNDRjYjA=
+    NDUyZjc1ZTE3YmE4MDRjMzU3M2U1ZWRiNTQxN2U1OTE1OTlkYmE5ZGQzOGUw
+    NGQ4NmNhYjYyZmNiZWFiMGQyYzMxNWE1MzJmNTdkYWQwOGMwMTM0M2JkYzBh
+    OTkyOWY1MzJjYjU2MjIwOGQ5ZDNjZjk2MjU1ZGI0MWRkMjJjNWY=

data/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'beaker'
+gem 'beaker', '~> 1.8.2'

data/beaker-rspec.gemspec

@@ -6,7 +6,7 @@ less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
 
 Gem::Specification.new do |s|
   s.name        = "beaker-rspec"
-  s.version     = '2.2.0'
+  s.version     = '2.2.1'
   s.authors     = ["Puppetlabs"]
   s.email       = ["sqa@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-rspec"
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~> 1.3'
+  s.add_runtime_dependency 'beaker', '~> 1.8.2'
   s.add_runtime_dependency 'rspec', '~> 2.14'
   s.add_runtime_dependency 'serverspec', '~> 0.14'
   s.add_runtime_dependency 'specinfra', '~> 0.3'

data/lib/beaker-rspec/beaker_shim.rb

@@ -29,10 +29,18 @@ module BeakerRSpec
       RSpec.configuration.hosts = @network_manager.provision
     end
 
-    # Validate that the SUTs are up and correctly configured
+    # Validate that the SUTs are up and correctly configured.  Checks that required
+    # packages are installed and if they are missing attempt installation.
     # Assumes #setup and #provision has already been called.
     def validate
-      Beaker::Utils::Validator.validate(RSpec.configuration.hosts, @logger)
+      @network_manager.validate
+    end
+
+    # Run configuration steps to have hosts ready to test on (such as ensuring that 
+    # hosts are correctly time synched, adding keys, etc).
+    # Assumes #setup, #provision and #validate have already been called.
+    def configure
+      @network_manager.configure
     end
 
     # Setup the testing environment

data/lib/beaker-rspec/spec_helper.rb

@@ -37,6 +37,7 @@ RSpec.configure do |c|
   c.setup([fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten.compact)
   c.provision
   c.validate
+  c.configure
 
   # Destroy nodes if no preserve hosts
   c.after :suite do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement