beaker-rspec 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +8 -8
  2. data/Gemfile +1 -1
  3. data/beaker-rspec.gemspec +2 -2
  4. data/lib/beaker-rspec/beaker_shim.rb +10 -2
  5. data/lib/beaker-rspec/spec_helper.rb +1 -0
  6. metadata +4 -4
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MjcyM2MxN2Y0M2ZkMzM1ODczZTA2YTI0NWYxNGM2MGJmNjQ0ZDZmZg==
4
+ MDBkNzdhMjMxZjI5Njk4N2UwYjQwZDk0MWI2ODJiNGY3N2JlMWQ2MA==
5
5
  data.tar.gz: !binary |-
6
- MThhOGQ2ZjBhY2I2NDdjZWRkOTA5NzQ1NmVmN2M5YTlkYjNlOWI4MA==
6
+ ZWQwOWU4NmNjNmJjNTZlODNlOWZmMWU5YTU2MTJlZDY1YTIwMDFhOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZTM2NzgwNTk4YWEwY2UzZjIxODJlODNhMGY0OTg0ZDg0MmEyMzk4OWVhYzg1
10
- YTZiZWQ1YzA1OGZjYzk2NjBlOGRjNDU3NGE3NjNkYjllZmIxZDcxYmE4Mjg3
11
- ZmY2OGMyM2VjNjg3YzY5ZGZiYjllYjA5MzNkOTY3NGFmZDJjYTE=
9
+ OGY2OGUzMTdlOGUwM2RiNWQxNTNkYzkwZTI0NzU5YjU4Yzk2ODU3ZGI2ZDVm
10
+ ODA4NDRhMzdiNjA1M2EzZDVlNTYxNmQ5NjgyOTNmMDllNzk2NjlhMGZkYjUw
11
+ Mjg2NDk4M2UzMmVlZjg1MmZhZjA5ZmJlZTY0YmRkMTFkMzQ5MjA=
12
12
  data.tar.gz: !binary |-
13
- MzZkZDk4ZjlhN2MxODkzMzhmZjMyNjMzNmY4MzVlMDE5ODQ5ODJkNzMzYmZj
14
- YmYzZmIxYzE3OTU2OTY2MTgxZDNkZDcxNTAzMjdjNDRkYjJhYTc2ZjEzZDc2
15
- N2ZiNTdhOWViNDMwYzM1ZTUwMWI1YjRlZmQxYjRmNDUzNDRjYjA=
13
+ NDUyZjc1ZTE3YmE4MDRjMzU3M2U1ZWRiNTQxN2U1OTE1OTlkYmE5ZGQzOGUw
14
+ NGQ4NmNhYjYyZmNiZWFiMGQyYzMxNWE1MzJmNTdkYWQwOGMwMTM0M2JkYzBh
15
+ OTkyOWY1MzJjYjU2MjIwOGQ5ZDNjZjk2MjU1ZGI0MWRkMjJjNWY=
data/Gemfile CHANGED
@@ -2,4 +2,4 @@ source "http://rubygems.org"
2
2
 
3
3
  gemspec
4
4
 
5
- gem 'beaker'
5
+ gem 'beaker', '~> 1.8.2'
data/beaker-rspec.gemspec CHANGED
@@ -6,7 +6,7 @@ less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "beaker-rspec"
9
- s.version = '2.2.0'
9
+ s.version = '2.2.1'
10
10
  s.authors = ["Puppetlabs"]
11
11
  s.email = ["sqa@puppetlabs.com"]
12
12
  s.homepage = "https://github.com/puppetlabs/beaker-rspec"
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
31
31
  s.add_development_dependency 'thin'
32
32
 
33
33
  # Run time dependencies
34
- s.add_runtime_dependency 'beaker', '~> 1.3'
34
+ s.add_runtime_dependency 'beaker', '~> 1.8.2'
35
35
  s.add_runtime_dependency 'rspec', '~> 2.14'
36
36
  s.add_runtime_dependency 'serverspec', '~> 0.14'
37
37
  s.add_runtime_dependency 'specinfra', '~> 0.3'
data/lib/beaker-rspec/beaker_shim.rb CHANGED
@@ -29,10 +29,18 @@ module BeakerRSpec
29
29
  RSpec.configuration.hosts = @network_manager.provision
30
30
  end
31
31
 
32
- # Validate that the SUTs are up and correctly configured
32
+ # Validate that the SUTs are up and correctly configured. Checks that required
33
+ # packages are installed and if they are missing attempt installation.
33
34
  # Assumes #setup and #provision has already been called.
34
35
  def validate
35
- Beaker::Utils::Validator.validate(RSpec.configuration.hosts, @logger)
36
+ @network_manager.validate
37
+ end
38
+
39
+ # Run configuration steps to have hosts ready to test on (such as ensuring that
40
+ # hosts are correctly time synched, adding keys, etc).
41
+ # Assumes #setup, #provision and #validate have already been called.
42
+ def configure
43
+ @network_manager.configure
36
44
  end
37
45
 
38
46
  # Setup the testing environment
data/lib/beaker-rspec/spec_helper.rb CHANGED
@@ -37,6 +37,7 @@ RSpec.configure do |c|
37
37
  c.setup([fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten.compact)
38
38
  c.provision
39
39
  c.validate
40
+ c.configure
40
41
 
41
42
  # Destroy nodes if no preserve hosts
42
43
  c.after :suite do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-rspec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-13 00:00:00.000000000 Z
11
+ date: 2014-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fakefs
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - ~>
102
102
  - !ruby/object:Gem::Version
103
- version: '1.3'
103
+ version: 1.8.2
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - ~>
109
109
  - !ruby/object:Gem::Version
110
- version: '1.3'
110
+ version: 1.8.2
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rspec
113
113
  requirement: !ruby/object:Gem::Requirement