test-kitchen 3.7.0 → 3.8.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.
- checksums.yaml +4 -4
- data/Gemfile +4 -4
- data/LICENSE +1 -1
- data/Rakefile +2 -2
- data/lib/kitchen/base64_stream.rb +5 -5
- data/lib/kitchen/chef_utils_wiring.rb +2 -2
- data/lib/kitchen/cli.rb +1 -1
- data/lib/kitchen/collection.rb +1 -1
- data/lib/kitchen/color.rb +2 -2
- data/lib/kitchen/command/action.rb +1 -1
- data/lib/kitchen/command/console.rb +1 -1
- data/lib/kitchen/command/diagnose.rb +1 -1
- data/lib/kitchen/command/doctor.rb +1 -1
- data/lib/kitchen/command/exec.rb +1 -1
- data/lib/kitchen/command/list.rb +3 -3
- data/lib/kitchen/command/login.rb +1 -1
- data/lib/kitchen/command/package.rb +1 -1
- data/lib/kitchen/command/sink.rb +1 -1
- data/lib/kitchen/command/test.rb +1 -1
- data/lib/kitchen/command.rb +6 -6
- data/lib/kitchen/config.rb +2 -2
- data/lib/kitchen/configurable.rb +3 -3
- data/lib/kitchen/data_munger.rb +3 -3
- data/lib/kitchen/diagnostic.rb +2 -2
- data/lib/kitchen/driver/base.rb +1 -1
- data/lib/kitchen/driver/dummy.rb +1 -1
- data/lib/kitchen/driver/exec.rb +1 -1
- data/lib/kitchen/driver/proxy.rb +1 -1
- data/lib/kitchen/driver/ssh_base.rb +1 -1
- data/lib/kitchen/driver.rb +1 -1
- data/lib/kitchen/errors.rb +1 -1
- data/lib/kitchen/generator/init.rb +2 -2
- data/lib/kitchen/instance.rb +9 -9
- data/lib/kitchen/lazy_hash.rb +1 -1
- data/lib/kitchen/lifecycle_hooks.rb +1 -1
- data/lib/kitchen/loader/yaml.rb +5 -5
- data/lib/kitchen/logger.rb +1 -1
- data/lib/kitchen/logging.rb +1 -1
- data/lib/kitchen/login_command.rb +2 -2
- data/lib/kitchen/metadata_chopper.rb +1 -1
- data/lib/kitchen/platform.rb +1 -1
- data/lib/kitchen/platform_filter.rb +4 -2
- data/lib/kitchen/plugin.rb +1 -1
- data/lib/kitchen/plugin_base.rb +1 -1
- data/lib/kitchen/provisioner/base.rb +120 -4
- data/lib/kitchen/provisioner/chef/berkshelf.rb +2 -2
- data/lib/kitchen/provisioner/chef/common_sandbox.rb +2 -2
- data/lib/kitchen/provisioner/chef/policyfile.rb +11 -5
- data/lib/kitchen/provisioner/chef_apply.rb +3 -3
- data/lib/kitchen/provisioner/chef_base.rb +7 -7
- data/lib/kitchen/provisioner/chef_infra.rb +2 -2
- data/lib/kitchen/provisioner/chef_solo.rb +1 -1
- data/lib/kitchen/provisioner/chef_target.rb +4 -4
- data/lib/kitchen/provisioner/dummy.rb +1 -1
- data/lib/kitchen/provisioner/shell.rb +1 -1
- data/lib/kitchen/provisioner.rb +1 -1
- data/lib/kitchen/rake_tasks.rb +1 -1
- data/lib/kitchen/shell_out.rb +2 -2
- data/lib/kitchen/ssh.rb +3 -3
- data/lib/kitchen/state_file.rb +2 -2
- data/lib/kitchen/suite.rb +1 -1
- data/lib/kitchen/thor_tasks.rb +1 -1
- data/lib/kitchen/transport/base.rb +1 -1
- data/lib/kitchen/transport/dummy.rb +1 -1
- data/lib/kitchen/transport/exec.rb +2 -2
- data/lib/kitchen/transport/ssh.rb +5 -3
- data/lib/kitchen/transport/winrm.rb +2 -2
- data/lib/kitchen/transport.rb +2 -2
- data/lib/kitchen/util.rb +2 -2
- data/lib/kitchen/verifier/base.rb +2 -2
- data/lib/kitchen/verifier/busser.rb +1 -1
- data/lib/kitchen/verifier/dummy.rb +1 -1
- data/lib/kitchen/verifier/shell.rb +1 -1
- data/lib/kitchen/verifier.rb +1 -1
- data/lib/kitchen/version.rb +2 -2
- data/lib/kitchen/which.rb +1 -1
- data/lib/kitchen.rb +1 -1
- data/lib/vendor/hash_recursive_merge.rb +1 -1
- data/templates/driver/license_apachev2.erb +1 -1
- data/templates/driver/license_lgplv3.erb +1 -1
- data/templates/init/kitchen.yml.erb +2 -2
- data/test-kitchen.gemspec +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b2b9e6d594b61d9e569f8051f34251c4c1c4c531618c70d382558f34c2b4fbdb
|
4
|
+
data.tar.gz: 6703f8a68a196806e858011fdc1a7695e5e48c936a8e86c550ce8369aba82174
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 36e39c93bc5d66d0d46b790f927ee54c412c6467fd61c72a981721511814c1681925232851a437013a1a4c3ee250cc73ae251b057931db9024dab20596c31db9
|
7
|
+
data.tar.gz: 930266c1bc9c86e98def9eb3e78cf9bde2d8106a13fa831f1f56a88a3ca3d9b48f2c9508df077a4e414add79ef792b47255870c0ff7a12351f238501cdb138f8
|
data/Gemfile
CHANGED
@@ -7,8 +7,8 @@ group :test do
|
|
7
7
|
gem "rb-readline"
|
8
8
|
gem "aruba", ">= 0.11", "< 3.0"
|
9
9
|
gem "countloc", "~> 0.4"
|
10
|
-
gem "cucumber", ">= 9.2", "<
|
11
|
-
gem "fakefs", "~>
|
10
|
+
gem "cucumber", ">= 9.2", "< 11"
|
11
|
+
gem "fakefs", "~> 3.0"
|
12
12
|
gem "maruku", "~> 0.6"
|
13
13
|
gem "minitest", "~> 5.3", "< 6.0"
|
14
14
|
gem "mocha", "~> 2.0"
|
@@ -21,6 +21,6 @@ group :integration do
|
|
21
21
|
gem "kitchen-vagrant"
|
22
22
|
end
|
23
23
|
|
24
|
-
group :
|
25
|
-
gem "
|
24
|
+
group :linting do
|
25
|
+
gem "cookstyle", "~> 8.2"
|
26
26
|
end
|
data/LICENSE
CHANGED
@@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
you may not use this file except in compliance with the License.
|
7
7
|
You may obtain a copy of the License at
|
8
8
|
|
9
|
-
|
9
|
+
https://www.apache.org/licenses/LICENSE-2.0
|
10
10
|
|
11
11
|
Unless required by applicable law or agreed to in writing, software
|
12
12
|
distributed under the License is distributed on an "AS IS" BASIS,
|
data/Rakefile
CHANGED
@@ -29,13 +29,13 @@ task :stats do
|
|
29
29
|
end
|
30
30
|
|
31
31
|
begin
|
32
|
-
require "chefstyle"
|
32
|
+
require "cookstyle/chefstyle"
|
33
33
|
require "rubocop/rake_task"
|
34
34
|
RuboCop::RakeTask.new(:style) do |task|
|
35
35
|
task.options += ["--display-cop-names", "--no-color"]
|
36
36
|
end
|
37
37
|
rescue LoadError
|
38
|
-
puts "chefstyle is not available. (sudo) gem install
|
38
|
+
puts "cookstyle/chefstyle is not available. (sudo) gem install cookstyle to do style checking."
|
39
39
|
end
|
40
40
|
|
41
41
|
desc "Run all quality tasks"
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -21,9 +21,9 @@ module Kitchen
|
|
21
21
|
#
|
22
22
|
# @author Fletcher Nichol <fnichol@nichol.ca>
|
23
23
|
module Base64Stream
|
24
|
-
# Encodes an input stream into a Base64 output stream. The input and
|
24
|
+
# Encodes an input stream into a Base64 output stream. The input and output
|
25
25
|
# objects must be opened IO resources. In other words, opening and closing
|
26
|
-
# the resources are not the
|
26
|
+
# the resources are not the responsibility of this method.
|
27
27
|
#
|
28
28
|
# @param io_in [#read] input stream
|
29
29
|
# @param io_out [#write] output stream
|
@@ -33,9 +33,9 @@ module Kitchen
|
|
33
33
|
buffer = nil # rubocop:disable Lint/UselessAssignment
|
34
34
|
end
|
35
35
|
|
36
|
-
# Decodes a Base64 input stream into an output stream. The input and
|
36
|
+
# Decodes a Base64 input stream into an output stream. The input and output
|
37
37
|
# objects must be opened IO resources. In other words, opening and closing
|
38
|
-
# the resources are not the
|
38
|
+
# the resources are not the responsibility of this method.
|
39
39
|
#
|
40
40
|
# @param io_in [#read] input stream
|
41
41
|
# @param io_out [#write] output stream
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -24,7 +24,7 @@ module Kitchen
|
|
24
24
|
def __config
|
25
25
|
# this would need to be some kind of Chef::Config looking thing, which probably requires
|
26
26
|
# a translation object from t-k config to Chef::Config layout if that ever becomes necessary.
|
27
|
-
# this
|
27
|
+
# this ISN'T the t-k config.
|
28
28
|
{}
|
29
29
|
end
|
30
30
|
|
data/lib/kitchen/cli.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/collection.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/color.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -16,7 +16,7 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
|
18
18
|
module Kitchen
|
19
|
-
# Utility methods to help
|
19
|
+
# Utility methods to help output colorized text in a terminal. The
|
20
20
|
# implementation is a compressed mashup of code from the Thor and Foreman
|
21
21
|
# projects.
|
22
22
|
#
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -4,7 +4,7 @@
|
|
4
4
|
# you may not use this file except in compliance with the License.
|
5
5
|
# You may obtain a copy of the License at
|
6
6
|
#
|
7
|
-
#
|
7
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
8
8
|
#
|
9
9
|
# Unless required by applicable law or agreed to in writing, software
|
10
10
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/command/exec.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/command/list.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -71,7 +71,7 @@ module Kitchen
|
|
71
71
|
# Format and color the given last action.
|
72
72
|
#
|
73
73
|
# @param last_action [String] the last action
|
74
|
-
# @return [String]
|
74
|
+
# @return [String] formatted last action
|
75
75
|
# @api private
|
76
76
|
def format_last_action(last_action)
|
77
77
|
case last_action
|
@@ -87,7 +87,7 @@ module Kitchen
|
|
87
87
|
# Format and color the given last error.
|
88
88
|
#
|
89
89
|
# @param last_error [String] the last error
|
90
|
-
# @return [String]
|
90
|
+
# @return [String] formatted last error
|
91
91
|
# @api private
|
92
92
|
def format_last_error(last_error)
|
93
93
|
case last_error
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -4,7 +4,7 @@
|
|
4
4
|
# you may not use this file except in compliance with the License.
|
5
5
|
# You may obtain a copy of the License at
|
6
6
|
#
|
7
|
-
#
|
7
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
8
8
|
#
|
9
9
|
# Unless required by applicable law or agreed to in writing, software
|
10
10
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/command/sink.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/command/test.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/command.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -23,7 +23,7 @@ module Kitchen
|
|
23
23
|
class Base
|
24
24
|
include Logging
|
25
25
|
|
26
|
-
#
|
26
|
+
# Constructs a new Command object.
|
27
27
|
#
|
28
28
|
# @param cmd_args [Array] remainder of the arguments from processed ARGV
|
29
29
|
# @param cmd_options [Hash] hash of Thor options
|
@@ -97,7 +97,7 @@ module Kitchen
|
|
97
97
|
end
|
98
98
|
end
|
99
99
|
|
100
|
-
# Return an array on instances
|
100
|
+
# Return an array on instances whose name matches the regular expression.
|
101
101
|
#
|
102
102
|
# @param regexp [Regexp] a regular expression matching on instance names
|
103
103
|
# @return [Array<Instance>] an array of instances
|
@@ -111,7 +111,7 @@ module Kitchen
|
|
111
111
|
rescue RegexpError => e
|
112
112
|
die "Invalid Ruby regular expression, " \
|
113
113
|
"you may need to single quote the argument. " \
|
114
|
-
"Please try again or consult
|
114
|
+
"Please try again or consult https://rubular.com/ (#{e.message})"
|
115
115
|
end
|
116
116
|
result = Array(result)
|
117
117
|
|
@@ -128,7 +128,7 @@ module Kitchen
|
|
128
128
|
Kitchen.logger
|
129
129
|
end
|
130
130
|
|
131
|
-
# Return an array on instances
|
131
|
+
# Return an array on instances whose name matches the regular expression,
|
132
132
|
# the full instance name, or the `"all"` literal.
|
133
133
|
#
|
134
134
|
# @param arg [String] an instance name, a regular expression, the literal
|
@@ -146,7 +146,7 @@ module Kitchen
|
|
146
146
|
module RunAction
|
147
147
|
# Run an instance action (create, converge, setup, verify, destroy) on
|
148
148
|
# a collection of instances. The instance actions will take place in a
|
149
|
-
#
|
149
|
+
# separate thread of execution which may or may not be running
|
150
150
|
# concurrently.
|
151
151
|
#
|
152
152
|
# @param action [String] action to perform
|
data/lib/kitchen/config.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -20,7 +20,7 @@ module Kitchen
|
|
20
20
|
# as the location of the Kitchen config file, instances, log_levels, etc.
|
21
21
|
# This object is a factory object, meaning that it is responsible for
|
22
22
|
# consuming the desired testing configuration in and returning Ruby objects
|
23
|
-
# which are used to
|
23
|
+
# which are used to perform the work.
|
24
24
|
#
|
25
25
|
# Most internal objects are created with the expectation of being
|
26
26
|
# *immutable*, meaning that internal state cannot be modified after creation.
|
data/lib/kitchen/configurable.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -63,7 +63,7 @@ module Kitchen
|
|
63
63
|
end
|
64
64
|
|
65
65
|
# @return [TrueClass,FalseClass] true if `:shell_type` is `"bourne"` (or
|
66
|
-
# unset, for backwards
|
66
|
+
# unset, for backwards compatibility)
|
67
67
|
def bourne_shell?
|
68
68
|
["bourne", nil].include?(instance.platform.shell_type)
|
69
69
|
end
|
@@ -72,7 +72,7 @@ module Kitchen
|
|
72
72
|
# fallback rules or returns nil if path cannot be determined.
|
73
73
|
#
|
74
74
|
# Given an instance with suite named `"server"`, a `test_base_path` of
|
75
|
-
# `"/a/b"`, and a path
|
75
|
+
# `"/a/b"`, and a path segment of `"roles"` then following will be tried
|
76
76
|
# in order (first match that exists wins):
|
77
77
|
#
|
78
78
|
# 1. /a/b/server/roles
|
data/lib/kitchen/data_munger.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -478,7 +478,7 @@ module Kitchen
|
|
478
478
|
#
|
479
479
|
# @deprecated The `:http_proxy` and `:https_proxy` should no longer be
|
480
480
|
# used in driver blocks, they should be added to the provisioner and
|
481
|
-
# verifier blocks so that they can be
|
481
|
+
# verifier blocks so that they can be independently configured.
|
482
482
|
# Provisioners and Verifiers are responsible for HTTP proxying and no
|
483
483
|
# longer are Drivers responsible for this.
|
484
484
|
# @api private
|
@@ -499,7 +499,7 @@ module Kitchen
|
|
499
499
|
# @param root [Hash] a hash to use as the root of the conversion
|
500
500
|
# @deprecated The `:http_proxy` and `:https_proxy` should no longer be
|
501
501
|
# used in driver blocks, they should be added to the provisioner and
|
502
|
-
# verifier blocks so that they can be
|
502
|
+
# verifier blocks so that they can be independently configured.
|
503
503
|
# Provisioners and Verifiers are responsible for HTTP proxying and no
|
504
504
|
# longer are Drivers responsible for this.
|
505
505
|
# @api private
|
data/lib/kitchen/diagnostic.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -125,7 +125,7 @@ module Kitchen
|
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
128
|
-
#
|
128
|
+
# Determines whether or not the object is an error hash. An error hash is
|
129
129
|
# defined as a Hash containing an `:error` key.
|
130
130
|
#
|
131
131
|
# @param obj [Object] an object
|
data/lib/kitchen/driver/base.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/driver/dummy.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/driver/exec.rb
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
# you may not use this file except in compliance with the License.
|
4
4
|
# You may obtain a copy of the License at
|
5
5
|
#
|
6
|
-
#
|
6
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
7
7
|
#
|
8
8
|
# Unless required by applicable law or agreed to in writing, software
|
9
9
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/driver/proxy.rb
CHANGED
@@ -8,7 +8,7 @@
|
|
8
8
|
# you may not use this file except in compliance with the License.
|
9
9
|
# You may obtain a copy of the License at
|
10
10
|
#
|
11
|
-
#
|
11
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
12
12
|
#
|
13
13
|
# Unless required by applicable law or agreed to in writing, software
|
14
14
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/driver.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/errors.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -116,7 +116,7 @@ module Kitchen
|
|
116
116
|
# initialized
|
117
117
|
# @api private
|
118
118
|
def init_test_dir?
|
119
|
-
Util.list_directory("test/integration/").
|
119
|
+
Util.list_directory("test/integration/").none? { |d| File.directory?(d) }
|
120
120
|
end
|
121
121
|
|
122
122
|
# @return [true,false] whether or not a `.gitignore` file needs to be
|
data/lib/kitchen/instance.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -123,7 +123,7 @@ module Kitchen
|
|
123
123
|
# @return [self] this instance, used to chain actions
|
124
124
|
#
|
125
125
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
126
|
-
# to
|
126
|
+
# to gracefully stop action chaining
|
127
127
|
def create
|
128
128
|
transition_to(:create)
|
129
129
|
end
|
@@ -134,7 +134,7 @@ module Kitchen
|
|
134
134
|
# @return [self] this instance, used to chain actions
|
135
135
|
#
|
136
136
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
137
|
-
# to
|
137
|
+
# to gracefully stop action chaining
|
138
138
|
def converge
|
139
139
|
transition_to(:converge)
|
140
140
|
end
|
@@ -145,7 +145,7 @@ module Kitchen
|
|
145
145
|
# @return [self] this instance, used to chain actions
|
146
146
|
#
|
147
147
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
148
|
-
# to
|
148
|
+
# to gracefully stop action chaining
|
149
149
|
def setup
|
150
150
|
transition_to(:setup)
|
151
151
|
end
|
@@ -156,7 +156,7 @@ module Kitchen
|
|
156
156
|
# @return [self] this instance, used to chain actions
|
157
157
|
#
|
158
158
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
159
|
-
# to
|
159
|
+
# to gracefully stop action chaining
|
160
160
|
def verify
|
161
161
|
transition_to(:verify)
|
162
162
|
end
|
@@ -167,7 +167,7 @@ module Kitchen
|
|
167
167
|
# @return [self] this instance, used to chain actions
|
168
168
|
#
|
169
169
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
170
|
-
# to
|
170
|
+
# to gracefully stop action chaining
|
171
171
|
def destroy
|
172
172
|
transition_to(:destroy)
|
173
173
|
end
|
@@ -181,7 +181,7 @@ module Kitchen
|
|
181
181
|
# @return [self] this instance, used to chain actions
|
182
182
|
#
|
183
183
|
# @todo rescue Driver::ActionFailed and return some kind of null object
|
184
|
-
# to
|
184
|
+
# to gracefully stop action chaining
|
185
185
|
def test(destroy_mode = :passing)
|
186
186
|
elapsed = Benchmark.measure do
|
187
187
|
banner "Cleaning up any prior instances of #{to_str}"
|
@@ -513,10 +513,10 @@ module Kitchen
|
|
513
513
|
# would be a driver create action failing, a chef convergence crashing
|
514
514
|
# in normal course of development, failing acceptance tests in the
|
515
515
|
# verify action, etc.
|
516
|
-
# @raise [ActionFailed] if an
|
516
|
+
# @raise [ActionFailed] if an unforeseen or unplanned exception is raised.
|
517
517
|
# This would usually indicate that a race condition was triggered, a
|
518
518
|
# bug exists in a driver, provisioner, or core, a transient IO error
|
519
|
-
#
|
519
|
+
# occurred, etc.
|
520
520
|
# @api private
|
521
521
|
def action(what, &block)
|
522
522
|
state = state_file.read
|
data/lib/kitchen/lazy_hash.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
data/lib/kitchen/loader/yaml.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# https://www.apache.org/licenses/LICENSE-2.0
|
11
11
|
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
@@ -23,7 +23,7 @@ require "yaml" unless defined?(YAML)
|
|
23
23
|
module Kitchen
|
24
24
|
module Loader
|
25
25
|
# YAML file loader for Test Kitchen configuration. This class is
|
26
|
-
#
|
26
|
+
# responsible for parsing the main YAML file and the local YAML if it
|
27
27
|
# exists. Local file configuration will win over the default configuration.
|
28
28
|
# The client of this class should not require any YAML loading or parsing
|
29
29
|
# logic.
|
@@ -156,7 +156,7 @@ module Kitchen
|
|
156
156
|
@process_erb ? process_erb(string, file) : string
|
157
157
|
end
|
158
158
|
|
159
|
-
# Passes a string through ERb to
|
159
|
+
# Passes a string through ERb to evaluate any ERb blocks.
|
160
160
|
#
|
161
161
|
# @param string [String] the string to process
|
162
162
|
# @param file [String] an absolute path to the file represented as the
|
@@ -242,7 +242,7 @@ module Kitchen
|
|
242
242
|
File.join(File.expand_path(ENV["HOME"]), ".kitchen", "config.yml")
|
243
243
|
end
|
244
244
|
|
245
|
-
# Generate a
|
245
|
+
# Generate a diagnose Hash for a particular YAML file Hash. If an error
|
246
246
|
# occurs when loading the data, then a failure hash will be inserted
|
247
247
|
# into the `:raw_data` sub-hash.
|
248
248
|
#
|
@@ -263,7 +263,7 @@ module Kitchen
|
|
263
263
|
{ filename: file, raw_data: hash }
|
264
264
|
end
|
265
265
|
|
266
|
-
# Generates a Hash
|
266
|
+
# Generates a Hash representing a failure, given an Exception object.
|
267
267
|
#
|
268
268
|
# @param e [Exception] an exception
|
269
269
|
# @param file [String] the absolute path to a file (default: `nil`)
|