beaker-rspec 2.1.1 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +15 -0
  2. data/beaker-rspec.gemspec +1 -1
  3. data/lib/beaker-rspec/spec_helper.rb +21 -7
  4. metadata +143 -119
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MjcyM2MxN2Y0M2ZkMzM1ODczZTA2YTI0NWYxNGM2MGJmNjQ0ZDZmZg==
5
+ data.tar.gz: !binary |-
6
+ MThhOGQ2ZjBhY2I2NDdjZWRkOTA5NzQ1NmVmN2M5YTlkYjNlOWI4MA==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ ZTM2NzgwNTk4YWEwY2UzZjIxODJlODNhMGY0OTg0ZDg0MmEyMzk4OWVhYzg1
10
+ YTZiZWQ1YzA1OGZjYzk2NjBlOGRjNDU3NGE3NjNkYjllZmIxZDcxYmE4Mjg3
11
+ ZmY2OGMyM2VjNjg3YzY5ZGZiYjllYjA5MzNkOTY3NGFmZDJjYTE=
12
+ data.tar.gz: !binary |-
13
+ MzZkZDk4ZjlhN2MxODkzMzhmZjMyNjMzNmY4MzVlMDE5ODQ5ODJkNzMzYmZj
14
+ YmYzZmIxYzE3OTU2OTY2MTgxZDNkZDcxNTAzMjdjNDRkYjJhYTc2ZjEzZDc2
15
+ N2ZiNTdhOWViNDMwYzM1ZTUwMWI1YjRlZmQxYjRmNDUzNDRjYjA=
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.1.1'
9
+ s.version = '2.2.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/spec_helper.rb CHANGED
@@ -11,13 +11,27 @@ RSpec.configure do |c|
11
11
  # Define persistant options setting
12
12
  c.add_setting :options, :default => {}
13
13
 
14
- # Defined target nodeset
15
- nodeset = ENV['RS_SET'] || 'default'
16
- nodesetfile = ENV['RS_SETFILE'] || File.join('spec/acceptance/nodesets',"#{nodeset}.yml")
14
+ #default option values
15
+ defaults = {
16
+ :nodeset => 'default',
17
+ }
18
+ #read env vars
19
+ env_vars = {
20
+ :nodeset => ENV['BEAKER_set'] || ENV['RS_SET'],
21
+ :nodesetfile => ENV['BEAKER_setfile'] || ENV['RS_SETFILE'],
22
+ :provision => ENV['BEAKER_provision'] || ENV['RS_PROVISION'],
23
+ :keyfile => ENV['BEAKER_keyfile'] || ENV['RS_KEYFILE'],
24
+ :debug => ENV['BEAKER_debug'] || ENV['RS_DEBUG'],
25
+ :destroy => ENV['BEAKER_destroy'] || ENV['RS_DESTROY'],
26
+ }.delete_if {|key, value| value.nil?}
27
+ #combine defaults and env_vars to determine overall options
28
+ options = defaults.merge(env_vars)
17
29
 
18
- fresh_nodes = ENV['RS_PROVISION'] == 'no' ? '--no-provision' : nil
19
- keyfile = ENV['RS_KEYFILE'] ? ['--keyfile', ENV['RS_KEYFILE']] : nil
20
- debug = ENV['RS_DEBUG'] ? ['--log-level', 'debug'] : nil
30
+ # process options to construct beaker command string
31
+ nodesetfile = options[:nodesetfile] || File.join('spec/acceptance/nodesets',"#{options[:nodeset]}.yml")
32
+ fresh_nodes = options[:provision] == 'no' ? '--no-provision' : nil
33
+ keyfile = options[:keyfile] ? ['--keyfile', options[:keyfile]] : nil
34
+ debug = options[:debug] ? ['--log-level', 'debug'] : nil
21
35
 
22
36
  # Configure all nodes in nodeset
23
37
  c.setup([fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten.compact)
@@ -26,7 +40,7 @@ RSpec.configure do |c|
26
40
 
27
41
  # Destroy nodes if no preserve hosts
28
42
  c.after :suite do
29
- case ENV['RS_DESTROY']
43
+ case options[:destroy]
30
44
  when 'no'
31
45
  # Don't cleanup
32
46
  when 'onpass'
metadata CHANGED
@@ -1,133 +1,162 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: beaker-rspec
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 2
7
- - 1
8
- - 1
9
- version: 2.1.1
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.2.0
10
5
  platform: ruby
11
- authors:
6
+ authors:
12
7
  - Puppetlabs
13
8
  autorequire:
14
9
  bindir: bin
15
10
  cert_chain: []
16
-
17
- date: 2014-01-30 00:00:00 -08:00
18
- default_executable:
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
11
+ date: 2014-03-13 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
21
14
  name: fakefs
22
- prerelease: false
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"
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - '='
18
+ - !ruby/object:Gem::Version
19
+ version: '0.4'
31
20
  type: :development
32
- version_requirements: *id001
33
- - !ruby/object:Gem::Dependency
21
+ 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
34
28
  name: rake
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ! '>='
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
34
+ type: :development
35
35
  prerelease: false
36
- requirement: &id002 !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- segments:
41
- - 0
42
- version: "0"
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'
43
48
  type: :development
44
- version_requirements: *id002
45
- - !ruby/object:Gem::Dependency
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
46
56
  name: yard
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ type: :development
47
63
  prerelease: false
48
- requirement: &id003 !ruby/object:Gem::Requirement
49
- requirements:
50
- - - ">="
51
- - !ruby/object:Gem::Version
52
- segments:
53
- - 0
54
- version: "0"
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'
55
76
  type: :development
56
- version_requirements: *id003
57
- - !ruby/object:Gem::Dependency
58
- name: thin
59
77
  prerelease: false
60
- requirement: &id004 !ruby/object:Gem::Requirement
61
- requirements:
62
- - - ">="
63
- - !ruby/object:Gem::Version
64
- segments:
65
- - 0
66
- version: "0"
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ! '>='
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: thin
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ! '>='
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
67
90
  type: :development
68
- version_requirements: *id004
69
- - !ruby/object:Gem::Dependency
70
- name: beaker
71
91
  prerelease: false
72
- requirement: &id005 !ruby/object:Gem::Requirement
73
- requirements:
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ! '>='
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: beaker
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
74
101
  - - ~>
75
- - !ruby/object:Gem::Version
76
- segments:
77
- - 1
78
- - 3
79
- version: "1.3"
102
+ - !ruby/object:Gem::Version
103
+ version: '1.3'
80
104
  type: :runtime
81
- version_requirements: *id005
82
- - !ruby/object:Gem::Dependency
83
- name: rspec
84
105
  prerelease: false
85
- requirement: &id006 !ruby/object:Gem::Requirement
86
- requirements:
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
87
108
  - - ~>
88
- - !ruby/object:Gem::Version
89
- segments:
90
- - 2
91
- - 14
92
- version: "2.14"
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'
93
118
  type: :runtime
94
- version_requirements: *id006
95
- - !ruby/object:Gem::Dependency
96
- name: serverspec
97
119
  prerelease: false
98
- requirement: &id007 !ruby/object:Gem::Requirement
99
- requirements:
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:
100
129
  - - ~>
101
- - !ruby/object:Gem::Version
102
- segments:
103
- - 0
104
- - 14
105
- version: "0.14"
130
+ - !ruby/object:Gem::Version
131
+ version: '0.14'
106
132
  type: :runtime
107
- version_requirements: *id007
108
- - !ruby/object:Gem::Dependency
109
- name: specinfra
110
133
  prerelease: false
111
- requirement: &id008 !ruby/object:Gem::Requirement
112
- requirements:
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:
113
143
  - - ~>
114
- - !ruby/object:Gem::Version
115
- segments:
116
- - 0
117
- - 3
118
- version: "0.3"
144
+ - !ruby/object:Gem::Version
145
+ version: '0.3'
119
146
  type: :runtime
120
- version_requirements: *id008
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ~>
151
+ - !ruby/object:Gem::Version
152
+ version: '0.3'
121
153
  description: RSpec bindings for beaker, see https://github.com/puppetlabs/beaker
122
- email:
154
+ email:
123
155
  - sqa@puppetlabs.com
124
156
  executables: []
125
-
126
157
  extensions: []
127
-
128
158
  extra_rdoc_files: []
129
-
130
- files:
159
+ files:
131
160
  - .gitignore
132
161
  - Gemfile
133
162
  - LICENSE
@@ -140,36 +169,31 @@ files:
140
169
  - sample.cfg
141
170
  - spec/acceptance/example_spec.rb
142
171
  - spec/spec_helper.rb
143
- has_rdoc: true
144
172
  homepage: https://github.com/puppetlabs/beaker-rspec
145
- licenses:
173
+ licenses:
146
174
  - Apache2
175
+ metadata: {}
147
176
  post_install_message:
148
177
  rdoc_options: []
149
-
150
- require_paths:
178
+ require_paths:
151
179
  - lib
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"
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'
166
190
  requirements: []
167
-
168
191
  rubyforge_project:
169
- rubygems_version: 1.3.6
192
+ rubygems_version: 2.2.2
170
193
  signing_key:
171
- specification_version: 3
194
+ specification_version: 4
172
195
  summary: RSpec bindings for beaker
173
- test_files:
196
+ test_files:
174
197
  - spec/acceptance/example_spec.rb
175
198
  - spec/spec_helper.rb
199
+ has_rdoc: