beaker-rspec 2.0.1 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/beaker-rspec.gemspec +1 -1
  2. data/lib/beaker-rspec/helpers/serverspec.rb +1 -1
  3. data/lib/beaker-rspec/spec_helper.rb +12 -5
  4. metadata +119 -143
  5. checksums.yaml +0 -15
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.0.1'
9
+ s.version = '2.1.0'
10
10
  s.authors = ["Puppetlabs"]
11
11
  s.email = ["sqa@puppetlabs.com"]
12
12
  s.homepage = "https://github.com/puppetlabs/beaker-rspec"
data/lib/beaker-rspec/helpers/serverspec.rb CHANGED
@@ -26,7 +26,7 @@ module SpecInfra
26
26
  @example.metadata[:stdout] = ret[:stdout]
27
27
  end
28
28
 
29
- ret
29
+ CommandResult.new ret
30
30
  end
31
31
 
32
32
  private
data/lib/beaker-rspec/spec_helper.rb CHANGED
@@ -15,13 +15,20 @@ RSpec.configure do |c|
15
15
  nodeset = ENV['RS_SET'] || 'default'
16
16
  nodesetfile = ENV['RS_SETFILE'] || File.join('spec/acceptance/nodesets',"#{nodeset}.yml")
17
17
 
18
- preserve = ENV['RS_DESTROY'] == 'no' ? '--preserve-hosts' : ''
19
- fresh_nodes = ENV['RS_PROVISION'] == 'no' ? '--no-provision' : ''
20
- keyfile = ENV['RS_KEYFILE'] ? ['--keyfile', ENV['RS_KEYFILE']] : []
21
- debug = ENV['RS_DEBUG'] ? ['--log-level', 'debug'] : []
18
+ case ENV['RS_DESTROY']
19
+ when 'no'
20
+ preserve = ['--preserve-hosts','always']
21
+ when 'onpass'
22
+ preserve = ['--preserve-hosts','onfail']
23
+ else
24
+ preserve = ['--preserve-hosts','never']
25
+ end
26
+ fresh_nodes = ENV['RS_PROVISION'] == 'no' ? '--no-provision' : nil
27
+ keyfile = ENV['RS_KEYFILE'] ? ['--keyfile', ENV['RS_KEYFILE']] : nil
28
+ debug = ENV['RS_DEBUG'] ? ['--log-level', 'debug'] : nil
22
29
 
23
30
  # Configure all nodes in nodeset
24
- c.setup([preserve, fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten)
31
+ c.setup([preserve, fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten.compact)
25
32
  c.provision
26
33
  c.validate
27
34
 
metadata CHANGED
@@ -1,162 +1,133 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: beaker-rspec
3
- version: !ruby/object:Gem::Version
4
- version: 2.0.1
3
+ version: !ruby/object:Gem::Version
4
+ prerelease: false
5
+ segments:
6
+ - 2
7
+ - 1
8
+ - 0
9
+ version: 2.1.0
5
10
  platform: ruby
6
- authors:
11
+ authors:
7
12
  - Puppetlabs
8
13
  autorequire:
9
14
  bindir: bin
10
15
  cert_chain: []
11
- date: 2014-01-23 00:00:00.000000000 Z
12
- dependencies:
13
- - !ruby/object:Gem::Dependency
16
+
17
+ date: 2014-01-29 00:00:00 -08:00
18
+ default_executable:
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
14
21
  name: fakefs
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '='
18
- - !ruby/object:Gem::Version
19
- version: '0.4'
20
- type: :development
21
22
  prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - '='
25
- - !ruby/object:Gem::Version
26
- version: '0.4'
27
- - !ruby/object:Gem::Dependency
28
- name: rake
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ! '>='
32
- - !ruby/object:Gem::Version
33
- version: '0'
23
+ requirement: &id001 !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - "="
26
+ - !ruby/object:Gem::Version
27
+ segments:
28
+ - 0
29
+ - 4
30
+ version: "0.4"
34
31
  type: :development
32
+ version_requirements: *id001
33
+ - !ruby/object:Gem::Dependency
34
+ name: rake
35
35
  prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ! '>='
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: simplecov
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ! '>='
46
- - !ruby/object:Gem::Version
47
- version: '0'
36
+ requirement: &id002 !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ segments:
41
+ - 0
42
+ version: "0"
48
43
  type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ! '>='
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- - !ruby/object:Gem::Dependency
44
+ version_requirements: *id002
45
+ - !ruby/object:Gem::Dependency
56
46
  name: yard
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
63
47
  prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - ! '>='
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
- - !ruby/object:Gem::Dependency
70
- name: markdown
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ! '>='
74
- - !ruby/object:Gem::Version
75
- version: '0'
48
+ requirement: &id003 !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ segments:
53
+ - 0
54
+ version: "0"
76
55
  type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ! '>='
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
- - !ruby/object:Gem::Dependency
56
+ version_requirements: *id003
57
+ - !ruby/object:Gem::Dependency
84
58
  name: thin
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ! '>='
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :development
91
59
  prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ! '>='
95
- - !ruby/object:Gem::Version
96
- version: '0'
97
- - !ruby/object:Gem::Dependency
60
+ requirement: &id004 !ruby/object:Gem::Requirement
61
+ requirements:
62
+ - - ">="
63
+ - !ruby/object:Gem::Version
64
+ segments:
65
+ - 0
66
+ version: "0"
67
+ type: :development
68
+ version_requirements: *id004
69
+ - !ruby/object:Gem::Dependency
98
70
  name: beaker
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - ~>
102
- - !ruby/object:Gem::Version
103
- version: '1.3'
104
- type: :runtime
105
71
  prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
72
+ requirement: &id005 !ruby/object:Gem::Requirement
73
+ requirements:
108
74
  - - ~>
109
- - !ruby/object:Gem::Version
110
- version: '1.3'
111
- - !ruby/object:Gem::Dependency
112
- name: rspec
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ~>
116
- - !ruby/object:Gem::Version
117
- version: '2.14'
75
+ - !ruby/object:Gem::Version
76
+ segments:
77
+ - 1
78
+ - 3
79
+ version: "1.3"
118
80
  type: :runtime
81
+ version_requirements: *id005
82
+ - !ruby/object:Gem::Dependency
83
+ name: rspec
119
84
  prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ~>
123
- - !ruby/object:Gem::Version
124
- version: '2.14'
125
- - !ruby/object:Gem::Dependency
126
- name: serverspec
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
85
+ requirement: &id006 !ruby/object:Gem::Requirement
86
+ requirements:
129
87
  - - ~>
130
- - !ruby/object:Gem::Version
131
- version: '0.14'
88
+ - !ruby/object:Gem::Version
89
+ segments:
90
+ - 2
91
+ - 14
92
+ version: "2.14"
132
93
  type: :runtime
94
+ version_requirements: *id006
95
+ - !ruby/object:Gem::Dependency
96
+ name: serverspec
133
97
  prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - ~>
137
- - !ruby/object:Gem::Version
138
- version: '0.14'
139
- - !ruby/object:Gem::Dependency
140
- name: specinfra
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
98
+ requirement: &id007 !ruby/object:Gem::Requirement
99
+ requirements:
143
100
  - - ~>
144
- - !ruby/object:Gem::Version
145
- version: '0.3'
101
+ - !ruby/object:Gem::Version
102
+ segments:
103
+ - 0
104
+ - 14
105
+ version: "0.14"
146
106
  type: :runtime
107
+ version_requirements: *id007
108
+ - !ruby/object:Gem::Dependency
109
+ name: specinfra
147
110
  prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
111
+ requirement: &id008 !ruby/object:Gem::Requirement
112
+ requirements:
150
113
  - - ~>
151
- - !ruby/object:Gem::Version
152
- version: '0.3'
114
+ - !ruby/object:Gem::Version
115
+ segments:
116
+ - 0
117
+ - 3
118
+ version: "0.3"
119
+ type: :runtime
120
+ version_requirements: *id008
153
121
  description: RSpec bindings for beaker, see https://github.com/puppetlabs/beaker
154
- email:
122
+ email:
155
123
  - sqa@puppetlabs.com
156
124
  executables: []
125
+
157
126
  extensions: []
127
+
158
128
  extra_rdoc_files: []
159
- files:
129
+
130
+ files:
160
131
  - .gitignore
161
132
  - Gemfile
162
133
  - LICENSE
@@ -169,31 +140,36 @@ files:
169
140
  - sample.cfg
170
141
  - spec/acceptance/example_spec.rb
171
142
  - spec/spec_helper.rb
143
+ has_rdoc: true
172
144
  homepage: https://github.com/puppetlabs/beaker-rspec
173
- licenses:
145
+ licenses:
174
146
  - Apache2
175
- metadata: {}
176
147
  post_install_message:
177
148
  rdoc_options: []
178
- require_paths:
149
+
150
+ require_paths:
179
151
  - lib
180
- required_ruby_version: !ruby/object:Gem::Requirement
181
- requirements:
182
- - - ! '>='
183
- - !ruby/object:Gem::Version
184
- version: '0'
185
- required_rubygems_version: !ruby/object:Gem::Requirement
186
- requirements:
187
- - - ! '>='
188
- - !ruby/object:Gem::Version
189
- version: '0'
152
+ required_ruby_version: !ruby/object:Gem::Requirement
153
+ requirements:
154
+ - - ">="
155
+ - !ruby/object:Gem::Version
156
+ segments:
157
+ - 0
158
+ version: "0"
159
+ required_rubygems_version: !ruby/object:Gem::Requirement
160
+ requirements:
161
+ - - ">="
162
+ - !ruby/object:Gem::Version
163
+ segments:
164
+ - 0
165
+ version: "0"
190
166
  requirements: []
167
+
191
168
  rubyforge_project:
192
- rubygems_version: 2.2.1
169
+ rubygems_version: 1.3.6
193
170
  signing_key:
194
- specification_version: 4
171
+ specification_version: 3
195
172
  summary: RSpec bindings for beaker
196
- test_files:
173
+ test_files:
197
174
  - spec/acceptance/example_spec.rb
198
175
  - spec/spec_helper.rb
199
- has_rdoc:
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YzRmYjczM2IwYmUyMjI3NWI2ZGMwYjhmNzk3N2VkOGFjODg5NDRjZQ==
5
- data.tar.gz: !binary |-
6
- MWI2MDRiYWYzNjUyZGI0NTc5Nzk4YWIxOWFlM2FhNTk4MmQwZDFlYQ==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- ZDAwNGNiYjgwZjJlN2I0ZWM3ZjkxNWVjM2JhNmQ2NTk1ZTg1ZmFkOTE1MzNh
10
- ODQ4ZGRkYzEzMTkwNWE2MDliZWZiMDgyMThlNWJiNmYwMzk2ZDAwMDY0MzZj
11
- ZDU3MjQzZDIwOGRjZTBhMjRkMDg0ZTkzNDBkZThkYWQ4ZGFlZTM=
12
- data.tar.gz: !binary |-
13
- MmFiZTU0ZWFkNWE4MzYxZTVkMTM3NjUwMDcwODMxOGI5MzY4ZjZmZGQ1ZjY5
14
- MzlhNmViZjU5YmFiNGU3Y2EwM2YyYjJkZTg0NDU0NTE2YjE2MDdjMDdkYzJk
15
- MTAzMmU3YjExM2JiZjI2Yjk0NDkyODQxNWMzZTg1M2M1NmYxMGI=