serverspec 2.42.1 → 2.42.3
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.
- checksums.yaml +5 -5
- data/lib/serverspec/setup.rb +6 -1
- data/lib/serverspec/type/file.rb +7 -1
- data/lib/serverspec/version.rb +1 -1
- data/serverspec.gemspec +7 -2
- data/spec/type/base/file_spec.rb +5 -1
- metadata +7 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: d58f828b590afebe91081d1913e623d0ad7e9ff811742e86afbae718f13a36b9
|
4
|
+
data.tar.gz: 050ae9d5bcc6245b62bb3262655ab9361a599ab4359591d19cf1c8c4a181a95e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 48a71ecd2e08a4fb3bd6f55b7eba209e80832517adbe1e402065a2ac293043edc47a06eafae63636f2280eab58a8c0d43633cf972ef8913b1a98ada39bcc8ef2
|
7
|
+
data.tar.gz: 1ff57cf575de9745c3279fded0432f09e5c001d359a6fe9a06445467ada3638ba40c23c9c7ddda887aaa52b0f26c38609afc450bc79696f3587302b4eb2e5c9b
|
data/lib/serverspec/setup.rb
CHANGED
@@ -152,7 +152,12 @@ EOF
|
|
152
152
|
end
|
153
153
|
|
154
154
|
def self.safe_create_spec_helper
|
155
|
-
|
155
|
+
erb = if RUBY_VERSION >= "2.6"
|
156
|
+
ERB.new(spec_helper_template, :trim_mode => '-')
|
157
|
+
else
|
158
|
+
ERB.new(spec_helper_template, nil, '-')
|
159
|
+
end
|
160
|
+
content = erb.result(binding)
|
156
161
|
if File.exist? 'spec/spec_helper.rb'
|
157
162
|
old_content = File.read('spec/spec_helper.rb')
|
158
163
|
if old_content != content
|
data/lib/serverspec/type/file.rb
CHANGED
@@ -121,7 +121,13 @@ module Serverspec::Type
|
|
121
121
|
end
|
122
122
|
|
123
123
|
def content_as_yaml
|
124
|
-
|
124
|
+
if @content_as_yaml.nil?
|
125
|
+
@content_as_yaml = if YAML.respond_to?(:unsafe_load)
|
126
|
+
YAML.unsafe_load(content)
|
127
|
+
else
|
128
|
+
YAML.load(content)
|
129
|
+
end
|
130
|
+
end
|
125
131
|
@content_as_yaml
|
126
132
|
end
|
127
133
|
|
data/lib/serverspec/version.rb
CHANGED
data/serverspec.gemspec
CHANGED
@@ -22,6 +22,11 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.add_runtime_dependency "rspec-its"
|
23
23
|
spec.add_runtime_dependency "multi_json"
|
24
24
|
spec.add_runtime_dependency "specinfra", "~> 2.72"
|
25
|
-
|
26
|
-
|
25
|
+
|
26
|
+
if RUBY_VERSION < "1.9"
|
27
|
+
spec.add_development_dependency "json", "~> 1.8"
|
28
|
+
spec.add_development_dependency "rake", "~> 10.1.1"
|
29
|
+
else
|
30
|
+
spec.add_development_dependency "rake"
|
31
|
+
end
|
27
32
|
end
|
data/spec/type/base/file_spec.rb
CHANGED
@@ -369,18 +369,22 @@ describe file('example.yml') do
|
|
369
369
|
let(:stdout) {<<EOF
|
370
370
|
---
|
371
371
|
yaml:
|
372
|
-
title: 'this is a yaml'
|
372
|
+
title: &anchor 'this is a yaml'
|
373
373
|
array:
|
374
374
|
-
|
375
375
|
title: 'array 1'
|
376
376
|
-
|
377
377
|
title: 'array 2'
|
378
|
+
date: 2023-02-03
|
379
|
+
Reuse anchor: *anchor
|
378
380
|
EOF
|
379
381
|
}
|
380
382
|
|
381
383
|
its(:content_as_yaml) { should include('yaml') }
|
382
384
|
its(:content_as_yaml) { should include('yaml' => include('title' => 'this is a yaml')) }
|
383
385
|
its(:content_as_yaml) { should include('yaml' => include('array' => include('title' => 'array 2'))) }
|
386
|
+
its(:content_as_yaml) { should include('yaml' => include('date' => Date.new(2023, 2, 3))) }
|
387
|
+
its(:content_as_yaml) { should include('yaml' => include('Reuse anchor' => 'this is a yaml')) }
|
384
388
|
end
|
385
389
|
|
386
390
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: serverspec
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.42.
|
4
|
+
version: 2.42.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gosuke Miyashita
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-09-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -70,16 +70,16 @@ dependencies:
|
|
70
70
|
name: rake
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- - "
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: '0'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - "
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: '0'
|
83
83
|
description: RSpec tests for your servers configured by Puppet, Chef, Itamae or anything
|
84
84
|
else
|
85
85
|
email:
|
@@ -321,8 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
321
321
|
- !ruby/object:Gem::Version
|
322
322
|
version: '0'
|
323
323
|
requirements: []
|
324
|
-
|
325
|
-
rubygems_version: 2.5.1
|
324
|
+
rubygems_version: 3.1.2
|
326
325
|
signing_key:
|
327
326
|
specification_version: 4
|
328
327
|
summary: RSpec tests for your servers configured by Puppet, Chef, Itamae or anything
|